Updated Traditional Chinese translation(Hong Kong and Taiwan)

author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw> 2009-07-15 06:26:51 +0800
committer: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw> 2009-07-15 06:26:51 +0800
commit: da8fac9a234c3e42da8d8535dfb72538d9b4b274 (patch)
tree: 3b7fe4d14938b0d3dcbbedc8c5e4a13984c9d94b /po/zh_TW.po
parent: fe962447cb7d2bed8c530114bf131566cbd71ac9 (diff)
download: gsoc2013-evolution-da8fac9a234c3e42da8d8535dfb72538d9b4b274.tar
gsoc2013-evolution-da8fac9a234c3e42da8d8535dfb72538d9b4b274.tar.gz
gsoc2013-evolution-da8fac9a234c3e42da8d8535dfb72538d9b4b274.tar.bz2
gsoc2013-evolution-da8fac9a234c3e42da8d8535dfb72538d9b4b274.tar.lz
gsoc2013-evolution-da8fac9a234c3e42da8d8535dfb72538d9b4b274.tar.xz
gsoc2013-evolution-da8fac9a234c3e42da8d8535dfb72538d9b4b274.tar.zst
gsoc2013-evolution-da8fac9a234c3e42da8d8535dfb72538d9b4b274.zip
1 files changed, 5136 insertions, 5444 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ef03a68d81..ac934caec6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,13 +6,13 @@
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005.
 # Abel Cheung <abelcheung@gmail.com>, 2006.
 #
-#: ../shell/main.c:603
+#: ../shell/main.c:631
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.25.91\n"
+"Project-Id-Version: evolution 2.27.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 21:48+0800\n"
-"PO-Revision-Date: 2009-02-15 22:16+0800\n"
+"POT-Creation-Date: 2009-07-15 06:18+0800\n"
+"PO-Revision-Date: 2009-07-14 06:37+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n@lists.linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -22,21 +22,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution address book"
 msgstr "evolution 通訊錄"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:208
 msgid "New Contact"
 msgstr "新增連絡人"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:216
 msgid "New Contact List"
 msgstr "新增連絡人清單"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -59,32 +59,32 @@ msgstr "連絡人: "
 msgid "evolution minicard"
 msgstr "Evolution 迷你名片"
 
-#: ../a11y/calendar/ea-cal-view-event.c:265
+#: ../a11y/calendar/ea-cal-view-event.c:263
 msgid "It has alarms."
 msgstr "它具有鬧鈴。"
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has recurrences."
 msgstr "它是週期性約會。"
 
-#: ../a11y/calendar/ea-cal-view-event.c:271
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It is a meeting."
 msgstr "這是一項會議。"
 
-#: ../a11y/calendar/ea-cal-view-event.c:277
+#: ../a11y/calendar/ea-cal-view-event.c:275
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "行事曆事件：摘要為 %s。"
 
-#: ../a11y/calendar/ea-cal-view-event.c:279
+#: ../a11y/calendar/ea-cal-view-event.c:277
 msgid "Calendar Event: It has no summary."
 msgstr "行事曆事件：沒有摘要。"
 
-#: ../a11y/calendar/ea-cal-view-event.c:299
+#: ../a11y/calendar/ea-cal-view-event.c:297
 msgid "calendar view event"
 msgstr "行事曆檢視事件"
 
-#: ../a11y/calendar/ea-cal-view-event.c:527
+#: ../a11y/calendar/ea-cal-view-event.c:525
 msgid "Grab Focus"
 msgstr "得到焦點"
 
@@ -108,8 +108,8 @@ msgstr "移至今日"
 msgid "Go to Date"
 msgstr "移至日期"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
+#: ../a11y/calendar/ea-day-view-main-item.c:300
+#: ../a11y/calendar/ea-week-view-main-item.c:297
 msgid "a table to view and select the current time range"
 msgstr "用來檢視與選擇時刻範圍的表格"
 
@@ -153,7 +153,7 @@ msgid "calendar view for one or more days"
 msgstr "用於一或多日的行事曆檢視"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:771
 msgid "%A %d %b %Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -164,18 +164,18 @@ msgstr "%Y/%m/%d (%a)"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:824
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1599
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1587
+#: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%-m 月 %-d 日 (%a)"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:826
-#: ../calendar/gui/calendar-component.c:831
-#: ../calendar/gui/calendar-component.c:833
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:783
 msgid "%a %d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 
@@ -183,10 +183,10 @@ msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:845
-#: ../calendar/gui/calendar-component.c:852
-#: ../calendar/gui/calendar-component.c:858
-#: ../calendar/gui/calendar-component.c:860
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:802
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:810
 msgid "%d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日"
 
@@ -196,15 +196,15 @@ msgstr "%Y 年 %-m 月 %-d 日"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:850
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1615
-#: ../calendar/gui/e-week-view-main-item.c:349
+#: ../calendar/gui/calendar-component.c:800
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1603
+#: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%-m 月 %-d 日"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "Gnome 行事曆"
 
@@ -216,11 +216,11 @@ msgstr "搜尋列"
 msgid "evolution calendar search bar"
 msgstr "evolution 行事曆搜尋列"
 
-#: ../a11y/calendar/ea-jump-button.c:147
+#: ../a11y/calendar/ea-jump-button.c:146
 msgid "Jump button"
 msgstr "跳躍按鈕"
 
-#: ../a11y/calendar/ea-jump-button.c:156
+#: ../a11y/calendar/ea-jump-button.c:155
 msgid "Click here, you can find more events."
 msgstr "按這裡，您可以找到更多事件。"
 
@@ -251,50 +251,50 @@ msgstr "彈出"
 msgid "popup a child"
 msgstr "彈出子選單"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
 msgid "edit"
 msgstr "編輯"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
 msgid "begin editing this cell"
 msgstr "開始編輯此儲存格"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
 msgid "toggle"
 msgstr "切換"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
 msgid "toggle the cell"
 msgstr "切換儲存格"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
 msgid "expand"
 msgstr "展開"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
 msgid "expands the row in the ETree containing this cell"
 msgstr "展開 ETree 中包含此儲存格的列"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
 msgid "collapse"
 msgstr "收摺"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
 msgid "collapses the row in the ETree containing this cell"
 msgstr "折疊 ETree 中包含此儲存格的列"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
+#: ../a11y/e-table/gal-a11y-e-cell.c:120
 msgid "Table Cell"
 msgstr "表格的儲存格"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
-#: ../widgets/table/e-table-click-to-add.c:580
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/e-table-click-to-add.c:578
 msgid "click to add"
 msgstr "請按這裡加入"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
 msgid "click"
 msgstr "單擊"
 
@@ -328,14 +328,6 @@ msgstr "使用預設值"
 msgid "Popup Menu"
 msgstr "彈出式選單"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "切換附加檔案列"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "使作用"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -384,9 +376,9 @@ msgstr "無法移除通訊錄。"
 
 #: ../addressbook/addressbook.error.xml.h:11
 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."
+"Currently you can only access the 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 個人連絡人"
@@ -410,7 +402,7 @@ msgstr "無法驗證 LDAP 伺服器。"
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1746
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1743
 msgid "Failed to delete contact"
 msgstr "刪除連絡人失敗"
 
@@ -553,17 +545,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:491
+#: ../addressbook/conduit/address-conduit.c:590
 msgid "Default Sync Address:"
 msgstr "預設的同步地址:"
 
-#: ../addressbook/conduit/address-conduit.c:1521
-#: ../addressbook/conduit/address-conduit.c:1522
+#: ../addressbook/conduit/address-conduit.c:1613
+#: ../addressbook/conduit/address-conduit.c:1614
 msgid "Could not load address book"
 msgstr "無法載入通訊錄"
 
-#: ../addressbook/conduit/address-conduit.c:1599
-#: ../addressbook/conduit/address-conduit.c:1602
+#: ../addressbook/conduit/address-conduit.c:1691
+#: ../addressbook/conduit/address-conduit.c:1694
 msgid "Could not read pilot's Address application block"
 msgstr "無法讀取 pilot 通訊錄程式區塊"
 
@@ -584,14 +576,12 @@ msgstr "憑證"
 msgid "Configure autocomplete here"
 msgstr "在此設定自動完成"
 
-#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:316
-#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:582
+#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
 msgstr "連絡人"
 
@@ -627,30 +617,26 @@ msgstr "Evolution 資料夾設定組態控制"
 msgid "Manage your S/MIME certificates here"
 msgstr "在此管理您的 S/MIME 憑證"
 
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:142
-#: ../addressbook/gui/component/addressbook-component.c:146
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:243
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/memos-component.c:197 ../calendar/gui/memos-component.c:201
-#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
-#: ../calendar/gui/tasks-component.c:198 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2990
-#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1517
+#: ../addressbook/gui/component/addressbook-component.c:97
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:192
+#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
+#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
+#: ../mail/message-list.c:1515
 msgid "On This Computer"
 msgstr "我的電腦"
 
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "在 LDAP 伺服器"
+
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. ensure the source name is in current locale, not read from configuration
@@ -662,144 +648,188 @@ msgstr "我的電腦"
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:154
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
-#: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/calendar-component.c:261
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memos-component.c:213
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
-#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../addressbook/gui/component/addressbook-component.c:135
+#: ../addressbook/gui/component/addressbook-component.c:138
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../calendar/gui/calendar-component.c:232
+#: ../calendar/gui/calendar-component.c:238
+#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
+#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Personal"
 msgstr "個人"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:168
-#: ../addressbook/gui/component/addressbook-component.c:171
-#: ../addressbook/gui/component/addressbook-migrate.c:518
-msgid "On LDAP Servers"
-msgstr "在 LDAP 伺服器"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:209
 msgctxt "New"
 msgid "_Contact"
 msgstr "連絡人(_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:210
 msgid "Create a new contact"
 msgstr "建立新的連絡人"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:217
 msgctxt "New"
 msgid "Contact _List"
 msgstr "連絡人清單(_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:218
 msgid "Create a new contact list"
 msgstr "建立新的連絡人清單"
 
-#: ../addressbook/gui/component/addressbook-component.c:253
-#: ../addressbook/gui/component/addressbook-config.c:1223
+#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-config.c:1245
 msgid "New Address Book"
 msgstr "新通訊錄"
 
-#: ../addressbook/gui/component/addressbook-component.c:254
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgctxt "New"
 msgid "Address _Book"
 msgstr "通訊錄(_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:255
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new address book"
 msgstr "建立新通訊錄"
 
-#: ../addressbook/gui/component/addressbook-component.c:418
+#: ../addressbook/gui/component/addressbook-component.c:389
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "升級通訊錄設定值或資料夾失敗。"
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:217
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"選取此選項表示，Evolution 只會連線到您的 LDAP 伺服器 (如果您的 LDAP 伺服器支"
+"援 SSL)。"
+
+#: ../addressbook/gui/component/addressbook-config.c:219
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"選取此選項表示，Evolution 只會連線到您的 LDAP 伺服器 (如果您的 LDAP 伺服器支"
+"援 TLS)。"
+
+#: ../addressbook/gui/component/addressbook-config.c:221
+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。這表示您的連線將不安全，而且您的"
+"安全有漏洞。 "
+
+#: ../addressbook/gui/component/addressbook-config.c:346
 msgid "Base"
 msgstr "基本"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:170
+#: ../addressbook/gui/component/addressbook-config.c:547
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "類型(_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:648
 msgid "Copy _book content locally for offline operation"
 msgstr "複製通訊錄內容至本地用於離線作業(_B)"
 
-#: ../addressbook/gui/component/addressbook-config.c:998
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../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:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2532
+#: ../addressbook/gui/component/addressbook-config.c:759
+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/addressbook-config.c:837
+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/addressbook-config.c:916
+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/addressbook-config.c:1020
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
+#: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "一般"
 
-#: ../addressbook/gui/component/addressbook-config.c:999
-#: ../addressbook/gui/widgets/e-addressbook-view.c:554
+#: ../addressbook/gui/component/addressbook-config.c:1021
+#: ../addressbook/gui/widgets/e-addressbook-view.c:553
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: ../addressbook/gui/component/addressbook-config.c:1003
+#: ../addressbook/gui/component/addressbook-config.c:1025
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: ../addressbook/gui/component/addressbook-config.c:1005
+#: ../addressbook/gui/component/addressbook-config.c:1027
 msgid "Authentication"
 msgstr "驗證"
 
-#: ../addressbook/gui/component/addressbook-config.c:1008
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:1030
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "詳細資料"
 
-#: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:1000
+#: ../addressbook/gui/component/addressbook-config.c:1031
+#: ../mail/em-folder-browser.c:1022
 msgid "Searching"
 msgstr "正在搜尋"
 
-#: ../addressbook/gui/component/addressbook-config.c:1011
+#: ../addressbook/gui/component/addressbook-config.c:1033
 msgid "Downloading"
 msgstr "下載中"
 
-#: ../addressbook/gui/component/addressbook-config.c:1221
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/addressbook-config.c:1243
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "通訊錄內容"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1209
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
 msgid "Migrating..."
 msgstr "正在移轉..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1268
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
 #, c-format
 msgid "Migrating '%s':"
 msgstr "正在移轉「%s」："
 
-#: ../addressbook/gui/component/addressbook-migrate.c:646
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP 伺服器"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:761
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "自動完成設定"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -810,7 +840,7 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -820,7 +850,7 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -830,7 +860,7 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -841,18 +871,18 @@ msgstr ""
 "當 Evolution 移轉您的 Pilot Sync 資料時，請耐心等候..."
 
 #: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:448
+#: ../mail/em-folder-utils.c:453
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "重新命名「%s」資料夾為："
 
 #: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:450
+#: ../mail/em-folder-utils.c:455
 msgid "Rename Folder"
 msgstr "重新命名資料夾"
 
 #: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:456
+#: ../mail/em-folder-utils.c:461
 msgid "Folder names cannot contain '/'"
 msgstr "資料夾名稱不能包含斜線。"
 
@@ -865,19 +895,19 @@ msgid "Save As vCard..."
 msgstr "儲存為 vCard..."
 
 #: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:678
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:501
-#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
+#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "重新命名(_R)..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:681
-#: ../calendar/gui/e-calendar-table.c:1620
-#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:954
-#: ../calendar/gui/memos-component.c:512 ../calendar/gui/tasks-component.c:504
-#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../calendar/gui/calendar-component.c:631
+#: ../calendar/gui/e-calendar-table.c:1608
+#: ../calendar/gui/e-calendar-view.c:1826 ../calendar/gui/e-memo-table.c:944
+#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
+#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -885,11 +915,10 @@ msgid "_Delete"
 msgstr "刪除(_D)"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:686
-#: ../calendar/gui/dialogs/comp-editor.c:2092
-#: ../calendar/gui/memos-component.c:517 ../calendar/gui/tasks-component.c:509
-#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "屬性(_P)"
 
@@ -902,20 +931,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "正以匿名方式存取 LDAP 伺服器"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
 msgid "Failed to authenticate.\n"
 msgstr "驗證憑證失敗。\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "輸入 %s (使用者 %s) 的密碼 "
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:422
-#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../plugins/google-account-setup/google-source.c:414
+#: ../plugins/publish-calendar/publish-calendar.c:216
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "輸入密碼"
@@ -961,7 +990,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "上次用於選取名稱對話盒的資料夾 URI"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Vertical pane position"
 msgstr "垂直窗格位置"
 
@@ -988,21 +1017,19 @@ msgid "1"
 msgstr "1"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:3
-msgid "389"
-msgstr "389"
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+"389\n"
+"636\n"
+"3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "636"
-msgstr "636"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "<b>Authentication</b>"
 msgstr "<b>驗證</b>"
@@ -1015,144 +1042,73 @@ msgstr "<b>下載中</b>"
 msgid "<b>Searching</b>"
 msgstr "<b>搜尋中</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "<b>Type:</b>"
-msgstr "<b>類型:</b>"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Add Address Book"
-msgstr "新增通訊錄"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:760
-msgid "Always"
-msgstr "永遠"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:13
-msgid "Anonymously"
-msgstr "匿名"
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr ""
+"匿名\n"
+"使用電子郵件位址\n"
+"使用辨認的名稱 (DN)"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "B_rowse this book until limit reached"
 msgstr "瀏覽這個通訊錄直到限制(_R)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Basic"
-msgstr "基本"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Distinguished name"
-msgstr "可辨識名稱"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-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."
 msgstr "Evolution 會使用此電子郵件地址，在伺服器驗證您的身份。"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid "Find Possible Search Bases"
-msgstr "尋找可能的搜尋基礎"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Lo_gin:"
 msgstr "登入(_G):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:759
-msgid "Never"
-msgstr "永不"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:287
-msgid "No encryption"
-msgstr "沒有加密"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "一層"
+#: ../addressbook/gui/component/ldap-config.glade.h:19
+#, fuzzy
+#| msgid "One"
+msgid ""
+"One\n"
+"Sub"
+msgstr "one fourth"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:295
-msgid "SSL encryption"
-msgstr "SSL 加密"
+#: ../addressbook/gui/component/ldap-config.glade.h:21
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
+"SSL 加密\n"
+"TLS 加密\n"
+"不加密"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:24
 msgid "Search Filter"
 msgstr "搜尋過濾器"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 msgid "Search _base:"
 msgstr "搜尋起點(_B):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search _filter:"
 msgstr "搜尋過濾器(_F):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Search filter"
-msgstr "搜尋過濾器"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:27
 msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
 msgstr ""
 "搜尋過濾器是在進行搜尋時使用的物件類型。如果此項沒有被修改，預設的搜尋目標是"
 "「person」物件類型。"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"選取此選項表示，Evolution 只會連線到您的 LDAP 伺服器 (如果您的 LDAP 伺服器支"
-"援 SSL)。"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"選取此選項表示，Evolution 只會連線到您的 LDAP 伺服器 (如果您的 LDAP 伺服器支"
-"援 TLS)。"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"選取此選項表示，您的伺服器不支援 SSL 或 TLS。這表示您的連線將不安全，而且您的"
-"安全有漏洞。 "
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid "Sub"
-msgstr "子目錄"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Supported Search Bases"
 msgstr "支援的搜尋起點"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:291
-msgid "TLS encryption"
-msgstr "TLS 加密"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 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 "
@@ -1161,124 +1117,79 @@ msgstr ""
 "搜尋基礎是指項目的可辨識名稱 (DN)，搜尋會由此處開始。如果此處空白，搜尋會在目"
 "錄樹的底層開始。"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-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:41
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 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:42
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 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:43
-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:44
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 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:45
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"這是 LDAP 伺服器上的埠，Evolution 會嘗試連線到這個地方。已提供標準埠清單。請"
-"洽詢您的系統管理員，瞭解您應該指定的埠。"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "Using distinguished name (DN)"
-msgstr "使用辨認的名稱 (DN)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "使用電子郵件位址"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-msgid "Whenever Possible"
-msgstr "每次可能的時候"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Add Address Book"
-msgstr "新增通訊錄(_A)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid "_Download limit:"
 msgstr "下載限制(_D):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "_Find Possible Search Bases"
 msgstr "尋找可能的搜尋基礎(_F)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "_Login method:"
 msgstr "登入方法(_L):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:178
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "名稱(_N):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "_Port:"
 msgstr "連接埠(_P):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid "_Search scope:"
 msgstr "搜尋範圍(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:187
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "伺服器(_S):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "_Timeout:"
 msgstr "時限(_T):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "_Use secure connection:"
 msgstr "使用安全連線(_U):"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid "cards"
 msgstr "名片"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/caldav/caldav-source.c:430
-#: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:652
-#: ../plugins/google-account-setup/google-contacts-source.c:366
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:523
+#: ../plugins/google-account-setup/google-source.c:668
+#: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "分鐘"
 
@@ -1303,27 +1214,25 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>雜項</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Notes</b>"
+msgstr "<b>備註</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>其他</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>電話</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>網址</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>工作</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
-msgid "AIM"
-msgstr "AIM"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../calendar/gui/dialogs/event-page.glade.h:6
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
@@ -1331,16 +1240,16 @@ msgid "Ca_tegories..."
 msgstr "分類(_T)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:199
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "連絡人"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
@@ -1349,1281 +1258,260 @@ msgid "Full _Name..."
 msgstr "全名(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2478
 msgid "Image"
 msgstr "圖片"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "郵寄地址"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Nic_kname:"
 msgstr "暱稱(_K):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "Novell Groupwise"
-msgstr "Novell GroupWise"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../calendar/gui/migration.c:1225
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+msgid "Notes"
+msgstr "備註"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "個人資訊"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 msgstr "電話"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../mail/em-migrate.c:1057
-msgid "Work"
-msgstr "工作"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Address:"
 msgstr "地址(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
 msgstr "週年紀念日(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
 msgstr "助理(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "生日(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../calendar/gui/dialogs/event-page.c:792
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../calendar/gui/dialogs/event-page.c:805
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "行事曆(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "縣/市(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "公司(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "國家/地區(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "部門(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "歸檔為(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "空閒/忙碌(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "首頁(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager:"
 msgstr "主管(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
-msgid "_Notes:"
-msgstr "備註(_N):"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "辦公室(_O):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_PO Box:"
 msgstr "郵箱(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "職業(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Spouse:"
 msgstr "配偶(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_State/Province:"
 msgstr "州/省(_S):"
 
 # (Abel) 職稱和輸入連絡人時的 Title (Dr., Ms.) 有衝突
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
 msgstr "頭銜(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "視訊交談(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
 msgstr "可接受 H_TML 郵件"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
 msgstr "網誌(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "通訊錄(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Zip/Postal Code:"
 msgstr "郵遞區號(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-msgid "Address"
-msgstr "地址"
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:472
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:61
+msgid "Name"
+msgstr "名稱"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:325
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:165
+#: ../addressbook/gui/widgets/e-addressbook-model.c:324
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3685
-#: ../widgets/text/e-text.c:3686
+#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "可編輯"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
-msgid "United States"
-msgstr "美國"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
-msgid "Afghanistan"
-msgstr "阿富汗"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
-msgid "Albania"
-msgstr "阿爾巴尼亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
-msgid "Algeria"
-msgstr "阿爾及利亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
-msgid "American Samoa"
-msgstr "美屬薩摩亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
-msgid "Andorra"
-msgstr "安道爾"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "Angola"
-msgstr "安哥拉"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Anguilla"
-msgstr "安圭拉島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Antarctica"
-msgstr "南極洲"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "Antigua And Barbuda"
-msgstr "安地卡及巴布達"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "Argentina"
-msgstr "阿根廷"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Armenia"
-msgstr "亞美尼亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
-msgid "Aruba"
-msgstr "阿盧巴島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
-msgid "Australia"
-msgstr "澳大利亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
-msgid "Austria"
-msgstr "奧地利"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Azerbaijan"
-msgstr "亞賽拜然"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Bahamas"
-msgstr "巴哈馬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Bahrain"
-msgstr "巴林"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
-msgid "Bangladesh"
-msgstr "孟加拉"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
-msgid "Barbados"
-msgstr "巴貝多"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Belarus"
-msgstr "白俄羅斯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
-msgid "Belgium"
-msgstr "比利時"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
-msgid "Belize"
-msgstr "貝里斯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
-msgid "Benin"
-msgstr "貝南"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
-msgid "Bermuda"
-msgstr "百慕達"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
-msgid "Bhutan"
-msgstr "不丹"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
-msgid "Bolivia"
-msgstr "玻利維亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
-msgid "Bosnia And Herzegowina"
-msgstr "波士尼亞-赫芝格維納"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
-msgid "Botswana"
-msgstr "波札那"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
-msgid "Bouvet Island"
-msgstr "波維特島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
-msgid "Brazil"
-msgstr "巴西"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
-msgid "British Indian Ocean Territory"
-msgstr "英屬印度洋地區"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
-msgid "Brunei Darussalam"
-msgstr "汶萊"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
-msgid "Bulgaria"
-msgstr "保加利亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
-msgid "Burkina Faso"
-msgstr "布吉納法索"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
-msgid "Burundi"
-msgstr "浦隆地"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "Cambodia"
-msgstr "柬埔寨王國"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "Cameroon"
-msgstr "喀麥隆"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Canada"
-msgstr "加拿大"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
-msgid "Cape Verde"
-msgstr "維德角島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
-msgid "Cayman Islands"
-msgstr "開曼群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
-msgid "Central African Republic"
-msgstr "中非"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
-msgid "Chad"
-msgstr "查德"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Chile"
-msgstr "智利"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
-msgid "China"
-msgstr "中國"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
-msgid "Christmas Island"
-msgstr "聖誕島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Cocos (Keeling) Islands"
-msgstr "可可斯群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Colombia"
-msgstr "哥倫比亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Comoros"
-msgstr "葛摩"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "Congo"
-msgstr "剛果共和國"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "Congo, The Democratic Republic Of The"
-msgstr "剛果共和國"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Cook Islands"
-msgstr "科克群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
-msgid "Costa Rica"
-msgstr "哥斯大黎加"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
-msgid "Cote d'Ivoire"
-msgstr "象牙海岸"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Croatia"
-msgstr "克羅埃西亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Cuba"
-msgstr "古巴"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Cyprus"
-msgstr "賽普勒斯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Czech Republic"
-msgstr "捷克共和國"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Denmark"
-msgstr "丹麥"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Djibouti"
-msgstr "吉布地"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Dominica"
-msgstr "多明尼克"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Dominican Republic"
-msgstr "多明尼加共和國"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
-msgid "Ecuador"
-msgstr "厄瓜多"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
-msgid "Egypt"
-msgstr "埃及"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
-msgid "El Salvador"
-msgstr "薩爾瓦多"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
-msgid "Equatorial Guinea"
-msgstr "赤道幾內亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Eritrea"
-msgstr "厄利垂亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Estonia"
-msgstr "愛沙尼亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Ethiopia"
-msgstr "依索比亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "Falkland Islands"
-msgstr "福克蘭群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "Faroe Islands"
-msgstr "法羅群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Fiji"
-msgstr "斐濟群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
-msgid "Finland"
-msgstr "芬蘭"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
-msgid "France"
-msgstr "法國"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "French Guiana"
-msgstr "法屬圭亞那"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "French Polynesia"
-msgstr "法屬玻里尼西亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "French Southern Territories"
-msgstr "法屬南部屬地"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
-msgid "Gabon"
-msgstr "加彭"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
-msgid "Gambia"
-msgstr "甘比亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "Georgia"
-msgstr "喬治亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "Germany"
-msgstr "德國"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "Ghana"
-msgstr "迦納"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "Gibraltar"
-msgstr "直布羅陀"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
-msgid "Greece"
-msgstr "希臘"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
-msgid "Greenland"
-msgstr "格陵蘭"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Grenada"
-msgstr "格瑞那達"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Guadeloupe"
-msgstr "瓜德魯普島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
-msgid "Guam"
-msgstr "關島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
-msgid "Guatemala"
-msgstr "瓜地馬拉"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
-msgid "Guernsey"
-msgstr "根息"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
-msgid "Guinea"
-msgstr "幾內亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-msgid "Guinea-Bissau"
-msgstr "幾內亞比索"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guyana"
-msgstr "蓋亞納"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
-msgid "Haiti"
-msgstr "海地"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
-msgid "Heard And McDonald Islands"
-msgstr "赫德及麥當勞群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
-msgid "Holy See"
-msgstr "教廷"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-msgid "Honduras"
-msgstr "宏都拉斯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Hong Kong"
-msgstr "香港"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
-msgid "Hungary"
-msgstr "匈牙利"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
-msgid "Iceland"
-msgstr "冰島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
-msgid "India"
-msgstr "印度"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Indonesia"
-msgstr "印尼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
-msgid "Iran"
-msgstr "伊朗"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
-msgid "Iraq"
-msgstr "伊拉克"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
-msgid "Ireland"
-msgstr "愛爾蘭"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "Isle of Man"
-msgstr "曼島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "Israel"
-msgstr "以色列"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Italy"
-msgstr "義大利"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-msgid "Jamaica"
-msgstr "牙買加"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
-msgid "Japan"
-msgstr "日本"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
-msgid "Jersey"
-msgstr "澤西"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Jordan"
-msgstr "約旦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
-msgid "Kazakhstan"
-msgstr "哈薩克"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
-msgid "Kenya"
-msgstr "肯亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
-msgid "Kiribati"
-msgstr "吉里巴斯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Korea, Democratic People's Republic Of"
-msgstr "北韓"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
-msgid "Korea, Republic Of"
-msgstr "韓國"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
-msgid "Kuwait"
-msgstr "科威特"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
-msgid "Kyrgyzstan"
-msgstr "吉爾吉斯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Laos"
-msgstr "寮國"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-msgid "Latvia"
-msgstr "拉脫維亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-msgid "Lebanon"
-msgstr "黎巴嫩"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Lesotho"
-msgstr "賴索托"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Liberia"
-msgstr "賴比瑞亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
-msgid "Libya"
-msgstr "利比亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
-msgid "Liechtenstein"
-msgstr "列支敦斯登"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Lithuania"
-msgstr "立陶宛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Luxembourg"
-msgstr "盧森堡"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
-msgid "Macao"
-msgstr "澳門"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
-msgid "Macedonia"
-msgstr "馬其頓"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
-msgid "Madagascar"
-msgstr "馬達加斯加"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
-msgid "Malawi"
-msgstr "馬拉威"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
-msgid "Malaysia"
-msgstr "馬來西亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Maldives"
-msgstr "馬爾地夫"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Mali"
-msgstr "馬利"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
-msgid "Malta"
-msgstr "馬爾他"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
-msgid "Marshall Islands"
-msgstr "馬紹爾群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
-msgid "Martinique"
-msgstr "法屬馬丁尼克"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
-msgid "Mauritania"
-msgstr "茅利塔尼亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
-msgid "Mauritius"
-msgstr "模里西斯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
-msgid "Mayotte"
-msgstr "美亞特"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
-msgid "Mexico"
-msgstr "墨西哥"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Micronesia"
-msgstr "密克羅尼西亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Moldova, Republic Of"
-msgstr "摩爾多瓦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Monaco"
-msgstr "摩納哥"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mongolia"
-msgstr "蒙古"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
-msgid "Montserrat"
-msgstr "蒙瑟拉特島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
-msgid "Morocco"
-msgstr "摩洛哥"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Mozambique"
-msgstr "莫三比克"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Myanmar"
-msgstr "緬甸"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Namibia"
-msgstr "納米比亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Nauru"
-msgstr "諾魯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
-msgid "Nepal"
-msgstr "尼泊爾"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
-msgid "Netherlands"
-msgstr "荷蘭"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Netherlands Antilles"
-msgstr "荷屬安地列斯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
-msgid "New Caledonia"
-msgstr "新喀里多尼亞島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
-msgid "New Zealand"
-msgstr "紐西蘭"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
-msgid "Nicaragua"
-msgstr "尼加拉瓜"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
-msgid "Niger"
-msgstr "尼日"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
-msgid "Nigeria"
-msgstr "奈及利亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "Niue"
-msgstr "紐威島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "Norfolk Island"
-msgstr "諾福克群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "Northern Mariana Islands"
-msgstr "北馬里亞納群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
-msgid "Norway"
-msgstr "挪威"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
-msgid "Oman"
-msgstr "阿曼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
-msgid "Pakistan"
-msgstr "巴基斯坦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
-msgid "Palau"
-msgstr "帛琉群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
-msgid "Palestinian Territory"
-msgstr "巴勒斯坦地區"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Panama"
-msgstr "巴拿馬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Papua New Guinea"
-msgstr "巴布亞紐幾內亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
-msgid "Paraguay"
-msgstr "巴拉圭"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
-msgid "Peru"
-msgstr "秘魯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
-msgid "Philippines"
-msgstr "菲律賓"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
-msgid "Pitcairn"
-msgstr "皮特康"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
-msgid "Poland"
-msgstr "波蘭"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-msgid "Portugal"
-msgstr "葡萄牙"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
-msgid "Puerto Rico"
-msgstr "波多黎各"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
-msgid "Qatar"
-msgstr "卡達"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Reunion"
-msgstr "留尼旺"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
-msgid "Romania"
-msgstr "羅馬尼亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
-msgid "Russian Federation"
-msgstr "俄羅斯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
-msgid "Rwanda"
-msgstr "盧安達"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
-msgid "Saint Kitts And Nevis"
-msgstr "聖克里斯多福"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
-msgid "Saint Lucia"
-msgstr "聖露西亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
-msgid "Saint Vincent And The Grenadines"
-msgstr "聖文森"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
-msgid "Samoa"
-msgstr "薩摩亞群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-msgid "San Marino"
-msgstr "聖馬利諾"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
-msgid "Sao Tome And Principe"
-msgstr "聖多美及普林西比"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
-msgid "Saudi Arabia"
-msgstr "沙烏地阿拉伯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Senegal"
-msgstr "塞內加爾"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Serbia And Montenegro"
-msgstr "塞爾維亞和黑山"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
-msgid "Seychelles"
-msgstr "塞席爾"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
-msgid "Sierra Leone"
-msgstr "獅子山"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
-msgid "Singapore"
-msgstr "新加坡"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Slovakia"
-msgstr "斯洛伐克"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
-msgid "Slovenia"
-msgstr "斯洛凡尼亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
-msgid "Solomon Islands"
-msgstr "索羅門群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
-msgid "Somalia"
-msgstr "索馬利亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
-msgid "South Africa"
-msgstr "南非"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "南喬治亞及南桑威奇群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Spain"
-msgstr "西班牙"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
-msgid "Sri Lanka"
-msgstr "斯里蘭卡"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
-msgid "St. Helena"
-msgstr "聖赫勒拿島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "St. Pierre And Miquelon"
-msgstr "聖匹及密啟倫群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "Sudan"
-msgstr "蘇丹"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "Suriname"
-msgstr "蘇利南"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "斯瓦巴及尖棉島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
-msgid "Swaziland"
-msgstr "史瓦濟蘭"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
-msgid "Sweden"
-msgstr "瑞典"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "Switzerland"
-msgstr "瑞士"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Syria"
-msgstr "敘利亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Taiwan"
-msgstr "臺灣"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Tajikistan"
-msgstr "塔吉克"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
-msgid "Tanzania, United Republic Of"
-msgstr "坦尚尼亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
-msgid "Thailand"
-msgstr "泰國"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-msgid "Timor-Leste"
-msgstr "東帝汶"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
-msgid "Togo"
-msgstr "多哥"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
-msgid "Tokelau"
-msgstr "托克勞群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
-msgid "Tonga"
-msgstr "東加"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
-msgid "Trinidad And Tobago"
-msgstr "千里達"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-msgid "Tunisia"
-msgstr "突尼西亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
-msgid "Turkey"
-msgstr "土耳其"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
-msgid "Turkmenistan"
-msgstr "土庫曼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
-msgid "Turks And Caicos Islands"
-msgstr "土克斯及開科斯群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
-msgid "Tuvalu"
-msgstr "吐瓦魯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
-msgid "Uganda"
-msgstr "烏干達"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Ukraine"
-msgstr "烏克蘭"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
-msgid "United Arab Emirates"
-msgstr "阿拉伯聯合大公國"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
-msgid "United Kingdom"
-msgstr "英國"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
-msgid "United States Minor Outlying Islands"
-msgstr "美屬邊疆群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
-msgid "Uruguay"
-msgstr "烏拉圭"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
-msgid "Uzbekistan"
-msgstr "烏茲別克"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
-msgid "Vanuatu"
-msgstr "萬那杜"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "Venezuela"
-msgstr "委內瑞拉"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "Viet Nam"
-msgstr "越南"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "Virgin Islands, British"
-msgstr "英屬維爾京群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Virgin Islands, U.S."
-msgstr "美屬維爾京群島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
-msgid "Wallis And Futuna Islands"
-msgstr "沃里斯與伏塔那島"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
-msgid "Western Sahara"
-msgstr "西撒哈拉"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
-msgid "Yemen"
-msgstr "葉門"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
-msgid "Zambia"
-msgstr "尚比亞"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Zimbabwe"
-msgstr "辛巴威"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:467
-#: ../plugins/exchange-operations/exchange-delegates.c:954
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:351
-#: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
-msgid "Name"
-msgstr "名稱"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Yahoo"
+msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu-Gadu Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:607
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
-msgid "Service"
-msgstr "服務"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:694
-#: ../plugins/save-calendar/csv-format.c:376
-msgid "Location"
-msgstr "位置"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
-msgid "Username"
-msgstr "使用者名稱"
+#. red
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../mail/em-migrate.c:959
+msgid "Work"
+msgstr "工作"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "住家"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2259
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../calendar/gui/e-calendar-view.c:2287
 msgid "Other"
 msgstr "其他"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
-msgid "MSN"
-msgstr "MSN"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
-msgid "GroupWise"
-msgstr "GroupWise"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "來源通訊錄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
 msgstr "目標通訊錄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Is New Contact"
 msgstr "是新連絡人"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 msgid "Writable Fields"
 msgstr "可寫的欄位"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Required Fields"
 msgstr "必要欄位"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Changed"
 msgstr "已變更"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "連絡人編輯器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
 msgid "Please select an image for this contact"
 msgstr "請選取代表此連絡人的圖片"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid "_No image"
 msgstr "沒有圖片(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2631,43 +1519,43 @@ msgstr ""
 "連絡人資料無效：\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "「%s」含有無效的格式"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s「%s」含有無效的格式"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s「%s」是空的"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
 msgid "Invalid contact."
 msgstr "無效的連絡人。"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
 msgstr "快速新增連絡人"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
 msgid "_Edit Full"
 msgstr "編輯全部(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
 msgid "_Full name"
 msgstr "全名(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "E_mail"
 msgstr "電子郵件(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
 msgid "_Select Address Book"
 msgstr "選擇通訊錄(_S)"
 
@@ -2705,111 +1593,61 @@ msgstr ""
 "您確定要刪除\n"
 "這些連絡人？"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "地址 _2:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Ci_ty:"
-msgstr "縣/市(_T):"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "國家(_Y):"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Full Address"
-msgstr "完整地址"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "郵遞區號(_Z):"
-
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid "Dr."
-msgstr "Dr."
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Esq."
-msgstr "Esq."
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+msgstr ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "全名"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "Jr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "Miss"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "Mr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "Mrs."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "Ms."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "Sr."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_First:"
 msgstr "名字(_F):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Last:"
 msgstr "姓氏(_L):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Middle:"
 msgstr "(_Middle):"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Suffix:"
 msgstr "(_Suffix):"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "新增 IM 帳號"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "_Account name:"
-msgstr "帳號名稱(_A):"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_IM Service:"
-msgstr "_IM 服務:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
-msgid "_Location:"
-msgstr "位置(_L):"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "<b>Members</b>"
 msgstr "<b>成員</b>"
@@ -2820,9 +1658,9 @@ msgid "Contact List Editor"
 msgstr "連絡人清單編輯器"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
-#: ../calendar/gui/e-day-view-time-item.c:815
-#: ../calendar/gui/e-timezone-entry.c:121
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:211
+#: ../calendar/gui/e-day-view-time-item.c:810
+#: ../calendar/gui/e-timezone-entry.c:118
 msgid "Select..."
 msgstr "選擇..."
 
@@ -2848,11 +1686,11 @@ msgid "_Members"
 msgstr "成員(_M)"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:311
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:211
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
+#: ../addressbook/gui/widgets/e-addressbook-view.c:210
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "書本"
 
@@ -2896,33 +1734,33 @@ msgstr ""
 "於此資料夾。您無論如何都要新增它嗎？"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
 msgid "_Merge"
 msgstr "合併(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
 msgid "Merge Contact"
 msgstr "合併連絡人"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
+#: ../addressbook/gui/merging/eab-contact-merging.c:266
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#: ../addressbook/gui/widgets/eab-contact-display.c:871
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "電子郵件"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
 #: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "任何欄位包含"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../addressbook/gui/widgets/e-addressbook-view.c:158
 msgid "Email begins with"
 msgstr "電子郵件開始於"
 
@@ -2930,35 +1768,35 @@ msgstr "電子郵件開始於"
 msgid "Name contains"
 msgstr "名稱包含"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "沒有連絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d 個連絡人"
 msgstr[1] "%d 個連絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:318
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
+#: ../addressbook/gui/widgets/e-addressbook-view.c:224
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "查詢"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
+#: ../addressbook/gui/widgets/e-addressbook-model.c:460
 msgid "Error getting book view"
 msgstr "取得書本檢視時發生錯誤"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
-#: ../widgets/table/e-table-click-to-add.c:509
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
+#: ../widgets/table/e-table-click-to-add.c:507
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3352
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3549
-#: ../widgets/text/e-text.c:3550
+#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "模型"
 
@@ -2966,114 +1804,112 @@ msgstr "模型"
 msgid "Error modifying card"
 msgstr "編輯名片時發生錯誤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:158
+#: ../addressbook/gui/widgets/e-addressbook-view.c:157
 msgid "Name begins with"
 msgstr "名稱開始於"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
+#: ../addressbook/gui/widgets/e-addressbook-view.c:217
 msgid "Source"
 msgstr "來源"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:565
+#: ../addressbook/gui/widgets/e-addressbook-view.c:231
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:564
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
 msgid "Type"
 msgstr "類型"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:811
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1962
 msgid "Save as vCard..."
 msgstr "儲存為 vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:931
+#: ../calendar/gui/e-calendar-table.c:1586
+#: ../calendar/gui/e-calendar-view.c:1804 ../calendar/gui/e-memo-table.c:927
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "開啟(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
 msgid "_New Contact..."
 msgstr "新增連絡人(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "New Contact _List..."
 msgstr "新增連絡人清單(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "_Save as vCard..."
 msgstr "儲存成 _vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "_Forward Contact"
 msgstr "轉寄連絡人(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Forward Contacts"
 msgstr "轉寄連絡人(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "Send _Message to Contact"
 msgstr "傳送郵件給連絡人(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "Send _Message to List"
 msgstr "傳送郵件給清單(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to Contacts"
 msgstr "傳送郵件給連絡人(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "_Print"
 msgstr "列印(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "Cop_y to Address Book..."
 msgstr "複製到通訊錄(_Y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "Mo_ve to Address Book..."
 msgstr "移至通訊錄(_V)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:487
-#: ../calendar/gui/e-calendar-table.c:1606
-#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:945
-#: ../composer/e-msg-composer.c:2056 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1327 ../mail/message-list.c:2105
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1811 ../calendar/gui/e-memo-table.c:935
+#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
+#: ../mail/message-list.c:2103 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "複製(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "P_aste"
 msgstr "貼上(_A)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1525
+#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "任何分類"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1531
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Assistant"
 msgstr "助理"
 
@@ -3103,7 +1939,7 @@ msgstr "汽車電話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:138
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3111,7 +1947,7 @@ msgid "Categories"
 msgstr "分類"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Company"
 msgstr "公司"
 
@@ -3160,22 +1996,22 @@ msgid "Journal"
 msgstr "日誌"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Manager"
 msgstr "主管"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Mobile Phone"
 msgstr "行動電話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Nickname"
 msgstr "暱稱"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Note"
 msgstr "備註"
 
@@ -3204,14 +2040,14 @@ msgid "Radio"
 msgstr "無線電電話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:577
+#: ../calendar/gui/e-meeting-list-view.c:576
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "角色"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Spouse"
 msgstr "配偶"
 
@@ -3241,55 +2077,53 @@ msgstr "單位"
 msgid "Web Site"
 msgstr "網址"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:116
-#: ../addressbook/gui/widgets/e-minicard.c:155
-#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
-#: ../widgets/table/e-table-click-to-add.c:523
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
+#: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
-#: ../widgets/table/e-table-group-container.c:997
-#: ../widgets/table/e-table-group-container.c:998
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3727 ../widgets/text/e-text.c:3728
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "寬度"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:123
-#: ../addressbook/gui/widgets/e-minicard.c:162
-#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
-#: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:661
-#: ../widgets/table/e-table-group-container.c:990
-#: ../widgets/table/e-table-group-container.c:991
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3735 ../widgets/text/e-text.c:3736
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "高度"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:130
-#: ../addressbook/gui/widgets/e-minicard.c:170
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "得到焦點"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "欄位"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "欄位名稱"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:151
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "文字模型"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:158
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "最大欄位名稱長度"
 
@@ -3297,7 +2131,7 @@ msgstr "最大欄位名稱長度"
 msgid "Column Width"
 msgstr "欄寬"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
 "\n"
@@ -3307,7 +2141,7 @@ msgstr ""
 "\n"
 "搜尋連絡人..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3321,7 +2155,7 @@ msgstr ""
 "\n"
 "雙擊這裡以建立新的連絡人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3335,7 +2169,7 @@ msgstr ""
 "\n"
 "雙擊這裡以建立新的連絡人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3345,7 +2179,7 @@ msgstr ""
 "\n"
 "尋找連絡人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3355,41 +2189,41 @@ msgstr ""
 "\n"
 "沒有項目可供這種檢視方式顯示。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "轉接器"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "工作電子郵件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "住家電子郵件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:831
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:825
 msgid "Other Email"
 msgstr "其它電子郵件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:178
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "已選擇"
 
-#: ../addressbook/gui/widgets/e-minicard.c:185
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "有游標"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器內開啟連結(_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2757
+#: ../mail/em-folder-view.c:2694
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "傳送新郵件至(_S)…"
 
@@ -3398,96 +2232,101 @@ msgstr "傳送新郵件至(_S)…"
 msgid "Copy _Email Address"
 msgstr "複製電子郵件位址(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:287
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:286
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "(map)"
 msgstr "(映射)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
-#: ../addressbook/gui/widgets/eab-contact-display.c:393
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:391
 msgid "map"
 msgstr "對映"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:838
+#: ../addressbook/gui/widgets/eab-contact-display.c:475
+#: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
 msgstr "清單成員"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Department"
 msgstr "部門"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Profession"
 msgstr "職業"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Position"
 msgstr "位置"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Video Chat"
 msgstr "視訊交談"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../calendar/gui/calendar-commands.c:90
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2512
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:576
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
-#: ../plugins/hula-account-setup/camel-hula-listener.c:377
-#: ../plugins/hula-account-setup/camel-hula-listener.c:406
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../calendar/gui/calendar-commands.c:89
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/gnome-cal.c:2545
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "行事曆"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "空閒/忙碌"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Phone"
 msgstr "電話"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Fax"
 msgstr "傳真"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
+msgid "Address"
+msgstr "地址"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
 msgid "Home Page"
 msgstr "首頁"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Web Log"
 msgstr "網誌"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2538
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../calendar/gui/e-calendar-view.c:2578
 msgid "Birthday"
 msgstr "生日"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2539
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../calendar/gui/e-calendar-view.c:2579
 msgid "Anniversary"
 msgstr "週年紀念日"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:853
 msgid "Job Title"
 msgstr "職稱"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Home page"
 msgstr "首頁"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:897
 msgid "Blog"
 msgstr "Blog"
 
@@ -3542,12 +2381,11 @@ msgstr "通訊協定不支援"
 
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:364
-#: ../calendar/gui/e-cal-model-tasks.c:681
-#: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:664 ../calendar/gui/print.c:2564
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-model-tasks.c:363
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:237
+#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/print.c:2548
 msgid "Canceled"
 msgstr "已取消"
 
@@ -3558,13 +2396,13 @@ msgstr "無法取消"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Authentication Failed"
 msgstr "驗証失敗"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Authentication Required"
 msgstr "要求驗證"
 
@@ -3675,7 +2513,7 @@ msgid "Error adding list"
 msgstr "新增清單時發生錯誤"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
+#: ../addressbook/gui/widgets/eab-gui-util.c:685
 msgid "Error adding contact"
 msgstr "新增連絡人時發生錯誤"
 
@@ -3692,7 +2530,7 @@ msgid "Error removing list"
 msgstr "移除清單時發生錯誤"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
+#: ../addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Error removing contact"
 msgstr "移除連絡人時發生錯誤"
 
@@ -3720,7 +2558,7 @@ msgid "Display _All Contacts"
 msgstr "顯示所有的連絡人(_A)"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3729,46 +2567,46 @@ msgstr ""
 "%s 已經存在\n"
 "您是否要覆寫它？"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:354
 msgid "Overwrite"
 msgstr "覆寫"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "個連絡人"
 msgstr[1] "個連絡人"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:480
 msgid "Select Address Book"
 msgstr "選擇通訊錄"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "清單"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
 msgstr "將連絡人移到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
 msgstr "複製連絡人到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
 msgstr "將連絡人移到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
 msgstr "複製連絡人到"
 
@@ -3792,329 +2630,128 @@ msgstr "連絡人資訊"
 msgid "Contact information for %s"
 msgstr "%s 的連絡人資訊"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:293
+#: ../addressbook/gui/widgets/eab-popup-control.c:291
 msgid "Querying Address Book..."
 msgstr "正在查詢通訊錄…"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:141
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "和另外 1 個連絡人。"
-msgstr[1] "和另外 %d 個連絡人。"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:226
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Show Full vCard"
-msgstr "顯示完整的 vCard"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:230
-msgid "Show Compact vCard"
-msgstr "顯示精簡的 vCard"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:282
-msgid "Save in address book"
-msgstr "存入目錄服務"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "名片檢視模式"
 
-#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:512
 #: ../addressbook/importers/evolution-vcard-importer.c:252
-#: ../calendar/importers/icalendar-importer.c:308
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "匯入..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:863
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:864
+#: ../addressbook/importers/evolution-csv-importer.c:862
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV 與 Tab 匯入程式"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:873
+#: ../addressbook/importers/evolution-csv-importer.c:871
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV 與 Tab 匯入程式"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:882
+#: ../addressbook/importers/evolution-csv-importer.c:880
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV 與 Tab 匯入程式"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP 資料交換格式 (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 輸入器"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf、.gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:550
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard 匯入程式"
 
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "結尾的空白:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "內文"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "下:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "尺寸:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "字型(_O)..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "字型"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "頁尾:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "格式"
-
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:647
-#: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "頁首"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "頁首/頁尾"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "檔頭"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "每封信的檔頭"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "高度:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "一個緊接著另一個"
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "包含:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "橫向"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "左:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "字母標籤於旁邊"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "邊界"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "欄數:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "選項"
-
-#: ../addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "紙張方向"
-
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "頁"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "頁面設定:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "紙張"
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "紙張來源:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "直向"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "預覽:"
-
-# zh_HK: msgstr "使用灰階打印"
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "使用灰階打印"
-
-# zh_HK: msgstr "偶數頁反向打印"
-#: ../addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "偶數頁反向打印"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "右:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "區段:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "網底"
-
-#. FIXME: Take care of i18n
-#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1141
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "大小:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "開始於新頁"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "樣式名稱:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "上:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:154
-msgid "Type:"
-msgstr "類型:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "寬度:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "字型(_F)..."
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "無法開啟檔案"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 msgid "Couldn't get list of address books"
 msgstr "無法取得通訊錄清單"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "無法開啟通訊錄"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:48
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 msgid "Specify the output file instead of standard output"
 msgstr "指定輸出檔案而不是標準輸出"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
 msgstr "輸出檔案"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "List local address book folders"
 msgstr "列出本地通訊錄資料夾"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:55
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr "將名片顯示成 vcard 或 csv 檔案"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Export in asynchronous mode"
 msgstr "在非同步模式匯出"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "非同步模式下，一個輸出檔案中的名片數目，預設大小是 100。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "數量"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:99
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "指令列引數錯誤，請使用 --help 選項來查看用法。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:113
 msgid "Only support csv or vcard format."
 msgstr "僅支援 csv 或 vcard 格式。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In async mode, output must be file."
 msgstr "在非同步模式下，輸出必須是檔案。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:130
 msgid "In normal mode, there is no need for the size option."
 msgstr "在一般模式下，不需要大小選項。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "Unhandled error"
 msgstr "未處理的錯誤"
 
@@ -4488,7 +3125,7 @@ msgstr "重新啟動 Evolution 之前，無法使用您的工作。"
 msgid "_Discard Changes"
 msgstr "放棄變更(_D)"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
 msgid "_Save"
 msgstr "儲存(_S)"
 
@@ -4510,56 +3147,56 @@ msgstr "傳送通知(_S)"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:258
+#: ../calendar/conduits/calendar/calendar-conduit.c:248
 msgid "Split Multi-Day Events:"
 msgstr "分割多日事件:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1523
-#: ../calendar/conduits/calendar/calendar-conduit.c:1524
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1019
-#: ../calendar/conduits/todo/todo-conduit.c:1020
+#: ../calendar/conduits/calendar/calendar-conduit.c:1513
+#: ../calendar/conduits/calendar/calendar-conduit.c:1514
+#: ../calendar/conduits/memo/memo-conduit.c:807
+#: ../calendar/conduits/memo/memo-conduit.c:808
+#: ../calendar/conduits/todo/todo-conduit.c:1007
+#: ../calendar/conduits/todo/todo-conduit.c:1008
 msgid "Could not start evolution-data-server"
 msgstr "無法啟動 Evolution 資料伺服器"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
-#: ../calendar/conduits/calendar/calendar-conduit.c:1634
+#: ../calendar/conduits/calendar/calendar-conduit.c:1621
+#: ../calendar/conduits/calendar/calendar-conduit.c:1624
 msgid "Could not read pilot's Calendar application block"
 msgstr "無法讀取 pilot 行事曆程式區塊"
 
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
+#: ../calendar/conduits/memo/memo-conduit.c:901
+#: ../calendar/conduits/memo/memo-conduit.c:904
 msgid "Could not read pilot's Memo application block"
 msgstr "無法讀取 pilot 備忘錄程式區塊"
 
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
+#: ../calendar/conduits/memo/memo-conduit.c:948
+#: ../calendar/conduits/memo/memo-conduit.c:951
 msgid "Could not write pilot's Memo application block"
 msgstr "無法寫入 pilot 備忘錄程式區塊"
 
-#: ../calendar/conduits/todo/todo-conduit.c:241
+#: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
 msgstr "預設優先順序:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1103
-#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1091
+#: ../calendar/conduits/todo/todo-conduit.c:1094
 msgid "Could not read pilot's ToDo application block"
 msgstr "無法讀取 pilot 待辦事項程式區塊"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1148
-#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1136
+#: ../calendar/conduits/todo/todo-conduit.c:1139
 msgid "Could not write pilot's ToDo application block"
 msgstr "無法讀取 pilot 待辦事項程式區塊"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2523
+#: ../plugins/itip-formatter/itip-formatter.c:2549
 msgid "Calendar and Tasks"
 msgstr "行事曆與工作"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:869
-#: ../calendar/gui/calendar-component.c:1291
+#: ../calendar/gui/calendar-component.c:819
+#: ../calendar/gui/calendar-component.c:1238
 msgid "Calendars"
 msgstr "行事曆"
 
@@ -4600,24 +3237,24 @@ msgid "Memo_s"
 msgstr "備忘錄(_S)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:594
-#: ../calendar/gui/memos-component.c:912 ../calendar/gui/memos-control.c:350
-#: ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/e-memo-table.c:288 ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1843 ../calendar/gui/memos-component.c:564
+#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Memos"
 msgstr "備忘錄"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1437
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
-#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/e-calendar-table.c:720 ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1711 ../calendar/gui/print.c:1973
+#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 #: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:588
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "工作"
@@ -4628,7 +3265,7 @@ msgstr "行事曆(_C)"
 
 #. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:329 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "工作(_T)"
 
@@ -4636,27 +3273,26 @@ msgstr "工作(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution 行事曆鬧鈴通知服務"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分鐘"
 msgstr[1] "分鐘"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/caldav/caldav-source.c:431
-#: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:653
-#: ../plugins/google-account-setup/google-contacts-source.c:367
+#: ../calendar/gui/dialogs/event-page.glade.h:22
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "小時"
 msgstr[1] "小時"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
 msgstr "開始時刻"
 
@@ -4671,10 +3307,10 @@ msgstr "全部解除(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1614
-#: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
 msgstr "位置:"
 
@@ -4687,11 +3323,11 @@ msgid "_Dismiss"
 msgstr "解除(_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1382
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
+#: ../calendar/gui/dialogs/comp-editor.c:1028
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
@@ -4707,32 +3343,32 @@ msgstr "延期(_S)"
 msgid "location of appointment"
 msgstr "約會的地點"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1458
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1467
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1469
 msgid "No description available."
 msgstr "沒有任何描述。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
 msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1522
 #, c-format
 msgid "You have %d alarms"
 msgstr "您有 %d 個鬧鈴"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1710
 #: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1686
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4744,7 +3380,7 @@ msgstr ""
 "送出電子郵件。  Evolution 會顯示\n"
 "普通的提醒對話盒來代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4761,7 +3397,7 @@ msgstr ""
 "\n"
 "您確定要執行這個程式？"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1730
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
@@ -4834,275 +3470,283 @@ msgid "Calendars to run alarms for"
 msgstr "執行鬧鈴的行事曆"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Check this to use system timezone in Evolution."
+msgstr "核取此選項會在 Evolution 中使用系統時區。"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 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.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "在日檢視中用來繪製 Marcus Bains 線的色彩"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Confirm expunge"
 msgstr "清空時確認"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "必須指明工作日開始與結束於幾時。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "預設的約會提醒"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default reminder units"
 msgstr "預設提醒的單位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder value"
 msgstr "預設提醒的數值"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Directory for saving alarm audio files"
 msgstr "用來存放鬧鈴音效檔的目錄"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Event Gradient"
 msgstr "事件漸層效果"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Transparency"
 msgstr "事件透明效果"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy server URLs"
 msgstr "空閒/忙碌伺服器網址"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy template URL"
 msgstr "空閒/忙碌範本網址"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Gradient of the events in calendar views."
 msgstr "行事曆檢視中的事件漸層效果。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide completed tasks"
 msgstr "隱藏已完成的工作"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide task units"
 msgstr "隱藏工作單位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task value"
 msgstr "隱藏工作數值"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Horizontal pane position"
 msgstr "水平窗格位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "工作日結束於幾點，以 24 小時格式，0 至 23。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "工作日開始於幾點，以 24 小時格式，0 至 23。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "在「日」和「工作週」檢視中顯示間隔，以分鐘計。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Last alarm time"
 msgstr "上次鬧鈴時刻"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 #: ../mail/evolution-mail.schemas.in.h:72
 msgid "Level beyond which the message should be logged."
 msgstr "應記錄的郵件等級。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr "最近在日檢視中使用的第二時區清單。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
 msgstr "用於空閒/忙碌發佈的伺服器 URL 清單。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains 線"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains 線色彩─日檢視"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains 線色彩─時刻列"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr "在「day_second_zones」清單中要記住的最近使用時區數目的最大值。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Maximum number of recently used timezones to remember."
 msgstr "要記住的最近使用時區數目的最大值。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "工作日結束分鐘，0 到 59。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "工作日開始分鐘，0 到 59。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Month view horizontal pane position"
 msgstr "月檢視的水平窗格位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Month view vertical pane position"
 msgstr "月檢視的垂直窗格位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Number of units for determining a default reminder."
 msgstr "決定預設提醒的單位數目。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Number of units for determining when to hide tasks."
 msgstr "決定何時隱藏工作的單位數目。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Overdue tasks color"
 msgstr "過期的工作色彩"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 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.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 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.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "垂直窗格的位置，在行事曆清單與日期導覽行事曆之間。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 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.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 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.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 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.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Programs that are allowed to be run by alarms."
 msgstr "用來做為鬧鈴而執行的程式。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Recently used second time zones in a Day View"
 msgstr "最近在日檢視中使用的第二時區"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Save directory for alarm audio"
 msgstr "儲存鬧鈴音效檔目錄"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Scroll Month View by a week"
+msgstr "以週為單位捲動月檢視"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 RSVP 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 角色 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show appointment end times in week and month views"
 msgstr "在週及月的檢視內顯示約會的結束時間"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "在事件/會議/工作編輯器中顯示 分類 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Show display alarms in notification tray"
 msgstr "在通知區中顯示鬧鈴畫面"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Show status field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 狀態 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Show the \"Preview\" pane"
 msgstr "顯示「預覽」窗格"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Show the \"Preview\" pane."
 msgstr "顯示「預覽」窗格。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show timezone field in the event/meeting editor"
 msgstr "在事件/會議編輯器中顯示 時區 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show type field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 類型 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Show week number in Day and Work Week View"
 msgstr "在日檢視與工作週檢視顯示週數"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show week numbers in date navigator"
 msgstr "在日期導覽顯示週數"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
 msgstr ""
 "如果設定則會在日檢視中顯示第二時區。數值類似於「timezone」設定鍵的用法。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Tasks due today color"
 msgstr "今天到期工作的色彩"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Tasks vertical pane position"
 msgstr "工作垂直窗格位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5111,7 +3755,7 @@ msgstr ""
 "作為空閒/忙碌資料回饋之用的網址範本，%u 要以電子郵件位址的使用者名稱部分來取"
 "代，而 %d 要替換為網域名稱。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5119,216 +3763,215 @@ msgstr ""
 "用於行事曆中日期與時刻的預設時區，未翻譯的 Olsen 時區資料庫位置就像 "
 "\"America/New York\"。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "The second timezone for a Day View"
 msgstr "用於日檢視的第二時區"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr "這裡可使用三種數值。「0」為錯誤。「1」為警告。「2」為除錯訊息。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Time divisions"
 msgstr "時間分隔"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Time the last alarm ran, in time_t."
 msgstr "上次鬧鈴執行的時間(_T)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-#: ../plugins/startup-wizard/startup-wizard.c:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Timezone"
 msgstr "時區"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr ""
 "行事曆檢視中的事件透明化效果，數值介於 0 (完全透明)到 10 (不透明)之間。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Twenty four hour time format"
 msgstr "24 小時制格式"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "預設提醒單位，「minutes」(分鐘)、「hours」(小時)或「days」(日)。"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "決定何時隱藏工作的單位，「minutes」(分鐘)、「hours」(小時)或「days」(日)。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+msgid "Use system timezone"
+msgstr "使用系統時區"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Week start"
 msgstr "一週開始於"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "每週的開始，從星期日 (0) 到星期六 (6)。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "是否使用通知區顯示鬧鈴。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "刪除約會或工作時是否要求確認。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "清除約會或工作時是否要求確認。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr "是否壓縮月檢視中的週末，這會將一週中的週六與週日置於一個空位中。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "是否在週及月的檢視內顯示約會的結束時間。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "是否在行事曆中繪出 Marcus Bains 線（代表目前時刻的直線）。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "是否在工作檢視中隱藏完成的工作。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "是否以週為單位捲動月檢視，而非以月為單位。"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Whether to set a default reminder for appointments."
 msgstr "是否設定約會的預設提醒。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 RSVP 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "是否在事件/會議編輯器中顯示 狀態 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 角色 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 狀態 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "是否使用 24 小時制時間而不是使用上午/下午。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "是否在事件/會議編輯器中顯示 時區 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 類型 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr "是否在日檢視與工作週檢視中顯示週數。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Whether to show week numbers in the date navigator."
 msgstr "是否在日期導覽中顯示週數。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "顯示事件時是否使用日光節約時間。"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Work days"
 msgstr "工作日"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Workday end hour"
 msgstr "工作日結束小時"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Workday end minute"
 msgstr "工作日結束分鐘"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Workday start hour"
 msgstr "工作日開始小時"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Workday start minute"
 msgstr "工作日開始分鐘"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "daylight savings time"
-msgstr "日光節約時間"
-
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Summary contains"
 msgstr "主旨包含"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Description contains"
 msgstr "描述包含"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Category is"
 msgstr "分類為"
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Comment contains"
 msgstr "備註包含"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Location contains"
 msgstr "位置包含"
 
-#: ../calendar/gui/cal-search-bar.c:640
+#: ../calendar/gui/cal-search-bar.c:636
 msgid "Next 7 Days' Tasks"
 msgstr "未來 7 天的工作"
 
-#: ../calendar/gui/cal-search-bar.c:644
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Active Tasks"
 msgstr "進行中的工作"
 
-#: ../calendar/gui/cal-search-bar.c:648
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Overdue Tasks"
 msgstr "過期的工作"
 
-#: ../calendar/gui/cal-search-bar.c:652
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Completed Tasks"
 msgstr "已完成的工作 "
 
-#: ../calendar/gui/cal-search-bar.c:656
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Tasks with Attachments"
 msgstr "有附加檔案的工作"
 
-#: ../calendar/gui/cal-search-bar.c:702
+#: ../calendar/gui/cal-search-bar.c:698
 msgid "Active Appointments"
 msgstr "進行中的約會"
 
-#: ../calendar/gui/cal-search-bar.c:706
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Next 7 Days' Appointments"
 msgstr "未來 7 天的約會(_P)"
 
 # zh_HK: msgstr "打印"
-#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
+#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "列印"
 
-#: ../calendar/gui/calendar-commands.c:315
+#: ../calendar/gui/calendar-commands.c:312
 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 "
@@ -5336,137 +3979,125 @@ msgid ""
 msgstr ""
 "此作業會永久性刪除比選取時間還舊的所有事件。如果您繼續，將無法復原這些事件。"
 
-#: ../calendar/gui/calendar-commands.c:321
+#: ../calendar/gui/calendar-commands.c:318
 msgid "Purge events older than"
 msgstr "清除早於這段時間的事件"
 
-#: ../calendar/gui/calendar-commands.c:326
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/caldav/caldav-source.c:432
-#: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:654
-#: ../plugins/google-account-setup/google-contacts-source.c:368
+#: ../calendar/gui/calendar-commands.c:323
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:670
+#: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "天"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the On the web source group
-#. ensure the group name is in current locale, not read from configuration
-#. Create the source group
 #. Create the Webcal source group
-#. Create the LDAP source group
-#. ensure the group name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:287
-#: ../calendar/gui/calendar-component.c:290
-#: ../calendar/gui/memos-component.c:240 ../calendar/gui/memos-component.c:243
-#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
-#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
-#: ../calendar/gui/tasks-component.c:243
+#: ../calendar/gui/calendar-component.c:194
+#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
+#: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
 msgstr "在網站上"
 
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:331
-#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
-msgid "Birthdays & Anniversaries"
-msgstr "生日和週年紀念日"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:346
-#: ../calendar/gui/calendar-component.c:349
+#: ../calendar/gui/calendar-component.c:195
 #: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "天氣"
 
-#: ../calendar/gui/calendar-component.c:676
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:289
+#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
+msgid "Birthdays & Anniversaries"
+msgstr "生日和週年紀念日"
+
+#: ../calendar/gui/calendar-component.c:626
 msgid "_New Calendar"
 msgstr "新增行事曆(_N)"
 
-#: ../calendar/gui/calendar-component.c:677
-#: ../calendar/gui/memos-component.c:508 ../calendar/gui/tasks-component.c:500
-#: ../mail/em-folder-tree.c:2124
+#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
+#: ../mail/em-folder-tree.c:2114
 msgid "_Copy..."
 msgstr "複製(_C)..."
 
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:505
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
 msgid "_Make available for offline use"
 msgstr "標記為供離線使用(_M)"
 
-#: ../calendar/gui/calendar-component.c:683
-#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:506
+#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
 msgid "_Do not make available for offline use"
 msgstr "不允許此項在離線狀態使用(_D)"
 
-#: ../calendar/gui/calendar-component.c:1013
+#: ../calendar/gui/calendar-component.c:961
 msgid "Failed upgrading calendars."
 msgstr "升級行事曆失敗。"
 
-#: ../calendar/gui/calendar-component.c:1142
+#: ../calendar/gui/calendar-component.c:1089
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "無法開啟行事曆 '%s' 來建立事件和會議"
 
-#: ../calendar/gui/calendar-component.c:1158
+#: ../calendar/gui/calendar-component.c:1105
 msgid "There is no calendar available for creating events and meetings"
 msgstr "沒有行事曆可用來建立事件和會議"
 
-#: ../calendar/gui/calendar-component.c:1271
+#: ../calendar/gui/calendar-component.c:1218
 msgid "Calendar Source Selector"
 msgstr "行事曆來源選擇器"
 
-#: ../calendar/gui/calendar-component.c:1487
+#: ../calendar/gui/calendar-component.c:1433
 msgid "New appointment"
 msgstr "新增約會"
 
-#: ../calendar/gui/calendar-component.c:1488
+#: ../calendar/gui/calendar-component.c:1434
 msgctxt "New"
 msgid "_Appointment"
 msgstr "約會(_A)"
 
-#: ../calendar/gui/calendar-component.c:1489
+#: ../calendar/gui/calendar-component.c:1435
 msgid "Create a new appointment"
 msgstr "建立一個新的約會"
 
-#: ../calendar/gui/calendar-component.c:1495
+#: ../calendar/gui/calendar-component.c:1441
 msgid "New meeting"
 msgstr "新增會議"
 
-#: ../calendar/gui/calendar-component.c:1496
+#: ../calendar/gui/calendar-component.c:1442
 msgctxt "New"
 msgid "M_eeting"
 msgstr "會議(_E)"
 
-#: ../calendar/gui/calendar-component.c:1497
+#: ../calendar/gui/calendar-component.c:1443
 msgid "Create a new meeting request"
 msgstr "建立新會議要求"
 
-#: ../calendar/gui/calendar-component.c:1503
+#: ../calendar/gui/calendar-component.c:1449
 msgid "New all day appointment"
 msgstr "新的全日約會"
 
-#: ../calendar/gui/calendar-component.c:1504
+#: ../calendar/gui/calendar-component.c:1450
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "全日約會(_P)"
 
-#: ../calendar/gui/calendar-component.c:1505
+#: ../calendar/gui/calendar-component.c:1451
 msgid "Create a new all-day appointment"
 msgstr "建立新的全日約會"
 
-#: ../calendar/gui/calendar-component.c:1511
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New calendar"
 msgstr "新行事曆"
 
-#: ../calendar/gui/calendar-component.c:1512
+#: ../calendar/gui/calendar-component.c:1458
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "行事曆(_N)"
 
-#: ../calendar/gui/calendar-component.c:1513
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new calendar"
 msgstr "建立新行事曆"
 
@@ -5508,20 +4139,20 @@ msgid "Category"
 msgstr "分類"
 
 #: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
-#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
-msgstr "分類"
+msgstr "歸類"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:248
+#: ../calendar/gui/e-cal-model.c:351 ../calendar/gui/e-calendar-table.c:564
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:340
 msgid "Confidential"
 msgstr "機密"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../widgets/misc/e-attachment-tree-view.c:496
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "描述:"
@@ -5541,21 +4172,27 @@ msgstr "不存在"
 msgid "Exist"
 msgstr "存在"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:718
+#: ../plugins/save-calendar/csv-format.c:371
+msgid "Location"
+msgstr "位置"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "會議召集人"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:247
+#: ../calendar/gui/e-cal-model.c:349 ../calendar/gui/e-calendar-table.c:563
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "私人"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:246
+#: ../calendar/gui/e-cal-model.c:340 ../calendar/gui/e-cal-model.c:347
+#: ../calendar/gui/e-calendar-table.c:562 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "公開"
 
@@ -5565,11 +4202,11 @@ msgid "Recurrence"
 msgstr "週期性"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../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 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Summary"
 msgstr "摘要"
 
@@ -5589,35 +4226,56 @@ msgid "does not contain"
 msgstr "不包含"
 
 #: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "是"
 
 #: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "不是"
 
-#: ../calendar/gui/comp-editor-factory.c:409
+#: ../calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "開啟行事曆時發生錯誤"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/comp-editor-factory.c:414
 msgid "Method not supported when opening the calendar"
 msgstr "開啟行事曆時不支援方法"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:420
 msgid "Permission denied to open the calendar"
 msgstr "沒有開啟行事曆的權限"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
+#: ../calendar/gui/comp-editor-factory.c:438
+#: ../plugins/mail-to-task/mail-to-task.c:455 ../shell/e-shell.c:1261
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:601
+#: ../calendar/gui/dialogs/alarm-dialog.c:611
 msgid "Edit Alarm"
 msgstr "編輯鬧鈴"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "顯示提示"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "播放音效"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "執行外部程式"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "傳送電子郵件"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>鬧鈴</b>"
@@ -5647,83 +4305,70 @@ msgid "Mes_sage:"
 msgstr "訊息(_S):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr "播放音效"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr "顯示提示"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "執行外部程式"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Select A File"
 msgstr "請選取檔案"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 msgid "Send To:"
 msgstr "收件者："
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "傳送電子郵件"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 msgid "_Arguments:"
 msgstr "引數(_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
 msgstr "執行程式(_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "_Repeat the alarm"
 msgstr "重複鬧鈴(_R)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Sound:"
 msgstr "聲音(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
-msgid "after"
-msgstr "之後"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-msgid "before"
-msgstr "之前"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "day(s)"
-msgstr "日"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
-msgid "end of appointment"
-msgstr "約會結束"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+#| msgid "before"
+msgid ""
+"before\n"
+"after"
+msgstr ""
+"先於\n"
+"晚於"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "extra times every"
 msgstr "提醒間隔每"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-msgid "hour(s)"
-msgstr "小時"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
+"分鐘\n"
+"小時\n"
+"日"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-msgid "minute(s)"
-msgstr "分鐘"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
+"分鐘\n"
+"小時\n"
+"日"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
-msgid "start of appointment"
-msgstr "約會開始"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid ""
+"start of appointment\n"
+"end of appointment"
+msgstr ""
+"約會開始\n"
+"約會結束"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
@@ -5739,39 +4384,38 @@ msgstr "加入(_A)"
 msgid "Alarms"
 msgstr "鬧鈴"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
-#: ../composer/e-composer-actions.c:62
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "建議自動顯示附件(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
 msgid "Attach file(s)"
 msgstr "附加檔案"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2955
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:788
-#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:135
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/event-page.c:2959
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-day-view-time-item.c:783
+#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:942
+#: ../mail/em-account-editor.c:706 ../mail/em-account-editor.c:1435
+#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:333
 #: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2179
-#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1725
+#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-dateedit.c:1674
 #: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
 msgstr "沒有"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:647
 msgid "Selected Calendars for Alarms"
 msgstr "選擇鬧鈴行事曆"
 
@@ -5800,36 +4444,36 @@ msgid ""
 msgstr "<i>%u 與 %d 會被替換為電子郵件位址中的使用者與網域名稱。</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "<span weight=\"bold\">Alarms</span>"
+msgstr "<span weight=\"bold\">鬧鈴</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #: ../mail/mail-config.glade.h:10
 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:11
 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:12
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">一般</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">工作清單</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 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:15
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">工作週</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "調整日光節約時間(_V)"
-
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Day _ends:"
 msgstr "一日結束於(_E):"
@@ -5838,13 +4482,17 @@ msgstr "一日結束於(_E):"
 msgid "Display"
 msgstr "顯示"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "Display alarms in _notification area only"
+msgstr "只在通知區域中顯示鬧鈴(_N)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/recurrence-page.c:1107
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "星期五"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5854,13 +4502,13 @@ msgstr ""
 "小時\n"
 "日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1103
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "星期一"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5878,215 +4526,231 @@ msgstr ""
 "星期六\n"
 "星期日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../mail/mail-config.glade.h:114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../mail/mail-config.glade.h:118
 msgid "Pick a color"
 msgstr "挑選顏色"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "S_un"
 msgstr "週日(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "星期六"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+msgid "Sc_roll Month View by a week"
+msgstr "以週捲動月檢視(_R)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Se_cond zone:"
 msgstr "第二時區(_C):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Select the calendars for alarm notification"
 msgstr "選擇鬧鈴通知的行事曆"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Sh_ow a reminder"
 msgstr "顯示提醒於約會(_O)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show a _reminder"
 msgstr "顯示提醒(_R)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show week _numbers in date navigator"
 msgstr "在日期導覽顯示週數(_N)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "在日檢視與工作週檢視中顯示週數(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "星期日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "T_asks due today:"
 msgstr "今天到期的工作(_A):"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "T_hu"
 msgstr "週四(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "Template:"
 msgstr "樣板:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/recurrence-page.c:1106
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Time _zone:"
 msgstr "時區(_Z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "時刻格式:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/recurrence-page.c:1104
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+msgid "Use s_ystem time zone"
+msgstr "使用系統時區(_Y)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/recurrence-page.c:1105
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "星期三"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "Wee_k starts on:"
 msgstr "一週開始於(_K):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work days:"
 msgstr "工作日:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_12 hour (AM/PM)"
 msgstr "_12 小時 (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_24 hour"
 msgstr "_24 小時"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Ask for confirmation when deleting items"
 msgstr "當刪除項目時先確認(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Day begins:"
 msgstr "一日開始於(_D):"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
 msgid "_Fri"
 msgstr "週五(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Hide completed tasks after"
 msgstr "隱藏已完成的工作(_H)"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "_Mon"
 msgstr "週一(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Overdue tasks:"
 msgstr "過期的工作(_O):"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
 msgid "_Sat"
 msgstr "週六(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Show appointment end times in week and month view"
 msgstr "在週及月的檢視內顯示約會的結束時間(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Time divisions:"
 msgstr "時間間隔(_T):"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:78
 msgid "_Tue"
 msgstr "週二(_T)"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:80
 msgid "_Wed"
 msgstr "週三(_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:82
 msgid "before every anniversary/birthday"
 msgstr "在每個週年紀念日/生日之前"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:84
 msgid "before every appointment"
 msgstr "前"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr "類型:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "複製行事曆內容至本地以便離線作業(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "複製工作清單內容至本地以便離線作業(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:275
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "複製備忘錄清單內容至本地以便離線作業(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:345
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "顏色(_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "工作清單"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "備忘錄清單"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "iCalendar 錯誤"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "新行事曆"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "工作清單"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "新增工作清單"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "備忘錄清單屬性"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "新增備忘錄清單"
 
@@ -6139,297 +4803,233 @@ msgstr "%s  您沒有做任何變更，更新這個編輯器？"
 msgid "Validation error: %s"
 msgstr "確認上的錯誤： %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
+#: ../calendar/gui/dialogs/comp-editor-util.c:188 ../calendar/gui/print.c:2349
 msgid " to "
 msgstr " 到 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (已完成) "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "已完成 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr "(期限)"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2362
 msgid "Due "
 msgstr "期限 "
 
-#: ../calendar/gui/dialogs/comp-editor.c:239
-#, c-format
-msgid "Attached message - %s"
-msgstr "附加訊息 - %s"
+#: ../calendar/gui/dialogs/comp-editor.c:221
+msgid "Could not save attachments"
+msgstr "無法儲存附件"
 
-#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:244
-#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1770
-#: ../composer/e-msg-composer.c:1989
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "附加 1 個訊息"
-msgstr[1] "附加 %d 個訊息"
-
-#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2057
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2106
-msgid "_Move"
-msgstr "移動(_M)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2059
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2108
-msgid "Cancel _Drag"
-msgstr "取消拖拉(_D)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3315 ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
-#: ../widgets/misc/e-attachment-bar.c:453
-msgid "attachment"
-msgstr "附件"
-
-#: ../calendar/gui/dialogs/comp-editor.c:849
+#: ../calendar/gui/dialogs/comp-editor.c:483
 msgid "Could not update object"
 msgstr "無法更新物件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:572
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:579
 #, c-format
 msgid "Meeting - %s"
 msgstr "會議 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:581
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:587
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "指派的工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:589
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../calendar/gui/dialogs/comp-editor.c:594
 #, c-format
 msgid "Memo - %s"
 msgstr "備忘錄 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:610
 msgid "No Summary"
 msgstr "沒有摘要"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:752
 msgid "Keep original item?"
 msgstr "是否保持原始項目？"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:958
 msgid "Click here to close the current window"
 msgstr "按這裡以關閉目前視窗"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
+#: ../calendar/gui/dialogs/comp-editor.c:965
 msgid "Copy selected text to the clipboard"
 msgstr "複製選取的文字至剪貼簿"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:972
 msgid "Cut selected text to the clipboard"
 msgstr "剪下選取的文字至剪貼簿"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:979
 msgid "Click here to view help available"
 msgstr "按這裡以檢視可用的說明"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1340
+#: ../calendar/gui/dialogs/comp-editor.c:986
 msgid "Paste text from the clipboard"
 msgstr "從剪貼簿貼上文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1007
 msgid "Click here to save the current window"
 msgstr "按這裡以儲存目前視窗"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1014
 msgid "Select all text"
 msgstr "選取所有文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1375
+#: ../calendar/gui/dialogs/comp-editor.c:1021
 msgid "_Classification"
-msgstr "分類(_C)"
+msgstr "歸類(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1035
 #: ../mail/mail-signature-editor.c:208
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1042
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1049
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1056
 msgid "_Options"
 msgstr "選項(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/dialogs/comp-editor.c:1063 ../mail/em-folder-tree.c:2106
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../composer/e-composer-actions.c:315
 msgid "_Attachment..."
 msgstr "附件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1075
 msgid "Click here to attach a file"
 msgstr "按這裡以附加檔案"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1083
 msgid "_Categories"
 msgstr "分類(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1085
 msgid "Toggles whether to display categories"
 msgstr "切換是否顯示「分類」"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Time _Zone"
 msgstr "時區(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "Toggles whether the time zone is displayed"
 msgstr "切換是否顯示「時區」"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1102
 msgid "Pu_blic"
 msgstr "公開(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1104
 msgid "Classify as public"
 msgstr "分類為公開"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1111
 msgid "Classify as private"
 msgstr "歸類為私人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1116
 msgid "_Confidential"
 msgstr "機密(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1472
+#: ../calendar/gui/dialogs/comp-editor.c:1118
 msgid "Classify as confidential"
 msgstr "歸類為機密"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1126
 msgid "R_ole Field"
 msgstr "角色欄位(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Toggles whether the Role field is displayed"
 msgstr "切換是否顯示「角色」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1134
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切換是否顯示「RSVP」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1496
+#: ../calendar/gui/dialogs/comp-editor.c:1142
 msgid "_Status Field"
 msgstr "狀態欄位(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1498
+#: ../calendar/gui/dialogs/comp-editor.c:1144
 msgid "Toggles whether the Status field is displayed"
 msgstr "切換是否顯示「狀態」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1504
+#: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "_Type Field"
 msgstr "類型欄位(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1506
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "切換是否顯示「到會者類型」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1828
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../composer/e-composer-private.c:66
 msgid "Recent _Documents"
 msgstr "最近使用文件(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1847
-#: ../composer/e-composer-actions.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:1602
+#: ../composer/e-composer-actions.c:518
 msgid "Attach"
 msgstr "附加"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1942
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b> 個附加檔案"
-msgstr[1] "<b>%d</b> 個附加檔案"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1974
-msgid "Hide Attachment _Bar"
-msgstr "隱藏附加檔案列(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1977
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-msgid "Show Attachment _Bar"
-msgstr "顯示附加檔案列(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:1039
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "移除(_R)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../composer/e-msg-composer.c:1042
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Add attachment..."
-msgstr "新增附件(_A)..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:2302
-#: ../mail/em-format-html-display.c:2384
-msgid "Show Attachments"
-msgstr "顯示附加檔案"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2303
-msgid "Press space key to toggle attachment bar"
-msgstr "按下空白鍵切換附加檔案列"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2448
-#: ../calendar/gui/dialogs/comp-editor.c:2496
-#: ../calendar/gui/dialogs/comp-editor.c:3348
+#: ../calendar/gui/dialogs/comp-editor.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:1913
+#: ../calendar/gui/dialogs/comp-editor.c:2760
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果有新的更新，則會放棄對此項目所做的變更"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3377
+#: ../calendar/gui/dialogs/comp-editor.c:2729 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "附件"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2789
 msgid "Unable to use current version!"
 msgstr "無法使用目前的版本！"
 
@@ -6502,7 +5102,7 @@ msgid "Contacts..."
 msgstr "連絡人..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
 msgstr "委託給："
 
@@ -6529,7 +5129,7 @@ msgstr "將此項設為循環事件"
 #: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "傳送選項"
 
@@ -6566,122 +5166,127 @@ msgstr "查詢此到會者的空閒/忙碌資訊"
 msgid "Appoint_ment"
 msgstr "約會(_M)"
 
-#: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2725
+#: ../calendar/gui/dialogs/event-page.c:749
+#: ../calendar/gui/dialogs/event-page.c:2735
 msgid "This event has alarms"
 msgstr "這個事件具有鬧鈴"
 
-#: ../calendar/gui/dialogs/event-page.c:799
+#: ../calendar/gui/dialogs/event-page.c:812
 #: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "會議召集人(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:845
+#: ../calendar/gui/dialogs/event-page.c:859
 msgid "_Delegatees"
 msgstr "代理者(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:861
 msgid "Atte_ndees"
 msgstr "到會者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1046
 msgid "Event with no start date"
 msgstr "無開始日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:1049
 msgid "Event with no end date"
 msgstr "無結束日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1203
-#: ../calendar/gui/dialogs/memo-page.c:641
-#: ../calendar/gui/dialogs/task-page.c:813
+#: ../calendar/gui/dialogs/event-page.c:1218
+#: ../calendar/gui/dialogs/memo-page.c:639
+#: ../calendar/gui/dialogs/task-page.c:814
 msgid "Start date is wrong"
 msgstr "開始日期錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1213
+#: ../calendar/gui/dialogs/event-page.c:1228
 msgid "End date is wrong"
 msgstr "結束日期錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1251
 msgid "Start time is wrong"
 msgstr "開始時間錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/event-page.c:1258
 msgid "End time is wrong"
 msgstr "結束時間錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1406
-#: ../calendar/gui/dialogs/memo-page.c:682
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1420
+#: ../calendar/gui/dialogs/memo-page.c:680
+#: ../calendar/gui/dialogs/task-page.c:874
 msgid "The organizer selected no longer has an account."
 msgstr "選取的召集人已經沒有帳號。"
 
-#: ../calendar/gui/dialogs/event-page.c:1412
-#: ../calendar/gui/dialogs/memo-page.c:688
-#: ../calendar/gui/dialogs/task-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:1426
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:880
 msgid "An organizer is required."
 msgstr "需要一個召集人。"
 
-#: ../calendar/gui/dialogs/event-page.c:1437
-#: ../calendar/gui/dialogs/task-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:1451
+#: ../calendar/gui/dialogs/task-page.c:904
 msgid "At least one attendee is required."
 msgstr "最少需要一個到會者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1878
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/event-page.c:1890
+#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "移除(_R)"
+
+#: ../calendar/gui/dialogs/event-page.c:1891
+#: ../calendar/gui/dialogs/task-page.c:1201
 msgid "_Add "
 msgstr "新增(_A)"
 
-#: ../calendar/gui/dialogs/event-page.c:2601
+#: ../calendar/gui/dialogs/event-page.c:2611
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "無法開啟行事曆 '%s'。"
 
-#: ../calendar/gui/dialogs/event-page.c:2645
-#: ../calendar/gui/dialogs/memo-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:2655
+#: ../calendar/gui/dialogs/memo-page.c:895
 #: ../calendar/gui/dialogs/task-page.c:1806
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "您正擔任 %s 的代理人"
 
-#: ../calendar/gui/dialogs/event-page.c:2925
+#: ../calendar/gui/dialogs/event-page.c:2933
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "在每個約會前 %d 天"
 msgstr[1] "在每個約會前 %d 天"
 
-#: ../calendar/gui/dialogs/event-page.c:2931
+#: ../calendar/gui/dialogs/event-page.c:2939
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "約會前 %d 小時"
 msgstr[1] "約會前 %d 小時"
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2945
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "約會前 %d 分鐘"
 msgstr[1] "約會前 %d 分鐘"
 
-#: ../calendar/gui/dialogs/event-page.c:2950
+#: ../calendar/gui/dialogs/event-page.c:2958
 msgid "Customize"
 msgstr "自訂"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid "1 day before appointment"
-msgstr "約會前 1 天"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 hour before appointment"
-msgstr "約會前 1 小時"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "15 minutes before appointment"
-msgstr "約會前 15 分鐘"
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
+"約會前 15 分鐘\n"
+"約會前 1 小時\n"
+"約會前 1 天"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
@@ -6708,58 +5313,54 @@ msgstr "鬧鈴(_A)"
 #: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
 #: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "描述(_D):"
 
+#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
+msgid "_Location:"
+msgstr "位置(_L):"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "時刻(_T):"
 
-# (Abel) 還有一處要用，就是加約會的 main dialog:
-# 時間(T):  [日期] [時間] [for] [1]時 [0]分鐘
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
-msgid "for"
-msgstr "總共"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
-msgid "until"
-msgstr "直至"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>到會者(_E)</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "變更會議召集人(_H)"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "連絡人(_N)..."
+#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:49
+msgid ""
+"a\n"
+"b"
+msgstr ""
+"a\n"
+"b"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "會議召集人:"
+#: ../calendar/gui/dialogs/event-page.glade.h:20
+msgid ""
+"for\n"
+"until"
+msgstr ""
+"於\n"
+"直到"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
 msgid "Memo"
 msgstr "備忘錄"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../calendar/gui/dialogs/memo-page.c:856
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "無法在「%s」開啟備忘錄。"
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887
+#: ../calendar/gui/dialogs/memo-page.c:1011 ../mail/em-format-html.c:1565
+#: ../mail/em-format-html.c:1623 ../mail/em-format-html.c:1648
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
 #: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "收件者"
@@ -6799,37 +5400,37 @@ msgstr "您正在修改週期性工作。您想要修改什麼？"
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "您正在修改週期性備忘錄。您想要修改什麼？"
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "限此例項"
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "此例項和先前的例項"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "此例項和以後的例項"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "所有例項"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:562
+#: ../calendar/gui/dialogs/recurrence-page.c:559
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution 無法編輯這個週期性約會。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:888
 msgid "Recurrence date is invalid"
 msgstr "週期性日期無效"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "End time of the recurrence was before event's start"
 msgstr "週期性事件的結束時刻早於開始時刻"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:961
+#: ../calendar/gui/dialogs/recurrence-page.c:957
 msgid "on"
 msgstr "的"
 
@@ -6837,7 +5438,7 @@ msgstr "的"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1014
 msgid "first"
 msgstr "一"
 
@@ -6846,7 +5447,7 @@ msgstr "一"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1020
 msgid "second"
 msgstr "二"
 
@@ -6854,7 +5455,7 @@ msgstr "二"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1025
 msgid "third"
 msgstr "三"
 
@@ -6862,7 +5463,7 @@ msgstr "三"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1030
 msgid "fourth"
 msgstr "四"
 
@@ -6870,13 +5471,13 @@ msgstr "四"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1035
 msgid "last"
 msgstr "最後"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "Other Date"
 msgstr "其它日期"
 
@@ -6884,7 +5485,7 @@ msgstr "其它日期"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1065
 msgid "1st to 10th"
 msgstr "1日至10日"
 
@@ -6892,7 +5493,7 @@ msgstr "1日至10日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1071
 msgid "11th to 20th"
 msgstr "11日至20日"
 
@@ -6900,45 +5501,45 @@ msgstr "11日至20日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1077
 msgid "21st to 31st"
 msgstr "21日至31日"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1102
 msgid "day"
 msgstr "天"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1231
 msgid "on the"
 msgstr "在第"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1401
 msgid "occurrences"
 msgstr "次"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2120
+#: ../calendar/gui/dialogs/recurrence-page.c:2096
 msgid "Add exception"
 msgstr "加入例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2161
+#: ../calendar/gui/dialogs/recurrence-page.c:2137
 msgid "Could not get a selection to modify."
 msgstr "無法取得要編輯的選取區。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2143
 msgid "Modify exception"
 msgstr "編輯例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2211
+#: ../calendar/gui/dialogs/recurrence-page.c:2187
 msgid "Could not get a selection to delete."
 msgstr "無法取得要刪除的選取區。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2335
+#: ../calendar/gui/dialogs/recurrence-page.c:2311
 msgid "Date/Time"
 msgstr "日期/時間"
 
@@ -6955,50 +5556,52 @@ msgstr "<b>預覽</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>週期</b>"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Every"
 msgstr "每"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "This appointment rec_urs"
 msgstr "這個約會的循環規則為(_U)"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
-msgid "forever"
-msgstr "永遠"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
-msgid "month(s)"
-msgstr "月"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
+"天\n"
+"週\n"
+"月\n"
+"年"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
-msgid "week(s)"
-msgstr "週"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
-msgid "year(s)"
-msgstr "年"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
+"於\n"
+"直到\n"
+"永遠"
 
 #: ../calendar/gui/dialogs/send-comp.c:116
 msgid "Send my alarms with this event"
 msgstr "將我的鬧鈴與這個事件一起送出"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../calendar/gui/dialogs/task-details-page.c:376
+#: ../calendar/gui/dialogs/task-details-page.c:396
 msgid "Completed date is wrong"
 msgstr "完成日期錯誤 "
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
+#: ../calendar/gui/dialogs/task-details-page.c:481
 msgid "Web Page"
 msgstr "網頁"
 
@@ -7010,74 +5613,38 @@ msgstr "<span weight=\"bold\">雜項</span>"
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">狀態</span>"
 
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-model-tasks.c:362
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:663 ../calendar/gui/e-itip-control.c:941
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
-msgid "Completed"
-msgstr "已完成"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1065
-msgid "High"
-msgstr "高"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-cal-model-tasks.c:754
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2558
-msgid "In Progress"
-msgstr "進行中"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
+"高\n"
+"中\n"
+"低\n"
+"未定義"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:590 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1063
-msgid "Low"
-msgstr "低"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:589
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
-msgid "Normal"
-msgstr "一般"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2555
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "未開始"
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
+"尚未開始\n"
+"進行中\n"
+"已完成\n"
+"已取消"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "P_ercent complete:"
 msgstr "完成百分比(_E):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Stat_us:"
 msgstr "狀態(_U):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:591 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "未指定"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "完成日期(_D):"
@@ -7100,7 +5667,7 @@ msgid "Click to change or view the status details of the task"
 msgstr "按這裡改變/檢視該工作的狀態詳細資料"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:525
+#: ../composer/e-composer-actions.c:371
 msgid "_Send Options"
 msgstr "傳送選項(_S)"
 
@@ -7117,7 +5684,7 @@ msgstr "工作詳細資料"
 msgid "Organi_zer:"
 msgstr "會議召集人(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:786
+#: ../calendar/gui/dialogs/task-page.c:787
 msgid "Due date is wrong"
 msgstr "到期日錯誤"
 
@@ -7218,80 +5785,161 @@ msgstr "%s 在 %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s 為未知的觸發類型"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3273
+#: ../calendar/gui/e-attachment-handler-calendar.c:258
+msgid "I_mport"
+msgstr "匯入(_M)"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:340
+msgid "Select a Calendar"
+msgstr "選擇行事曆"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:367
+msgid "Select a Task List"
+msgstr "選擇工作清單"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:377
+msgid "I_mport to Calendar"
+msgstr "匯入至行事曆(_M)"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:384
+msgid "I_mport to Tasks"
+msgstr "匯入至工作(_M)"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:68
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3210
 #, c-format
 msgid "Click to open %s"
 msgstr "按一下來開啟 %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-memo-preview.c:127
+#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
 msgid "Untitled"
 msgstr "無標題"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:181
-#: ../calendar/gui/e-cal-component-preview.c:211
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-memo-preview.c:178
+#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:220
 msgid "Start Date:"
 msgstr "開始日期："
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-memo-preview.c:191
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1213
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
 msgid "Description:"
 msgstr "描述:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-memo-preview.c:215
 #: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "網頁："
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1157
+#: ../calendar/gui/e-cal-component-preview.c:202
+#: ../calendar/gui/e-itip-control.c:1154
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "摘要:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:231
 msgid "Due Date:"
 msgstr "截止日期："
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-itip-control.c:1181
-#: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
 msgstr "狀態:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-model-tasks.c:359
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-cal-model-tasks.c:752
+#: ../calendar/gui/e-calendar-table.c:233
+#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2542
+msgid "In Progress"
+msgstr "進行中"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-model-tasks.c:361
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:235
+#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Completed"
+msgstr "已完成"
+
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model-tasks.c:357
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-calendar-table.c:231
+#: ../calendar/gui/e-calendar-table.c:657 ../calendar/gui/print.c:2539
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "未開始"
+
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Priority:"
 msgstr "優先等級:"
 
+#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-calendar-table.c:584 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "高"
+
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-model.c:1057 ../calendar/gui/e-calendar-table.c:585
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "一般"
+
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-calendar-table.c:586 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "低"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:362
+msgid "Created"
+msgstr "已建立"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "結束日期"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Last modified"
+msgstr "修改日期"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "開始日期"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:640
+#: ../calendar/gui/e-calendar-table.c:636
 msgid "Free"
 msgstr "空閒"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-calendar-table.c:637
+#: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:625
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7301,225 +5949,200 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1063
 #: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:745
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:742
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "是"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1063
 #: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "否"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
-#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-cal-model.c:353 ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-itip-control.c:1333
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
-#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1342
-#: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2204
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
+#: ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2233
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "不明"
 
-#: ../calendar/gui/e-cal-model.c:1008
+#: ../calendar/gui/e-cal-model.c:1059
 msgid "Recurring"
 msgstr "循環模式"
 
-#: ../calendar/gui/e-cal-model.c:1010
+#: ../calendar/gui/e-cal-model.c:1061
 msgid "Assigned"
 msgstr "已指定"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
-msgid "Save As..."
-msgstr "另存新檔..."
-
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2217
-msgid "Select folder to save selected attachments..."
-msgstr "選擇用來儲存選定的附加檔案的資料夾..."
-
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
-#, c-format
-msgid "untitled_image.%s"
-msgstr "untitled_image.%s"
-
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:939
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:559 ../mail/em-popup.c:570
-msgid "_Save As..."
-msgstr "另存新檔(_S)..."
-
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
-#: ../mail/em-popup.c:571
-msgid "Set as _Background"
-msgstr "設為背景(_B)"
-
-#: ../calendar/gui/e-cal-popup.c:288
-msgid "_Save Selected"
-msgstr "儲存選取的(_S)"
-
-#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
-#, c-format
-msgid "Open in %s..."
-msgstr "在 %s 內開啟..."
-
-#: ../calendar/gui/e-calendar-table.c:336
+#: ../calendar/gui/e-calendar-table.c:334
 msgid "* No Summary *"
 msgstr "* 沒有摘要 *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:372
-#: ../calendar/gui/e-calendar-view.c:2399
+#: ../calendar/gui/e-calendar-table.c:370
+#: ../calendar/gui/e-calendar-view.c:2427
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "召集人: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:375
-#: ../calendar/gui/e-calendar-view.c:2403
+#: ../calendar/gui/e-calendar-table.c:373
+#: ../calendar/gui/e-calendar-view.c:2431
 #, c-format
 msgid "Organizer: %s"
 msgstr "會議召集人: %s"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "Start: "
 msgstr "開始:"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "Due: "
 msgstr "到期:"
 
-#: ../calendar/gui/e-calendar-table.c:610
+#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "未指定"
+
+#: ../calendar/gui/e-calendar-table.c:606
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:613
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:614
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:615
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:616
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:617
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:618
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:900
-#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:452
+#: ../calendar/gui/e-calendar-table.c:892
+#: ../calendar/gui/e-calendar-view.c:657 ../calendar/gui/e-memo-table.c:444
 msgid "Deleting selected objects"
 msgstr "刪除選定的物件"
 
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:657
+#: ../calendar/gui/e-calendar-table.c:1171
+#: ../calendar/gui/e-calendar-view.c:871 ../calendar/gui/e-memo-table.c:649
 msgid "Updating objects"
 msgstr "更新物件"
 
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:833
-#: ../composer/e-composer-actions.c:275
+#: ../calendar/gui/e-calendar-table.c:1359
+#: ../calendar/gui/e-calendar-view.c:1331 ../calendar/gui/e-memo-table.c:823
+#: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "另存新檔..."
 
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1758
+#: ../calendar/gui/e-calendar-table.c:1583
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New _Task"
 msgstr "新增工作(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1599 ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/e-calendar-table.c:1587 ../calendar/gui/e-memo-table.c:928
 msgid "Open _Web Page"
 msgstr "開啟網頁(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1601
-#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1805 ../calendar/gui/e-memo-table.c:929
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
+msgid "_Save As..."
+msgstr "另存新檔(_S)..."
+
+#: ../calendar/gui/e-calendar-table.c:1589
+#: ../calendar/gui/e-calendar-view.c:1790 ../calendar/gui/e-memo-table.c:930
 msgid "P_rint..."
 msgstr "列印(_R)..."
 
-#: ../calendar/gui/e-calendar-table.c:1605
-#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:944
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1810 ../calendar/gui/e-memo-table.c:934
 #: ../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:1607
-#: ../calendar/gui/e-calendar-view.c:1764
-#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:946
+#: ../calendar/gui/e-calendar-table.c:1595
+#: ../calendar/gui/e-calendar-view.c:1793
+#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:936
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1611 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1599 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "指派工作(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1612 ../calendar/gui/e-memo-table.c:950
+#: ../calendar/gui/e-calendar-table.c:1600 ../calendar/gui/e-memo-table.c:940
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "以 iCale_ndar 轉寄"
 
-#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-table.c:1601
 msgid "_Mark as Complete"
 msgstr "標示為完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1614
+#: ../calendar/gui/e-calendar-table.c:1602
 msgid "_Mark Selected Tasks as Complete"
 msgstr "標示選定的工作為已完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1615
+#: ../calendar/gui/e-calendar-table.c:1603
 msgid "_Mark as Incomplete"
 msgstr "標示為未完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1616
+#: ../calendar/gui/e-calendar-table.c:1604
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "標示選定的工作為未完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1621
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Delete Selected Tasks"
 msgstr "刪除選定的工作(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1858
+#: ../calendar/gui/e-calendar-table.c:1844
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "請按這裡增加新的工作"
@@ -7537,167 +6160,167 @@ msgstr "完成"
 msgid "Completion date"
 msgstr "完成日期"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "到期日"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Priority"
 msgstr "優先等級"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 msgid "Start date"
 msgstr "開始日期"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2307
-#: ../calendar/gui/e-meeting-list-view.c:602
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:2335
+#: ../calendar/gui/e-meeting-list-view.c:601
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "狀態"
 
-#: ../calendar/gui/e-calendar-view.c:1444
+#: ../calendar/gui/e-calendar-view.c:1476
 msgid "Moving items"
 msgstr "移動項目"
 
-#: ../calendar/gui/e-calendar-view.c:1446
+#: ../calendar/gui/e-calendar-view.c:1478
 msgid "Copying items"
 msgstr "複製項目"
 
-#: ../calendar/gui/e-calendar-view.c:1755
+#: ../calendar/gui/e-calendar-view.c:1784
 msgid "New _Appointment..."
 msgstr "新增約會(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1756
+#: ../calendar/gui/e-calendar-view.c:1785
 msgid "New All Day _Event"
 msgstr "新增全天事件(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1757
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Meeting"
 msgstr "新增會議(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1768
+#: ../calendar/gui/e-calendar-view.c:1797
 msgid "_Current View"
 msgstr "目前檢視(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1770
+#: ../calendar/gui/e-calendar-view.c:1799
 msgid "Select T_oday"
 msgstr "選擇今天(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1771
+#: ../calendar/gui/e-calendar-view.c:1800
 msgid "_Select Date..."
 msgstr "選擇日期(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1777
+#: ../calendar/gui/e-calendar-view.c:1806
 msgid "Pri_nt..."
 msgstr "列印(_N)..."
 
-#: ../calendar/gui/e-calendar-view.c:1787
+#: ../calendar/gui/e-calendar-view.c:1816
 msgid "Cop_y to Calendar..."
 msgstr "複製至行事曆(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1788
+#: ../calendar/gui/e-calendar-view.c:1817
 msgid "Mo_ve to Calendar..."
 msgstr "移至行事曆(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1789
+#: ../calendar/gui/e-calendar-view.c:1818
 msgid "_Delegate Meeting..."
 msgstr "委派會議(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1790
+#: ../calendar/gui/e-calendar-view.c:1819
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1791
+#: ../calendar/gui/e-calendar-view.c:1820
 msgid "_Forward as iCalendar..."
 msgstr "以 iCale_ndar 轉寄..."
 
-#: ../calendar/gui/e-calendar-view.c:1792
+#: ../calendar/gui/e-calendar-view.c:1821
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../calendar/gui/e-calendar-view.c:1822
+#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1798
+#: ../calendar/gui/e-calendar-view.c:1827
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示成可移動(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1828 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "刪除這個事件(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1800
+#: ../calendar/gui/e-calendar-view.c:1829
 msgid "Delete _All Occurrences"
 msgstr "刪除全部事件(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:2254
-#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-calendar-view.c:2282
+#: ../calendar/gui/e-itip-control.c:1183
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2192
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "Accepted"
 msgstr "接受"
 
-#: ../calendar/gui/e-calendar-view.c:2255
-#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-calendar-view.c:2283
+#: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2198
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../plugins/itip-formatter/itip-formatter.c:2227
 msgid "Declined"
 msgstr "婉拒"
 
-#: ../calendar/gui/e-calendar-view.c:2256
+#: ../calendar/gui/e-calendar-view.c:2284
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-time-sel.c:390
 msgid "Tentative"
 msgstr "暫訂"
 
-#: ../calendar/gui/e-calendar-view.c:2257
+#: ../calendar/gui/e-calendar-view.c:2285
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2201
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Delegated"
 msgstr "已委派"
 
-#: ../calendar/gui/e-calendar-view.c:2258
+#: ../calendar/gui/e-calendar-view.c:2286
 msgid "Needs action"
 msgstr "需要動作"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-view.c:2447 ../calendar/gui/print.c:2501
 #, c-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2453
+#: ../calendar/gui/e-calendar-view.c:2478
 #, c-format
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:109
+#: ../calendar/gui/e-cell-date-edit-text.c:105
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:112
+#: ../calendar/gui/e-cell-date-edit-text.c:108
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:120
+#: ../calendar/gui/e-cell-date-edit-text.c:116
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7710,12 +6333,12 @@ msgstr ""
 #. * 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:750
+#: ../calendar/gui/e-day-view-time-item.c:745
 #, c-format
 msgid "%02i minute divisions"
 msgstr "間隔 %02i 分鐘"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:766
 msgid "Show the second time zone"
 msgstr "顯示第二時區"
 
@@ -7725,48 +6348,48 @@ msgstr "顯示第二時區"
 #. 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:851 ../calendar/gui/e-day-view.c:1582
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1570
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/e-day-view.c:799 ../calendar/gui/e-week-view.c:541
+#: ../calendar/gui/print.c:825
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:830
+#: ../calendar/gui/e-day-view.c:802 ../calendar/gui/e-week-view.c:544
+#: ../calendar/gui/print.c:827
 msgid "pm"
 msgstr "下午"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2320
+#: ../calendar/gui/e-day-view.c:2301
 #, c-format
 msgid "Week %d"
 msgstr "第 %d 週"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:758
 msgid "Yes. (Complex Recurrence)"
 msgstr "是。(複雜循環)"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "每天"
 msgstr[1] "每 %d 天"
 
-#: ../calendar/gui/e-itip-control.c:790
+#: ../calendar/gui/e-itip-control.c:788
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "每週"
 msgstr[1] "每 %d 週"
 
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7774,35 +6397,35 @@ msgstr[0] "每週於"
 msgstr[1] "每 %d 週於"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:806
 msgid " and "
 msgstr " 和 "
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "The %s day of "
 msgstr "%s 日於 "
 
-#: ../calendar/gui/e-itip-control.c:833
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s 日於 "
 
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:842
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "每月"
 msgstr[1] "每 %d 月"
 
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:854
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "每年"
 msgstr[1] "每 %d 年"
 
-#: ../calendar/gui/e-itip-control.c:869
+#: ../calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7810,36 +6433,36 @@ msgstr[0] "總共 %d 次"
 msgstr[1] "總共 %d 次"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:880
+#: ../calendar/gui/e-itip-control.c:878
 msgid ", ending on "
 msgstr "，結束於 "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:902
+#: ../calendar/gui/e-itip-control.c:900
 msgid "Starts"
 msgstr "開始"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:916
+#: ../calendar/gui/e-itip-control.c:914
 msgid "Ends"
 msgstr "結束"
 
-#: ../calendar/gui/e-itip-control.c:956
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-itip-control.c:954
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "截止"
 
-#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "iCalendar 資訊"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1015
+#: ../calendar/gui/e-itip-control.c:1012
 msgid "iCalendar Error"
 msgstr "iCalendar 錯誤"
 
-#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
+#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -7850,284 +6473,284 @@ msgid "An unknown person"
 msgstr "不明人士"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1138
+#: ../calendar/gui/e-itip-control.c:1135
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> 請查閱下列資訊，然後在下面的選單中選擇一個動作。"
 
-#: ../calendar/gui/e-itip-control.c:1190
-#: ../plugins/itip-formatter/itip-formatter.c:2195
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
 
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1274
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "會議已經取消，但是在您的行事曆中找不到"
 
-#: ../calendar/gui/e-itip-control.c:1280
+#: ../calendar/gui/e-itip-control.c:1276
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "工作已經取消，但是在您的工作清單中找不到"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 已經發佈會議資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Information"
 msgstr "會議資訊"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1360
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> 邀請 %s 出席此次會議。"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 邀請您出席此次會議。"
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Proposal"
 msgstr "會議提案"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> 希望加入一個既存的會議。"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Update"
 msgstr "會議更新"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> 希望收到最新的會議資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update Request"
 msgstr "會議更新請求"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1382
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已經答覆了會議請求。"
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1383
 msgid "Meeting Reply"
 msgstr "會議答覆"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> 已經消取會議。"
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Cancelation"
 msgstr "會議取消"
 
-#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> 傳送了一個難以理解的訊息。"
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1402
 msgid "Bad Meeting Message"
 msgstr "不正確的會議訊息"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 已經發佈了工作資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1430
 msgid "Task Information"
 msgstr "工作資訊"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1437
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> 要求 %s 進行工作。"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> 要求您進行工作。"
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Proposal"
 msgstr "工作計劃"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> 希望加入一項既存的工作。"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1447
 msgid "Task Update"
 msgstr "工作更新"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> 希望收到最新的工作資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update Request"
 msgstr "工作更新請求"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已經回覆指派的工作。"
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1460
 msgid "Task Reply"
 msgstr "工作回覆"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> 已經取消工作。"
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Cancelation"
 msgstr "工作取消"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1479
 msgid "Bad Task Message"
 msgstr "不正確的工作訊息"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1503
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 已經發佈空閒/忙碌資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1504
 msgid "Free/Busy Information"
 msgstr "空閒/忙碌資訊"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 請求您的空閒/忙碌資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Request"
 msgstr "空閒/忙碌請求"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> 已經答覆空閒/忙碌請求。"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Reply"
 msgstr "空閒/忙碌回覆"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Bad Free/Busy Message"
 msgstr "不正確的空閒/忙碌訊息"
 
-#: ../calendar/gui/e-itip-control.c:1600
+#: ../calendar/gui/e-itip-control.c:1595
 msgid "The message does not appear to be properly formed"
 msgstr "郵件似乎沒有被適當地組成"
 
-#: ../calendar/gui/e-itip-control.c:1659
+#: ../calendar/gui/e-itip-control.c:1654
 msgid "The message contains only unsupported requests."
 msgstr "這個郵件只包含不支援的請求。"
 
-#: ../calendar/gui/e-itip-control.c:1692
+#: ../calendar/gui/e-itip-control.c:1687
 msgid "The attachment does not contain a valid calendar message"
 msgstr "附件並未包含合法的行事曆訊息"
 
-#: ../calendar/gui/e-itip-control.c:1730
+#: ../calendar/gui/e-itip-control.c:1725
 msgid "The attachment has no viewable calendar items"
 msgstr "附件沒有可檢視的行事曆項目"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1967
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: ../calendar/gui/e-itip-control.c:2009
+#: ../calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "物件是無效的而且不能更新\n"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "這個回覆並非來自目前的到會者。將他加入為到會者？"
 
-#: ../calendar/gui/e-itip-control.c:2044
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！\n"
 
-#: ../calendar/gui/e-itip-control.c:2068
+#: ../calendar/gui/e-itip-control.c:2060
 msgid "Attendee status updated\n"
 msgstr "到會者狀態已更新\n"
 
-#: ../calendar/gui/e-itip-control.c:2075
-#: ../plugins/itip-formatter/itip-formatter.c:1379
+#: ../calendar/gui/e-itip-control.c:2067
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "到會者狀態不能更新，因為項目已經不存在"
 
-#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
 msgid "Item sent!\n"
 msgstr "項目傳送！\n"
 
-#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
+#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
 msgstr "無法傳送這個項目！\n"
 
-#: ../calendar/gui/e-itip-control.c:2251
+#: ../calendar/gui/e-itip-control.c:2281
 msgid "Choose an action:"
 msgstr "選擇一個動作:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2280
-#: ../calendar/gui/e-meeting-list-view.c:590
+#: ../calendar/gui/e-itip-control.c:2310
+#: ../calendar/gui/e-meeting-list-view.c:589
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Update"
 msgstr "更新"
 
-#: ../calendar/gui/e-itip-control.c:2350
-#: ../plugins/groupwise-features/process-meeting.c:51
+#: ../calendar/gui/e-itip-control.c:2374
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "接受"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2375
 msgid "Tentatively accept"
 msgstr "暫時接受"
 
-#: ../calendar/gui/e-itip-control.c:2352
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2376
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "拒絕"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2401
 msgid "Send Free/Busy Information"
 msgstr "送出空閒/忙碌資訊"
 
-#: ../calendar/gui/e-itip-control.c:2409
+#: ../calendar/gui/e-itip-control.c:2425
 msgid "Update respondent status"
 msgstr "更新回應狀態"
 
-#: ../calendar/gui/e-itip-control.c:2437
+#: ../calendar/gui/e-itip-control.c:2449
 msgid "Send Latest Information"
 msgstr "送出最新資訊"
 
-#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
 
@@ -8151,6 +6774,10 @@ msgstr "載入行事曆"
 msgid "Loading calendar..."
 msgstr "載入行事曆..."
 
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr "會議召集人:"
+
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "伺服器訊息:"
@@ -8176,72 +6803,72 @@ msgid "Attendees"
 msgstr "到會者"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
+#: ../calendar/gui/e-meeting-store.c:84 ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
 msgid "Individual"
 msgstr "個別"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "群組"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:976
 msgid "Resource"
 msgstr "資源"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:977
 msgid "Room"
 msgstr "會議室"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:997
+#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:991
 msgid "Chair"
 msgstr "主席"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
 msgid "Required Participant"
 msgstr "出席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:993
 msgid "Optional Participant"
 msgstr "列席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:994
 msgid "Non-Participant"
 msgstr "缺席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:752
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 msgstr "需要動作"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:544
 msgid "Attendee                          "
 msgstr "到會者"
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
 msgid "In Process"
 msgstr "進行中"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:467
-#: ../calendar/gui/e-meeting-time-sel.c:2124
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2083
 msgid "%A, %B %d, %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 
@@ -8249,78 +6876,78 @@ msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2155
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2114
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:475
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "不在辦公室"
 
-#: ../calendar/gui/e-meeting-time-sel.c:401
+#: ../calendar/gui/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "沒有資訊"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:408
 msgid "A_ttendees..."
 msgstr "到會者(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:437
+#: ../calendar/gui/e-meeting-time-sel.c:429
 msgid "O_ptions"
 msgstr "選項(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:454
+#: ../calendar/gui/e-meeting-time-sel.c:446
 msgid "Show _only working hours"
 msgstr "只顯示工作時間(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:456
 msgid "Show _zoomed out"
 msgstr "顯示縮小(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "_Update free/busy"
 msgstr "更新空閒/忙碌(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:512
+#: ../calendar/gui/e-meeting-time-sel.c:504
 msgid "_Autopick"
 msgstr "自動選擇(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:536
 msgid "_All people and resources"
 msgstr "所有人員和資源(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:553
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "All _people and one resource"
 msgstr "所有人員和一個資源(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "_Required people"
 msgstr "必要的人員(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Required people and _one resource"
 msgstr "必要人員和一個資源(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_End time:"
 msgstr "結束時刻(_E):"
 
@@ -8348,15 +6975,15 @@ msgstr "語言"
 msgid "Member"
 msgstr "成員"
 
-#: ../calendar/gui/e-memo-table.c:955
+#: ../calendar/gui/e-memo-table.c:945
 msgid "_Delete Selected Memos"
 msgstr "刪除選定的備忘錄(_D)"
 
-#: ../calendar/gui/e-memo-table.c:1106 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1094 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "請按這裡增加新的備忘錄"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8365,165 +6992,145 @@ msgstr ""
 "發生於 %s 的錯誤：\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:812
+#: ../calendar/gui/e-memos.c:806
 msgid "Loading memos"
 msgstr "正在載入備忘錄"
 
-#: ../calendar/gui/e-memos.c:903
+#: ../calendar/gui/e-memos.c:897
 #, c-format
 msgid "Opening memos at %s"
 msgstr "開啟在 %s 的備忘錄"
 
-#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
 msgid "Deleting selected objects..."
 msgstr "正在刪除選定的物件..."
 
-#: ../calendar/gui/e-tasks.c:963
+#: ../calendar/gui/e-tasks.c:955
 msgid "Loading tasks"
 msgstr "正在載入工作"
 
-#: ../calendar/gui/e-tasks.c:1061
+#: ../calendar/gui/e-tasks.c:1052
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "開啟在 %s 的工作"
 
-#: ../calendar/gui/e-tasks.c:1306
+#: ../calendar/gui/e-tasks.c:1295
 msgid "Completing tasks..."
 msgstr "正在完成工作..."
 
-#: ../calendar/gui/e-tasks.c:1356
+#: ../calendar/gui/e-tasks.c:1345
 msgid "Expunging"
 msgstr "除去中"
 
-#: ../calendar/gui/e-timezone-entry.c:127
+#: ../calendar/gui/e-timezone-entry.c:124
 msgid "Select Timezone"
 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:343 ../calendar/gui/print.c:1659
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1647
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2637
+#: ../calendar/gui/gnome-cal.c:2670
 msgid "_Custom View"
 msgstr "自訂檢視(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2638
+#: ../calendar/gui/gnome-cal.c:2671
 msgid "_Save Custom View"
 msgstr "儲存自訂檢視(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2643
+#: ../calendar/gui/gnome-cal.c:2676
 msgid "_Define Views..."
 msgstr "定義檢視(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2880
+#: ../calendar/gui/gnome-cal.c:2913
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "載入 %s 的約會"
 
-#: ../calendar/gui/gnome-cal.c:2895
+#: ../calendar/gui/gnome-cal.c:2928
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "載入 %s 的工作"
 
-#: ../calendar/gui/gnome-cal.c:2904
+#: ../calendar/gui/gnome-cal.c:2937
 #, c-format
 msgid "Loading memos at %s"
 msgstr "正在載入 %s 的備忘錄"
 
-#: ../calendar/gui/gnome-cal.c:3016
+#: ../calendar/gui/gnome-cal.c:3049
 #, c-format
 msgid "Opening %s"
 msgstr "正在開啟 %s"
 
-#: ../calendar/gui/gnome-cal.c:3984
+#: ../calendar/gui/gnome-cal.c:4009
 msgid "Purging"
 msgstr "清除"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "四月"
-
-#: ../calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "八月"
-
-#: ../calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "十二月"
-
-#: ../calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "二月"
-
-#: ../calendar/gui/goto-dialog.glade.h:5
-msgid "January"
-msgstr "一月"
-
-#: ../calendar/gui/goto-dialog.glade.h:6
-msgid "July"
-msgstr "七月"
-
-#: ../calendar/gui/goto-dialog.glade.h:7
-msgid "June"
-msgstr "六月"
-
-#: ../calendar/gui/goto-dialog.glade.h:8
-msgid "March"
-msgstr "三月"
-
-#: ../calendar/gui/goto-dialog.glade.h:9
-msgid "May"
-msgstr "五月"
-
-#: ../calendar/gui/goto-dialog.glade.h:10
-msgid "November"
-msgstr "十一月"
-
-#: ../calendar/gui/goto-dialog.glade.h:11
-msgid "October"
-msgstr "十月"
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
+"一月\n"
+"二月\n"
+"三月\n"
+"四月\n"
+"五月\n"
+"六月\n"
+"七月\n"
+"八月\n"
+"九月\n"
+"十月\n"
+"十一月\n"
+"十二月"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "Select Date"
 msgstr "選擇日期"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
-msgid "September"
-msgstr "九月"
-
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "選擇今天(_S)"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
+#: ../calendar/gui/itip-utils.c:548
 msgid "An organizer must be set."
 msgstr "必須指定一個召集人。"
 
-#: ../calendar/gui/itip-utils.c:454
+#: ../calendar/gui/itip-utils.c:452
 msgid "At least one attendee is necessary"
 msgstr "至少需要一個到會者"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:776
 msgid "Event information"
 msgstr "事件資訊"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:779
 msgid "Task information"
 msgstr "工作資訊"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:782
 msgid "Memo information"
 msgstr "備忘錄資訊"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:800
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:638
 msgid "Calendar information"
 msgstr "行事曆資訊"
 
@@ -8531,7 +7138,7 @@ msgstr "行事曆資訊"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:674
+#: ../calendar/gui/itip-utils.c:672
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "已接受"
@@ -8540,7 +7147,7 @@ msgstr "已接受"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:681
+#: ../calendar/gui/itip-utils.c:679
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
@@ -8552,7 +7159,7 @@ msgstr "暫時接受"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+#: ../calendar/gui/itip-utils.c:686 ../calendar/gui/itip-utils.c:734
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "已拒絕"
@@ -8561,7 +7168,7 @@ msgstr "已拒絕"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:693
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "已委派"
@@ -8569,7 +7176,7 @@ msgstr "已委派"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:706
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "已更新"
@@ -8577,7 +7184,7 @@ msgstr "已更新"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:713
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "取消"
@@ -8585,7 +7192,7 @@ msgstr "取消"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/itip-utils.c:720
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "重新整理"
@@ -8593,100 +7200,100 @@ msgstr "重新整理"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:729
+#: ../calendar/gui/itip-utils.c:727
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "投票表决"
 
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:797
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "空閒/忙碌資訊 (%s 到 %s)"
 
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:805
 msgid "iCalendar information"
 msgstr "iCalendar 資訊"
 
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:976
 msgid "You must be an attendee of the event."
 msgstr "您必須是此事件的到會者。"
 
-#: ../calendar/gui/memos-component.c:507
+#: ../calendar/gui/memos-component.c:477
 msgid "_New Memo List"
 msgstr "新增備忘錄清單(_N)"
 
-#: ../calendar/gui/memos-component.c:590
+#: ../calendar/gui/memos-component.c:560
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 項備忘錄"
 msgstr[1] "%d 項備忘錄"
 
-#: ../calendar/gui/memos-component.c:592 ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "，已選擇 %d 個"
 msgstr[1] "，已選擇 %d 個"
 
-#: ../calendar/gui/memos-component.c:639
+#: ../calendar/gui/memos-component.c:609
 msgid "Failed upgrading memos."
 msgstr "升級備忘錄失敗。"
 
-#: ../calendar/gui/memos-component.c:769
+#: ../calendar/gui/memos-component.c:739
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "無法開啟備忘錄清單「%s」來建立事件和會議"
 
-#: ../calendar/gui/memos-component.c:782
+#: ../calendar/gui/memos-component.c:752
 msgid "There is no calendar available for creating memos"
 msgstr "沒有可用的行事曆來建立備忘錄"
 
-#: ../calendar/gui/memos-component.c:892
+#: ../calendar/gui/memos-component.c:862
 msgid "Memo Source Selector"
 msgstr "備忘錄來源選擇器"
 
-#: ../calendar/gui/memos-component.c:1071
+#: ../calendar/gui/memos-component.c:1041
 msgid "New memo"
 msgstr "新增備忘錄"
 
-#: ../calendar/gui/memos-component.c:1072
+#: ../calendar/gui/memos-component.c:1042
 msgctxt "New"
 msgid "Mem_o"
 msgstr "備忘錄(_O)"
 
-#: ../calendar/gui/memos-component.c:1073
+#: ../calendar/gui/memos-component.c:1043
 msgid "Create a new memo"
 msgstr "建立新的備忘錄"
 
-#: ../calendar/gui/memos-component.c:1079
+#: ../calendar/gui/memos-component.c:1049
 msgid "New shared memo"
 msgstr "新增共用備忘錄"
 
-#: ../calendar/gui/memos-component.c:1080
+#: ../calendar/gui/memos-component.c:1050
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "共用備忘錄(_S)"
 
-#: ../calendar/gui/memos-component.c:1081
+#: ../calendar/gui/memos-component.c:1051
 msgid "Create a shared new memo"
 msgstr "建立新的共用備忘錄"
 
-#: ../calendar/gui/memos-component.c:1087
+#: ../calendar/gui/memos-component.c:1057
 msgid "New memo list"
 msgstr "新備忘錄清單"
 
-#: ../calendar/gui/memos-component.c:1088
+#: ../calendar/gui/memos-component.c:1058
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "備忘錄清單(_S)"
 
-#: ../calendar/gui/memos-component.c:1089
+#: ../calendar/gui/memos-component.c:1059
 msgid "Create a new memo list"
 msgstr "建立新備忘錄清單"
 
 # zh_HK: msgstr "打印備忘錄"
-#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
 msgid "Print Memos"
 msgstr "打印備忘錄"
 
@@ -8713,297 +7320,289 @@ msgstr ""
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "無法從 evolution/config.xmldb 移轉舊設定"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
+#: ../calendar/gui/migration.c:803
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "無法移轉移行事曆 `%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
+#: ../calendar/gui/migration.c:971
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "無法移轉工作 `%s'"
 
-#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
-msgid "Notes"
-msgstr "備註"
-
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "31st"
 msgstr "31日"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "日"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "一"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "二"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "三"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "四"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "五"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "六"
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2465
 msgid "Appointment"
 msgstr "約會"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2467
 msgid "Task"
 msgstr "工作"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2492
 #, c-format
 msgid "Summary: %s"
 msgstr "摘要：%s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2515
 msgid "Attendees: "
 msgstr "到會者:"
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2555
 #, c-format
 msgid "Status: %s"
 msgstr "狀態(_S): %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "Priority: %s"
 msgstr "優先順序(_P): %s"
 
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2584
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成百分比: %i"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2595
 #, c-format
 msgid "URL: %s"
 msgstr "網址: %s"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2608
 #, c-format
 msgid "Categories: %s"
 msgstr "分類: %s"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2619
 msgid "Contacts: "
 msgstr "連絡人: "
 
-#: ../calendar/gui/tasks-component.c:499
+#: ../calendar/gui/tasks-component.c:470
 msgid "_New Task List"
 msgstr "新增工作清單(_N)"
 
-#: ../calendar/gui/tasks-component.c:582
+#: ../calendar/gui/tasks-component.c:553
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d 項工作"
 msgstr[1] "%d 項工作"
 
-#: ../calendar/gui/tasks-component.c:631
+#: ../calendar/gui/tasks-component.c:602
 msgid "Failed upgrading tasks."
 msgstr "升級工作失敗。"
 
-#: ../calendar/gui/tasks-component.c:764
+#: ../calendar/gui/tasks-component.c:735
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "無法開啟工作清單 '%s' 來建立事件和會議"
 
-#: ../calendar/gui/tasks-component.c:777
+#: ../calendar/gui/tasks-component.c:748
 msgid "There is no calendar available for creating tasks"
 msgstr "沒有可用的行事曆來建立工作"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:859
 msgid "Task Source Selector"
 msgstr "工作來源選擇器"
 
-#: ../calendar/gui/tasks-component.c:1142
+#: ../calendar/gui/tasks-component.c:1113
 msgid "New task"
 msgstr "新增工作"
 
-#: ../calendar/gui/tasks-component.c:1143
+#: ../calendar/gui/tasks-component.c:1114
 msgctxt "New"
 msgid "_Task"
 msgstr "工作(_T)"
 
-#: ../calendar/gui/tasks-component.c:1144
+#: ../calendar/gui/tasks-component.c:1115
 msgid "Create a new task"
 msgstr "建立一個新的工作"
 
-#: ../calendar/gui/tasks-component.c:1150
+#: ../calendar/gui/tasks-component.c:1121
 msgid "New assigned task"
 msgstr "新指定的工作"
 
-#: ../calendar/gui/tasks-component.c:1151
+#: ../calendar/gui/tasks-component.c:1122
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "指派的工作(_D)"
 
-#: ../calendar/gui/tasks-component.c:1152
+#: ../calendar/gui/tasks-component.c:1123
 msgid "Create a new assigned task"
 msgstr "建立新指定的工作"
 
-#: ../calendar/gui/tasks-component.c:1158
+#: ../calendar/gui/tasks-component.c:1129
 msgid "New task list"
 msgstr "新工作清單"
 
-#: ../calendar/gui/tasks-component.c:1159
+#: ../calendar/gui/tasks-component.c:1130
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "工作清單(_K)"
 
-#: ../calendar/gui/tasks-component.c:1160
+#: ../calendar/gui/tasks-component.c:1131
 msgid "Create a new task list"
 msgstr "建立新工作清單"
 
-#: ../calendar/gui/tasks-control.c:442
+#: ../calendar/gui/tasks-control.c:484
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -9015,11 +7614,11 @@ msgstr ""
 "\n"
 "確定清除這些工作？"
 
-#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1128
+#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "不要再顯示這個訊息。"
 
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 msgid "Print Tasks"
 msgstr "列印工作"
 
@@ -9036,11 +7635,11 @@ msgstr "已取消"
 msgid "In progress"
 msgstr "正在進行"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "大於"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "小於"
 
@@ -9048,37 +7647,37 @@ msgstr "小於"
 msgid "Appointments and Meetings"
 msgstr "約會和會議"
 
-#: ../calendar/importers/icalendar-importer.c:333
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1723
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1728
 msgid "Opening calendar"
 msgstr "開啟行事曆"
 
-#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 檔案 (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 輸入器"
 
-#: ../calendar/importers/icalendar-importer.c:529
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "提醒！"
 
-#: ../calendar/importers/icalendar-importer.c:581
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar 檔案 (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 輸入器"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "行事曆事件"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 行事曆智慧輸入器"
 
@@ -10639,248 +9238,233 @@ msgstr "無法開啟自動儲存檔案"
 msgid "Unable to retrieve message from editor"
 msgstr "無法從編輯器取得郵件"
 
-#: ../composer/e-composer-actions.c:45
-msgid "Insert Attachment"
-msgstr "插入附加檔案"
-
-#: ../composer/e-composer-actions.c:49
-msgid "A_ttach"
-msgstr "附加(_T)"
-
-#: ../composer/e-composer-actions.c:140
+#: ../composer/e-composer-actions.c:84
 msgid "Untitled Message"
 msgstr "未命名的郵件"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:317
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "附加檔案"
 
-#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:194
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:324
 msgid "Close the current file"
 msgstr "關閉目前的檔案"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
+#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "列印(_P)..."
 
-#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "預覽列印(_V)"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:345
 msgid "Save the current file"
 msgstr "儲存目前的檔案"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:350
 msgid "Save _As..."
 msgstr "另存新檔(_A)..."
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:352
 msgid "Save the current file with a different name"
 msgstr "以另一個名稱儲存目前的檔案"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:357
 msgid "Save as _Draft"
 msgstr "儲存為草稿(_D)"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:359
 msgid "Save as draft"
 msgstr "儲存為草稿"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:186
 msgid "S_end"
 msgstr "傳送(_E)"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:366
 msgid "Send this message"
 msgstr "傳送這個郵件"
 
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:373
 msgid "Insert Send options"
 msgstr "插入傳送選項"
 
-#: ../composer/e-composer-actions.c:532
+#: ../composer/e-composer-actions.c:378
 msgid "New _Message"
 msgstr "撰寫新郵件(_M)"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:380
 msgid "Open New Message window"
 msgstr "開啟新的郵件視窗"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:387
 msgid "Character _Encoding"
 msgstr "字元編碼(_E)"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:394
 msgid "_Security"
 msgstr "安全性(_S)"
 
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:404
 msgid "PGP _Encrypt"
 msgstr "PG_P 加密"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:406
 msgid "Encrypt this message with PGP"
 msgstr "使用 PGP 將這封郵件加密"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:412
 msgid "PGP _Sign"
 msgstr "P_GP 加簽"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
 msgstr "用您的 PGP 金鑰為郵件加上數位簽章"
 
-#: ../composer/e-composer-actions.c:574
+#: ../composer/e-composer-actions.c:420
 msgid "_Prioritize Message"
 msgstr "郵件優先權(_P)"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:422
 msgid "Set the message priority to high"
 msgstr "將郵件優先權設為「高」"
 
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:428
 msgid "Re_quest Read Receipt"
 msgstr "要求讀信回條(_Q)"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:430
 msgid "Get delivery notification when your message is read"
 msgstr "在您的郵件被閱讀時取得送信通知"
 
-#: ../composer/e-composer-actions.c:590
+#: ../composer/e-composer-actions.c:436
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME 加密"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:438
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "使用您的 S/MIME 加密憑證將這封郵件加密"
 
-#: ../composer/e-composer-actions.c:598
+#: ../composer/e-composer-actions.c:444
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME 加簽"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:446
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "用您的 S/MIME 簽名憑證為郵件加上數位簽章"
 
-#: ../composer/e-composer-actions.c:606
+#: ../composer/e-composer-actions.c:452
 msgid "_Bcc Field"
 msgstr "密件副本欄位(_B)"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the BCC field is displayed"
 msgstr "切換密件副本欄位的顯示狀態"
 
-#: ../composer/e-composer-actions.c:614
+#: ../composer/e-composer-actions.c:460
 msgid "_Cc Field"
 msgstr "副本欄位(_C)"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:462
 msgid "Toggles whether the CC field is displayed"
 msgstr "切換副本欄位的顯示狀態"
 
-#: ../composer/e-composer-actions.c:622
+#: ../composer/e-composer-actions.c:468
 msgid "_From Field"
 msgstr "寄件者欄位(_F)"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:470
 msgid "Toggles whether the From chooser is displayed"
 msgstr "切換寄件者選擇器的顯示狀態"
 
-#: ../composer/e-composer-actions.c:630
-msgid "_Post-To Field"
-msgstr "張貼到欄位(_P)"
-
-#: ../composer/e-composer-actions.c:632
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "切換是否顯示「張貼至」欄位"
-
-#: ../composer/e-composer-actions.c:638
+#: ../composer/e-composer-actions.c:476
 msgid "_Reply-To Field"
 msgstr "回覆欄位(_R)"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:478
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "切換回覆欄位的顯示狀態"
 
-#: ../composer/e-composer-actions.c:646
-msgid "_Subject Field"
-msgstr "主旨欄位(_S)"
-
-#: ../composer/e-composer-actions.c:648
-msgid "Toggles whether the Subject field is displayed"
-msgstr "切換是否顯示「主旨」欄位"
-
-#: ../composer/e-composer-actions.c:654
-msgid "_To Field"
-msgstr "數件者欄位(_T)"
-
-#: ../composer/e-composer-actions.c:656
-msgid "Toggles whether the To field is displayed"
-msgstr "切換是否顯示「收件者」欄位"
-
-#: ../composer/e-composer-actions.c:699
+#: ../composer/e-composer-actions.c:521
 msgid "Save Draft"
 msgstr "儲存草稿"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-header.c:114
+msgid "Show"
+msgstr "顯示"
+
+#: ../composer/e-composer-header.c:117
+msgid "Hide"
+msgstr "隱藏"
+
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "輸入郵件的收件者"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "輸入郵件副本的收件者"
 
-#: ../composer/e-composer-header-table.c:69
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr ""
 "輸入郵件密件副本的收件者，他們會收到這封郵件但不會出現在郵件的收件者清單"
 
-#: ../composer/e-composer-header-table.c:643
+#: ../composer/e-composer-header-table.c:927
 msgid "Fr_om:"
 msgstr "寄件者(_O):"
 
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:936
 msgid "_Reply-To:"
 msgstr "回覆地址(_R):"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:941
 msgid "_To:"
 msgstr "收件者(_T):"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:947
 msgid "_Cc:"
 msgstr "副本(_C):"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:947 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "副本(CC)"
+
+#: ../composer/e-composer-header-table.c:953
 msgid "_Bcc:"
 msgstr "密件副本(_B):"
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:953 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "密件副本(BCC)"
+
+#: ../composer/e-composer-header-table.c:958
 msgid "_Post To:"
 msgstr "張貼到(_P):"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:962
 msgid "S_ubject:"
 msgstr "主旨(_U):"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:971
 msgid "Si_gnature:"
 msgstr "簽名檔(_G):"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:116
 msgid "Click here for the address book"
 msgstr "按這裡新增目錄服務"
 
@@ -10896,38 +9480,26 @@ msgstr "選取資料夾來張貼郵件。"
 msgid "Click here to select folders to post to"
 msgstr "按一下這裡，選取要張貼的資料夾"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1557
-msgid "Show _Attachment Bar"
-msgstr "顯示附加檔案列(_A)"
+#: ../composer/e-composer-private.c:203
+msgid "Save draft"
+msgstr "儲存草稿"
 
-#: ../composer/e-msg-composer.c:866
+#: ../composer/e-msg-composer.c:807
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽署送出的郵件：此帳號沒有設定簽章憑證"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:814
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "無法加密送出的郵件：沒有設定加密憑證(此帳號)"
 
-#: ../composer/e-msg-composer.c:1499 ../mail/em-format-html-display.c:1952
-#: ../mail/em-format-html-display.c:2600 ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "附件"
-msgstr[1] "附件"
-
-#: ../composer/e-msg-composer.c:1555
-msgid "Hide _Attachment Bar"
-msgstr "隱藏附加檔案列(_A)"
-
-#: ../composer/e-msg-composer.c:1572 ../composer/e-msg-composer.c:2797
+#: ../composer/e-msg-composer.c:1331 ../composer/e-msg-composer.c:2170
 msgid "Compose Message"
 msgstr "編輯郵件"
 
-#: ../composer/e-msg-composer.c:4098
+#: ../composer/e-msg-composer.c:3328
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11082,7 +9654,7 @@ msgstr "儲存草稿(_S)"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution 郵件與行事曆"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:947
 msgid "Groupware Suite"
 msgstr "Groupware 套裝軟體"
 
@@ -11115,7 +9687,7 @@ msgid "Evolution Query"
 msgstr "Evolution 查詢"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-error.c:448
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "內部錯誤，要求的不明錯誤 '%s'>"
@@ -11151,11 +9723,11 @@ msgid "Log Level"
 msgstr "紀錄等級"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:389
+#: ../widgets/misc/e-dateedit.c:380
 msgid "Time"
 msgstr "時間"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
+#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2521
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "郵件"
@@ -11185,10 +9757,10 @@ msgstr "偵錯"
 msgid "Error, Warnings and Debug messages"
 msgstr "錯誤、警告與除錯訊息"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:943
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:690
+#: ../plugins/publish-calendar/publish-calendar.c:714
 msgid "Enabled"
 msgstr "已啟用"
 
@@ -11237,244 +9809,244 @@ msgstr "覆蓋檔案？"
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
-#: ../e-util/e-util.c:127
+#: ../e-util/e-util.c:133
 msgid "Could not open the link."
 msgstr "無法開啟該連結。"
 
-#: ../e-util/e-util.c:174
+#: ../e-util/e-util.c:183
 msgid "Could not display help for Evolution."
 msgstr "無法顯示 Evolution 的求助文件。"
 
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:45
 msgid "I_mportant"
 msgstr "重要(_M)"
 
 #. red
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:46
 msgid "_Work"
 msgstr "工作(_W)"
 
 #. orange
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:47
 msgid "_Personal"
 msgstr "個人(_P)"
 
 #. green
-#: ../e-util/e-util-labels.c:42
+#: ../e-util/e-util-labels.c:48
 msgid "_To Do"
 msgstr "待辦事項(_T)"
 
 #. blue
-#: ../e-util/e-util-labels.c:43
+#: ../e-util/e-util-labels.c:49
 msgid "_Later"
 msgstr "稍後(_L)"
 
-#: ../e-util/e-util-labels.c:315
+#: ../e-util/e-util-labels.c:320
 msgid "Label _Name:"
 msgstr "標籤名稱(_N):"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Edit Label"
 msgstr "編輯標籤"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Add Label"
 msgstr "加入標籤"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:362
 msgid "Label name cannot be empty."
 msgstr "標籤的名稱不能空白。"
 
-#: ../e-util/e-util-labels.c:362
+#: ../e-util/e-util-labels.c:367
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
 msgstr "伺服器上已存在同樣的標籤。請更改您的標籤名稱。"
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../e-util/gconf-bridge.c:1222
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf 錯誤：%s"
 
-#: ../e-util/gconf-bridge.c:1231
+#: ../e-util/gconf-bridge.c:1233
 msgid "All further errors shown only on terminal."
 msgstr "所有進一步的錯誤訊息只會在終端機中顯示。"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 秒前"
 msgstr[1] "%d 秒前"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 秒後"
 msgstr[1] "%d 秒後"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 分鐘前"
 msgstr[1] "%d 分鐘前"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 分鐘後"
 msgstr[1] "%d 分鐘後"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 小時前"
 msgstr[1] "%d 小時前"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 小時後"
 msgstr[1] "%d 小時後"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 日前"
 msgstr[1] "%d 日前"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 天後"
 msgstr[1] "%d 天後"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 週前"
 msgstr[1] "%d 週前"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 週後"
 msgstr[1] "%d 週後"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 月前"
 msgstr[1] "%d 月前"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 個月後"
 msgstr[1] "%d 個月後"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 年前"
 msgstr[1] "%d 年前"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 年後"
 msgstr[1] "%d 年後"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<按這裏選擇日期>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "現在"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%Y 年 %-m 月 %-d 日"
 
-#: ../filter/filter-datespec.c:452
+#: ../filter/filter-datespec.c:447
 msgid "Select a time to compare against"
 msgstr "選擇要比對的時間"
 
-#: ../filter/filter-file.c:284
+#: ../filter/filter-file.c:281
 msgid "Choose a file"
 msgstr "選擇一個檔案"
 
-#: ../filter/filter-part.c:532
+#: ../filter/filter-part.c:528
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "測試"
 
-#: ../filter/filter-rule.c:853
+#: ../filter/filter-rule.c:854
 msgid "R_ule name:"
 msgstr "規則名稱(_U):"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:882
 msgid "Find items that meet the following conditions"
 msgstr "尋找符合下列條件的項目"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:916
 msgid "A_dd Condition"
 msgstr "加入條件(_D)"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If all conditions are met"
 msgstr "如果全部條件符合"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:922
 msgid "If any conditions are met"
 msgstr "如果任何條件符合"
 
-#: ../filter/filter-rule.c:923
+#: ../filter/filter-rule.c:924
 msgid "_Find items:"
 msgstr "尋找項目(_F):"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "All related"
 msgstr "所有相關的"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies"
 msgstr "回覆"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "Replies and parents"
 msgstr "回覆和父代"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:942
 msgid "No reply or parent"
 msgstr "沒有回復或原始郵件"
 
-#: ../filter/filter-rule.c:947
+#: ../filter/filter-rule.c:944
 msgid "I_nclude threads"
 msgstr "包括郵件群組(_N)"
 
-#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "內送"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "外寄"
 
@@ -11559,54 +10131,50 @@ msgstr ""
 "時間作比較。"
 
 #: ../filter/filter.glade.h:12
-msgid "a time relative to the current time"
-msgstr "相對於目前時間的時差"
-
-#: ../filter/filter.glade.h:13
-msgid "ago"
-msgstr "前"
-
-#: ../filter/filter.glade.h:16
-msgid "in the future"
-msgstr "後"
-
-#: ../filter/filter.glade.h:18
-msgid "months"
-msgstr "月"
-
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
-msgid "seconds"
-msgstr "秒後"
-
-#: ../filter/filter.glade.h:20
-msgid "the current time"
-msgstr "目前時間"
+msgid ""
+"ago\n"
+"in the future"
+msgstr ""
+"之前\n"
+"之後"
+
+#: ../filter/filter.glade.h:14
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
+msgstr ""
+"秒\n"
+"分\n"
+"時\n"
+"天\n"
+"週\n"
+"月\n"
+"年"
 
 #: ../filter/filter.glade.h:21
-msgid "the time you specify"
-msgstr "您所指定的時間"
-
-#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:527
-#: ../plugins/google-account-setup/google-source.c:655
-#: ../plugins/google-account-setup/google-contacts-source.c:369
-msgid "weeks"
-msgstr "週"
-
-#: ../filter/filter.glade.h:23
-msgid "years"
-msgstr "年"
+msgid ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
+msgstr ""
+"目前的時刻\n"
+"您指定的時刻\n"
+"相對於目前時刻的時差"
 
-#: ../filter/rule-editor.c:382
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "新增規則"
 
-#: ../filter/rule-editor.c:463
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "編輯規則"
 
-#: ../filter/rule-editor.c:809
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "規則名稱"
 
@@ -11659,21 +10227,21 @@ msgstr "Evolution 郵件優先設定控制"
 msgid "Evolution Network configuration control"
 msgstr "Evolution 網路組態控制"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
+#: ../mail/mail-component.c:790
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "郵件"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:490
 msgid "Mail Accounts"
 msgstr "郵件帳號"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:108
 msgid "Mail Preferences"
 msgstr "郵件偏好設定"
 
@@ -11682,16 +10250,114 @@ msgid "Network Preferences"
 msgstr "網路偏好設定"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:298
 msgid "_Mail"
 msgstr "郵件(_M)"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
+msgid "_Forward"
+msgstr "轉寄(_F)"
+
+#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Reply to Sender"
+msgstr "回覆寄件者(_R)"
+
+#. Translators: This is only for multiple messages.
+#: ../mail/e-attachment-handler-mail.c:334
+#, c-format
+msgid "%d attached messages"
+msgstr "%d 個附加的郵件"
+
+#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1653
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:141
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "附件"
+msgstr[1] "附件"
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:601
+msgid "Icon View"
+msgstr "圖示檢視"
+
+#: ../mail/e-mail-attachment-bar.c:616
+#: ../widgets/misc/e-attachment-paned.c:602
+msgid "List View"
+msgstr "清單檢視"
+
+#: ../mail/e-mail-search-bar.c:76
+#, c-format
+msgid "Matches: %d"
+msgstr "符合：%d"
+
+#: ../mail/e-mail-search-bar.c:520
+msgid "Close the find bar"
+msgstr "關閉搜尋工具列"
+
+#: ../mail/e-mail-search-bar.c:528
+msgid "Fin_d:"
+msgstr "尋找(_D):"
+
+#: ../mail/e-mail-search-bar.c:540
+msgid "Clear the search"
+msgstr "清除此搜尋"
+
+#: ../mail/e-mail-search-bar.c:559
+msgid "_Previous"
+msgstr "上一個(_P)"
+
+#: ../mail/e-mail-search-bar.c:565
+msgid "Find the previous occurrence of the phrase"
+msgstr "尋找上一個出現的字詞"
+
+#: ../mail/e-mail-search-bar.c:573
+msgid "_Next"
+msgstr "下一個(_N)"
+
+#: ../mail/e-mail-search-bar.c:579
+msgid "Find the next occurrence of the phrase"
+msgstr "尋找下一個出現的字詞"
+
+#: ../mail/e-mail-search-bar.c:587
+msgid "Mat_ch case"
+msgstr "區分大小寫(_C)"
+
+#: ../mail/e-mail-search-bar.c:615
+msgid "Reached bottom of page, continued from top"
+msgstr "到達頁面底部，從頂端繼續"
+
+#: ../mail/e-mail-search-bar.c:637
+msgid "Reached top of page, continued from bottom"
+msgstr "到達頁面頂端，從底部繼續"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:309
+msgid "No encryption"
+msgstr "沒有加密"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:313
+msgid "TLS encryption"
+msgstr "TLS 加密"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:317
+msgid "SSL encryption"
+msgstr "SSL 加密"
+
+#: ../mail/em-account-editor.c:408
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s 授權合約"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:415
 #, c-format
 msgid ""
 "\n"
@@ -11704,118 +10370,127 @@ msgstr ""
 " %s 授權合約\n"
 "並選取核取方塊來接受它\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "選擇資料夾"
 
-#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
+#: ../mail/em-account-editor.c:611 ../mail/em-account-editor.c:656
+#: ../mail/em-account-editor.c:723 ../widgets/misc/e-signature-combo-box.c:102
 msgid "Autogenerated"
 msgstr "自動產生的"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:781
+msgid "Never"
+msgstr "永不"
+
+#: ../mail/em-account-editor.c:782
+msgid "Always"
+msgstr "永遠"
+
+#: ../mail/em-account-editor.c:783
 msgid "Ask for each message"
 msgstr "每封郵件皆詢問"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
+#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "身分"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:1912 ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "接收電子郵件"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2184
 msgid "Check for _new messages every"
 msgstr "自動檢查新郵件每(_N)"
 
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2192
 msgid "minu_tes"
 msgstr "分鐘(_T)"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
+#: ../mail/em-account-editor.c:2382 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "傳送電子郵件"
 
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2441 ../mail/mail-config.glade.h:73
 msgid "Defaults"
 msgstr "預設值"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
-#: ../plugins/exchange-operations/exchange-account-setup.c:332
+#: ../mail/em-account-editor.c:2507 ../mail/mail-config.glade.h:133
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Security"
 msgstr "安全性"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
+#: ../mail/em-account-editor.c:2544 ../mail/em-account-editor.c:2639
 msgid "Receiving Options"
 msgstr "接收選項"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2545 ../mail/em-account-editor.c:2640
 msgid "Checking for New Messages"
 msgstr "檢查新郵件"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3106 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "帳號編輯器"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:3106 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助理"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
+#: ../mail/em-account-prefs.c:426
 msgid "[Default]"
 msgstr "[預設值]"
 
-#: ../mail/em-account-prefs.c:488
+#: ../mail/em-account-prefs.c:483
 msgid "Account name"
 msgstr "帳號名稱"
 
-#: ../mail/em-account-prefs.c:490
+#: ../mail/em-account-prefs.c:485
 msgid "Protocol"
 msgstr "通訊協定"
 
 #: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
+#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:478
 msgid "Unnamed"
 msgstr "未命名的"
 
-#: ../mail/em-composer-prefs.c:970
+#: ../mail/em-composer-prefs.c:947
 msgid "Language(s)"
 msgstr "語言"
 
-#: ../mail/em-composer-prefs.c:1019
+#: ../mail/em-composer-prefs.c:980
 msgid "Add signature script"
 msgstr "新增簽名程序檔"
 
-#: ../mail/em-composer-prefs.c:1061
+#: ../mail/em-composer-prefs.c:1022
 msgid "Signature(s)"
 msgstr "簽名檔"
 
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1113 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉遞的郵件 --------"
 
-#: ../mail/em-composer-utils.c:1602
+#: ../mail/em-composer-utils.c:1564
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "沒有提供目的地位址，郵件的轉寄已經取消。"
 
-#: ../mail/em-composer-utils.c:1608
+#: ../mail/em-composer-utils.c:1570
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "找不到可使用的帳號，郵件的轉寄已經取消。"
 
-#: ../mail/em-composer-utils.c:2058
+#: ../mail/em-composer-utils.c:2037
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2105
+#: ../mail/em-composer-utils.c:2084
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11823,11 +10498,11 @@ msgstr ""
 "於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} "
 "${TimeZone}，${Sender} 提到："
 
-#: ../mail/em-composer-utils.c:2248
+#: ../mail/em-composer-utils.c:2227
 msgid "-----Original Message-----"
 msgstr "-----原始郵件-----"
 
-#: ../mail/em-filter-editor.c:156
+#: ../mail/em-filter-editor.c:172
 msgid "_Filter Rules"
 msgstr "過濾器規則(_F)"
 
@@ -11844,18 +10519,10 @@ msgstr "指定色彩"
 msgid "Assign Score"
 msgstr "指定目標"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "密件副本(BCC)"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "嗶聲"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "副本(CC)"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "已完成於"
@@ -11873,7 +10540,7 @@ msgid "Date sent"
 msgstr "送件日期"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:768
+#: ../plugins/groupwise-features/share-folder.c:765
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -11924,226 +10591,234 @@ msgstr "詞句"
 msgid "Follow Up"
 msgstr "跟隨"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+msgid "Forward to"
+msgstr "轉寄至"
+
+#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
 msgid "Important"
 msgstr "重要"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "是之後的"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "是之前的"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "有標幟"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:38
 msgid "is not Flagged"
 msgstr "沒有標幟"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:39
 msgid "is not set"
 msgstr "未設定"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:40
 msgid "is set"
 msgstr "設定"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr "垃圾郵件測試"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr "標籤"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr "郵件列表"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr "符合全部"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr "郵件內容"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr "郵件檔頭"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr "垃圾郵件"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr "非垃圾郵件"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:50
+msgid "Message Location"
+msgstr "郵件位置"
+
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "移至資料夾"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "建立程式管道"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "播放音效"
 
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
+#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
 msgid "Read"
 msgstr "已讀"
 
-#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "收件者"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr "正規表示式相配"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "回覆"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "傳回"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "傳回大於"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr "傳回小於"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "執行程式"
 
-#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "分數"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "寄件者"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:64
 msgid "Sender or Recipients"
 msgstr "寄件者或收件者"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:65
 msgid "Set Label"
 msgstr "設定標籤"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "設定狀態"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "大小 (kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "類似"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "來源帳號"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr "指定檔頭"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr "以此開始"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr "停止處理"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:80
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
+#: ../smime/lib/e-cert.c:1112
 msgid "Subject"
 msgstr "主旨"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "取消設定狀態"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:522
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "接著依"
 
-#: ../mail/em-filter-rule.c:550
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "加入動作(_T)"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:194
 msgid "C_reate Search Folder From Search..."
 msgstr "從搜尋建立搜尋資料夾(_R)..."
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:219
 msgid "All Messages"
 msgstr "所有郵件"
 
-#: ../mail/em-folder-browser.c:219
+#: ../mail/em-folder-browser.c:220
 msgid "Unread Messages"
 msgstr "未讀郵件"
 
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:222
 msgid "No Label"
 msgstr "無標籤"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Read Messages"
 msgstr "已讀郵件"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Recent Messages"
 msgstr "最近的郵件"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
 msgstr "最近 5 天的郵件"
 
-#: ../mail/em-folder-browser.c:231
+#: ../mail/em-folder-browser.c:232
 msgid "Messages with Attachments"
 msgstr "有附加檔案的郵件"
 
-#: ../mail/em-folder-browser.c:232
+#: ../mail/em-folder-browser.c:233
 msgid "Important Messages"
 msgstr "重要郵件"
 
-#: ../mail/em-folder-browser.c:233
+#: ../mail/em-folder-browser.c:234
 msgid "Messages Not Junk"
 msgstr "非垃圾郵件"
 
-#: ../mail/em-folder-browser.c:1188
+#: ../mail/em-folder-browser.c:1199
 msgid "Account Search"
 msgstr "帳號搜尋"
 
-#: ../mail/em-folder-browser.c:1241
+#: ../mail/em-folder-browser.c:1252
 msgid "All Account Search"
 msgstr "所有的帳號搜尋"
 
@@ -12173,11 +10848,11 @@ msgid "Quota usage"
 msgstr "限制用量"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
-#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
-#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:594
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "收件匣"
 
@@ -12190,429 +10865,400 @@ msgstr "資料夾內容"
 msgid "<click here to select a folder>"
 msgstr "<按這裏選擇資料夾>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:249
 msgid "C_reate"
 msgstr "建立(_R)"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:253
 msgid "Folder _name:"
 msgstr "資料夾名稱(_N):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
+#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
 msgstr "搜尋資料夾"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
 msgstr "不符合"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
 msgid "Drafts"
 msgstr "草稿"
 
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "範本"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
+#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "寄件匣"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "已傳送"
 
-#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
 msgid "Loading..."
 msgstr "載入中..."
 
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:380
-#, c-format
+#: ../mail/em-folder-tree.c:318
+#, fuzzy, c-format
+#| msgctxt "folder-display"
+#| msgid "%s (%u)"
 msgctxt "folder-display"
-msgid "%s (%u)"
+msgid "%s (%u%s)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:741
+#: ../mail/em-folder-tree.c:727
 msgid "Mail Folder Tree"
 msgstr "郵件資料夾樹"
 
-#: ../mail/em-folder-tree.c:900
+#: ../mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving folder %s"
 msgstr "正在移動資料夾 %s"
 
-#: ../mail/em-folder-tree.c:902
+#: ../mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2012
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2014
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:912
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "無法將郵件拖放到最上層的儲存區"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "複製至資料夾(_C)"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "移至資料夾(_M)"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2104
+msgid "_Move"
+msgstr "移動(_M)"
+
+#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2106
+msgid "Cancel _Drag"
+msgstr "取消拖拉(_D)"
+
+#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "掃描「%s」內的資料夾"
 
-#: ../mail/em-folder-tree.c:2117
+#: ../mail/em-folder-tree.c:2107
 msgid "Open in _New Window"
 msgstr "在新視窗開啟(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2122
+#: ../mail/em-folder-tree.c:2112
 msgid "_New Folder..."
 msgstr "新增資料夾(_N)..."
 
-#: ../mail/em-folder-tree.c:2125
+#: ../mail/em-folder-tree.c:2115
 msgid "_Move..."
 msgstr "移動(_M)..."
 
-#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "重新整理(_F)"
 
-#: ../mail/em-folder-tree.c:2134
+#: ../mail/em-folder-tree.c:2124
 msgid "Fl_ush Outbox"
 msgstr "清理寄件匣(_U)"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
-#: ../mail/em-folder-tree.c:2243
+#: ../mail/em-folder-tree.c:2232
 msgid "_Unread Search Folder"
 msgstr "未讀搜尋資料夾(_U)"
 
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "將「%s」複製到「%s」"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1188
-#: ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:303
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "複製(_O)"
 
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:537
+#: ../plugins/groupwise-features/share-folder-common.c:144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "正在建立資料夾 `%s'"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "建立資料夾"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "指定要建立資料夾的位置："
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "刪除郵件失敗"
 
-#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "您沒有足夠的權限刪除此封郵件。"
 
-#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
-msgid "_Reply to Sender"
-msgstr "回覆寄件者(_R)"
-
-#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:566 ../mail/em-popup.c:577
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Forward"
-msgstr "轉寄(_F)"
-
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1337 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "復原(_N)"
 
-#: ../mail/em-folder-view.c:1344
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "移至資料夾(_M)..."
 
-#: ../mail/em-folder-view.c:1345
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "標示成已閱讀(_K)"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_U)"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "標示成不重要(_I)"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "標示成垃圾郵件(_J)"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "標示成非垃圾郵件(_N)"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "標示為跟隨(_W)..."
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "標籤(_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:478
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:469
 msgid "_None"
 msgstr "沒有(_N)"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "新增標籤(_N)"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "標幟已完成(_G)"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "清除標幟(_E)"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "從郵件建立規則(_T)"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "從主旨建立搜尋資料夾(_S)"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "從寄件者建立搜尋資料夾(_N)"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "從收件者建立搜尋資料夾(_R)"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "從郵件清單建立搜尋資料夾(_L)"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "從主旨建立過濾器(_J)"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "從寄件者建立過濾器(_D)"
 
-#: ../mail/em-folder-view.c:1380
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "收件者過濾器(_C)"
 
-#: ../mail/em-folder-view.c:1381
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "從通信論壇建立過濾器(_M)"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2257 ../mail/em-folder-view.c:2300
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:510
-#: ../plugins/google-account-setup/google-source.c:708
+#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
+#: ../plugins/google-account-setup/google-source.c:220
+#: ../plugins/google-account-setup/google-source.c:505
+#: ../plugins/google-account-setup/google-source.c:715
 msgid "Default"
 msgstr "預設值"
 
-#: ../mail/em-folder-view.c:2518
+#: ../mail/em-folder-view.c:2493
 msgid "Unable to retrieve message"
 msgstr "無法接收郵件"
 
-#: ../mail/em-folder-view.c:2537
-msgid "Retrieving Message..."
-msgstr "取回郵件..."
-
-#: ../mail/em-folder-view.c:2756
-msgid "C_all To..."
-msgstr "播號給(_A)..."
-
-#: ../mail/em-folder-view.c:2759
+#: ../mail/em-folder-view.c:2696
 msgid "Create _Search Folder"
 msgstr "建立搜尋資料夾(_S)"
 
-#: ../mail/em-folder-view.c:2760
+#: ../mail/em-folder-view.c:2697
 msgid "_From this Address"
 msgstr "從這個位址(_F)"
 
-#: ../mail/em-folder-view.c:2761
+#: ../mail/em-folder-view.c:2698
 msgid "_To this Address"
 msgstr "到這個位址(_T)"
 
-#: ../mail/em-folder-view.c:3254
+#: ../mail/em-folder-view.c:3191
 #, c-format
 msgid "Click to mail %s"
 msgstr "按一下來傳送郵件 %s"
 
-#: ../mail/em-folder-view.c:3266
+#: ../mail/em-folder-view.c:3203
 #, c-format
 msgid "Click to call %s"
 msgstr "按一下播號給 %s"
 
-#: ../mail/em-folder-view.c:3271
+#: ../mail/em-folder-view.c:3208
 msgid "Click to hide/unhide addresses"
 msgstr "按這裡隱藏/解除隱藏位址"
 
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:474
-#, c-format
-msgid "Matches: %d"
-msgstr "符合：%d"
-
-#: ../mail/em-format-html-display.c:618
-msgid "Fin_d:"
-msgstr "尋找(_D):"
-
-#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:642
-msgid "_Previous"
-msgstr "上一個(_P)"
-
-#: ../mail/em-format-html-display.c:647
-msgid "_Next"
-msgstr "下一個(_N)"
-
-#: ../mail/em-format-html-display.c:652
-msgid "M_atch case"
-msgstr "區分大小寫(_A)"
-
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:569 ../mail/em-format-html.c:653
 msgid "Unsigned"
 msgstr "未簽名"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:569
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "此郵件未簽名。不保證此郵件已驗證。"
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:570 ../mail/em-format-html.c:654
 msgid "Valid signature"
 msgstr "有效的簽名"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:570
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "此郵件已簽名而且有效，表示它非常有可能是驗證的郵件。"
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:655
 msgid "Invalid signature"
 msgstr "無效的簽名"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:571
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "郵件的簽名無法檢驗，可能已在傳送時被更動了。"
 
-#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:656
 msgid "Valid signature, but cannot verify sender"
 msgstr "簽名有效，但是無法檢驗寄件者"
 
-#: ../mail/em-format-html-display.c:954
+#: ../mail/em-format-html-display.c:572
 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:955 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:657
 msgid "Signature exists, but need public key"
 msgstr "簽章存在，但需要公開金鑰"
 
-#: ../mail/em-format-html-display.c:955
+#: ../mail/em-format-html-display.c:573
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "此郵件有一個有效的簽名，但是沒有對應的公開金鑰。"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:580 ../mail/em-format-html.c:663
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:580
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "此郵件未加密。它的內容在透過網際網路傳送可能會被檢閱。"
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:581 ../mail/em-format-html.c:664
 msgid "Encrypted, weak"
 msgstr "已加密，不嚴密"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:581
 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 "
@@ -12621,21 +11267,21 @@ msgstr ""
 "此郵件已加密，但是使用不嚴密的加密演算法。外面的人很難檢閱內容，但只要一些時"
 "日，並不是無法檢視此郵件的內容。"
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:582 ../mail/em-format-html.c:665
 msgid "Encrypted"
 msgstr "已加密"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:582
 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:965 ../mail/em-format-html.c:668
+#: ../mail/em-format-html-display.c:583 ../mail/em-format-html.c:666
 msgid "Encrypted, strong"
 msgstr "已加密，嚴密"
 
-#: ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html-display.c:583
 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 "
@@ -12644,88 +11290,58 @@ msgstr ""
 "此郵件已加密，使用嚴密的加密演算法。縱使經過一段時間，外面的人很難檢閱此郵件"
 "的內容。"
 
-#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:684 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "檢視憑證(_V)"
 
-#: ../mail/em-format-html-display.c:1081
+#: ../mail/em-format-html-display.c:699
 msgid "This certificate is not viewable"
 msgstr "此憑證無法檢視"
 
-#: ../mail/em-format-html-display.c:1410
+#: ../mail/em-format-html-display.c:991
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "完成於 %Y 年 %-m 月 %-d 日%p %-l:%M"
 
-#: ../mail/em-format-html-display.c:1418
+#: ../mail/em-format-html-display.c:999
 msgid "Overdue:"
 msgstr "到期日:"
 
 # (Abel) combine with previous entry
-#: ../mail/em-format-html-display.c:1421
+#: ../mail/em-format-html-display.c:1002
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y 年 %-m 月 %-d 日%p %-l:%M"
 
-#: ../mail/em-format-html-display.c:1499
+#: ../mail/em-format-html-display.c:1082
+#: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "檢視行內(_V)"
 
-#: ../mail/em-format-html-display.c:1500
+#: ../mail/em-format-html-display.c:1083
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "隱藏(_H)"
 
-#: ../mail/em-format-html-display.c:1501
+#: ../mail/em-format-html-display.c:1084
 msgid "_Fit to Width"
 msgstr "符合寬度(_F)"
 
-#: ../mail/em-format-html-display.c:1502
+#: ../mail/em-format-html-display.c:1085
 msgid "Show _Original Size"
 msgstr "顯示原始大小(_O)"
 
-#: ../mail/em-format-html-display.c:2171
-msgid "Save attachment as"
-msgstr "另存附加檔案為"
-
-#: ../mail/em-format-html-display.c:2175
-msgid "Select folder to save all attachments"
-msgstr "選擇用來儲存所有附加檔案的資料夾"
-
-#: ../mail/em-format-html-display.c:2226
-msgid "_Save Selected..."
-msgstr "儲存選取的(_S)..."
-
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2293
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d 個附件(_T)"
-msgstr[1] "%d 個附件(_T)"
-
-#: ../mail/em-format-html-display.c:2300 ../mail/em-format-html-display.c:2390
-msgid "S_ave"
-msgstr "儲存(_A)"
-
-#: ../mail/em-format-html-display.c:2311
-msgid "S_ave All"
-msgstr "儲存全部(_A)"
-
-#: ../mail/em-format-html-display.c:2386
-msgid "No Attachment"
-msgstr "無附件"
-
-#: ../mail/em-format-html-display.c:2533 ../mail/em-format-html-display.c:2572
+#: ../mail/em-format-html-display.c:1586 ../mail/em-format-html-display.c:1625
 msgid "View _Unformatted"
 msgstr "檢閱未排版的(_U)"
 
-#: ../mail/em-format-html-display.c:2535
+#: ../mail/em-format-html-display.c:1588
 msgid "Hide _Unformatted"
 msgstr "隱藏未排版的(_U)"
 
-#: ../mail/em-format-html-display.c:2592
+#: ../mail/em-format-html-display.c:1645
 msgid "O_pen With"
 msgstr "以...開啟(_O)"
 
-#: ../mail/em-format-html-display.c:2668
+#: ../mail/em-format-html-display.c:1722
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12738,156 +11354,156 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "第 %d / %d 頁"
 
-#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515
+#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "正在擷取 `%s'"
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:928
 msgid "Unknown external-body part."
 msgstr "未知的外加本文部分。"
 
-#: ../mail/em-format-html.c:938
+#: ../mail/em-format-html.c:936
 msgid "Malformed external-body part."
 msgstr "格式不良的外加本文部分。"
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:966
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 站指示 (%s)"
 
-#: ../mail/em-format-html.c:979
+#: ../mail/em-format-html.c:977
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "本地端檔案 (%s) 於 「%s」有效的指示"
 
-#: ../mail/em-format-html.c:981
+#: ../mail/em-format-html.c:979
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "本地檔案指示 (%s)"
 
-#: ../mail/em-format-html.c:1002
+#: ../mail/em-format-html.c:1000
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "遠端資料指示 (%s)"
 
-#: ../mail/em-format-html.c:1013
+#: ../mail/em-format-html.c:1011
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明的外部檔案指示 (「%s」類型)"
 
-#: ../mail/em-format-html.c:1241
+#: ../mail/em-format-html.c:1239
 msgid "Formatting message"
 msgstr "格式化郵件"
 
-#: ../mail/em-format-html.c:1415
+#: ../mail/em-format-html.c:1413
 msgid "Formatting Message..."
 msgstr "格式化郵件..."
 
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1566 ../mail/em-format-html.c:1630
+#: ../mail/em-format-html.c:1651 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:78
 msgid "Cc"
 msgstr "副本"
 
-#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1636
+#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:79
 msgid "Bcc"
 msgstr "密件副本"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1451
+#: ../mail/em-format-html.c:1746 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1434
 msgid "Mailer"
 msgstr "寄件者"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1776
+#: ../mail/em-format-html.c:1773
 msgid " (%a, %R %Z)"
 msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1781
+#: ../mail/em-format-html.c:1778
 msgid " (%R %Z)"
 msgstr " (%R %Z)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1917
+#: ../mail/em-format-html.c:1914
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "這封郵件是由 <b>%s</b> 代表 <b>%s</b> 寄出"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:923
 #: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:307
+#: ../mail/message-tag-followup.c:296
 msgid "From"
 msgstr "寄件者"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
 #: ../mail/em-mailer-prefs.c:76
 msgid "Reply-To"
 msgstr "回覆"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
-#: ../widgets/misc/e-dateedit.c:347
+#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:338
 msgid "Date"
 msgstr "日期"
 
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:82
 msgid "Newsgroups"
 msgstr "新聞群組"
 
-#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:83
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "面貌"
 
-#: ../mail/em-format.c:1160
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附加檔案"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "無法剖析 S/MIME 郵件:未知的錯誤"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "多部份/已加密不支援的加密類型"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message"
 msgstr "無法剖析 PGP/MIME 郵件"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "無法剖析 PGP/MIME 郵件：未知的錯誤"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr "不支援的簽名格式"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr "檢驗簽名發生錯誤"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr "檢驗簽名發生不明錯誤"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message"
 msgstr "無法剖析 PGP 郵件"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message: Unknown error"
 msgstr "無法剖析 PGP 郵件：未知的錯誤"
 
@@ -12907,77 +11523,82 @@ msgstr "每週一次"
 msgid "Once per month"
 msgstr "每月一次"
 
-#: ../mail/em-mailer-prefs.c:327
+#: ../mail/em-mailer-prefs.c:331
 msgid "Add Custom Junk Header"
 msgstr "加入自訂垃圾郵件檔頭"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:335
 msgid "Header Name:"
 msgstr "標頭名稱:"
 
-#: ../mail/em-mailer-prefs.c:332
+#: ../mail/em-mailer-prefs.c:336
 msgid "Header Value Contains:"
 msgstr "標頭數值包含:"
 
-#: ../mail/em-mailer-prefs.c:437
+#: ../mail/em-mailer-prefs.c:437 ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "頁首"
+
+#: ../mail/em-mailer-prefs.c:441
 msgid "Contains Value"
 msgstr "包含數值"
 
-#: ../mail/em-mailer-prefs.c:459
+#: ../mail/em-mailer-prefs.c:464
 msgid "Color"
 msgstr "顏色"
 
-#: ../mail/em-mailer-prefs.c:462
+#: ../mail/em-mailer-prefs.c:467
 msgid "Tag"
 msgstr "標籤"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
+#: ../mail/em-mailer-prefs.c:1062 ../mail/em-mailer-prefs.c:1116
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s 外掛程式已可使用並且該軟體也安裝完成。"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
+#: ../mail/em-mailer-prefs.c:1070 ../mail/em-mailer-prefs.c:1125
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s 外掛程式尚無法使用。請檢查是否有安裝該套件。"
 
-#: ../mail/em-mailer-prefs.c:1108
+#: ../mail/em-mailer-prefs.c:1091
 msgid "No Junk plugin available"
 msgstr "沒有可用的垃圾郵件外掛程式"
 
 #. green
-#: ../mail/em-migrate.c:1059
+#: ../mail/em-migrate.c:961
 msgid "To Do"
 msgstr "待辦"
 
 #. blue
-#: ../mail/em-migrate.c:1060
+#: ../mail/em-migrate.c:962
 msgid "Later"
 msgstr "稍後"
 
-#: ../mail/em-migrate.c:1228
+#: ../mail/em-migrate.c:1128
 msgid "Migration"
 msgstr "移轉"
 
-#: ../mail/em-migrate.c:1673
+#: ../mail/em-migrate.c:1573
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "無法建立新資料夾 `%s'：%s"
 
-#: ../mail/em-migrate.c:1699
+#: ../mail/em-migrate.c:1599
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "無法複製製資料夾 `%s' 至 `%s'：%s"
 
-#: ../mail/em-migrate.c:1884
+#: ../mail/em-migrate.c:1784
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "無法掃描 `%s' 現有的信箱：%s"
 
-#: ../mail/em-migrate.c:1889
+#: ../mail/em-migrate.c:1789
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12988,31 +11609,31 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:1990
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "無法開啟舊的 POP 儲存在伺服器上的資料 `%s':%s"
 
-#: ../mail/em-migrate.c:2104
+#: ../mail/em-migrate.c:2004
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "無法建立 POP 儲存在伺服器上的資料目錄 `%s':%s"
 
-#: ../mail/em-migrate.c:2133
+#: ../mail/em-migrate.c:2033
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "無法複製 POP 儲存在伺服器上的資料 `%s':%s"
 
-#: ../mail/em-migrate.c:2604 ../mail/em-migrate.c:2616
+#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "無法建立本地郵件儲存區 `%s':%s"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid "Migrating Folders"
 msgstr "正在轉移資料夾"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -13023,86 +11644,103 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-#: ../mail/em-migrate.c:3056
+#: ../mail/em-migrate.c:2955
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "無法在 `%s' 建立本地郵件資料夾:%s"
 
-#: ../mail/em-migrate.c:3075
+#: ../mail/em-migrate.c:2974
 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:562 ../mail/em-popup.c:573
+#: ../mail/em-popup.c:364
+msgid "Save As..."
+msgstr "另存新檔..."
+
+#: ../mail/em-popup.c:389
+#, c-format
+msgid "untitled_image.%s"
+msgstr "untitled_image.%s"
+
+#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "設為背景(_B)"
+
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
 #. make it first item
-#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
 msgid "_Add to Address Book"
 msgstr "加入到通訊錄(_A)"
 
-#: ../mail/em-subscribe-editor.c:600
+#: ../mail/em-popup.c:725
+#, c-format
+msgid "Open in %s..."
+msgstr "在 %s 內開啟..."
+
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "此儲存區不支援訂閱，或者未啟用它們。"
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "已訂閱"
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:643
 msgid "Folder"
 msgstr "資料夾"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:839
+#: ../mail/em-subscribe-editor.c:858
 msgid "Please select a server."
 msgstr "請選擇一個伺服器。"
 
-#: ../mail/em-subscribe-editor.c:860
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr "尚未選擇伺服器"
 
 #. Check buttons
-#: ../mail/em-utils.c:122
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
 msgid "_Do not show this message again."
 msgstr "不要再顯示這個訊息(_D)"
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "郵件規則"
 
-#: ../mail/em-utils.c:371
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "郵件"
 
-#: ../mail/em-utils.c:655
+#: ../mail/em-utils.c:652
 msgid "Save Message..."
 msgstr "儲存郵件…"
 
-#: ../mail/em-utils.c:705
+#: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr "新增地址"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1226
+#: ../mail/em-utils.c:1223
 #, c-format
 msgid "Messages from %s"
 msgstr "來自 %s 的郵件"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:114
 msgid "Search _Folders"
 msgstr "搜尋資料夾(_F)"
 
-#: ../mail/em-vfolder-rule.c:593
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "搜尋資料夾來源"
 
@@ -13318,81 +11956,81 @@ msgid "Enable or disable magic space bar"
 msgstr "啟用或停用魔術空白鍵"
 
 #: ../mail/evolution-mail.schemas.in.h:49
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "啟用或停用標記多個郵件時的提示。"
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Enable or disable type ahead search feature"
 msgstr "啟用或停用隨打即查功能"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable search folders"
 msgstr "啟用搜尋資料夾"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Enable search folders on startup."
 msgstr "啟用程式開始時搜尋資料夾。"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
-msgstr ""
-"啟用側邊欄搜尋功能使您能輸入文字開始互動式搜尋。它的作用是讓您只須在側邊欄中"
-"輸入資料夾名稱就可以輕鬆的找到該資料夾，藉由選取的動作更可以自動跳至該資料夾"
-"的位置。"
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+msgstr "啟用側邊列搜尋功能允許互動式搜尋資料夾名稱。"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr "啟用此選項可在郵件預覽、郵件清單和資料夾中使用空白鍵捲動畫面。"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Enable to render message text part of limited size."
 msgstr "啟用以顯示限制大小的郵件文字。"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable/disable caret mode"
 msgstr "啟用/停用插入號模式"
 
-#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+#: ../mail/evolution-mail.schemas.in.h:57 ../mail/mail-config.glade.h:86
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "將檔案名稱編碼為 Outlook/GMail 形式"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid ""
-"Encode file names in the mail headers same as Outlook or GMail does, to let "
-"them understand localized file names sent by Evolution, because they do not "
-"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr ""
-"將郵件標頭中的檔案名稱編碼為 Outlook 或 GMail 的形式，好讓它們能辨別由 "
-"Evolution 寄出的本地化檔案名稱。因為它們並未遵循 RFC 2231 規範，而用了不正確"
-"的 RFC 2047 標準。"
+"將郵件標頭中的檔案名稱編碼為 Outlook 或 GMail 的形式，好讓它們能正確顯示由 "
+"Evolution 寄出的 UTF-8 字元檔案名稱，因為它們並未遵循 RFC 2231 規範，而用了不"
+"正確的 RFC 2047 標準。"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Height of the message-list pane"
 msgstr "郵件清單窗格高度"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Height of the message-list pane."
 msgstr "郵件清單窗格的高度。"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "隱藏各資料夾預覽並移除選取區"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 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.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 msgstr "當「預覽」窗格開啟時，將它緊貼顯示而非重疊顯示。"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 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 "
@@ -13402,13 +12040,13 @@ msgstr ""
 "MIME 類型且對應至 GNOME 的 MIME 類型資料庫之 Bonobo 元件檢視器，會用於顯示內"
 "容。"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr "「傳送與接收郵件」視窗的初始高度。這個數值會在視窗垂直改變大小時更新。"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13420,16 +12058,12 @@ msgstr ""
 "視窗時更新。注意，這個特定的數值不能在 Evolution 中使用，因為「傳送與接收郵"
 "件」視窗不能最大化。這個鍵值只為了實作需要而存在。"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr "「傳送與接收郵件」視窗的初始寬度。這個數值會在視窗水平改變大小時更新。"
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "這會停用/啟用標記多個郵件時的提示。"
-
 #: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
@@ -13664,90 +12298,154 @@ msgid "Server synchronization interval"
 msgstr "伺服器同步間隔"
 
 #: ../mail/evolution-mail.schemas.in.h:121
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "傳送郵件訊息時顯示「密件副本」欄位"
+
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "傳送郵件訊息時顯示「副本」欄位"
+
+#: ../mail/evolution-mail.schemas.in.h:123
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "張貼到新聞群組時顯示「寄件者」欄位"
+
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show \"From\" field when sending a mail message"
+msgstr "傳送郵件訊息時顯示「寄件者」欄位"
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr "張貼到新聞群組時顯示「回覆」欄位"
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "傳送郵件訊息時顯示「回覆」欄位"
+
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Show Animations"
 msgstr "顯示動畫"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Show animated images as animations."
 msgstr "播放動畫圖片。"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "在郵件清單中顯示刪除的郵件 (加上刪除號)"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Show deleted messages in the message-list"
 msgstr "在郵件清單中顯示刪除的郵件"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Show photo of the sender"
 msgstr "顯示寄件者的相片"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:132
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"傳送郵件訊息時顯示「密件副本」欄位。這是在選取郵件帳號時由檢視選單所控制。"
+
+#: ../mail/evolution-mail.schemas.in.h:133
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr "傳送郵件訊息時顯示「副本」欄位。這是在選取郵件帳號時由檢視選單所控制。"
+
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+"張貼到新聞群組時顯示「寄件者」欄位。這是在選取郵件帳號時由檢視選單所控制。"
+
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid ""
+"Show the \"From\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"傳送郵件訊息時顯示「寄件者」欄位。這是在選取郵件帳號時由檢視選單所控制。"
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+"張貼到新聞群組時顯示「回覆」欄位。這是在選取郵件帳號時由檢視選單所控制。"
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr "傳送郵件訊息時顯示「回覆」欄位。這是在選取郵件帳號時由檢視選單所控制。"
+
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "在郵件清單的中以分離的欄位顯示寄件者的電子郵件。"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "在郵件閱讀窗格中顯示寄件者的相片。"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Spell check inline"
 msgstr "行內拼字檢查"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Spell checking color"
 msgstr "拼字檢查顏色"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Spell checking languages"
 msgstr "拼字檢查語言"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Subscribe dialog default height"
 msgstr "訂閱對話盒預設高度"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Subscribe dialog default width"
 msgstr "訂閱對話盒預設寬度"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Terminal font"
 msgstr "終端機字型"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Text message part limit"
 msgstr "文字郵件限制"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "The default plugin for Junk hook"
 msgstr "垃圾釣鉤的預設外掛程式"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "上次執行清空垃圾郵件的時間，從電腦紀元後算起的日數。"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "上次執行清單回收筒的時間，從紀元後算起的日數。"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "The terminal font for mail display."
 msgstr "用於顯示郵件的終端機字型。"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "The variable width font for mail display."
 msgstr "用於顯示郵件的變動寬度字型。"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr "這裡可使用三種數值。「0」為錯誤，「1」為警告，「2」為除錯訊息。"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
@@ -13755,7 +12453,7 @@ msgstr ""
 "這裡決定了郵件內文在 Evolution 中可排版的最大容量。預設的大小是 4MB / 4096 "
 "KB，以 KB 來指定。"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13764,7 +12462,7 @@ msgstr ""
 "這是預設的垃圾郵件外掛程式，即使已啟用了其他的外掛程式。如果停用這裡列出的預"
 "設外掛程式，並不會影響其他可用的外掛程式。"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -13772,7 +12470,7 @@ msgstr ""
 "這個鍵值只能讀取一次，並會在讀取後設為「false」。這樣會取消在清單中對該郵件的"
 "選取並移除對該資料夾的預覽。"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:158
 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;"
@@ -13782,7 +12480,7 @@ msgstr ""
 "此金鑰應該包含 XML 清單，它會指定自訂檔頭，以及是否顯示它們。XML 結構的格式"
 "是 &lt;header enabled&gt; - 如果檔頭會顯示在郵件檢視，則設定成 enabled。"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -13791,24 +12489,24 @@ msgstr ""
 "這個選項相關於鍵值「lookup_addressbook」，是用來決定是否只在本地端通訊錄中查"
 "詢電子郵件位址以用於垃圾郵件過濾時「排除已知連絡人寄出的郵件」功能。"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "This option would help in improving the speed of fetching."
 msgstr "這個選項能協助增進接收的速度。"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr "這會設定在預設郵件清單檢視中顯示位址的長度，超過的部分會顯示「...」。"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr ""
 "這個設定值指定相關郵件預設為展開或收摺的狀態。Evolution 將需要重新啟動。"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13817,130 +12515,90 @@ msgstr ""
 "這個設定值指定相關郵件要依每個郵件群組最新的郵件排序，而非依照郵件的日期。"
 "Evolution 將需要重新啟動。"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Thread the message list."
 msgstr "串接郵件清單。"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Thread the message-list"
 msgstr "串接郵件清單"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Thread the message-list based on Subject"
 msgstr "以主旨為基礎串接郵件清單"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Timeout for marking message as seen"
 msgstr "將郵件標示成已閱讀的時限"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Timeout for marking message as seen."
 msgstr "將郵件標示成已閱讀的時限。"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "UID string of the default account."
 msgstr "預設帳號的 UID 字串。"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "使用行內拼字檢查時對拼錯字的底線顏色。"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Use SpamAssassin daemon and client"
 msgstr "使用 SpamAsssassin 伺服程式和客戶端"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "使用 SpamAsssassin 伺服程式和客戶端 (spamc/spamd)。"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Use custom fonts"
 msgstr "使用自訂字型"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Use custom fonts for displaying mail."
 msgstr "使用自訂字型來顯示郵件。"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use only local spam tests."
 msgstr "只使用本地垃圾郵件測試。"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Use only the local spam tests (no DNS)."
 msgstr "只使用本地垃圾郵件測試 (沒有 DNS)。"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Use side-by-side or wide layout"
 msgstr "使用緊貼或寬配置"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Variable width font"
 msgstr "變動寬度字型"
 
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "View/Bcc menu item is checked"
-msgstr "檢視/密件副本功能表項目已選取"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "檢視/密件副本功能表項目已選取。"
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "檢視/副本功能表項目已選取"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "檢視/副本功能表項目已選取。"
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "View/From menu item is checked"
-msgstr "檢視/寄件者功能表項目已選取"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "View/From menu item is checked."
-msgstr "檢視/寄件者功能表項目已選取。"
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "View/PostTo menu item is checked"
-msgstr "檢視/張貼功能表項目已選取"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "View/PostTo menu item is checked."
-msgstr "檢視/張貼功能表項目已選取。"
-
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "檢視/回覆功能表項目已選取"
-
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "View/ReplyTo menu item is checked."
-msgstr "檢視/回覆功能表項目已選取。"
-
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "是否預設在每封郵件加入讀信回條的要求"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "是否停用側邊列的資料夾名稱省略。"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:181
 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 檔頭時，是否按照主旨放回郵件群組。"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "是否依郵件群組中最新的郵件來排序相關郵件"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid "Width of the message-list pane"
 msgstr "郵件清單窗格寬度"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "Width of the message-list pane."
 msgstr "郵件清單窗格的寬度。"
 
@@ -13957,12 +12615,12 @@ msgid "Import mail from Elm."
 msgstr "從 Elm 匯入郵件。"
 
 #: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:312
+#: ../plugins/pst-import/pst-importer.c:310
 msgid "Destination folder:"
 msgstr "目的地資料夾:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:303
 msgid "Select folder to import into"
 msgstr "選取資料夾來輸入"
 
@@ -13980,8 +12638,8 @@ msgstr "正在匯入信箱"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:457
-#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
+#: ../plugins/pst-import/pst-importer.c:455
+#: ../plugins/pst-import/pst-importer.c:561 ../shell/e-shell-importer.c:536
 #, c-format
 msgid "Importing `%s'"
 msgstr "正在匯入 ‘%s’"
@@ -14008,108 +12666,108 @@ msgstr "從 Pine 匯入郵件。"
 msgid "Mail to %s"
 msgstr "郵件送到 %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "郵件來自 %s "
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr "主旨是 %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 郵件列表"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "新增過濾器規則"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "已選擇 %d 個，"
 msgstr[1] "已選擇 %d 個，"
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d 封已刪除"
 msgstr[1] "%d 封已刪除"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d 封垃圾"
 msgstr[1] "%d 封垃圾"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d 個草稿"
 msgstr[1] "%d 個草稿"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d 封已傳送"
 msgstr[1] "%d 封已傳送"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d 封未傳送"
 msgstr[1] "%d 封未傳送"
 
-#: ../mail/mail-component.c:574
+#: ../mail/mail-component.c:597
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d 封未讀，"
 msgstr[1] "%d 封未讀，"
 
-#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:598
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "共 %d 封"
 msgstr[1] "共 %d 封"
 
-#: ../mail/mail-component.c:927
+#: ../mail/mail-component.c:949
 msgid "New Mail Message"
 msgstr "新增郵件"
 
-#: ../mail/mail-component.c:928
+#: ../mail/mail-component.c:950
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "郵件訊息(_M)"
 
-#: ../mail/mail-component.c:929
+#: ../mail/mail-component.c:951
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊息"
 
-#: ../mail/mail-component.c:935
+#: ../mail/mail-component.c:957
 msgid "New Mail Folder"
 msgstr "新郵件資料夾"
 
-#: ../mail/mail-component.c:936
+#: ../mail/mail-component.c:958
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "郵件資料夾(_F)"
 
-#: ../mail/mail-component.c:937
+#: ../mail/mail-component.c:959
 msgid "Create a new mail folder"
 msgstr "建立新郵件資料夾"
 
-#: ../mail/mail-component.c:1084
+#: ../mail/mail-component.c:1106
 msgid "Failed upgrading Mail settings or folders."
 msgstr "升級郵件或資料夾失敗。"
 
@@ -14275,59 +12933,81 @@ msgstr "當傳送加密郵件時永遠自我加密(_M)"
 msgid "Always request rea_d receipt"
 msgstr "永遠要求讀信回條(_D)"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:45
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr ""
+"附件\n"
+"行內\n"
+"引文"
+
+#: ../mail/mail-config.glade.h:48
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
+msgstr ""
+"附件\n"
+"行內 (Outlook 風格)\n"
+"引文\n"
+"不要引用"
+
+#: ../mail/mail-config.glade.h:52
 msgid "Automatically insert _emoticon images"
 msgstr "自動插入表情符號(_E)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:53
 msgid "Baltic (ISO-8859-13)"
 msgstr "波羅的海語系 (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:54
 msgid "Baltic (ISO-8859-4)"
 msgstr "波羅的海語系 (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:55
 msgid "C_haracter set:"
 msgstr "字元集(_H):"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:56
 msgid "Ch_eck for Supported Types "
 msgstr " 檢查可支援的類型(_E) "
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:57
 msgid "Check cu_stom headers for junk"
 msgstr "以自訂標頭檢查垃圾郵件(_S)"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:58
 msgid "Check incoming _messages for junk"
 msgstr "檢查內送郵件是否為垃圾郵件(_M)"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:59
 msgid "Check spelling while I _type"
 msgstr "當我輸入時檢查拼字(_T)"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:60
 msgid "Checks incoming mail messages to be Junk"
 msgstr "檢查內送的垃圾郵件訊息"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:61
 msgid "Cle_ar"
 msgstr "清除(_A)"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:62
 msgid "Clea_r"
 msgstr "清除(_R)"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:63
 msgid "Color for _misspelled words:"
 msgstr "拼錯字的顏色(_M):"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:64
 msgid "Confirm _when expunging a folder"
 msgstr "刪除資料夾時確認(_W)"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:65
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14343,182 +13023,180 @@ msgstr ""
 "\n"
 "請按一下「套用」儲存設定。"
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:71
 msgid "De_fault"
 msgstr "預設值(_F)"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
 msgstr "預設字元編碼(_N):"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:74
 msgid "Delete junk messages on e_xit"
 msgstr "離開時刪除垃圾郵件(_X)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:76
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "為外送的郵件加上數位簽章 [預設值] (_U)"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:77
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "不排版郵件內文的文字大小上限(_Z)"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:78
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "若寄件者在我的通訊錄中就不要將郵件標記為垃圾郵件(_K)"
 
-#: ../mail/mail-config.glade.h:73
-msgid "Do not quote"
-msgstr "不使用引文"
-
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:79
 msgid "Done"
 msgstr "完成"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:80
 msgid "Drafts _Folder:"
 msgstr "草稿匣(_F):"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:81
 msgid "Email Accounts"
 msgstr "電子郵件帳號"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:82
 msgid "Email _Address:"
 msgstr "電子郵件位址(_A):"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "離開時清空回收筒資料夾(_X)"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:84
 msgid "Enable Magic S_pacebar"
 msgstr "啟用魔術空白鍵(_P)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:85
 msgid "Enable Sea_rch Folders"
 msgstr "啟用搜尋資料夾(_R)"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:87
 msgid "Encry_ption certificate:"
 msgstr "加密憑證(_P):"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:88
 msgid "Encrypt out_going messages (by default)"
 msgstr "加密外送的郵件 (預設值)(_E)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:90
 msgid "Fi_xed-width:"
 msgstr "固定寬度(_X):"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:91
 msgid "Fix_ed width Font:"
 msgstr "固定寬度字型(_E):"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:92
 msgid "Font Properties"
 msgstr "字型內容"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:93
 msgid "Format messages in _HTML"
 msgstr "將郵件格式化為 _HTML"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:94
 msgid "Full Nam_e:"
 msgstr "全名(_E):"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:96
 msgid "HTML Messages"
 msgstr "HTML 郵件"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:97
 msgid "H_TTP Proxy:"
 msgstr "H_TTP 代理伺服器:"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:98
 msgid "Headers"
 msgstr "檔頭"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:99
 msgid "Highlight _quotations with"
 msgstr "強調引文為(_Q)"
 
-#: ../mail/mail-config.glade.h:96
-msgid "Inline"
-msgstr "行內"
-
-#: ../mail/mail-config.glade.h:97
-msgid "Inline (Outlook style)"
-msgstr "行內（Outlook 風格）"
+#: ../mail/mail-config.glade.h:101
+msgid ""
+"If the server uses a non-standard port then specify the server address as "
+"\"server-name:port-number\""
+msgstr ""
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:103
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "標籤"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:105
 msgid "Languages Table"
 msgstr "語言表"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:106
 msgid "Mail Configuration"
 msgstr "郵件組態"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Headers Table"
 msgstr "郵件檔頭表"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:109
 msgid "Mailbox location"
 msgstr "信箱位置"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:110
 msgid "Message Composer"
 msgstr "郵件編輯器"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:111
 msgid "No _Proxy for:"
 msgstr "沒有代理伺服器給(_P):"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.glade.h:112
 msgid ""
 "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr "注意：在標籤名稱中的底線是用來標記選單中的捷徑鍵。"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注意：在首次連線之前將不會提示您輸入密碼"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:114
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "如果找到符合的自訂垃圾郵件標頭這個選項就會被忽略。"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:115
 msgid "Or_ganization:"
 msgstr "團體(_G):"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:116
 msgid "PGP/GPG _Key ID:"
 msgstr "_PGP/GPG 金鑰 ID:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:117
 msgid "Pass_word:"
 msgstr "密碼(_W):"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+#, fuzzy
+#| msgid ""
+#| "Please enter a descriptive name for this account in the space below.\n"
+#| "This name will be used for display purposes only."
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
+"Please enter a descriptive name for this account in the space below. This "
+"name will be used for display purposes only."
 msgstr ""
 "請在下面的空間輸入描述這個帳號的名稱。\n"
 "這個名稱將只做為顯示之用。"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:120
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14526,7 +13204,7 @@ msgstr ""
 "請輸入以下關於寄送郵件方式的資訊。如果您不清楚，請聯絡系統管理員或網路服務供"
 "應商。"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:121
 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 "
@@ -14535,58 +13213,46 @@ msgstr ""
 "請在下面輸入您的名稱及電郵地址。「選擇性」的欄位不一定要填，除非您希望在送出"
 "的郵件內包含這些資訊。"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:122
 msgid "Please select among the following options"
 msgstr "請在下列選項中選擇"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:123
 msgid "Port:"
 msgstr "連接埠:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "當傳送的郵件只有指定密件副本收件者時顯示提示(_O)"
 
-#: ../mail/mail-config.glade.h:122
-msgid "Quoted"
-msgstr "引用"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "Re_member password"
 msgstr "記住密碼(_M)"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:126
 msgid "Re_ply-To:"
 msgstr "回覆地址(_P):"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:128
 msgid "Remember _password"
 msgstr "記住密碼(_P)"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_OCKS Host:"
-msgstr "S_OCKS 主機:"
-
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_earch for sender photograph only in local address books"
 msgstr "只搜尋本地端通訊錄中的寄件者相片(_E)"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_elect..."
 msgstr "選取(_E)..."
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_end message receipts:"
 msgstr "傳送郵件回條(_E):"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "S_tandard Font:"
 msgstr "標準字型(_T):"
 
-#: ../mail/mail-config.glade.h:133
-msgid "Select Drafts Folder"
-msgstr "選擇草稿資料夾"
-
 #: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "選擇 HTML 固定寬度字型"
@@ -14603,71 +13269,71 @@ msgstr "選擇 HTML 可變寬度字型"
 msgid "Select HTML variable width font for printing"
 msgstr "選擇用於列印的 HTML 可變寬度字型"
 
-#: ../mail/mail-config.glade.h:138
-msgid "Select Sent Folder"
-msgstr "選擇寄送資料夾"
-
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "傳送郵件"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "傳送郵件資料夾(_M):"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "伺服器要求驗證(_V)"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:142
 msgid "Server _Type: "
 msgstr "伺服器類型(_T):"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "簽名憑證(_N):"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "簽名檔(_U):"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "簽名"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "簽章表"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "回覆時從底部開始輸入(_T)"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:149
 msgid "T_ype: "
 msgstr "類型(_Y):"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這裡的語言清單只反映出已經安裝字典的語言。"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:151
+#, fuzzy
+#| msgid ""
+#| "The output of this script will be used as your\n"
+#| "signature. The name you specify will be used\n"
+#| "for display purposes only. "
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
+"signature. The name you specify will be used for display purposes only."
 msgstr ""
 "這個命令稿的輸出會用來作為您的\n"
 "簽名檔。您指定的名稱只會作為\n"
 "顯示之用。"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14675,26 +13341,26 @@ msgstr ""
 "輸入想用來代表這個帳號的名稱。\n"
 "例如：「工作」或「個人」"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:155
 msgid "Us_ername:"
 msgstr "使用者名稱(_E):"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:156
 msgid "Use Authe_ntication"
 msgstr "使用驗證(_N)"
 
-#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
-#: ../plugins/google-account-setup/google-source.c:615
-#: ../plugins/google-account-setup/google-contacts-source.c:316
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:348
+#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:629
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:158
 msgid "V_ariable-width:"
 msgstr "可變寬度(_A):"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:159
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14702,129 +13368,129 @@ msgid ""
 msgstr ""
 "歡迎使用 Evolution 郵件組態助理。\n"
 "\n"
-"按一下「下一頁」開始。 "
+"按一下「往前」開始。 "
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:162
 msgid "_Add Signature"
 msgstr "加入簽名檔(_A)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:163
 msgid "_Always load images from the Internet"
 msgstr "一定自網路下載圖片(_A)"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Automatic proxy configuration URL:"
-msgstr "自動代理伺服器組態網址(_A):"
-
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "預設垃圾郵件外掛程式(_D):"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "直接連線到網際網路(_D)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "不簽署會議邀請 (相容於 _Outlook)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "轉寄方式(_F):"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "回信時保留原始郵件的簽名(_K)"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "載入由連絡人寄出郵件中的圖片(_L)"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:171
 msgid "_Lookup in local address book only"
 msgstr "只在本地通訊錄查詢(_L)"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "設為我的預設帳號(_M)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "手動代理伺服器組態(_M):"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "標示郵件為已閱讀於(_M)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "一定不自網路下載圖片(_N)"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "路徑(_P):"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:178
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "當傳送 HTML 郵件給不想收到這類郵件的連絡人時顯示提示(_P)"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "當傳送沒有主旨的郵件時顯示提示(_P)"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "回覆方式(_R):"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "命令稿(_S):"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "安全 HTTP 代理伺服器(_S):"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "選取(_S)..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "顯示動畫圖片(_S)"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "在郵件預覽顯示寄件者相片(_S)"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "縮短 _To / Cc / Bcc 檔頭為"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "使用安全連線(_U):"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "使用系統預設值(_U)"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "使用與其他應用程式相同的字型(_U)"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "地址"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "色彩"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "描述"
 
+#: ../mail/mail-config.glade.h:197
+msgid "seconds"
+msgstr "秒後"
+
 #: ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
@@ -14854,50 +13520,34 @@ msgid "All local folders"
 msgstr "所有本地端資料夾"
 
 #: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "區分大小寫(_S)"
-
-#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "已完成(_M)"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "尋找(_I):"
-
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "在郵件內尋找"
-
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
 msgid "Flag to Follow Up"
 msgstr "要跟隨的標幟"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
 msgstr "資料夾訂閱"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "License Agreement"
 msgstr "授權合約"
 
-#: ../mail/mail-dialogs.glade.h:15
-msgid "None Selected"
-msgstr "未選取"
-
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "伺服器(_E):"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "保全性資訊"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
 msgstr "指定的資料夾"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14905,19 +13555,19 @@ msgstr ""
 "您選擇要跟隨的郵件已在下面列出。\n"
 "請從「標幟」選單中選擇跟隨的動作。"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
 msgstr "接受授權(_A)"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr "到期於(_D):"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "標幟(_F):"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "選取此項來接受授權合約(_T)"
 
@@ -14926,21 +13576,21 @@ msgstr "選取此項來接受授權合約(_T)"
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:107
 msgid "Filtering Selected Messages"
 msgstr "過濾選擇的郵件"
 
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr "接收郵件"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:562
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "無法套用外寄過濾器：%s"
 
-#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14949,123 +13599,123 @@ msgstr ""
 "無法附加至 %s：%s\n"
 "改附加至本地「寄件匣」。"
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "無法附加至本地「寄件匣」：%s"
 
-#: ../mail/mail-ops.c:725
+#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
 msgid "Sending message"
 msgstr "正在傳送郵件"
 
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "正在傳送郵件 %d / %d"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "無法傳送第 %d 個郵件 (共 %d 個)"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
 msgid "Canceled."
 msgstr "已取消。"
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
 msgid "Complete."
 msgstr "完成。"
 
-#: ../mail/mail-ops.c:872
+#: ../mail/mail-ops.c:877
 msgid "Saving message to folder"
 msgstr "儲存郵件到資料夾"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Moving messages to %s"
 msgstr "將郵件移到 %s"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Copying messages to %s"
 msgstr "將郵件複製到 %s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1171
 msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
-#: ../mail/mail-ops.c:1208
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "開啟資料夾 %s"
 
-#: ../mail/mail-ops.c:1273
+#: ../mail/mail-ops.c:1277
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "取得資料夾 %s 的用量限額資訊"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "開啟貯藏 %s"
 
-#: ../mail/mail-ops.c:1413
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Removing folder %s"
 msgstr "移除資料夾 %s"
 
-#: ../mail/mail-ops.c:1531
+#: ../mail/mail-ops.c:1535
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "貯藏資料夾「%s」"
 
-#: ../mail/mail-ops.c:1594
+#: ../mail/mail-ops.c:1598
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "清空和儲存帳號 '%s'"
 
-#: ../mail/mail-ops.c:1595
+#: ../mail/mail-ops.c:1599
 #, c-format
 msgid "Storing account '%s'"
 msgstr "儲存帳號 '%s'"
 
-#: ../mail/mail-ops.c:1649
+#: ../mail/mail-ops.c:1653
 msgid "Refreshing folder"
 msgstr "重新載入資料夾"
 
-#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
+#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
-#: ../mail/mail-ops.c:1736
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "清空 '%s' 的回收筒"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1741
 msgid "Local Folders"
 msgstr "本機資料夾"
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1822
 #, c-format
 msgid "Retrieving message %s"
 msgstr "取回郵件 %s"
 
-#: ../mail/mail-ops.c:1925
+#: ../mail/mail-ops.c:1931
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "取回 %d 封郵件"
 msgstr[1] "取回 %d 封郵件"
 
-#: ../mail/mail-ops.c:2010
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "儲存 %d 封郵件"
 msgstr[1] "儲存 %d 封郵件"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2096
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15074,11 +13724,11 @@ msgstr ""
 "儲存郵件到：%s 時發生錯誤：\n"
 " %s"
 
-#: ../mail/mail-ops.c:2160
+#: ../mail/mail-ops.c:2168
 msgid "Saving attachment"
 msgstr "儲存附件"
 
-#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15087,27 +13737,27 @@ msgstr ""
 "不能建立輸出檔案：%s：\n"
 " %s"
 
-#: ../mail/mail-ops.c:2201
+#: ../mail/mail-ops.c:2209
 #, c-format
 msgid "Could not write data: %s"
 msgstr "無法寫入資料：%s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "中斷與 %s 的連線"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "重新連線到 %s"
 
-#: ../mail/mail-ops.c:2443
+#: ../mail/mail-ops.c:2450
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "準備帳號「%s」離線工作"
 
-#: ../mail/mail-ops.c:2529
+#: ../mail/mail-ops.c:2536
 msgid "Checking Service"
 msgstr "檢查服務"
 
@@ -15131,31 +13781,31 @@ msgstr "更新中..."
 msgid "Waiting..."
 msgstr "正在等待..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:813
 #, c-format
 msgid "Checking for new mail"
 msgstr "檢查新郵件"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:210
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "請輸入 %s 所需的密語"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:212
 msgid "Enter Passphrase"
 msgstr "輸入密語"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../mail/mail-session.c:215
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "請輸入 %s 所需的密碼"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:217
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:259
 msgid "User canceled operation."
 msgstr "使用者已取消操作。"
 
@@ -15200,21 +13850,21 @@ msgstr "資料夾無效:`%s'"
 msgid "Setting up Search Folder: %s"
 msgstr "設定搜尋資料夾： %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:234
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "更新 '%s:%s' 的搜尋資料夾"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "更新 '%s' 的搜尋資料夾"
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1067
 msgid "Edit Search Folder"
 msgstr "編輯搜尋資料夾"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "新增搜尋資料夾"
 
@@ -15800,86 +14450,86 @@ msgstr "清除(_E)"
 msgid "_Open Messages"
 msgstr "開啟郵件(_O)"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "未閱讀"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "已閱讀"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "已回覆"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "轉寄"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "低"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "高"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205
-#: ../widgets/table/e-cell-date.c:70
+#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
+#: ../widgets/table/e-cell-date.c:71
 msgid "Today %l:%M %p"
 msgstr "今天 %p %l:%M"
 
-#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1670 ../widgets/table/e-cell-date.c:81
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %p %l:%M"
 
-#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1682 ../widgets/table/e-cell-date.c:93
 msgid "%a %l:%M %p"
 msgstr "%A%p %-l:%M"
 
-#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1690 ../widgets/table/e-cell-date.c:101
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日%p %l:%M"
 
-#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:103
 msgid "%b %d %Y"
 msgstr "%Y/%m/%d"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3985 ../mail/message-list.c:4450
+#: ../mail/message-list.c:3981 ../mail/message-list.c:4454
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
-#: ../mail/message-list.c:4289
+#: ../mail/message-list.c:4293
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 "沒有郵件符合您的搜尋條作。可以使用「搜尋->清除」選單項目來清除搜尋或改變它。"
 
-#: ../mail/message-list.c:4291
+#: ../mail/message-list.c:4295
 msgid "There are no messages in this folder."
 msgstr "這個資料夾中沒有郵件。"
 
@@ -15909,6 +14559,7 @@ msgstr "傳送郵件"
 
 #: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+#: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "大小"
 
@@ -15916,39 +14567,39 @@ msgstr "大小"
 msgid "Subject - Trimmed"
 msgstr "主旨 - 已截短"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "原始位置"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "請勿轉寄"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "跟隨"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr "給您的資訊"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "轉寄"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "不需要回應"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
 msgid "Reply"
 msgstr "回覆"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
 msgid "Reply to All"
 msgstr "全部回覆"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:64
 msgid "Review"
 msgstr "檢閱"
 
@@ -15973,20 +14624,24 @@ msgid "Subject contains"
 msgstr "主旨包含"
 
 #: ../mail/searchtypes.xml.h:6
+msgid "Subject or Addresses contains"
+msgstr "主旨或電子郵件位址包含"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Recipients contains"
 msgstr "主旨或收件者包含"
 
-#: ../mail/searchtypes.xml.h:7
+#: ../mail/searchtypes.xml.h:8
 msgid "Subject or Sender contains"
 msgstr "主旨或寄件者包含"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "本地端通訊錄"
+msgid "Add local address books to Evolution."
+msgstr "將本地通訊錄加入 Evolution。"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr "提供本地端行事曆的核心功能。"
+msgid "Local Address Books"
+msgstr "本地端通訊錄"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
@@ -16000,8 +14655,8 @@ msgid ""
 "body."
 msgstr "讓附加檔案提醒外掛程式用來搜尋郵件內文的關鍵字清單。"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:390
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:389
 msgid "Keywords"
 msgstr "關鍵字"
 
@@ -16011,10 +14666,8 @@ msgid "Attachment Reminder"
 msgstr "附加檔案提醒程式"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
-msgstr "在郵件中尋找關鍵字以提醒其中的附加檔案並且可在附加檔案遺失時提出警告"
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "當您忘記將附件加入郵件時提醒您。"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
@@ -16027,22 +14680,23 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "郵件沒有附加檔案"
 
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "新增附件(_A)..."
+
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "編輯郵件(_E)"
 
 #: ../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 "Audio Inline"
+msgstr "行內音效"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "郵件音訊外掛程式"
+msgid "Play audio attachments directly from Evolution."
+msgstr "從 Evolution 直接播放音效附件。"
 
-#: ../plugins/backup-restore/backup-restore.c:138
+#: ../plugins/backup-restore/backup-restore.c:139
 msgid "Select name of the Evolution backup file"
 msgstr "選擇 Evolution 備份檔案的名稱"
 
@@ -16063,136 +14717,142 @@ msgid "Restore from backup"
 msgstr "從備份還原"
 
 #: ../plugins/backup-restore/backup-restore.c:289
+#, fuzzy
+#| msgid ""
+#| "You can restore Evolution from your backup. It can restore all the Mails, "
+#| "Calendars, Tasks, Memos, Contacts. \n"
+#| "It also restores all your personal settings, mail filters etc."
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
-"It also restores all your personal settings, mail filters etc."
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 msgstr ""
 "您可以從備份中還原 Evolution。它可以還原所有的郵件、行事曆、工作、備忘錄、連"
 "絡人。\n"
 "它也可以還原您所有的個人設定、郵件過濾器等。"
 
-#: ../plugins/backup-restore/backup-restore.c:295
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "從備份檔案還原 Evol_ution"
 
-#: ../plugins/backup-restore/backup-restore.c:302
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "選擇要還原的 Evolution 檔案庫："
 
-#: ../plugins/backup-restore/backup-restore.c:305
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "選擇要還原的檔案"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "備份 Evolution 目錄"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
 msgstr "回存 Evolution 目錄"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
 msgstr "檢查 Evolution 備份"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "重新啟動 Evolution"
 
-#: ../plugins/backup-restore/backup.c:73
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "使用圖形使用者介面"
 
-#: ../plugins/backup-restore/backup.c:124
-#: ../plugins/backup-restore/backup.c:257
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "正在關閉 Evolution"
 
-#: ../plugins/backup-restore/backup.c:131
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
 msgstr "備份 Evolution 的帳號與設定值"
 
-#: ../plugins/backup-restore/backup.c:135
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "正在備份 Evolution 資料 (郵件、連絡人、行事曆、工作、備忘錄)"
 
-#: ../plugins/backup-restore/backup.c:146
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "備份完成"
 
-#: ../plugins/backup-restore/backup.c:151
-#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
 msgid "Restarting Evolution"
 msgstr "重新啟動 Evolution"
 
-#: ../plugins/backup-restore/backup.c:261
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "備份目前的 Evolution 資料"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:259
 msgid "Extracting files from backup"
 msgstr "從備份解開檔案"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "正在讀取 Evolution 的設定值"
 
-#: ../plugins/backup-restore/backup.c:277
+#: ../plugins/backup-restore/backup.c:273
 msgid "Removing temporary backup files"
 msgstr "移除暫存的備份檔案"
 
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:280
 msgid "Ensuring local sources"
 msgstr "正在確認本地端來源"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:429
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "正備份至資料夾 %s"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:434
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "從資料夾還原 %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "Evolution 備份"
 
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "Evolution 還原"
 
-#: ../plugins/backup-restore/backup.c:513
+#: ../plugins/backup-restore/backup.c:489
 msgid "Backing up Evolution Data"
 msgstr "備份 Evolution 資料"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:490
 msgid "Please wait while Evolution is backing up your data."
 msgstr "在 Evolution 備份您的資料時請稍候。"
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:492
 msgid "Restoring Evolution Data"
 msgstr "還原 Evolution 資料"
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:493
 msgid "Please wait while Evolution is restoring your data."
 msgstr "在 Evolution 還原您的資料時請稍候。"
 
-#: ../plugins/backup-restore/backup.c:535
+#: ../plugins/backup-restore/backup.c:511
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "這個動作所花的時間取決於您的帳號中資料的多寡。"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "備份與回存 Evolution 的資料與設定值的外掛程式。"
-
 #. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+msgid "Backup and Restore"
+msgstr "備份與回存"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
-msgstr "備份與回存外掛程式。"
+msgid "Backup and restore your Evolution data and settings."
+msgstr "備份與回存 Evolution 的資料與設定值。"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
@@ -16253,73 +14913,80 @@ msgstr "還原設定值(_E)..."
 msgid "_Backup Settings..."
 msgstr "備份設定值(_B)..."
 
-#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自動加入的連絡人"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:639
-msgid "_Auto-create address book entries when replying to messages"
-msgstr "在回覆郵件時自動在通訊錄中建立項目(_A)"
+#: ../plugins/bbdb/bbdb.c:646
+msgid "Create _address book entries when sending mails"
+msgstr "在傳送郵件時自動建立通訊錄項目(_A)"
 
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:652
 msgid "Select Address book for Automatic Contacts"
 msgstr "選擇給自動加入連絡人用的通訊錄"
 
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Instant Messaging Contacts"
 msgstr "即時訊息連絡人"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "定期從 Pidgin 的好友清單同步連絡人資訊和圖片"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:688
 msgid "Select Address book for Pidgin buddy list"
 msgstr "選擇給 Pidgin 好友名單用的通訊錄"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Synchronize with _buddy list now"
 msgstr "立即與好友清單同步(_B)"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+#, fuzzy
+#| msgid ""
+#| "Automatically fills your address book with names and email addresses as "
+#| "you reply to messages. Also fills in IM contact information from your "
+#| "buddy lists."
 msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
 "Automatically fills your address book with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
+"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"
-msgstr "BBDB"
-
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "在產生 %s 時發生錯誤：%s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter 子程序沒有回應，中止它..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "等待 Bogofilter 子程序中斷，終結它..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "導管至 Bogofilter 失敗，錯誤代碼：%d。"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
 msgid "Convert message text to _Unicode"
 msgstr "將郵件文字轉換為 _Unicode"
 
@@ -16334,73 +15001,80 @@ msgid ""
 msgstr "將郵件文字轉換為 Unicode UTF-8 以統一來自不同字集的 spam/ham 特徵。"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "Bogofilter 選項"
+msgid "Bogofilter Junk Filter"
+msgstr "Bogofilter 垃圾郵件過濾器"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter junk plugin"
-msgstr "Bogofilter 垃圾郵件外掛程式"
+msgid "Bogofilter Options"
+msgstr "Bogofilter 選項"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filters junk messages using Bogofilter."
+msgid "Filter junk messages using Bogofilter."
 msgstr "使用 Bogofilter 過濾垃圾郵件。"
 
-#. we found the group, change the name based on the actual language
-#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
+#: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:348
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "網址(_U):"
 
-#: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:608
-#: ../plugins/google-account-setup/google-contacts-source.c:339
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-source.c:622
+#: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "使用 _SSL"
 
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:415
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:509
-#: ../plugins/google-account-setup/google-source.c:632
-#: ../plugins/google-account-setup/google-contacts-source.c:358
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/google-account-setup/google-source.c:646
+#: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "重新整理(_F):"
 
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:671
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+msgid "weeks"
+msgstr "週"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "CalDAV 行事曆來源"
+msgid "Add CalDAV support to Evolution."
+msgstr "加入 Evolution 對 CalDAV 的支援。"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
-msgstr "CalDAV 來源"
+msgid "CalDAV Support"
+msgstr "CalDAV 支援"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "本地行事曆"
+msgid "Add local calendars to Evolution."
+msgstr "將本地端行事曆加入 Evolution。"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
-msgstr "提供本地行事曆的核心功能。"
+msgid "Local Calendars"
+msgstr "本地行事曆"
 
-#: ../plugins/calendar-http/calendar-http.c:332
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "安全連線(_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:397
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "使用者名稱(_M):"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "HTTP 行事曆"
+msgid "Add web calendars to Evolution."
+msgstr "將網路行事曆加入 Evolution。"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "提供 webcal 與 http 行事曆的核心功能。"
+msgid "Web Calendars"
+msgstr "網路行事曆"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
@@ -16442,37 +15116,33 @@ msgstr "天氣：雷暴"
 msgid "Select a location"
 msgstr "選擇一個位置"
 
-#: ../plugins/calendar-weather/calendar-weather.c:615
+#: ../plugins/calendar-weather/calendar-weather.c:606
 msgid "_Units:"
 msgstr "單位(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:622
+#: ../plugins/calendar-weather/calendar-weather.c:613
 msgid "Metric (Celsius, cm, etc)"
 msgstr "公制(攝氏、公分等)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:623
+#: ../plugins/calendar-weather/calendar-weather.c:614
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "英制(華氏、公吋等)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
-msgstr "提供氣象行事曆的核心功能。"
+msgid "Add weather calendars to Evolution."
+msgstr "加入 Evolution 對天氣行事曆的支援。"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 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 "Copy Tool"
+msgstr "複製工具"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "複製工具"
+msgid "Copy things to the clipboard."
+msgstr "將內容複製到剪貼簿。"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -16484,11 +15154,11 @@ msgid ""
 msgstr "每次啟動 Evolution 時，檢查它是否為預設的郵件程式。"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
+msgid "Check whether Evolution is the default mail client on startup."
 msgstr "在啟動時檢查 Evolution 是否為預設的郵件客戶端程式。"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client "
+msgid "Default Mail Client"
 msgstr "預設郵件客戶端程式"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
@@ -16496,23 +15166,23 @@ msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "您是否要將 Evolution 設為您的預設電子郵件客戶端程式？"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:599
+#: ../shell/main.c:627
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:80
 msgid "Mark as _default address book"
 msgstr "標示為預設通訊錄(_D)"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:101
 msgid "Mark as _default calendar"
 msgstr "標示為預設行事曆(_D)"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:102
 msgid "Mark as _default task list"
 msgstr "標示為預設工作清單(_D)"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default memo list"
 msgstr "標示為預設備忘錄清單(_D)"
 
@@ -16521,32 +15191,30 @@ msgid "Default Sources"
 msgstr "預設來源"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
-msgstr "提供標記預設行事曆或通訊錄的功能。"
+msgid "Mark your preferred address book and calendar as default."
+msgstr "將您偏好的通訊錄和行事曆標記為預設。"
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:333
 msgid "Security:"
 msgstr "安全性:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Unclassified"
-msgstr "非密件"
+msgstr "未歸類"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:339
 msgid "Protected"
 msgstr "已保護"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Secret"
 msgstr "密"
 
-#: ../plugins/email-custom-header/email-custom-header.c:343
+#: ../plugins/email-custom-header/email-custom-header.c:342
 msgid "Top secret"
 msgstr "極機密"
 
-#: ../plugins/email-custom-header/email-custom-header.c:585
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "自訂標頭(_C)"
 
@@ -16555,7 +15223,7 @@ msgid "Key"
 msgstr "設定鍵"
 
 #: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:396
+#: ../plugins/templates/templates.c:395
 msgid "Values"
 msgstr "數值"
 
@@ -16574,7 +15242,7 @@ msgstr "電子郵件自訂標頭"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
-msgid "Adds custom header to outgoing messages."
+msgid "Add custom headers to outgoing mail messages."
 msgstr "在外寄郵件中加入自訂標頭。"
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
@@ -16632,11 +15300,11 @@ msgid ""
 "password authentication."
 msgstr "此選項將會連接到使用標準純文字密碼驗證的 Exchange 伺服器。"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
 msgid "Out Of Office"
 msgstr "不在辦公室"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16644,90 +15312,97 @@ msgstr ""
 "以下指定的訊息將會自動傳送給\n"
 "每一位在您離開辦公室時傳送郵件給您的人。"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am out of the office"
 msgstr "我目前不在辦公室"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
 msgid "I am in the office"
 msgstr "我目前在辦公室"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-account-setup.c:340
 msgid "Change the password for Exchange account"
 msgstr "改變 Exchange 帳號的密碼"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:342
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "變更密碼"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Manage the delegate settings for Exchange account"
 msgstr "管理 Exchange 帳號的授權設定"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Delegation Assistant"
 msgstr "委派設定助理"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Miscelleneous"
 msgstr "雜項"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/exchange-account-setup.c:371
 msgid "View the size of all Exchange folders"
 msgstr "檢視所有 Exchange 資料夾的大小"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
+#: ../plugins/exchange-operations/exchange-account-setup.c:373
 msgid "Folders Size"
 msgstr "資料夾大小"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
+#: ../plugins/exchange-operations/exchange-account-setup.c:380
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange 設定值"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
+#: ../plugins/exchange-operations/exchange-account-setup.c:752
 msgid "A_uthenticate"
 msgstr "驗證(_U)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:777
-msgid "S_pecify the mailbox name"
-msgstr "指定信箱名稱(_P)"
+#: ../plugins/exchange-operations/exchange-account-setup.c:774
+msgid "Mailbox name is _different than user name"
+msgstr "信箱名稱與使用者名稱不同(_D)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:790
+#: ../plugins/exchange-operations/exchange-account-setup.c:787
 msgid "_Mailbox:"
 msgstr "信件匣(_M):"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1005
+#: ../plugins/exchange-operations/exchange-account-setup.c:1001
 msgid "_Authentication Type"
 msgstr "驗證類型(_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1019
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
 msgid "Ch_eck for Supported Types"
 msgstr "檢查支援的類型(_E) "
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-account-setup.c:1130
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
 #: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
+#. FIXME: Take care of i18n
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "大小:"
+
 #: ../plugins/exchange-operations/exchange-calendar.c:196
 #: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
@@ -16766,38 +15441,35 @@ msgstr "新密碼："
 msgid "Your current password has expired. Please change your password now."
 msgstr "目前的密碼已過期。請立即變更密碼。"
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "您的密碼將在 %d 天後到期"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:154
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
 msgid "Custom"
 msgstr "自訂"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:184
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
 msgid "Editor (read, create, edit)"
 msgstr "編輯者 (讀取、建立、編輯)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:188
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
 msgid "Author (read, create)"
 msgstr "原著者 (讀取，建立)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:192
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
 msgid "Reviewer (read-only)"
 msgstr "檢閱者 (僅限讀取)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:242
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Delegate Permissions"
 msgstr "代理人權限"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:253
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s 的權限"
@@ -16805,7 +15477,7 @@ msgstr "%s 的權限"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:343
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -16815,84 +15487,96 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
 msgid "You have been given the following permissions on my folders:"
 msgstr "您已經得到我的資料夾的權限有："
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:366
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
 msgid "You are also permitted to see my private items."
 msgstr "您也被允許查看我的私人項目。"
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:373
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
 msgid "However you are not permitted to see my private items."
 msgstr "然而您並未得到允許觀看我的私人項目。"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:405
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "您已經被指派為 %s 的代理人"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To"
 msgstr "委託給"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:582
+#: ../plugins/exchange-operations/exchange-delegates.c:581
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "要移除代理人 %s 嗎？"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:700
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "無法存取 Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:712
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Active Directory 中找不到自己"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:725
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Active Directory 中找不到代理人 %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:737
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "無法移除代理人 %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "無法更新代理人的清單。"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:815
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "無法新增代理人 %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:983
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 msgid "Error reading delegates list."
 msgstr "讀取代理人清單錯誤。"
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
 msgstr "行事曆(_A):"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 msgid "Co_ntacts:"
 msgstr "連絡人(_N):"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegates"
 msgstr "代理人"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+msgstr ""
+"沒有\n"
+"檢閱者 (僅限讀取)\n"
+"原著者 (讀取，建立)\n"
+"編輯者 (讀取、建立、編輯)"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Permissions for"
 msgstr "權限授予"
 
@@ -16919,6 +15603,7 @@ msgstr "權限摘要(_S)"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1912
 msgid "_Tasks:"
 msgstr "工作(_T):"
 
@@ -16936,11 +15621,11 @@ msgid "Folder Size"
 msgstr "資料夾大小"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
 msgid "User"
 msgstr "使用者"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "訂閱其他使用者的資料夾"
@@ -16949,20 +15634,20 @@ msgstr "訂閱其他使用者的資料夾"
 msgid "Exchange Folder Tree"
 msgstr "Exchange 資料夾樹"
 
-#: ../plugins/exchange-operations/exchange-folder.c:67
-#: ../plugins/exchange-operations/exchange-folder.c:236
-#: ../plugins/exchange-operations/exchange-folder.c:246
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:243
 msgid "Unsubscribe Folder..."
 msgstr "取消訂閱資料夾..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:518
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "確定要取消訂閱資料夾「%s」？"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:530
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "取消訂閱「%s」"
@@ -17026,18 +15711,18 @@ msgstr "您的密碼將在 7 天內到期..."
 msgid "_Change Password"
 msgstr "變更密碼(_D)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(權限被拒絕。)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
 msgstr "新增使用者："
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:937
-#: ../plugins/groupwise-features/share-folder.c:716
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
 msgid "Add User"
 msgstr "加入使用者"
 
@@ -17155,11 +15840,11 @@ msgstr "敏感度(_S):"
 msgid "_User"
 msgstr "使用者(_U)"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
+#: ../plugins/exchange-operations/exchange-user-dialog.c:134
 msgid "Select User"
 msgstr "選擇使用者"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
+#: ../plugins/exchange-operations/exchange-user-dialog.c:172
 msgid "Address Book..."
 msgstr "通訊錄..."
 
@@ -17172,10 +15857,8 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "訂閱其他使用者的行事曆"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that manages a collection of Exchange account specific operations "
-"and features."
-msgstr "處理 Exchange 帳號指定操作與功能集合的外掛程式。"
+msgid "Activates the Evolution-Exchange extension package."
+msgstr "使用 Evolution-Exchange 延伸套件。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17318,7 +16001,7 @@ msgid "Folder offline"
 msgstr "資料夾離線"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1269
+#: ../shell/e-shell.c:1259
 msgid "Generic error"
 msgstr "一般錯誤"
 
@@ -17435,7 +16118,9 @@ msgid "Unknown error looking up {0}"
 msgstr "查詢 {0} 時發生不明的錯誤"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:516
+#: ../plugins/mail-to-task/mail-to-task.c:343
+#: ../plugins/mail-to-task/mail-to-task.c:555
 msgid "Unknown error."
 msgstr "不明的錯誤。"
 
@@ -17514,64 +16199,77 @@ msgid "Check folder permissions"
 msgstr "檢查資料夾權限"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr "在郵件編輯器中按下按鍵時自動執行編輯器"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:120
+msgid "Automatically launch when a new mail is edited"
+msgstr "當編輯新郵件時自動執行"
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
 msgstr "預設外部編輯器"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "The default command that must be used as the editor."
 msgstr "預設的指令必須能做為編輯器。"
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
-msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
-msgstr "使用外部編輯器做為郵件編輯器的外掛程式。您只能寄出純文字郵件。"
-
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
 msgid "External Editor"
 msgstr "外部編輯器"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "使用外部編輯器撰寫純文字郵件。"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
 msgstr "不能建立暫存檔案"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "編輯器無法啟動"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 msgstr "Evoluton 無法建立用來儲存您郵件的暫存檔案。請稍後再試。"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+msgid "External editor still running"
+msgstr "外部編輯器仍在執行中"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr "外部編輯器仍在執行中。只要該編輯器仍在使用，郵件編輯器視窗就不能關閉。"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 msgstr ""
 "不能啟動在您外掛程式偏好設定中設定的外部編輯器。請試著設定不同的編輯器。"
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in _External Editor"
-msgstr "在外部編輯器中撰寫(_E)"
-
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose messages using an external editor"
-msgstr "使用外部編輯器來編寫郵件"
-
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:109
 msgid "Command to be executed to launch the editor: "
 msgstr "用來啟動編輯器的指令: "
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:110
 msgid ""
 "For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
+"For VI use \"gvim -f\""
 msgstr ""
 "Emacs 使用「xemacs」\n"
-"VI 使用「gvim」"
+"VI 使用「gvim -f」"
+
+#: ../plugins/external-editor/external-editor.c:307
+#: ../plugins/external-editor/external-editor.c:309
+msgid "Compose in External Editor"
+msgstr "在外部編輯器中撰寫"
 
 #: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
@@ -17587,36 +16285,46 @@ msgstr "面貌(_F)"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid ""
-"Attach Face header to outgoing messages. First time the user needs to "
-"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
-"faces This will be used in messages that are sent further."
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
 msgstr ""
-"在外寄的郵件中附加大頭貼標頭。第一次使用時需要先設定一張 48*48 的 png 相片。"
-"它會以 base 64 編碼並儲存於 ~/.evolution/faces 這會用在未來所寄出的郵件中。"
+"在外寄的郵件中附加大頭貼照片。\n"
+"\n"
+"第一次使用時需要先設定一張 48x48 的 PNG 圖片。它會以 Base-64 編碼並儲存於 ~/."
+"evolution/faces 。這會用在未來所寄出的郵件中。"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "取消訂閱資料夾 「%s」"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr "允許在側邊列的快顯選單中取消訂閱郵件資料夾。"
-
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
 msgstr "取消訂閱資料夾"
 
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid ""
+"Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr "要取消訂閱 IMAP 資料夾，可在資料夾樹中對它按滑鼠右鍵。"
+
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
-#: ../plugins/google-account-setup/google-source.c:421
+#: ../plugins/google-account-setup/google-source.c:79
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-source.c:413
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "輸入使用者 %s 的密碼以存取已訂閱的行事曆清單。"
 
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:516
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17625,45 +16333,40 @@ msgstr ""
 "不能從 Google 伺服器讀取資料。\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:683
+#: ../plugins/google-account-setup/google-source.c:690
 msgid "Cal_endar:"
 msgstr "行事曆(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:725
 msgid "Retrieve _list"
 msgstr "取回清單(_L)"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:69
-#: ../plugins/google-account-setup/google-contacts-source.c:71
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:306
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:325
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
 msgid "<b>Server</b>"
 msgstr "<b>伺服器</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "用來設定 Google 日曆與連絡人的外掛程式。"
+msgid "Add Google Calendars to Evolution."
+msgstr "將 Google 日曆加入 Evolution。"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google sources"
-msgstr "Google 來源"
+msgid "Google Calendars"
+msgstr "Google 日曆"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
 msgid "Checklist"
 msgstr "檢查清單"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "用來設定 GroupWise 行事曆與連絡人來源的外掛程式。"
+msgid "Add Novell GroupWise support to Evolution."
+msgstr "加入 Evolution 對 Novell GroupWise 的支援。"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
 msgstr "GroupWare 帳號設定"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17688,11 +16391,11 @@ msgstr ""
 "按「繼續」以安裝分享資料夾\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "安裝分享資料夾"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "分享資料夾安裝"
 
@@ -17730,21 +16433,21 @@ msgstr "啟用(_E)"
 msgid "_Junk List"
 msgstr "垃圾郵件清單(_J)"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/mail-retract.c:52
 msgid "Message Retract"
 msgstr "郵件取消"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
+#: ../plugins/groupwise-features/mail-retract.c:57
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this ?"
 msgstr "取回郵件可能會將該郵件自數件者的 mailbox 移除。您確定要這麼做？"
 
-#: ../plugins/groupwise-features/mail-retract.c:77
+#: ../plugins/groupwise-features/mail-retract.c:76
 msgid "Message retracted successfully"
 msgstr "郵件已成功收回"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid "Retract Mail"
 msgstr "收回郵件"
 
@@ -17753,88 +16456,80 @@ msgid "Add Send Options to GroupWise messages"
 msgstr "將 傳送 選項加入 GroupWise 訊息"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in GroupWise accounts."
+#, fuzzy
+#| msgid "A plugin for the features in GroupWise accounts."
+msgid "Fine-tune your GroupWise accounts."
 msgstr "提供 GroupWise 帳號功能的外掛程式。"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
 msgstr "GroupWise 功能"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
 msgid "Message retract failed"
 msgstr "郵件取消失敗"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
 msgid "The server did not allow the selected message to be retracted."
 msgstr "此伺服器不允許將選取的郵件取消。"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "已經有名稱為 &quot;{0}&quot; 的帳號存在。請檢查您的資料夾結構。"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "帳號已存在"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "無效的使用者"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"以 &quot;{0}&quot; 登入代理伺服器失敗。請檢查您的電子郵件位址並再試一次。"
+
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "不能讓使用者 &quot;{0}&quot; 存取代理伺服器"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
 msgid "Specify User"
 msgstr "指定使用者"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "您已經將代理伺服器的權限給予這個使用者。"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr "您必須指定有效的使用者名稱以取得代理伺服器權限。"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "已經有名稱為 &quot;{0}&quot; 的帳號存在。請檢查您的資料夾結構。"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-msgid "Account Already Exists"
-msgstr "帳號已存在"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"以 &quot;{0}&quot; 登入代理伺服器失敗。請檢查您的電子郵件位址並再試一次。"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
-msgid "This is a recurring meeting"
-msgstr "這是週期性會議"
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
-msgid "Would you like to accept it?"
-msgstr "您想要接受它嗎？"
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
-msgid "Would you like to decline it?"
-msgstr "您想要拒絕它嗎？"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 msgstr "您不能與指定的使用者 &quot;{0}&quot; 分享這個資料夾"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
 msgid "You have to specify a user name which you want to add to the list"
 msgstr "您必須指定要加入清單使用者名稱"
 
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Accept Tentatively"
 msgstr "暫時套用"
 
+#: ../plugins/groupwise-features/process-meeting.c:319
+msgid "Rese_nd Meeting..."
+msgstr "重寄會議(_N)..."
+
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>使用者：</b>"
@@ -17848,7 +16543,7 @@ msgid "Con_tacts..."
 msgstr "連絡人(_T)..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:516
+#: ../widgets/table/e-table-click-to-add.c:514
 msgid "Message"
 msgstr "郵件"
 
@@ -17931,10 +16626,10 @@ msgstr "<b>帳號名稱</b>"
 msgid "Proxy Login"
 msgstr "登入代理伺服器"
 
-#: ../plugins/groupwise-features/proxy-login.c:206
-#: ../plugins/groupwise-features/proxy-login.c:248
-#: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s請輸入 %s 所需的密碼(使用者 %s)"
@@ -17947,12 +16642,12 @@ msgid "_Proxy Login..."
 msgstr "代理伺服器登入(_P)..."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "代理伺服器頁籤只有在帳號上線時才會出現。"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "代理伺服器頁籤只有在啟用此帳號時才會出現。"
 
@@ -17960,95 +16655,95 @@ msgstr "代理伺服器頁籤只有在啟用此帳號時才會出現。"
 msgid "Advanced send options"
 msgstr "進階傳送選項"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:751
+#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "使用者"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:321
 msgid "Enter the users and set permissions"
 msgstr "輸入使用者並設定權限"
 
-#: ../plugins/groupwise-features/share-folder-common.c:341
+#: ../plugins/groupwise-features/share-folder-common.c:340
 msgid "New _Shared Folder..."
 msgstr "新增分享資料夾(_S)..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:449
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "分享"
 
-#: ../plugins/groupwise-features/share-folder.c:534
+#: ../plugins/groupwise-features/share-folder.c:531
 msgid "Custom Notification"
 msgstr "自訂通知"
 
-#: ../plugins/groupwise-features/share-folder.c:756
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Add   "
 msgstr "新增"
 
-#: ../plugins/groupwise-features/share-folder.c:762
+#: ../plugins/groupwise-features/share-folder.c:759
 msgid "Modify"
 msgstr "修改"
 
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:94
 msgid "Message Status"
 msgstr "郵件狀態"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:108
 msgid "Subject:"
 msgstr "主旨:"
 
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:122
 msgid "From:"
 msgstr "寄件者:"
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Creation date:"
 msgstr "建立日期:"
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:176
 msgid "Recipient: "
 msgstr "收件者:"
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:183
 msgid "Delivered: "
 msgstr "已遞送:"
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Opened: "
 msgstr "已開啟:"
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Accepted: "
 msgstr "已接受:"
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Deleted: "
 msgstr "已刪除:"
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Declined: "
 msgstr "已婉拒:"
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Completed: "
 msgstr "已完成: "
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Undelivered: "
 msgstr "未遞送:"
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:238
 msgid "Track Message Status..."
 msgstr "追蹤郵件狀態..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "用來設定 hula 行事曆來源的外掛程式。"
+msgid "Add Hula support to Evolution."
+msgstr "加入 Evolution 對 Hula 的支援。"
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Account Setup"
-msgstr "Hula 帳號設定"
+msgid "Hula Support"
+msgstr "Hula 支援"
 
 #: ../plugins/imap-features/imap-headers.c:320
 msgid "Custom Headers"
@@ -18100,52 +16795,18 @@ msgstr ""
 "若沒有通信論壇過濾器則可使用此項"
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "A plugin for the features in the IMAP accounts."
-msgstr "提供 IMAP 帳號功能的外掛程式。"
+msgid "Fine-tune your IMAP accounts."
+msgstr ""
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
 msgstr "IMAP 功能"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
-msgid "_Import to Calendar"
-msgstr "匯入至行事曆(_I)"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:83
-msgid "_Import to Tasks"
-msgstr "匯入至工作(_I)"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:201
-msgid "Import ICS"
-msgstr "匯入 ICS"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:224
-msgid "Select Task List"
-msgstr "選擇工作清單"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:228
-msgid "Select Calendar"
-msgstr "選擇行事曆"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:260
-#: ../shell/e-shell-importer.c:696
-msgid "_Import"
-msgstr "匯入(_I)"
-
-#. the path to the shared library
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
-msgid "Import to Calendar"
-msgstr "匯入至行事曆"
-
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
-msgid "Imports ICS attachments to calendar."
-msgstr "匯入 ICS 附加檔案到行事曆。"
-
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "無法載入硬體抽象層"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -18153,7 +16814,7 @@ msgstr ""
 "「hald」服務是必要的但目前並未執行。請啟用該服務後再回到本程式，或者連絡您的"
 "系統管理者。"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
 msgid "Search for an iPod failed"
 msgstr "搜尋 iPod 失敗"
 
@@ -18171,201 +16832,204 @@ msgid "iCalendar format (.ics)"
 msgstr "iCalendar 格式 (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid ""
-"Synchronize the selected task/memo/calendar/address book with Apple iPod"
-msgstr "與 Apple iPod 同步選取的工作/備忘錄/行事曆/通訊錄"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
 msgstr "同步化 iPod"
 
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+msgid "Synchronize your data with your Apple iPod."
+msgstr "將您的資料與 Apple iPod 同步化。"
+
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
 msgstr "iPod 同步化"
 
-#: ../plugins/itip-formatter/itip-formatter.c:481
-#: ../plugins/itip-formatter/itip-formatter.c:606
+#: ../plugins/itip-formatter/itip-formatter.c:482
+#: ../plugins/itip-formatter/itip-formatter.c:607
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "載入行事曆「%s」失敗"
 
-#: ../plugins/itip-formatter/itip-formatter.c:626
+#: ../plugins/itip-formatter/itip-formatter.c:627
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "行事曆 '%s' 中的約會和這個會議相衝突"
 
-#: ../plugins/itip-formatter/itip-formatter.c:662
+#: ../plugins/itip-formatter/itip-formatter.c:663
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "尋找在行事曆「%s」中的約會"
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:753
 msgid "Unable to find any calendars"
 msgstr "找不到任何行事曆"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:760
 msgid "Unable to find this meeting in any calendar"
 msgstr "無法在任何行事曆中找到這個約會"
 
-#: ../plugins/itip-formatter/itip-formatter.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:764
 msgid "Unable to find this task in any task list"
 msgstr "無法在任何工作清單中找到這項工作"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:768
 msgid "Unable to find this memo in any memo list"
 msgstr "無法在任何備忘錄清單中找到這項備忘錄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../plugins/itip-formatter/itip-formatter.c:839
+msgid "Opening the calendar. Please wait.."
+msgstr "正在開啟行事曆。請稍候..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:842
 msgid "Searching for an existing version of this appointment"
 msgstr "尋找這個約會既存的版本"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 msgid "Unable to parse item"
 msgstr "無法分析項目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1111
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "無法傳送項目至行事曆「%s」。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "傳送至行事曆 '%s' 並設為已接受"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1127
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "傳送至行事曆 '%s' 並設為不確定的"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "傳送至行事曆 '%s' 並設為已婉拒"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1137
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "傳送至行事曆「%s」並設為已取消"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1231
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "會議召集人已移除代理人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1238
 msgid "Sent a cancelation notice to the delegate"
 msgstr "傳送取消通知給代理人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1236
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "無法傳送取消通知給代理人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "無法更新到會者。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1381
 msgid "Attendee status updated"
 msgstr "到會者狀態已更新"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Meeting information sent"
 msgstr "會議資訊寄出"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Task information sent"
 msgstr "工作資訊寄出"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 msgid "Memo information sent"
 msgstr "備忘錄資訊寄出"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "無法寄出會議資訊，該會議並不存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1425
 msgid "Unable to send task information, the task does not exist"
 msgstr "無法寄出工作資訊，該項工作不存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1428
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "無法寄出備忘錄資訊，該備忘錄並不存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 msgid "The calendar attached is not valid"
 msgstr "附帶的行事曆是無效的"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1492
-#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1508
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "此郵件宣告其含有行事曆內容，但其行事曆並非有效的 iCalendar。"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1543
-#: ../plugins/itip-formatter/itip-formatter.c:1571
-#: ../plugins/itip-formatter/itip-formatter.c:1663
+#: ../plugins/itip-formatter/itip-formatter.c:1548
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The item in the calendar is not valid"
 msgstr "行事曆中的項目是無效的"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1544
-#: ../plugins/itip-formatter/itip-formatter.c:1572
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1549
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 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:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
 msgstr "附加的行事曆內容含有多個項目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1584
+#: ../plugins/itip-formatter/itip-formatter.c:1589
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "要處理這些全部的項目，應該將此檔案儲存後匯入其中的行事曆"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2306
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "This meeting recurs"
 msgstr "這個會議的循環規則為"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "This task recurs"
 msgstr "這項工作的循環規則為"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 msgid "This memo recurs"
 msgstr "這個備忘錄的循環規則為"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2548
+#: ../plugins/itip-formatter/itip-formatter.c:2574
 msgid "_Delete message after acting"
 msgstr "完成後刪除郵件(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../plugins/itip-formatter/itip-formatter.c:2590
+#: ../plugins/itip-formatter/itip-formatter.c:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Conflict Search"
 msgstr "衝突的搜尋"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2599
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "選擇要搜尋會議衝突的行事曆"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:297
+#: ../widgets/misc/e-cell-date-edit.c:304
 msgid "Today"
 msgstr "今天"
 
@@ -18730,113 +17394,109 @@ msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> 已經取消下列共用備忘錄："
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "_Open Calendar"
 msgstr "開啟行事曆(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
-msgid "_Decline"
-msgstr "拒絕(_D)"
-
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:829
 #: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:839
 #: ../plugins/itip-formatter/itip-view.c:856
 #: ../plugins/itip-formatter/itip-view.c:861
+msgid "_Decline"
+msgstr "拒絕(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Accept"
 msgstr "接受(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Decline all"
 msgstr "全部拒絕(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Tentative all"
 msgstr "全部暫訂(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative"
 msgstr "暫訂(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Accept all"
 msgstr "全部接受(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Send Information"
 msgstr "傳送資訊(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update Attendee Status"
 msgstr "更新出席狀態(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Update"
 msgstr "更新(_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "Start time:"
 msgstr "開始時間:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "End time:"
 msgstr "結束時間:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1062
-#: ../plugins/itip-formatter/itip-view.c:1116
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 msgid "Comment:"
 msgstr "註解:"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1103
 msgid "Send _reply to sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Send _updates to attendees"
 msgstr "傳送更新給到會者(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1142
 msgid "_Apply to all instances"
 msgstr "套用至所有實體(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1149
+#: ../plugins/itip-formatter/itip-view.c:1151
 msgid "Show time as _free"
 msgstr "顯示時間為空閒(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Preserve my reminder"
 msgstr "保留我的提醒(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1158
+#: ../plugins/itip-formatter/itip-view.c:1160
 #, fuzzy
 #| msgid "Attachment Reminder"
 msgid "_Inherit reminder"
-msgstr "附加檔案提醒程式"
-
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks :"
-msgstr "工作(_T):"
+msgstr "顯示提醒(_R)"
 
 #: ../plugins/itip-formatter/itip-view.c:1914
-msgid "Memos :"
-msgstr "備忘錄:"
+msgid "_Memos:"
+msgstr "備忘錄(_M):"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
-msgstr "顯示郵件中的文字/行事曆部分。"
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "顯示郵件中的「text/calendar」 MIME 部分。"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
@@ -18862,13 +17522,13 @@ msgid "Proxy _Logout"
 msgstr "登出代理伺服器(_L)"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Allows disabling of accounts."
-msgstr "允許停用帳號。"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 msgid "Disable Account"
 msgstr "停用帳號"
 
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr "要停用帳號，可在資料夾樹中對它按滑鼠右鍵。"
+
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "發出嗶聲或播放聲音檔案。"
@@ -18935,20 +17595,20 @@ msgstr "圖示是否要閃爍。"
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "是否只通知收件匣的新郵件。"
 
-#: ../plugins/mail-notification/mail-notification.c:256
+#: ../plugins/mail-notification/mail-notification.c:245
 msgid "Generate a _D-Bus message"
 msgstr "產生 _D-Bus 訊息"
 
-#: ../plugins/mail-notification/mail-notification.c:379
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Evolution's Mail Notification"
 msgstr "Evolution 的新郵件通知"
 
-#: ../plugins/mail-notification/mail-notification.c:400
+#: ../plugins/mail-notification/mail-notification.c:389
 msgid "Mail Notification Properties"
 msgstr "新郵件通知屬性"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:479
+#: ../plugins/mail-notification/mail-notification.c:468
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18963,109 +17623,140 @@ msgstr[1] ""
 "您已經接收 %d 封郵件 。 \n"
 "位於 %s。"
 
-#: ../plugins/mail-notification/mail-notification.c:484
+#: ../plugins/mail-notification/mail-notification.c:473
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "您已經接收 %d 封郵件 。 "
 msgstr[1] "您已經接收 %d 封郵件 。 "
 
-#: ../plugins/mail-notification/mail-notification.c:501
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:490
+#: ../plugins/mail-notification/mail-notification.c:495
 msgid "New email"
 msgstr "新郵件"
 
-#: ../plugins/mail-notification/mail-notification.c:566
+#: ../plugins/mail-notification/mail-notification.c:555
 msgid "Show icon in _notification area"
 msgstr "在通知區中顯示圖示(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:569
+#: ../plugins/mail-notification/mail-notification.c:558
 msgid "B_link icon in notification area"
 msgstr "讓通知區圖示閃爍(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:571
+#: ../plugins/mail-notification/mail-notification.c:560
 msgid "Popup _message together with the icon"
 msgstr "在圖示上彈出訊息(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:752
+#: ../plugins/mail-notification/mail-notification.c:741
 msgid "_Play sound when new messages arrive"
 msgstr "當新郵件到達時播放聲音檔案(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:747
 msgid "_Beep"
 msgstr "嗶聲(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:759
+#: ../plugins/mail-notification/mail-notification.c:748
 msgid "Play _sound file"
 msgstr "播放聲音檔案(_S)"
 
-#: ../plugins/mail-notification/mail-notification.c:770
+#: ../plugins/mail-notification/mail-notification.c:759
 msgid "Specify _filename:"
 msgstr "指定檔案名稱(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:771
+#: ../plugins/mail-notification/mail-notification.c:760
 msgid "Select sound file"
 msgstr "選擇聲音檔案"
 
-#: ../plugins/mail-notification/mail-notification.c:772
+#: ../plugins/mail-notification/mail-notification.c:761
 msgid "Pl_ay"
 msgstr "播放(_A)"
 
-#: ../plugins/mail-notification/mail-notification.c:829
+#: ../plugins/mail-notification/mail-notification.c:818
 msgid "Notify new messages for _Inbox only"
 msgstr "只通知收件匣的新郵件(_I)"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-msgid ""
-"Generates a D-Bus message or notifies the user with an icon in notification "
-"area and a notification message whenever a new message has arrived."
-msgstr "當新郵件抵達時產生 D-Bus 訊息或在通知區以圖示和通知訊息知會使用者。"
-
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Mail Notification"
 msgstr "郵件通知"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
-msgid ""
-"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
-msgid "Con_vert to Meeting"
-msgstr "轉換為會議(_V)"
-
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "寄信到會議"
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Notifies you when new mail messages arrive."
+msgstr "當新郵件到達時通知您。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:287
+#: ../plugins/mail-to-task/mail-to-task.c:343
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "無法開啟行事曆。%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:292
+#: ../plugins/mail-to-task/mail-to-task.c:350
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr "選取的來源是唯讀的，因此不能在這裡建立事件。請選擇其他的來源。"
+
+#: ../plugins/mail-to-task/mail-to-task.c:353
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr "選定的來源是唯讀的，因此不能在這裡建立工作。請選擇其他的來源。"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:356
 msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
-msgstr "可以從郵件訊息的內容建立工作的外掛程式。"
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
+msgstr "選取的來源是唯讀的，因此不能在這裡建立備忘錄。請選擇其他的來源。"
+
+#: ../plugins/mail-to-task/mail-to-task.c:455
+#, c-format
+msgid "Could not create object. %s"
+msgstr "無法建立物件。%s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:555
+#, c-format
+msgid "Cannot get source list. %s"
+msgstr "不能取得來源清單。%s"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "將郵件轉換為工作。"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Con_vert to Task"
-msgstr "轉換為工作(_V)"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
+msgid "Convert to a Mem_o"
+msgstr "轉換為備忘錄(_O)"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
-msgstr "寄信到工作"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+msgid "Convert to a _Meeting"
+msgstr "轉換為會議(_M)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+msgid "Convert to a _Task"
+msgstr "轉換為工作(_T)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+msgid "Convert to an _Event"
+msgstr "轉換為事件(_E)"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
+msgid "Mail-to-Task"
+msgstr "郵件轉工作"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+msgid "Convert the selected message to a new event"
+msgstr "將選取的郵件轉換為新的事件"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Convert the selected message to a new meeting"
+msgstr "將選取的郵件轉換為新的會議"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+msgid "Convert the selected message to a new memo"
+msgstr "將選取的郵件轉換為新的備忘錄"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
 msgid "Convert the selected message to a new task"
 msgstr "將選定的郵件轉換為新的工作"
 
@@ -19091,9 +17782,8 @@ 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...)."
-msgstr "提供一般通信論壇指令的動作 （訂閱、取消訂閱…）。"
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "執行一般通信論壇指令的動作 （訂閱、取消訂閱等等…）。"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -19260,20 +17950,20 @@ msgid "Mark Me_ssages as Read"
 msgstr "標示郵件為已讀(_S)"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-msgid "Used for marking all the messages under a folder as read"
-msgstr "用來將資料夾下的所有郵件標記為已讀"
+msgid "Mark all messages in a folder as read."
+msgstr "將資料夾中全部的郵件標示成已閱讀。"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr "實作 mono 功能的外掛程式。"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
 msgstr "Mono 載入器"
 
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Support plugins written in Mono."
+msgstr "支援以 Mono 編寫的外掛程式。"
+
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "用來管理啟用或停用外掛程式的外掛程式。"
+msgid "Manage your Evolution plugins."
+msgstr "管理您的 Evolution 外掛程式。"
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -19310,26 +18000,19 @@ msgstr "概覽"
 msgid "Plugin"
 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"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-"展示可以讓您選擇停用 HTML 郵件的格式外掛程式的測試用外掛程式。\n"
-"\n"
-"此外掛程式僅為未支援的展示程式碼。\n"
-
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "純文字模型"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Prefer Plain Text"
 msgstr "偏好純文字"
 
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr "以純文字方式檢視郵件，即使它們含有 HTML 內容。"
+
 #: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "如提供 HTML 則顯示之"
@@ -19351,8 +18034,8 @@ msgid "Evolution Profiler"
 msgstr "Evolution 設定工具"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
-msgstr "寫入設定資料事件的紀錄檔。"
+msgid "Profile data events in Evolution (for developers only)."
+msgstr "Evolution 中的設定組合資料事件（只供開發者使用）。"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -19367,44 +18050,74 @@ msgid "Outlook personal folders (.pst)"
 msgstr "Outlook 個人資料夾 (.pst)"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "_Address Book"
 msgstr "通訊錄(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:323
 msgid "A_ppointments"
 msgstr "約會(_P)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:337
+#: ../plugins/pst-import/pst-importer.c:335
 msgid "_Journal entries"
 msgstr "日誌項目(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:350
 msgid "Importing Outlook data"
 msgstr "匯入 Outlook 資料"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "允許將行事曆發佈為網頁"
-
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
 msgstr "行事曆發佈"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "位置"
 
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Publish calendars to the web."
+msgstr "將行事曆發佈為網頁。"
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
 msgstr "發佈行事曆資訊(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:95
+#: ../plugins/publish-calendar/publish-calendar.c:337
+#, c-format
+msgid "Could not open %s:"
+msgstr "無法開啟 %s："
+
+#: ../plugins/publish-calendar/publish-calendar.c:97
+#, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "無法開啟 %s：未知的錯誤"
+
+#: ../plugins/publish-calendar/publish-calendar.c:117
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr "發佈到 %s 時發生錯誤："
+
+#: ../plugins/publish-calendar/publish-calendar.c:119
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr "發佈到 %s 已成功結束"
+
+#: ../plugins/publish-calendar/publish-calendar.c:164
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "掛載 %s 失敗："
+
+#: ../plugins/publish-calendar/publish-calendar.c:620
 msgid "Are you sure you want to remove this location?"
 msgstr "確定要移除這個位置？"
 
+#: ../plugins/publish-calendar/publish-calendar.c:784
+msgid "Could not create publish thread."
+msgstr "無法建立發佈執行緒。"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">位置</span>"
@@ -19461,27 +18174,41 @@ msgstr ""
 msgid "Service _type:"
 msgstr "服務類型(_T):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+msgid "Time _duration:"
+msgstr "時間週期(_D):"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_File:"
 msgstr "檔案(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Publish as:"
 msgstr "發佈為(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Remember password"
 msgstr "記住密碼(_R)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid "_Username:"
 msgstr "使用者名稱(_U):"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+"日\n"
+"週\n"
+"月"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -19489,11 +18216,17 @@ msgstr ""
 "iCal\n"
 "空閒/忙碌"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr "無法發佈行事曆：行事曆後端程式已不存在"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "新的位置"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "編輯位置"
 
@@ -19521,175 +18254,135 @@ msgstr "可以載入其他以 Python 寫的功能的外掛程式。"
 msgid "Python Loader"
 msgstr "Python 載入器"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
-msgid "SpamAssassin (built-in)"
-msgstr "SpamAssassin (內建)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "找不到 SpamAssassin，代碼：%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "建立導管失敗：%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
 msgid "Error after fork: %s"
 msgstr "fork 之後發生錯誤：%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassin 子程序沒有回應，中止它..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "等待 SpamAssassin 子程序中斷，終結它..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "導管至 SpamAssassin 失敗，錯誤代碼：%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssassin 無法使用。"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "這會讓 SpamAssasin 更可靠，但速度變慢"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
 msgid "I_nclude remote tests"
 msgstr "包含遠端測試(_N)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
-msgstr "使用 SpamAssassin 過濾垃圾郵件。這個外掛程式需要安裝 SpamAssassin。"
+msgid "Filter junk messages using SpamAssassin."
+msgstr "使用 SpamAssassin 過濾垃圾郵件。"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Options"
-msgstr "SpamAssassin 選項"
+msgid "SpamAssassin Junk Filter"
+msgstr "SpamAssassin 垃圾郵件過濾器"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin junk plugin"
-msgstr "SpamAssassin 垃圾郵件外掛程式"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
-msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr "提供一次儲存所有附伴或郵件的各部分的外掛程式。"
-
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:315
-msgid "Save attachments"
-msgstr "儲存附加檔案"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
-msgstr "儲存附加檔案..."
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
-msgstr "儲存所有的附加檔案"
-
-#: ../plugins/save-attachments/save-attachments.c:321
-msgid "Select save base name"
-msgstr "選擇儲存的基本名稱"
-
-#: ../plugins/save-attachments/save-attachments.c:340
-msgid "MIME Type"
-msgstr "MIME 類型"
-
-#: ../plugins/save-attachments/save-attachments.c:348
-msgid "Save"
-msgstr "儲存"
+msgid "SpamAssassin Options"
+msgstr "SpamAssassin 選項"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:163
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Description List"
 msgstr "描述清單"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Categories List"
 msgstr "分類清單"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Comment List"
 msgstr "註解清單"
 
-#: ../plugins/save-calendar/csv-format.c:367
-msgid "Created"
-msgstr "已建立"
-
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Contact List"
 msgstr "連絡人清單"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Start"
 msgstr "開始"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "End"
 msgstr "結束"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "percent Done"
 msgstr "％已完成"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "URL"
 msgstr "網址"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Attendees List"
 msgstr "到會者清單"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Modified"
 msgstr "已修改"
 
-#: ../plugins/save-calendar/csv-format.c:532
+#: ../plugins/save-calendar/csv-format.c:523
 msgid "Advanced options for the CSV format"
 msgstr "CSV 格式的進階選項"
 
-#: ../plugins/save-calendar/csv-format.c:539
+#: ../plugins/save-calendar/csv-format.c:530
 msgid "Prepend a header"
 msgstr "預設的檔頭"
 
-#: ../plugins/save-calendar/csv-format.c:548
+#: ../plugins/save-calendar/csv-format.c:539
 msgid "Value delimiter:"
 msgstr "數值定界符:"
 
-#: ../plugins/save-calendar/csv-format.c:554
+#: ../plugins/save-calendar/csv-format.c:545
 msgid "Record delimiter:"
 msgstr "記錄定界符:"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:551
 msgid "Encapsulate values with:"
 msgstr "以此封裝數值:"
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../plugins/save-calendar/csv-format.c:572
 msgid "Comma separated value format (.csv)"
 msgstr "逗號隔開的數值格式 (.csv)"
 
@@ -19698,8 +18391,8 @@ msgid "Save Selected"
 msgstr "儲存選取的"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Saves selected calendar or tasks list to disk."
-msgstr "將選定的行事曆或工作儲存至磁碟。"
+msgid "Save a calendar or task list to disk."
+msgstr "將行事曆或工作儲存至磁碟。"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
@@ -19714,21 +18407,21 @@ msgstr "儲存至磁碟(_S)"
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:372
 msgid "RDF format (.rdf)"
 msgstr "RDF 格式 (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:158
 msgid "Select destination file"
 msgstr "選取目的檔案"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "選擇一個來源"
+msgid "Quickly select a single calendar or task list for viewing."
+msgstr "快速選取要檢視的單一行事曆或工作清單。"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "選擇要檢視的單一行事曆或工作來源。"
+msgid "Select One Source"
+msgstr "選擇一個來源"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
@@ -19750,15 +18443,15 @@ msgstr "指引您完成初始帳號設定。"
 msgid "Setup Assistant"
 msgstr "設定助理"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 設定助理"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "歡迎使用"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -19770,35 +18463,35 @@ msgstr ""
 "\n"
 "請按一下「下一步」按鈕繼續。 "
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Importing files"
 msgstr "匯入檔案"
 
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
+#: ../plugins/startup-wizard/startup-wizard.c:117
+#: ../shell/e-shell-importer.c:138
 msgid "Please select the information that you would like to import:"
 msgstr "請選擇您想要匯入的資訊："
 
-#: ../plugins/startup-wizard/startup-wizard.c:152
-#: ../shell/e-shell-importer.c:394
+#: ../plugins/startup-wizard/startup-wizard.c:132
+#: ../shell/e-shell-importer.c:419
 #, c-format
 msgid "From %s:"
 msgstr "來自 %s："
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:505
+#: ../plugins/startup-wizard/startup-wizard.c:203
+#: ../shell/e-shell-importer.c:529
 #, c-format
 msgid "Importing data."
 msgstr "匯入資料。"
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:519
+#: ../plugins/startup-wizard/startup-wizard.c:205
+#: ../shell/e-shell-importer.c:543
 msgid "Please wait"
 msgstr "請稍候"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr "指示相關郵件功能是否應以主旨為準。"
+msgid "Sort mail message threads by subject."
+msgstr "以主旨為基礎串接郵件。"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -19819,15 +18512,15 @@ msgid ""
 "message body."
 msgstr "使用郵件內文的範本外掛程式可用的關鍵字/數值組清單。"
 
-#: ../plugins/templates/templates.c:603
+#: ../plugins/templates/templates.c:601
 msgid "No title"
 msgstr "沒有標題"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:709
 msgid "Save as _Template"
 msgstr "儲存為範本(_T)"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:711
 msgid "Save as Template"
 msgstr "儲存為範本"
 
@@ -19836,31 +18529,62 @@ msgid "Drafts based template plugin"
 msgstr "基於草稿的範本外掛程式"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "使用 yTNEF 解碼 TNEF 附加檔案的簡易外掛程式。"
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "解碼 Microsoft Outlook 的 TNEF (winmail.dat) 附件。"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "TNEF Attachment decoder"
-msgstr "TNEF 附加檔案解碼器"
+msgid "TNEF Decoder"
+msgstr "TNEF 解碼器"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+msgid "Inline vCards"
+msgstr "行內 vCard"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "直接在郵件中顯示 vCard。"
+
+#: ../plugins/vcard-inline/vcard-inline.c:159
+#: ../plugins/vcard-inline/vcard-inline.c:243
+msgid "Show Full vCard"
+msgstr "顯示完整的 vCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:162
+msgid "Show Compact vCard"
+msgstr "顯示精簡的 vCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:222
+msgid "There is one other contact."
+msgstr "還有連絡人。"
+
+#: ../plugins/vcard-inline/vcard-inline.c:231
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "還有 %d 個其他連絡人。"
+msgstr[1] "還有 %d 個其他連絡人。"
+
+#: ../plugins/vcard-inline/vcard-inline.c:252
+msgid "Save in Address Book"
+msgstr "存入通訊錄"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "A plugin to setup WebDAV contacts."
-msgstr "用來設定 WebDAV 連絡人的外掛程式。"
+msgid "Add WebDAV contacts to Evolution."
+msgstr "將 WebDAV 連絡人加入 Evolution。"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "WebDAV 連絡人"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:336
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
 msgid "URL:"
 msgstr "網址:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:363
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "避免 IfM_atch (需使用 Apache < 2.2.8)"
 
@@ -19945,43 +18669,61 @@ msgstr ""
 "gnome-keyring 或「~/.gnome2_private/Evolution」的密碼檔案取得。"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
+msgid "Initial attachment view"
+msgstr "初始附件檢視"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid "Initial file chooser folder"
+msgstr "檔案選擇對話盒的初始資料夾"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "GtkFileChooser 對話盒的初始資料夾。"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr "附件工具列元件的初始檢視。「0」是圖示，「1」是清單檢視。"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Last upgraded configuration version"
 msgstr "上次升級的組態版本"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "要同步至磁碟的資料夾，其路徑清單 (供離線使用)"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Non-proxy hosts"
 msgstr "不使用代理伺服器的主機"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "使用 HTTP 代理伺服器時進行認證的密碼。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Proxy configuration mode"
 msgstr "代理伺服器組態模式"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "SOCKS proxy host name"
 msgstr "SOCKS 代理伺服器主機名稱"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "SOCKS proxy port"
 msgstr "SOCKS 代理伺服器通訊埠"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Secure HTTP proxy host name"
 msgstr "安全式 HTTP 代理伺服器主機名稱"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Secure HTTP proxy port"
 msgstr "安全式 HTTP 代理伺服器通訊埠"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19992,42 +18734,42 @@ msgstr ""
 "值」、「不使用代理伺服器」、「使用手動代理伺服器組態」和「使用在 autoconfig "
 "url 中提供的代理伺服器組態」。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Sidebar is visible"
 msgstr "顯示側邊欄"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Skip development warning dialog"
 msgstr "忽略開發警告對話盒"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
+#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:489
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Statusbar is visible"
 msgstr "狀態列設為顯示"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr ""
 "Evolution 的組態版本，以 major/minor/configuration 層級表示(例如「2.6.0」) 。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default height for the main window, in pixels."
 msgstr "主視窗的預設高度，以像素計。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The default width for the main window, in pixels."
 msgstr "主視窗的預設寬度，以像素計。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The default width for the sidebar, in pixels."
 msgstr "資訊方塊列的預設寬度，以像素計。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -20035,19 +18777,19 @@ msgstr ""
 "上次升級的 Evolution 組態版本，以 major/minor/configuration 層級表示(例如"
 "「2.6.0」) 。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy HTTP through."
 msgstr "HTTP 代理伺服器主機名稱。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The machine name to proxy secure HTTP through."
 msgstr "用在安全式 HTTP 的代理伺服器主機名稱。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The machine name to proxy socks through."
 msgstr "socks 代理伺服器主機名稱。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -20055,7 +18797,7 @@ msgstr ""
 "定義於「/apps/evolution/shell/network_config/http_host」的代理伺服器主機通訊"
 "埠。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -20063,7 +18805,7 @@ msgstr ""
 "定義於「/apps/evolution/shell/network_config/secure_host」的代理伺服器主機通"
 "訊埠。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -20072,7 +18814,7 @@ msgstr ""
 "埠。"
 
 # (pofilter) gconf: do not translate gconf attribute: "text", "icons", "both", "toolbar", "toolbar"
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -20082,7 +18824,7 @@ msgstr ""
 "「toolbar」(工具列)。如果設為「toolbar」(工具列)，按鈕的風格會依 GNOME 工具列"
 "設定值決定。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -20093,57 +18835,57 @@ msgstr ""
 "機名稱、網域（開頭使用萬用字元如 *.foo.com）、IP 位址（IPv4 和 IPv6 皆可）或"
 "帶有子網路遮罩的位址（像是 192.168.0.0/24）。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Toolbar is visible"
 msgstr "工具列可以看到"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "URL that provides proxy configuration values."
 msgstr "提供代理伺服器組態的網址。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Use HTTP proxy"
 msgstr "使用 HTTP 代理伺服器"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr "使用 HTTP 代理伺服器時用來驗證的使用者名稱。"
 
 # zh_HK: msgstr "Evolution 是否以離線模式啟動取代線上模式。"
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution 是否以離線模式啟動取代線上模式。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether or not the window should be maximized."
 msgstr "視窗是否可以最大化。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the sidebar should be visible."
 msgstr "是否可以看到側邊欄。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the status bar should be visible."
 msgstr "是否顯示狀態列。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the toolbar should be visible."
 msgstr "是否可以看到工具列。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "是否省略 Evulution 開發版本的警告對話盒。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "是否可以看到視窗按鈕。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "視窗按鈕風格"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "視窗按鈕是可視的"
 
@@ -20159,21 +18901,21 @@ msgstr "作用中的連線"
 msgid "Click OK to close these connections and go offline"
 msgstr "按「確定」關閉這些連線以離線"
 
-#: ../shell/e-shell-importer.c:131
+#: ../shell/e-shell-importer.c:128
 msgid "Choose the type of importer to run:"
 msgstr "選擇匯入服務要執行的類型："
 
-#: ../shell/e-shell-importer.c:134
+#: ../shell/e-shell-importer.c:131
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr "選取要匯入 Evolution 的檔案，並且在清單內選取檔案類型。"
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the destination for this import"
 msgstr "選擇此輸入的目的地"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20185,58 +18927,62 @@ msgstr ""
 "輸入的設定值。如果您想\n"
 "再試一次，請按一下「上一步」按鈕。\n"
 
-#: ../shell/e-shell-importer.c:282
+#: ../shell/e-shell-importer.c:295
 msgid "F_ilename:"
 msgstr "檔案名稱(_I):"
 
-#: ../shell/e-shell-importer.c:287
+#: ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
-#: ../shell/e-shell-importer.c:296
+#: ../shell/e-shell-importer.c:309
 msgid "File _type:"
 msgstr "檔案類型(_T):"
 
-#: ../shell/e-shell-importer.c:332
+#: ../shell/e-shell-importer.c:357
 msgid "Import data and settings from _older programs"
 msgstr "從舊程式輸入資料和設定值(_O)"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:360
 msgid "Import a _single file"
 msgstr "匯入單一檔案(_S)"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-importer.c:724
+msgid "_Import"
+msgstr "匯入(_I)"
+
+#: ../shell/e-shell-settings-dialog.c:312
 msgid "Evolution Preferences"
 msgstr "Evolution 偏好設定"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window-commands.c:75
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "系統似乎沒有安裝 GNOME Pilot 工具。"
 
-#: ../shell/e-shell-window-commands.c:83
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
-msgid "Error executing %s."
-msgstr "執行 %s 發生錯誤。"
+msgid "Error executing %s. (%s)"
+msgstr "執行 %s 發生錯誤。(%s)"
 
-#: ../shell/e-shell-window-commands.c:139
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy is not installed."
 msgstr "未安裝設計錯誤部份。"
 
-#: ../shell/e-shell-window-commands.c:142
+#: ../shell/e-shell-window-commands.c:138
 msgid "Bug buddy could not be run."
 msgstr "無法執行 Bug buddy。"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:942
+#: ../shell/e-shell-window-commands.c:938
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -20247,87 +18993,87 @@ msgstr ""
 "Craig Jeffares <cjeffares@novell.com>, 2004\n"
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-commands.c:949
 msgid "Evolution Website"
 msgstr "Evolution 網站"
 
 # zh_HK: msgstr "線上工作(_W)"
-#: ../shell/e-shell-window-commands.c:1170
+#: ../shell/e-shell-window-commands.c:1163
 msgid "_Work Online"
 msgstr "線上工作(_W)"
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
-#: ../shell/e-shell-window-commands.c:1196
+#: ../shell/e-shell-window-commands.c:1189
 msgid "Work Offline"
 msgstr "離線工作"
 
 # zh_HK: msgstr "Evolution 目前為線上模式。按一下此按鈕以進行離線工作。"
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:372
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
 msgstr "Evolution 目前為線上模式。按一下此按鈕以進行離線工作。"
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution 正在離線的程序中。"
 
 # zh_HK: msgstr "Evolution 目前為離線模式。按一下此按鈕以進行線上工作。"
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:386
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
 msgstr "Evolution 目前為離線模式。按一下此按鈕以進行線上工作。"
 
-#: ../shell/e-shell-window.c:787
+#: ../shell/e-shell-window.c:778
 #, c-format
 msgid "Switch to %s"
 msgstr "切換至 %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:634
 msgid "Unknown system error."
 msgstr "不明的系統錯誤。"
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
+#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
 msgid "OK"
 msgstr "確定"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1253
 msgid "Invalid arguments"
 msgstr "無效的引數"
 
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1255
 msgid "Cannot register on OAF"
 msgstr "不能於 OAF 註冊"
 
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1257
 msgid "Configuration Database not found"
 msgstr "找不到組態資料庫"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:674
+#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:689
 msgid "New"
 msgstr "新增"
 
-#: ../shell/test/evolution-test-component.c:105
+#: ../shell/test/evolution-test-component.c:103
 msgid "New Test"
 msgstr "新測試"
 
-#: ../shell/test/evolution-test-component.c:106
+#: ../shell/test/evolution-test-component.c:104
 msgctxt "New"
 msgid "_Test"
 msgstr "測試(_T)"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "Create a new test item"
 msgstr "建立新的測試項目"
 
@@ -20370,7 +19116,7 @@ msgstr ""
 "匯入到 Evolution。"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20405,7 +19151,7 @@ msgstr ""
 "我們希望您享受工作成果，而且我們\n"
 "熱切希望您提供意見！\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20413,44 +19159,44 @@ msgstr ""
 "謝謝\n"
 "Evolution 小組敬上\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "不要再顯示這個訊息"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr "啟動 Evolution 會啟動指定的元件"
 
 # zh_HK: msgstr "以線上模式啟動"
-#: ../shell/main.c:485
+#: ../shell/main.c:491
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:494
 msgid "Forcibly shut down all Evolution components"
 msgstr "強制關閉所有 Evoultion 元件"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "強制從 Evolution 1.4 重新移轉"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:501
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
 
-#: ../shell/main.c:497
+#: ../shell/main.c:503
 msgid "Disable loading of any plugins."
 msgstr "停用對任何外掛程式的載入。"
 
-#: ../shell/main.c:499
+#: ../shell/main.c:505
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "停用郵件、連絡人和工作的預覽窗格。"
 
-#: ../shell/main.c:586
+#: ../shell/main.c:614
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM 與郵件客戶端"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20601,7 +19347,7 @@ msgstr ""
 "\n"
 "編輯信任設定值："
 
-#: ../smime/gui/cert-trust-dialog.c:151
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20610,7 +19356,7 @@ msgstr ""
 "因為您信任發出此憑證的憑證單位，所以除非在此指示，否則您將信任此憑證的有效"
 "性。"
 
-#: ../smime/gui/cert-trust-dialog.c:155
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20619,51 +19365,51 @@ msgstr ""
 "因為您不信任發出此憑證的憑證單位，所以除非在此指示，否則您將不信任此憑證的有"
 "效性。"
 
-#: ../smime/gui/certificate-manager.c:137
-#: ../smime/gui/certificate-manager.c:380
-#: ../smime/gui/certificate-manager.c:604
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:611
 msgid "Select a certificate to import..."
 msgstr "選取要匯入的憑證..."
 
-#: ../smime/gui/certificate-manager.c:146
+#: ../smime/gui/certificate-manager.c:145
 msgid "All PKCS12 files"
 msgstr "所有的 PKCS12 檔案"
 
 #: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:394
-#: ../smime/gui/certificate-manager.c:618
+#: ../smime/gui/certificate-manager.c:398
+#: ../smime/gui/certificate-manager.c:625
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../smime/gui/certificate-manager.c:271
-#: ../smime/gui/certificate-manager.c:480
-#: ../smime/gui/certificate-manager.c:702
+#: ../smime/gui/certificate-manager.c:275
+#: ../smime/gui/certificate-manager.c:488
+#: ../smime/gui/certificate-manager.c:713
 msgid "Certificate Name"
 msgstr "憑證名稱"
 
-#: ../smime/gui/certificate-manager.c:280
-#: ../smime/gui/certificate-manager.c:498
+#: ../smime/gui/certificate-manager.c:284
+#: ../smime/gui/certificate-manager.c:506
 msgid "Purposes"
 msgstr "用途"
 
-#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:553
+#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "序號"
 
-#: ../smime/gui/certificate-manager.c:297
+#: ../smime/gui/certificate-manager.c:301
 msgid "Expires"
 msgstr "到期"
 
-#: ../smime/gui/certificate-manager.c:389
+#: ../smime/gui/certificate-manager.c:392
 msgid "All email certificate files"
 msgstr "所有的電子郵件憑證檔案"
 
-#: ../smime/gui/certificate-manager.c:489
+#: ../smime/gui/certificate-manager.c:497
 msgid "E-Mail Address"
 msgstr "電子郵件地址"
 
-#: ../smime/gui/certificate-manager.c:613
+#: ../smime/gui/certificate-manager.c:620
 msgid "All CA certificate files"
 msgstr "所有的 CA 憑證檔案"
 
@@ -20765,7 +19511,7 @@ msgstr ""
 "信任此憑證管理中心之前，如果可以的話，您應該先檢查它的憑證以及它的政策和程"
 "序。"
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "憑證"
 
@@ -20841,11 +19587,11 @@ msgstr "組織單位 (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指紋"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "SSL 用戶端憑證"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "SSL 伺服器憑證"
 
@@ -20891,7 +19637,7 @@ msgid "_Edit CA Trust"
 msgstr "編輯憑證管理中心 (_CA) 信任度"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:656
+#: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
 msgstr "憑證已經存在"
 
@@ -20900,161 +19646,161 @@ msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr "簽署"
 
-#: ../smime/lib/e-cert.c:409
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr "加密"
 
-#: ../smime/lib/e-cert.c:514
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr "版本"
 
-#: ../smime/lib/e-cert.c:529
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr "版本 1"
 
-#: ../smime/lib/e-cert.c:532
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "版本 2"
 
-#: ../smime/lib/e-cert.c:535
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "版本 3"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 附 RSA 加密"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 附 RSA 加密"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 附 RSA 加密"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA 加密"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "憑證金鑰使用"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "Netscape 憑證類型"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "憑證管理中心金鑰識別碼"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "物件識別碼 (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr "演算法識別碼"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-cert.c:728
 msgid "Algorithm Parameters"
 msgstr "演算法參數"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:750
 msgid "Subject Public Key Info"
 msgstr "主旨公鑰資訊"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:755
 msgid "Subject Public Key Algorithm"
 msgstr "主旨公鑰演算法"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-cert.c:770
 msgid "Subject's Public Key"
 msgstr "主旨的公鑰"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr "錯誤：無法處理延伸"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "物件簽署者"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-cert.c:816
 msgid "SSL Certificate Authority"
 msgstr "SSL 憑證單位"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-cert.c:820
 msgid "Email Certificate Authority"
 msgstr "電子郵件單位"
 
-#: ../smime/lib/e-cert.c:850
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr "簽署中"
 
-#: ../smime/lib/e-cert.c:854
+#: ../smime/lib/e-cert.c:852
 msgid "Non-repudiation"
 msgstr "不可拒絕"
 
-#: ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:856
 msgid "Key Encipherment"
 msgstr "金鑰加密"
 
-#: ../smime/lib/e-cert.c:862
+#: ../smime/lib/e-cert.c:860
 msgid "Data Encipherment"
 msgstr "資料密碼"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:864
 msgid "Key Agreement"
 msgstr "金鑰合同"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:868
 msgid "Certificate Signer"
 msgstr "憑證簽署者"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:872
 msgid "CRL Signer"
 msgstr "CRL 簽署者"
 
-#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr "重要"
 
-#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
+#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "不重要"
 
-#: ../smime/lib/e-cert.c:948
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr "延伸"
 
-#: ../smime/lib/e-cert.c:1019
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
+#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "憑證簽章演算法"
 
-#: ../smime/lib/e-cert.c:1084
+#: ../smime/lib/e-cert.c:1081
 msgid "Issuer"
 msgstr "發照者"
 
-#: ../smime/lib/e-cert.c:1138
+#: ../smime/lib/e-cert.c:1135
 msgid "Issuer Unique ID"
 msgstr "發照者獨有 ID"
 
-#: ../smime/lib/e-cert.c:1157
+#: ../smime/lib/e-cert.c:1154
 msgid "Subject Unique ID"
 msgstr "主旨獨有 ID"
 
-#: ../smime/lib/e-cert.c:1200
+#: ../smime/lib/e-cert.c:1197
 msgid "Certificate Signature Value"
 msgstr "憑證簽章值"
 
@@ -21204,7 +19950,7 @@ msgstr "將選取的連絡人儲存為 VCard"
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "將選定資料夾中的連絡人儲存為 VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2721
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
 msgid "Select All"
 msgstr "全部選取"
 
@@ -21338,7 +20084,7 @@ msgid "Month"
 msgstr "月"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
+#: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "下一個"
 
@@ -21347,8 +20093,8 @@ msgstr "下一個"
 msgid "Previews the calendar to be printed"
 msgstr "預覽將要打印的行事曆內容"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:171
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
+#: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "上一個"
 
@@ -21659,7 +20405,7 @@ msgstr "相關郵件清單"
 msgid "_Group By Threads"
 msgstr "依相關郵件為群組(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "郵件(_M)"
@@ -21914,201 +20660,185 @@ msgid "Paste messages from the clipboard"
 msgstr "自剪貼簿貼上郵件"
 
 #: ../ui/evolution-mail-message.xml.h:68
-msgid "Pos_t New Message to Folder"
-msgstr "張貼新郵件到資料夾(_T)"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Post a Repl_y"
-msgstr "張貼回覆(_Y)"
-
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "張貼新郵件到公開資料夾"
-
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a reply to a message in a Public folder"
-msgstr "張貼郵件的回覆至公開資料夾"
-
-#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "上一封重要郵件(_E)"
 
 # zh_HK: msgstr "預覽需要打印的郵件"
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Preview the message to be printed"
 msgstr "預覽需要打印的郵件"
 
 # zh_HK: msgstr "打印郵件"
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Print this message"
 msgstr "打印郵件"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Re_direct"
 msgstr "重新導向(_D)"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "將選定的郵件重新導向給某人"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
 msgstr "重設文字為原始大小"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Save the selected messages as a text file"
 msgstr "將選定的郵件另存成文字檔案"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Search Folder from Mailing _List..."
 msgstr "通信論壇搜尋資料夾(_L)..."
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Search Folder from Recipien_ts..."
 msgstr "從收件者搜尋資料夾(_T)..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search Folder from S_ubject..."
 msgstr "主旨搜尋資料夾(_U)..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Sen_der..."
 msgstr "寄件者搜尋資料夾(_D)..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search for text in the body of the displayed message"
 msgstr "搜尋顯示的郵件本文中的文字"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Select _All Text"
 msgstr "選取所有文字(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Select all the text in a message"
 msgstr "選擇郵件中的所有文字"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "設定您目前印表機的版面設定"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在顯示的郵件內文中顯示閃爍游標"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show messages with all email headers"
 msgstr "顯示郵件及詳細檔頭"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "顯示郵件原始檔"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Undelete the selected messages"
 msgstr "取消刪除選定的郵件"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Zoom _Out"
 msgstr "拉遠(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "附件(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "_Caret Mode"
 msgstr "漏字模式(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "_Clear Flag"
 msgstr "清除標幟(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Delete Message"
 msgstr "刪除郵件(_D)"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Find in Message..."
 msgstr "在郵件內尋找(_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Flag Completed"
 msgstr "標幟已完成(_F)"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "移至(_G)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Important"
 msgstr "重要(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Inline"
 msgstr "行內(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Junk"
 msgstr "垃圾郵件(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Load Images"
 msgstr "載入圖片(_L)"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Message Source"
 msgstr "郵件來源(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "下一封郵件(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "正常大小(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "不是垃圾郵件(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "在新視窗開啟(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "上一封郵件(_P)"
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Quoted"
 msgstr "引文(_Q)"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Read"
 msgstr "已閱讀(_R)"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Save Message..."
 msgstr "儲存郵件(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Undelete Message"
 msgstr "復原刪除郵件(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Unread"
 msgstr "未閱讀(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Zoom"
 msgstr "縮放(_Z)"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Zoom In"
 msgstr "拉近(_Z)"
 
@@ -22473,11 +21203,11 @@ msgid "With _Status"
 msgstr "設定狀態(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:421
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:423
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:425
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:764
 msgid "UTC"
 msgstr "UTC"
 
@@ -22506,19 +21236,19 @@ msgstr ""
 "使用滑鼠左鍵拉近地圖的區域，然後選取時區。\n"
 "使用滑鼠右鍵拉遠。"
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "收集"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "定義 %s 的檢視"
 
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "定義檢視"
 
@@ -22528,17 +21258,16 @@ msgid "Define Views for \"%s\""
 msgstr "定義「%s」的檢視"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "表格"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 msgid "Instance"
 msgstr "實體"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
 msgid "Save Current View"
 msgstr "儲存目前檢視"
 
@@ -22551,17 +21280,17 @@ msgid "_Replace existing view"
 msgstr "置換現存的檢視(_R)"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:581
-#: ../widgets/menus/gal-view-menus.c:367
+#: ../widgets/menus/gal-view-instance.c:580
+#: ../widgets/menus/gal-view-menus.c:365
 msgid "Custom View"
 msgstr "自訂檢視"
 
-#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-instance.c:581
 msgid "Save Custom View"
 msgstr "儲存自訂檢視"
 
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:388
 msgid "Define Views..."
 msgstr "定義檢視..."
 
@@ -22569,32 +21298,32 @@ msgstr "定義檢視..."
 msgid "C_urrent View"
 msgstr "目前檢視(_U)"
 
-#: ../widgets/menus/gal-view-menus.c:328
+#: ../widgets/menus/gal-view-menus.c:327
 #, c-format
 msgid "Select View: %s"
 msgstr "選擇檢視：%s"
 
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-menus.c:370
 msgid "Current view is a customized view"
 msgstr "目前的檢視方式是自訂的檢視"
 
-#: ../widgets/menus/gal-view-menus.c:377
+#: ../widgets/menus/gal-view-menus.c:374
 msgid "Save Custom View..."
 msgstr "儲存自訂檢視..."
 
-#: ../widgets/menus/gal-view-menus.c:382
+#: ../widgets/menus/gal-view-menus.c:379
 msgid "Save current custom view"
 msgstr "儲存目前的自訂檢視"
 
-#: ../widgets/menus/gal-view-menus.c:396
+#: ../widgets/menus/gal-view-menus.c:393
 msgid "Create or edit views"
 msgstr "建立或編輯檢視(_C)"
 
-#: ../widgets/menus/gal-view-new-dialog.c:70
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "工廠"
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
 msgstr "定義新的檢視"
 
@@ -22610,64 +21339,166 @@ msgstr "檢視的類型"
 msgid "Type of view:"
 msgstr "檢視的類型:"
 
-#: ../widgets/misc/e-attachment-bar.c:1132
-msgid "Attachment Bar"
-msgstr "附加檔案列"
+#: ../widgets/misc/e-attachment.c:940
+msgid "Attached message"
+msgstr "附加的郵件"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1723 ../widgets/misc/e-attachment.c:2261
+#: ../widgets/misc/e-attachment-store.c:636
+msgid "attachment.dat"
+msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:1770 ../widgets/misc/e-attachment.c:2567
+msgid "A load operation is already in progress"
+msgstr "載入操作已在進行中"
+
+#: ../widgets/misc/e-attachment.c:1778 ../widgets/misc/e-attachment.c:2575
+msgid "A save operation is already in progress"
+msgstr "儲存操作已在進行中"
+
+#: ../widgets/misc/e-attachment.c:1871
 #, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "不能附加檔案 %s： %s"
+msgid "Could not load '%s'"
+msgstr "無法載入「%s」"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:1874
 #, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "不能附加檔案 %s：不是一個合法的檔案"
+msgid "Could not load the attachment"
+msgstr "無法載入附件"
 
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/e-attachment.c:2138
+#, c-format
+msgid "Could not open '%s'"
+msgstr "無法開啟「%s」"
+
+#: ../widgets/misc/e-attachment.c:2141
+#, c-format
+msgid "Could not open the attachment"
+msgstr "無法開啟附件"
+
+#: ../widgets/misc/e-attachment.c:2583
+msgid "Attachment contents not loaded"
+msgstr "無法載入附件內容"
+
+#: ../widgets/misc/e-attachment.c:2660
+#, c-format
+msgid "Could not save '%s'"
+msgstr "無法儲存「%s」"
+
+#: ../widgets/misc/e-attachment.c:2663
+#, c-format
+msgid "Could not save the attachment"
+msgstr "無法儲存附件"
+
+#: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "附件內容"
 
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "檔案名稱:"
+#: ../widgets/misc/e-attachment-dialog.c:328
+msgid "_Filename:"
+msgstr "檔案名稱(_F):"
+
+#: ../widgets/misc/e-attachment-dialog.c:363
+msgid "MIME Type:"
+msgstr "MIME 類型："
+
+#: ../widgets/misc/e-attachment-handler-image.c:95
+msgid "Could not set as background"
+msgstr "無法設為背景"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "無法送出附件。"
+msgstr[1] "無法送出附件。"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+msgid "_Send To..."
+msgstr "傳送至(_S)..."
 
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME 類型:"
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+msgid "Send the selected attachments somewhere"
+msgstr "傳送選取的附件到別處"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "建議自動顯示附件"
+#: ../widgets/misc/e-attachment-icon-view.c:473
+#: ../widgets/misc/e-attachment-tree-view.c:517
+msgid "Loading"
+msgstr "載入中"
+
+#: ../widgets/misc/e-attachment-icon-view.c:485
+#: ../widgets/misc/e-attachment-tree-view.c:529
+msgid "Saving"
+msgstr "儲存中"
+
+#: ../widgets/misc/e-attachment-paned.c:81
+msgid "Hide _Attachment Bar"
+msgstr "隱藏附加檔案列(_A)"
+
+#: ../widgets/misc/e-attachment-paned.c:83
+#: ../widgets/misc/e-attachment-paned.c:620
+msgid "Show _Attachment Bar"
+msgstr "顯示附加檔案列(_A)"
+
+#: ../widgets/misc/e-attachment-store.c:541
+msgid "Add Attachment"
+msgstr "加入附件"
+
+#: ../widgets/misc/e-attachment-store.c:544
+msgid "A_ttach"
+msgstr "附加(_T)"
+
+#: ../widgets/misc/e-attachment-store.c:607
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "儲存附件"
+msgstr[1] "儲存附件"
+
+#: ../widgets/misc/e-attachment-view.c:300
+msgid "S_ave All"
+msgstr "儲存全部(_A)"
+
+#: ../widgets/misc/e-attachment-view.c:326
+msgid "A_dd Attachment..."
+msgstr "加入附件(_A)..."
+
+#: ../widgets/misc/e-attachment-view.c:643
+#, c-format
+msgid "Open with \"%s\""
+msgstr "以「%s」開啟"
+
+#: ../widgets/misc/e-attachment-view.c:646
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "在 %s 中開啟這個附件"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1267
+#: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
 msgstr "%Y 年 %-m 月"
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:217
 msgid "Month Calendar"
 msgstr "月行事曆"
 
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3641
-#: ../widgets/text/e-text.c:3642
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 msgid "Fill color"
 msgstr "填入色彩"
 
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3648
-#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3656
-#: ../widgets/text/e-text.c:3657
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
 msgid "GDK fill color"
 msgstr "GDK 填色"
 
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3663
-#: ../widgets/text/e-text.c:3664
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "填入網點"
 
@@ -22691,26 +21522,25 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
-#: ../widgets/table/e-table-group-container.c:1004
+#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
+#: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "最小寬度"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
-#: ../widgets/table/e-table-group-container.c:1005
+#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
+#: ../widgets/table/e-table-group-container.c:1002
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "最小寬度"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "間距"
 
-#: ../widgets/misc/e-cell-date-edit.c:289
+#: ../widgets/misc/e-cell-date-edit.c:296
 msgid "Now"
 msgstr "現在"
 
@@ -22719,7 +21549,7 @@ msgstr "現在"
 msgid "The time must be in the format: %s"
 msgstr "時間必須為此格式：%s"
 
-#: ../widgets/misc/e-cell-percent.c:77
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "數值必須是由 0 到 100 的數字"
 
@@ -22818,144 +21648,90 @@ msgstr "其它..."
 msgid "Ch_aracter Encoding"
 msgstr "字元編碼(_A)"
 
-#: ../widgets/misc/e-dateedit.c:303
+#: ../widgets/misc/e-dateedit.c:295
 msgid "Date and Time"
 msgstr "日期與時刻"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:315
 msgid "Text entry to input date"
 msgstr "用來輸入日期的文字項目"
 
-#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:337
 msgid "Click this button to show a calendar"
 msgstr "按此按鈕以顯示行事曆"
 
-#: ../widgets/misc/e-dateedit.c:388
+#: ../widgets/misc/e-dateedit.c:379
 msgid "Drop-down combination box to select time"
 msgstr "用以選擇時刻的下拉式組合方塊"
 
-#: ../widgets/misc/e-dateedit.c:464
+#: ../widgets/misc/e-dateedit.c:455
 msgid "No_w"
 msgstr "現在(_W)"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:461
 msgid "_Today"
 msgstr "今天(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1635
+#: ../widgets/misc/e-dateedit.c:1583
 msgid "Invalid Date Value"
 msgstr "無效的日期數值"
 
-#: ../widgets/misc/e-dateedit.c:1664
+#: ../widgets/misc/e-dateedit.c:1613
 msgid "Invalid Time Value"
 msgstr "無效的時刻數值"
 
-#: ../widgets/misc/e-expander.c:182
-msgid "Expanded"
-msgstr "展開"
-
-#: ../widgets/misc/e-expander.c:183
-msgid "Whether or not the expander is expanded"
-msgstr "是否打開展開器"
-
-#: ../widgets/misc/e-expander.c:191
-msgid "Text of the expander's label"
-msgstr "展開器標籤的文字"
-
-#: ../widgets/misc/e-expander.c:198
-msgid "Use underline"
-msgstr "使用底線"
-
-#: ../widgets/misc/e-expander.c:199
-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:207
-msgid "Space to put between the label and the child"
-msgstr "區隔子元件與文字標籤的額外的空間"
-
-#: ../widgets/misc/e-expander.c:216
-msgid "Label widget"
-msgstr "標籤元件"
-
-#: ../widgets/misc/e-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr "可於一般展開器標籤中顯示的元件"
-
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
-msgid "Expander Size"
-msgstr "展開器大小"
-
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
-msgid "Size of the expander arrow"
-msgstr "展開器箭號的大小"
-
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "指示器間距"
-
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "展開器箭頭周圍的間距"
-
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180
-#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:750
+#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
+#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:231
+#: ../widgets/misc/e-filter-bar.c:229
 msgid "Save Search"
 msgstr "儲存搜尋結果"
 
-#: ../widgets/misc/e-filter-bar.c:268
+#: ../widgets/misc/e-filter-bar.c:266
 msgid "_Searches"
 msgstr "搜尋(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:268
 msgid "Searches"
 msgstr "搜尋"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "儲存搜尋結果(_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "編輯儲存的搜尋結果(_E)..."
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "進階搜尋(_A)..."
 
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "所有的帳號"
 
-#: ../widgets/misc/e-filter-bar.h:108
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
 msgstr "目前的帳號"
 
-#: ../widgets/misc/e-filter-bar.h:109
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "目前的資料夾"
 
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "Current Message"
-msgstr "目前的郵件"
-
-#: ../widgets/misc/e-image-chooser.c:169
+#: ../widgets/misc/e-image-chooser.c:166
 msgid "Choose Image"
 msgstr "選擇圖片"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "世界地圖"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:607
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -22971,102 +21747,100 @@ msgstr "上線"
 msgid "The button state is online"
 msgstr "按鈕狀態為上線"
 
-#: ../widgets/misc/e-pilot-settings.c:102
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "同步對象:"
 
-#: ../widgets/misc/e-pilot-settings.c:110
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
 msgstr "同步私人記錄:"
 
-#: ../widgets/misc/e-pilot-settings.c:119
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr "同步分類:"
 
-#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
+#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
 msgid "Empty message"
 msgstr "空白郵件"
 
-#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
 msgid "Reflow model"
 msgstr "回流模式"
 
-#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 msgid "Column width"
 msgstr "欄寬"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:339 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Search"
 msgstr "搜尋"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:339 ../widgets/misc/e-search-bar.c:474
+#: ../widgets/misc/e-search-bar.c:476
 msgid "Click here to change the search type"
 msgstr "按這裡以改變搜尋類型"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../widgets/misc/e-search-bar.c:609
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Find Now"
 msgstr "立即搜尋(_F)"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:614
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../widgets/misc/e-search-bar.c:865
+#: ../widgets/misc/e-search-bar.c:869
 msgid "Item ID"
 msgstr "項目 ID"
 
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3563
-#: ../widgets/text/e-text.c:3564
+#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
 msgid "Text"
 msgstr "文字"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1003
+#: ../widgets/misc/e-search-bar.c:1011
 msgid "Sho_w: "
 msgstr "顯示(_W):"
 
-#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
-#. the term to search for
-#: ../widgets/misc/e-search-bar.c:1020
+#: ../widgets/misc/e-search-bar.c:1030
 msgid "Sear_ch: "
 msgstr "搜尋(_C):"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1032
+#: ../widgets/misc/e-search-bar.c:1046
 msgid " i_n "
 msgstr " i_n "
 
-#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:806
+#: ../widgets/misc/e-selection-model-array.c:593
+#: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
 msgstr "游標列"
 
-#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:813
+#: ../widgets/misc/e-selection-model-array.c:600
+#: ../widgets/table/e-tree-selection-model.c:810
 msgid "Cursor Column"
 msgstr "游標欄"
 
-#: ../widgets/misc/e-selection-model.c:209
+#: ../widgets/misc/e-selection-model.c:208
 msgid "Sorter"
 msgstr "分類器"
 
-#: ../widgets/misc/e-selection-model.c:216
+#: ../widgets/misc/e-selection-model.c:215
 msgid "Selection Mode"
 msgstr "選擇區模式"
 
-#: ../widgets/misc/e-selection-model.c:224
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Cursor Mode"
 msgstr "游標模式"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:519
 msgid "When de_leted:"
 msgstr "刪除時(_L):"
 
@@ -23090,19 +21864,19 @@ msgstr "<b>狀態追蹤</b>"
 msgid "A_uto-delete sent item"
 msgstr "自動刪除項目(_U)"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Creat_e a sent item to track information"
 msgstr "建立新的傳送項目至追蹤資訊(_E)"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
 msgstr "已遞送與已開啟(_V)"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Gene_ral Options"
 msgstr "一般選項(_R)"
 
-#: ../widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -23110,7 +21884,7 @@ msgstr ""
 "無\n"
 "讀信回條"
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -23126,15 +21900,15 @@ msgstr ""
 "極機密\n"
 "只有您能看"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
 msgstr "要求回覆(_E)"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
 msgstr "狀態追蹤(_T)"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid ""
 "Undefined\n"
 "High\n"
@@ -23146,30 +21920,34 @@ msgstr ""
 "標準\n"
 "低"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "當接受時(_P):"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "當完成時(_M):"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
 msgstr "當拒絕時(_N):"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "Wi_thin"
 msgstr "於內(_T)"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_After:"
 msgstr "之後(_A):"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_All information"
 msgstr "全部資訊(_A)"
 
+#: ../widgets/misc/e-send-options.glade.h:30
+msgid "_Classification:"
+msgstr "歸類(_C):"
+
 #. To translators: This means Delay the message delivery for some time
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
@@ -23196,43 +21974,27 @@ msgid "_When opened:"
 msgstr "當開啟時(_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:252
+#: ../widgets/misc/e-task-widget.c:251
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:258
+#: ../widgets/misc/e-task-widget.c:257
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
 msgstr "按這裡以移至 URL"
 
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "Edit Master Category List..."
-msgstr "編輯主分類清單..."
-
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "屬於這些分類的項目(_C):"
-
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "可用的分類(_A):"
-
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "分類"
-
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "彈出式清單"
 
-#: ../widgets/table/e-cell-date.c:62
+#: ../widgets/table/e-cell-date.c:63
 msgid "%l:%M %p"
 msgstr "%p %l:%M"
 
@@ -23248,23 +22010,23 @@ msgstr "聚焦的欄"
 msgid "Unselected Column"
 msgstr "未選擇的欄"
 
-#: ../widgets/table/e-cell-text.c:1794
+#: ../widgets/table/e-cell-text.c:1788
 msgid "Strikeout Column"
 msgstr "刪除線欄"
 
-#: ../widgets/table/e-cell-text.c:1801
+#: ../widgets/table/e-cell-text.c:1795
 msgid "Underline Column"
 msgstr "底線欄"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Bold Column"
 msgstr "粗體欄"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Color Column"
 msgstr "色彩欄"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1823
 msgid "BG Color Column"
 msgstr "背景色彩欄"
 
@@ -23288,12 +22050,12 @@ msgstr "未排序"
 msgid "No grouping"
 msgstr "未組成群組"
 
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:642
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "顯示欄位"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:663
 msgid "Available Fields"
 msgstr "可用的欄位"
 
@@ -23302,7 +22064,7 @@ msgid "A_vailable Fields:"
 msgstr "可用的欄位(_V):"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Ascending"
 msgstr "遞增"
 
@@ -23315,7 +22077,7 @@ msgid "Clear _All"
 msgstr "全部清除(_A)"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Descending"
 msgstr "遞減"
 
@@ -23375,21 +22137,7 @@ msgstr "依序顯示這些欄位(_S):"
 msgid "_Sort..."
 msgstr "排序(_S)..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:633
-#: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1886
-msgid "DnD code"
-msgstr "DnD 碼"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:640
-#: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1900
-msgid "Full Header"
-msgstr "完整檔頭"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
 msgstr "加入一欄..."
 
@@ -23405,310 +22153,1254 @@ msgstr ""
 "想在您的表格中加入欄位，只要將它\n"
 "拖曳至您希望它出現的位置即可。"
 
-#: ../widgets/table/e-table-group-container.c:344
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (%d 個項目)"
 msgstr[1] "%s : %s (%d 個項目)"
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d 個項目)"
 msgstr[1] "%s (%d 個項目)"
 
-#: ../widgets/table/e-table-group-container.c:927
-#: ../widgets/table/e-table-group-container.c:928
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "列與列間交替使用的色彩"
 
-#: ../widgets/table/e-table-group-container.c:934
-#: ../widgets/table/e-table-group-container.c:935
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "水平繪圖格"
 
-#: ../widgets/table/e-table-group-container.c:941
-#: ../widgets/table/e-table-group-container.c:942
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "垂直繪圖格"
 
-#: ../widgets/table/e-table-group-container.c:948
-#: ../widgets/table/e-table-group-container.c:949
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "繪圖焦點"
 
-#: ../widgets/table/e-table-group-container.c:955
-#: ../widgets/table/e-table-group-container.c:956
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
+#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "游標模式"
 
-#: ../widgets/table/e-table-group-container.c:962
-#: ../widgets/table/e-table-group-container.c:963
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "選擇區模型"
 
-#: ../widgets/table/e-table-group-container.c:969
-#: ../widgets/table/e-table-group-container.c:970
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
 msgstr "界限長度"
 
-#: ../widgets/table/e-table-group-container.c:976
-#: ../widgets/table/e-table-group-container.c:977
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3369
-#: ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
 msgstr "標準列高"
 
-#: ../widgets/table/e-table-group-container.c:983
-#: ../widgets/table/e-table-group-container.c:984
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
 #: ../widgets/table/e-table-group-leaf.c:656
 #: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "凍結"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1449
 msgid "Customize Current View"
 msgstr "自訂目前的檢視"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1469
 msgid "Sort _Ascending"
 msgstr "遞增排序(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Descending"
 msgstr "遞減排序(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "_Unsort"
 msgstr "不排序(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Group By This _Field"
 msgstr "依此欄位做群組(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By _Box"
 msgstr "依方塊為群組(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Remove This _Column"
 msgstr "移除此欄(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Add a C_olumn..."
 msgstr "加入一欄(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "A_lignment"
 msgstr "排列(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "B_est Fit"
 msgstr "最適填滿(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Format Column_s..."
 msgstr "格式化欄(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "Custo_mize Current View..."
 msgstr "自訂目前的檢視(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Sort By"
 msgstr "排序方式(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "_Custom"
 msgstr "自訂(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1893
-msgid "Font Description"
-msgstr "字型描述"
-
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:172
-msgid "Sort Info"
-msgstr "排序資訊"
-
-#: ../widgets/table/e-table-header-item.c:1928
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "樹狀"
-
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "表格標題"
 
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "表格模型"
 
-#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "游標列"
 
-#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3376
-#: ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "排序資訊"
+
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
 msgid "Always search"
 msgstr "總是搜尋"
 
-#: ../widgets/table/e-table.c:3345
+#: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
 msgstr "請按這裡加入"
 
-#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "樹狀"
+
+#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "ETree 表格橋接器"
 
-#: ../widgets/table/e-tree.c:3383
+#: ../widgets/table/e-tree.c:3379
 msgid "Retro Look"
 msgstr "懷舊外觀"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3380
 msgid "Draw lines and +/- expanders."
 msgstr "繪出線條與 +/- 展開符號。"
 
-#: ../widgets/text/e-text.c:2733
+#: ../widgets/table/e-tree.c:3386
+msgid "Expander Size"
+msgstr "展開器大小"
+
+#: ../widgets/table/e-tree.c:3387
+msgid "Size of the expander arrow"
+msgstr "展開器箭號的大小"
+
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "輸入法"
 
-#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "Event Processor"
 msgstr "事件處理器"
 
-#: ../widgets/text/e-text.c:3570 ../widgets/text/e-text.c:3571
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "粗體"
 
-#: ../widgets/text/e-text.c:3577 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "刪除線"
 
-#: ../widgets/text/e-text.c:3584 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "錨點"
 
-#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "左右對齊"
 
-#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "剪輯寬度"
 
-#: ../widgets/text/e-text.c:3606 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "剪輯高度"
 
-#: ../widgets/text/e-text.c:3613 ../widgets/text/e-text.c:3614
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "剪輯"
 
-#: ../widgets/text/e-text.c:3620 ../widgets/text/e-text.c:3621
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "填滿剪輯方塊"
 
-#: ../widgets/text/e-text.c:3627 ../widgets/text/e-text.c:3628
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "X 位移"
 
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "Y 位移"
 
-#: ../widgets/text/e-text.c:3670 ../widgets/text/e-text.c:3671
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "文字寬度"
 
-#: ../widgets/text/e-text.c:3677 ../widgets/text/e-text.c:3678
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "文字高度"
 
-#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "使用省略號"
 
-#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "橢圓"
 
-#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "換行"
 
-#: ../widgets/text/e-text.c:3713 ../widgets/text/e-text.c:3714
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "中斷字元"
 
-#: ../widgets/text/e-text.c:3720 ../widgets/text/e-text.c:3721
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "最大行數"
 
-#: ../widgets/text/e-text.c:3742 ../widgets/text/e-text.c:3743
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "繪製框線"
 
-#: ../widgets/text/e-text.c:3749 ../widgets/text/e-text.c:3750
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "允許新行"
 
-#: ../widgets/text/e-text.c:3756 ../widgets/text/e-text.c:3757
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "繪製背景"
 
-#: ../widgets/text/e-text.c:3763 ../widgets/text/e-text.c:3764
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "繪製按鈕"
 
-#: ../widgets/text/e-text.c:3770 ../widgets/text/e-text.c:3771
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Cursor position"
 msgstr "游標位置"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3780
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "IM 快顯視窗"
 
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "處理彈出式項目"
 
-#~ msgid ""
-#~ "We were unable to open this address book.  This either means you have "
-#~ "entered an incorrect URI, or the LDAP server is unreachable."
-#~ msgstr ""
-#~ "我們無法開啟這個通訊錄。這表示您輸入錯誤的 URI，或無法連線 LDAP 伺服器。"
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "切換附加檔案列"
+
+#~ msgid "activate"
+#~ msgstr "使作用"
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>類型:</b>"
+
+#~ msgid "Add Address Book"
+#~ msgstr "新增通訊錄"
+
+#~ msgid "Anonymously"
+#~ msgstr "匿名"
+
+#~ msgid "Basic"
+#~ msgstr "基本"
+
+#~ msgid "Distinguished name"
+#~ msgstr "可辨識名稱"
+
+#~ msgid "Email address"
+#~ msgstr "電子郵件地址"
+
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "尋找可能的搜尋基礎"
+
+#~ msgid "Search filter"
+#~ msgstr "搜尋過濾器"
+
+#~ msgid "Sub"
+#~ msgstr "子目錄"
+
+#~ msgid "Using email address"
+#~ msgstr "使用電子郵件位址"
+
+#~ msgid "Whenever Possible"
+#~ msgstr "每次可能的時候"
+
+#~ msgid "_Add Address Book"
+#~ msgstr "新增通訊錄(_A)"
+
+#~ msgid "MSN Messenger"
+#~ msgstr "MSN Messenger"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
+
+#~ msgid "Novell Groupwise"
+#~ msgstr "Novell GroupWise"
+
+#~ msgid "_Notes:"
+#~ msgstr "備註(_N):"
+
+#~ msgid "United States"
+#~ msgstr "美國"
+
+#~ msgid "Afghanistan"
+#~ msgstr "阿富汗"
+
+#~ msgid "Albania"
+#~ msgstr "阿爾巴尼亞"
+
+#~ msgid "Algeria"
+#~ msgstr "阿爾及利亞"
+
+#~ msgid "American Samoa"
+#~ msgstr "美屬薩摩亞"
+
+#~ msgid "Andorra"
+#~ msgstr "安道爾"
+
+#~ msgid "Angola"
+#~ msgstr "安哥拉"
+
+#~ msgid "Anguilla"
+#~ msgstr "安圭拉島"
+
+#~ msgid "Antarctica"
+#~ msgstr "南極洲"
+
+#~ msgid "Antigua And Barbuda"
+#~ msgstr "安地卡及巴布達"
+
+#~ msgid "Argentina"
+#~ msgstr "阿根廷"
+
+#~ msgid "Armenia"
+#~ msgstr "亞美尼亞"
+
+#~ msgid "Aruba"
+#~ msgstr "阿盧巴島"
+
+#~ msgid "Australia"
+#~ msgstr "澳大利亞"
+
+#~ msgid "Austria"
+#~ msgstr "奧地利"
+
+#~ msgid "Azerbaijan"
+#~ msgstr "亞賽拜然"
+
+#~ msgid "Bahamas"
+#~ msgstr "巴哈馬"
+
+#~ msgid "Bahrain"
+#~ msgstr "巴林"
+
+#~ msgid "Bangladesh"
+#~ msgstr "孟加拉"
+
+#~ msgid "Barbados"
+#~ msgstr "巴貝多"
+
+#~ msgid "Belarus"
+#~ msgstr "白俄羅斯"
+
+#~ msgid "Belgium"
+#~ msgstr "比利時"
+
+#~ msgid "Belize"
+#~ msgstr "貝里斯"
+
+#~ msgid "Benin"
+#~ msgstr "貝南"
+
+#~ msgid "Bermuda"
+#~ msgstr "百慕達"
+
+#~ msgid "Bhutan"
+#~ msgstr "不丹"
+
+#~ msgid "Bolivia"
+#~ msgstr "玻利維亞"
+
+#~ msgid "Bosnia And Herzegowina"
+#~ msgstr "波士尼亞-赫芝格維納"
+
+#~ msgid "Botswana"
+#~ msgstr "波札那"
+
+#~ msgid "Bouvet Island"
+#~ msgstr "波維特島"
+
+#~ msgid "Brazil"
+#~ msgstr "巴西"
+
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "英屬印度洋地區"
+
+#~ msgid "Brunei Darussalam"
+#~ msgstr "汶萊"
+
+#~ msgid "Bulgaria"
+#~ msgstr "保加利亞"
+
+#~ msgid "Burkina Faso"
+#~ msgstr "布吉納法索"
+
+#~ msgid "Burundi"
+#~ msgstr "浦隆地"
+
+#~ msgid "Cambodia"
+#~ msgstr "柬埔寨王國"
+
+#~ msgid "Cameroon"
+#~ msgstr "喀麥隆"
+
+#~ msgid "Canada"
+#~ msgstr "加拿大"
+
+#~ msgid "Cape Verde"
+#~ msgstr "維德角島"
+
+#~ msgid "Cayman Islands"
+#~ msgstr "開曼群島"
+
+#~ msgid "Central African Republic"
+#~ msgstr "中非"
+
+#~ msgid "Chad"
+#~ msgstr "查德"
+
+#~ msgid "Chile"
+#~ msgstr "智利"
+
+#~ msgid "China"
+#~ msgstr "中國"
+
+#~ msgid "Christmas Island"
+#~ msgstr "聖誕島"
+
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "可可斯群島"
+
+#~ msgid "Colombia"
+#~ msgstr "哥倫比亞"
+
+#~ msgid "Comoros"
+#~ msgstr "葛摩"
+
+#~ msgid "Congo"
+#~ msgstr "剛果共和國"
+
+#~ msgid "Congo, The Democratic Republic Of The"
+#~ msgstr "剛果共和國"
+
+#~ msgid "Cook Islands"
+#~ msgstr "科克群島"
+
+#~ msgid "Costa Rica"
+#~ msgstr "哥斯大黎加"
+
+#~ msgid "Cote d'Ivoire"
+#~ msgstr "象牙海岸"
+
+#~ msgid "Croatia"
+#~ msgstr "克羅埃西亞"
+
+#~ msgid "Cuba"
+#~ msgstr "古巴"
+
+#~ msgid "Cyprus"
+#~ msgstr "賽普勒斯"
+
+#~ msgid "Czech Republic"
+#~ msgstr "捷克共和國"
+
+#~ msgid "Denmark"
+#~ msgstr "丹麥"
+
+#~ msgid "Djibouti"
+#~ msgstr "吉布地"
+
+#~ msgid "Dominica"
+#~ msgstr "多明尼克"
+
+#~ msgid "Dominican Republic"
+#~ msgstr "多明尼加共和國"
+
+#~ msgid "Ecuador"
+#~ msgstr "厄瓜多"
+
+#~ msgid "Egypt"
+#~ msgstr "埃及"
+
+#~ msgid "El Salvador"
+#~ msgstr "薩爾瓦多"
+
+#~ msgid "Equatorial Guinea"
+#~ msgstr "赤道幾內亞"
+
+#~ msgid "Eritrea"
+#~ msgstr "厄利垂亞"
+
+#~ msgid "Estonia"
+#~ msgstr "愛沙尼亞"
+
+#~ msgid "Ethiopia"
+#~ msgstr "依索比亞"
+
+#~ msgid "Falkland Islands"
+#~ msgstr "福克蘭群島"
+
+#~ msgid "Faroe Islands"
+#~ msgstr "法羅群島"
+
+#~ msgid "Fiji"
+#~ msgstr "斐濟群島"
+
+#~ msgid "Finland"
+#~ msgstr "芬蘭"
+
+#~ msgid "France"
+#~ msgstr "法國"
+
+#~ msgid "French Guiana"
+#~ msgstr "法屬圭亞那"
+
+#~ msgid "French Polynesia"
+#~ msgstr "法屬玻里尼西亞"
+
+#~ msgid "French Southern Territories"
+#~ msgstr "法屬南部屬地"
+
+#~ msgid "Gabon"
+#~ msgstr "加彭"
+
+#~ msgid "Gambia"
+#~ msgstr "甘比亞"
+
+#~ msgid "Georgia"
+#~ msgstr "喬治亞"
+
+#~ msgid "Germany"
+#~ msgstr "德國"
+
+#~ msgid "Ghana"
+#~ msgstr "迦納"
+
+#~ msgid "Gibraltar"
+#~ msgstr "直布羅陀"
+
+#~ msgid "Greece"
+#~ msgstr "希臘"
+
+#~ msgid "Greenland"
+#~ msgstr "格陵蘭"
+
+#~ msgid "Grenada"
+#~ msgstr "格瑞那達"
+
+#~ msgid "Guadeloupe"
+#~ msgstr "瓜德魯普島"
+
+#~ msgid "Guam"
+#~ msgstr "關島"
+
+#~ msgid "Guatemala"
+#~ msgstr "瓜地馬拉"
+
+#~ msgid "Guernsey"
+#~ msgstr "根息"
+
+#~ msgid "Guinea"
+#~ msgstr "幾內亞"
+
+#~ msgid "Guinea-Bissau"
+#~ msgstr "幾內亞比索"
+
+#~ msgid "Guyana"
+#~ msgstr "蓋亞納"
+
+#~ msgid "Haiti"
+#~ msgstr "海地"
+
+#~ msgid "Heard And McDonald Islands"
+#~ msgstr "赫德及麥當勞群島"
+
+#~ msgid "Holy See"
+#~ msgstr "教廷"
+
+#~ msgid "Honduras"
+#~ msgstr "宏都拉斯"
+
+#~ msgid "Hong Kong"
+#~ msgstr "香港"
+
+#~ msgid "Hungary"
+#~ msgstr "匈牙利"
+
+#~ msgid "Iceland"
+#~ msgstr "冰島"
+
+#~ msgid "India"
+#~ msgstr "印度"
+
+#~ msgid "Indonesia"
+#~ msgstr "印尼"
+
+#~ msgid "Iran"
+#~ msgstr "伊朗"
+
+#~ msgid "Iraq"
+#~ msgstr "伊拉克"
+
+#~ msgid "Ireland"
+#~ msgstr "愛爾蘭"
+
+#~ msgid "Isle of Man"
+#~ msgstr "曼島"
+
+#~ msgid "Israel"
+#~ msgstr "以色列"
+
+#~ msgid "Italy"
+#~ msgstr "義大利"
+
+#~ msgid "Jamaica"
+#~ msgstr "牙買加"
+
+#~ msgid "Japan"
+#~ msgstr "日本"
+
+#~ msgid "Jersey"
+#~ msgstr "澤西"
+
+#~ msgid "Jordan"
+#~ msgstr "約旦"
+
+#~ msgid "Kazakhstan"
+#~ msgstr "哈薩克"
+
+#~ msgid "Kenya"
+#~ msgstr "肯亞"
+
+#~ msgid "Kiribati"
+#~ msgstr "吉里巴斯"
+
+#~ msgid "Korea, Democratic People's Republic Of"
+#~ msgstr "北韓"
+
+#~ msgid "Korea, Republic Of"
+#~ msgstr "韓國"
+
+#~ msgid "Kuwait"
+#~ msgstr "科威特"
+
+#~ msgid "Kyrgyzstan"
+#~ msgstr "吉爾吉斯"
+
+#~ msgid "Laos"
+#~ msgstr "寮國"
+
+#~ msgid "Latvia"
+#~ msgstr "拉脫維亞"
+
+#~ msgid "Lebanon"
+#~ msgstr "黎巴嫩"
+
+#~ msgid "Lesotho"
+#~ msgstr "賴索托"
+
+#~ msgid "Liberia"
+#~ msgstr "賴比瑞亞"
+
+#~ msgid "Libya"
+#~ msgstr "利比亞"
+
+#~ msgid "Liechtenstein"
+#~ msgstr "列支敦斯登"
+
+#~ msgid "Lithuania"
+#~ msgstr "立陶宛"
+
+#~ msgid "Luxembourg"
+#~ msgstr "盧森堡"
+
+#~ msgid "Macao"
+#~ msgstr "澳門"
+
+#~ msgid "Macedonia"
+#~ msgstr "馬其頓"
+
+#~ msgid "Madagascar"
+#~ msgstr "馬達加斯加"
+
+#~ msgid "Malawi"
+#~ msgstr "馬拉威"
+
+#~ msgid "Malaysia"
+#~ msgstr "馬來西亞"
+
+#~ msgid "Maldives"
+#~ msgstr "馬爾地夫"
+
+#~ msgid "Mali"
+#~ msgstr "馬利"
+
+#~ msgid "Malta"
+#~ msgstr "馬爾他"
+
+#~ msgid "Marshall Islands"
+#~ msgstr "馬紹爾群島"
+
+#~ msgid "Martinique"
+#~ msgstr "法屬馬丁尼克"
+
+#~ msgid "Mauritania"
+#~ msgstr "茅利塔尼亞"
+
+#~ msgid "Mauritius"
+#~ msgstr "模里西斯"
+
+#~ msgid "Mayotte"
+#~ msgstr "美亞特"
+
+#~ msgid "Mexico"
+#~ msgstr "墨西哥"
+
+#~ msgid "Micronesia"
+#~ msgstr "密克羅尼西亞"
+
+#~ msgid "Moldova, Republic Of"
+#~ msgstr "摩爾多瓦"
+
+#~ msgid "Monaco"
+#~ msgstr "摩納哥"
+
+#~ msgid "Mongolia"
+#~ msgstr "蒙古"
+
+#~ msgid "Montserrat"
+#~ msgstr "蒙瑟拉特島"
+
+#~ msgid "Morocco"
+#~ msgstr "摩洛哥"
+
+#~ msgid "Mozambique"
+#~ msgstr "莫三比克"
+
+#~ msgid "Myanmar"
+#~ msgstr "緬甸"
+
+#~ msgid "Namibia"
+#~ msgstr "納米比亞"
+
+#~ msgid "Nauru"
+#~ msgstr "諾魯"
+
+#~ msgid "Nepal"
+#~ msgstr "尼泊爾"
+
+#~ msgid "Netherlands"
+#~ msgstr "荷蘭"
+
+#~ msgid "Netherlands Antilles"
+#~ msgstr "荷屬安地列斯"
+
+#~ msgid "New Caledonia"
+#~ msgstr "新喀里多尼亞島"
+
+#~ msgid "New Zealand"
+#~ msgstr "紐西蘭"
+
+#~ msgid "Nicaragua"
+#~ msgstr "尼加拉瓜"
+
+#~ msgid "Niger"
+#~ msgstr "尼日"
+
+#~ msgid "Nigeria"
+#~ msgstr "奈及利亞"
+
+#~ msgid "Niue"
+#~ msgstr "紐威島"
+
+#~ msgid "Norfolk Island"
+#~ msgstr "諾福克群島"
+
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "北馬里亞納群島"
+
+#~ msgid "Norway"
+#~ msgstr "挪威"
+
+#~ msgid "Oman"
+#~ msgstr "阿曼"
+
+#~ msgid "Pakistan"
+#~ msgstr "巴基斯坦"
+
+#~ msgid "Palau"
+#~ msgstr "帛琉群島"
+
+#~ msgid "Palestinian Territory"
+#~ msgstr "巴勒斯坦地區"
+
+#~ msgid "Panama"
+#~ msgstr "巴拿馬"
+
+#~ msgid "Papua New Guinea"
+#~ msgstr "巴布亞紐幾內亞"
+
+#~ msgid "Paraguay"
+#~ msgstr "巴拉圭"
+
+#~ msgid "Peru"
+#~ msgstr "秘魯"
+
+#~ msgid "Philippines"
+#~ msgstr "菲律賓"
+
+#~ msgid "Pitcairn"
+#~ msgstr "皮特康"
+
+#~ msgid "Poland"
+#~ msgstr "波蘭"
+
+#~ msgid "Portugal"
+#~ msgstr "葡萄牙"
+
+#~ msgid "Puerto Rico"
+#~ msgstr "波多黎各"
+
+#~ msgid "Qatar"
+#~ msgstr "卡達"
+
+#~ msgid "Reunion"
+#~ msgstr "留尼旺"
+
+#~ msgid "Romania"
+#~ msgstr "羅馬尼亞"
+
+#~ msgid "Russian Federation"
+#~ msgstr "俄羅斯"
+
+#~ msgid "Rwanda"
+#~ msgstr "盧安達"
+
+#~ msgid "Saint Kitts And Nevis"
+#~ msgstr "聖克里斯多福"
+
+#~ msgid "Saint Lucia"
+#~ msgstr "聖露西亞"
+
+#~ msgid "Saint Vincent And The Grenadines"
+#~ msgstr "聖文森"
+
+#~ msgid "Samoa"
+#~ msgstr "薩摩亞群島"
+
+#~ msgid "San Marino"
+#~ msgstr "聖馬利諾"
+
+#~ msgid "Sao Tome And Principe"
+#~ msgstr "聖多美及普林西比"
+
+#~ msgid "Saudi Arabia"
+#~ msgstr "沙烏地阿拉伯"
+
+#~ msgid "Senegal"
+#~ msgstr "塞內加爾"
+
+#~ msgid "Serbia And Montenegro"
+#~ msgstr "塞爾維亞和黑山"
+
+#~ msgid "Seychelles"
+#~ msgstr "塞席爾"
+
+#~ msgid "Sierra Leone"
+#~ msgstr "獅子山"
+
+#~ msgid "Singapore"
+#~ msgstr "新加坡"
+
+#~ msgid "Slovakia"
+#~ msgstr "斯洛伐克"
+
+#~ msgid "Slovenia"
+#~ msgstr "斯洛凡尼亞"
+
+#~ msgid "Solomon Islands"
+#~ msgstr "索羅門群島"
+
+#~ msgid "Somalia"
+#~ msgstr "索馬利亞"
+
+#~ msgid "South Africa"
+#~ msgstr "南非"
+
+#~ msgid "South Georgia And The South Sandwich Islands"
+#~ msgstr "南喬治亞及南桑威奇群島"
+
+#~ msgid "Spain"
+#~ msgstr "西班牙"
+
+#~ msgid "Sri Lanka"
+#~ msgstr "斯里蘭卡"
+
+#~ msgid "St. Helena"
+#~ msgstr "聖赫勒拿島"
+
+#~ msgid "St. Pierre And Miquelon"
+#~ msgstr "聖匹及密啟倫群島"
+
+#~ msgid "Sudan"
+#~ msgstr "蘇丹"
+
+#~ msgid "Suriname"
+#~ msgstr "蘇利南"
+
+#~ msgid "Svalbard And Jan Mayen Islands"
+#~ msgstr "斯瓦巴及尖棉島"
+
+#~ msgid "Swaziland"
+#~ msgstr "史瓦濟蘭"
+
+#~ msgid "Sweden"
+#~ msgstr "瑞典"
+
+#~ msgid "Switzerland"
+#~ msgstr "瑞士"
+
+#~ msgid "Syria"
+#~ msgstr "敘利亞"
+
+#~ msgid "Taiwan"
+#~ msgstr "臺灣"
+
+#~ msgid "Tajikistan"
+#~ msgstr "塔吉克"
+
+#~ msgid "Tanzania, United Republic Of"
+#~ msgstr "坦尚尼亞"
+
+#~ msgid "Thailand"
+#~ msgstr "泰國"
+
+#~ msgid "Timor-Leste"
+#~ msgstr "東帝汶"
+
+#~ msgid "Togo"
+#~ msgstr "多哥"
+
+#~ msgid "Tokelau"
+#~ msgstr "托克勞群島"
+
+#~ msgid "Tonga"
+#~ msgstr "東加"
+
+#~ msgid "Trinidad And Tobago"
+#~ msgstr "千里達"
+
+#~ msgid "Tunisia"
+#~ msgstr "突尼西亞"
+
+#~ msgid "Turkey"
+#~ msgstr "土耳其"
+
+#~ msgid "Turkmenistan"
+#~ msgstr "土庫曼"
+
+#~ msgid "Turks And Caicos Islands"
+#~ msgstr "土克斯及開科斯群島"
+
+#~ msgid "Tuvalu"
+#~ msgstr "吐瓦魯"
+
+#~ msgid "Uganda"
+#~ msgstr "烏干達"
+
+#~ msgid "Ukraine"
+#~ msgstr "烏克蘭"
+
+#~ msgid "United Arab Emirates"
+#~ msgstr "阿拉伯聯合大公國"
+
+#~ msgid "United Kingdom"
+#~ msgstr "英國"
+
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "美屬邊疆群島"
+
+#~ msgid "Uruguay"
+#~ msgstr "烏拉圭"
+
+#~ msgid "Uzbekistan"
+#~ msgstr "烏茲別克"
+
+#~ msgid "Vanuatu"
+#~ msgstr "萬那杜"
+
+#~ msgid "Venezuela"
+#~ msgstr "委內瑞拉"
+
+#~ msgid "Viet Nam"
+#~ msgstr "越南"
+
+#~ msgid "Virgin Islands, British"
+#~ msgstr "英屬維爾京群島"
+
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "美屬維爾京群島"
+
+#~ msgid "Wallis And Futuna Islands"
+#~ msgstr "沃里斯與伏塔那島"
+
+#~ msgid "Western Sahara"
+#~ msgstr "西撒哈拉"
+
+#~ msgid "Yemen"
+#~ msgstr "葉門"
+
+#~ msgid "Zambia"
+#~ msgstr "尚比亞"
+
+#~ msgid "Zimbabwe"
+#~ msgstr "辛巴威"
+
+#~ msgid "AOL Instant Messenger"
+#~ msgstr "AOL Instant Messenger"
+
+#~ msgid "Yahoo Messenger"
+#~ msgstr "Yahoo Messenger"
+
+#~ msgid "Gadu-Gadu Messenger"
+#~ msgstr "Gadu-Gadu Messenger"
+
+#~ msgid "Service"
+#~ msgstr "服務"
+
+#~ msgid "Username"
+#~ msgstr "使用者名稱"
+
+#~ msgid "Address _2:"
+#~ msgstr "地址 _2:"
+
+#~ msgid "Ci_ty:"
+#~ msgstr "縣/市(_T):"
+
+#~ msgid "Countr_y:"
+#~ msgstr "國家(_Y):"
+
+#~ msgid "Full Address"
+#~ msgstr "完整地址"
+
+#~ msgid "_ZIP Code:"
+#~ msgstr "郵遞區號(_Z):"
+
+#~ msgid "Dr."
+#~ msgstr "Dr."
+
+#~ msgid "Esq."
+#~ msgstr "Esq."
+
+#~ msgid "I"
+#~ msgstr "I"
+
+#~ msgid "II"
+#~ msgstr "II"
+
+#~ msgid "III"
+#~ msgstr "III"
+
+#~ msgid "Jr."
+#~ msgstr "Jr."
+
+#~ msgid "Miss"
+#~ msgstr "Miss"
+
+#~ msgid "Mr."
+#~ msgstr "Mr."
+
+#~ msgid "Mrs."
+#~ msgstr "Mrs."
+
+#~ msgid "Ms."
+#~ msgstr "Ms."
+
+#~ msgid "Sr."
+#~ msgstr "Sr."
+
+#~ msgid "Add IM Account"
+#~ msgstr "新增 IM 帳號"
+
+#~ msgid "_Account name:"
+#~ msgstr "帳號名稱(_A):"
+
+#~ msgid "_IM Service:"
+#~ msgstr "_IM 服務:"
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "結尾的空白:"
+
+#~ msgid "Body"
+#~ msgstr "內文"
+
+#~ msgid "Bottom:"
+#~ msgstr "下:"
+
+#~ msgid "Dimensions:"
+#~ msgstr "尺寸:"
+
+#~ msgid "F_ont..."
+#~ msgstr "字型(_O)..."
+
+#~ msgid "Fonts"
+#~ msgstr "字型"
+
+#~ msgid "Footer:"
+#~ msgstr "頁尾:"
+
+#~ msgid "Format"
+#~ msgstr "格式"
+
+#~ msgid "Header/Footer"
+#~ msgstr "頁首/頁尾"
+
+#~ msgid "Headings"
+#~ msgstr "檔頭"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "每封信的檔頭"
+
+#~ msgid "Height:"
+#~ msgstr "高度:"
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "一個緊接著另一個"
+
+#~ msgid "Include:"
+#~ msgstr "包含:"
+
+#~ msgid "Landscape"
+#~ msgstr "橫向"
+
+#~ msgid "Left:"
+#~ msgstr "左:"
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "字母標籤於旁邊"
+
+#~ msgid "Margins"
+#~ msgstr "邊界"
+
+#~ msgid "Number of columns:"
+#~ msgstr "欄數:"
+
+#~ msgid "Options"
+#~ msgstr "選項"
+
+#~ msgid "Orientation"
+#~ msgstr "紙張方向"
+
+#~ msgid "Page"
+#~ msgstr "頁"
+
+#~ msgid "Page Setup:"
+#~ msgstr "頁面設定:"
+
+#~ msgid "Paper"
+#~ msgstr "紙張"
+
+#~ msgid "Paper source:"
+#~ msgstr "紙張來源:"
+
+#~ msgid "Portrait"
+#~ msgstr "直向"
+
+#~ msgid "Preview:"
+#~ msgstr "預覽:"
author	Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>	2009-07-15 06:26:51 +0800
committer	Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>	2009-07-15 06:26:51 +0800
commit	da8fac9a234c3e42da8d8535dfb72538d9b4b274 (patch)
tree	3b7fe4d14938b0d3dcbbedc8c5e4a13984c9d94b /po/zh_TW.po
parent	fe962447cb7d2bed8c530114bf131566cbd71ac9 (diff)
download	gsoc2013-evolution-da8fac9a234c3e42da8d8535dfb72538d9b4b274.tar gsoc2013-evolution-da8fac9a234c3e42da8d8535dfb72538d9b4b274.tar.gz gsoc2013-evolution-da8fac9a234c3e42da8d8535dfb72538d9b4b274.tar.bz2 gsoc2013-evolution-da8fac9a234c3e42da8d8535dfb72538d9b4b274.tar.lz gsoc2013-evolution-da8fac9a234c3e42da8d8535dfb72538d9b4b274.tar.xz gsoc2013-evolution-da8fac9a234c3e42da8d8535dfb72538d9b4b274.tar.zst gsoc2013-evolution-da8fac9a234c3e42da8d8535dfb72538d9b4b274.zip