Updated Traditional Chinese translation.

2006-01-07 Chao-Hsiung Liao <j_h_liau@yahoo.com.tw> * zh_TW.po: Updated Traditional Chinese translation. svn path=/trunk/; revision=31091
author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw> 2006-01-07 07:09:28 +0800
committer: Chao-Hsiung Liao <chliao@src.gnome.org> 2006-01-07 07:09:28 +0800
commit: 7b43323bbe43d846c7dcd32a25192dba93413625 (patch)
tree: f57a4f4b335d49a8b2193f76547f8e8c6e641222 /po/zh_TW.po
parent: 5bbcf0da7a587e171b6931553792e2884002fb41 (diff)
download: gsoc2013-evolution-7b43323bbe43d846c7dcd32a25192dba93413625.tar
gsoc2013-evolution-7b43323bbe43d846c7dcd32a25192dba93413625.tar.gz
gsoc2013-evolution-7b43323bbe43d846c7dcd32a25192dba93413625.tar.bz2
gsoc2013-evolution-7b43323bbe43d846c7dcd32a25192dba93413625.tar.lz
gsoc2013-evolution-7b43323bbe43d846c7dcd32a25192dba93413625.tar.xz
gsoc2013-evolution-7b43323bbe43d846c7dcd32a25192dba93413625.tar.zst
gsoc2013-evolution-7b43323bbe43d846c7dcd32a25192dba93413625.zip
1 files changed, 2230 insertions, 2120 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ccccf69aa7..a7572bc680 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.5.2\n"
+"Project-Id-Version: evolution 2.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-10 08:43+0800\n"
-"PO-Revision-Date: 2005-12-12 15:59+0800\n"
+"POT-Creation-Date: 2006-01-07 06:45+0800\n"
+"PO-Revision-Date: 2006-01-07 07:05+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -28,13 +28,13 @@ msgstr "Evolution 通訊錄"
 
 # ui/evolution-addressbook.xml.h:7
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "New Contact"
 msgstr "新連絡人"
 
 # ui/evolution-addressbook.xml.h:17
 #: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:234
 msgid "New Contact List"
 msgstr "新增連絡人清單"
 
@@ -228,7 +228,7 @@ msgstr "%d %b"
 # ui/evolution-calendar.xml.h:3
 #: ../a11y/calendar/ea-gnome-calendar.c:247
 #: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:738
+#: ../calendar/importers/icalendar-importer.c:772
 msgid "Gnome Calendar"
 msgstr "Gnome 行事曆"
 
@@ -447,7 +447,6 @@ msgid "Server Version"
 msgstr "伺服器版本"
 
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server"
 msgstr "某些功能可能無法在您目前的伺服器版本上正常運作"
 
@@ -523,7 +522,6 @@ msgstr ""
 "想要儲存一個副本來代替嗎？"
 
 #: ../addressbook/addressbook.error.xml.h:30
-#: ../calendar/calendar.error.xml.h:61
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -543,7 +541,7 @@ msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "重新啟動 Evolution 之前，無法使用 {0} 的連絡人。"
 
-#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:495
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
@@ -603,7 +601,7 @@ msgstr "在此設定自動完成"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1186
-#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
+#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:393
 msgid "Contacts"
 msgstr "連絡人"
 
@@ -647,13 +645,13 @@ msgstr "在此管理您的 S/MIME 憑證"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:137
-#: ../addressbook/gui/component/addressbook-migrate.c:502
+#: ../addressbook/gui/component/addressbook-component.c:141
+#: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../calendar/gui/calendar-component.c:208
-#: ../calendar/gui/memos-component.c:192 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/migration.c:1057
-#: ../calendar/gui/tasks-component.c:188 ../mail/em-folder-tree-model.c:197
-#: ../mail/em-folder-tree-model.c:199 ../mail/mail-component.c:292
+#: ../calendar/gui/memos-component.c:193 ../calendar/gui/migration.c:467
+#: ../calendar/gui/migration.c:560 ../calendar/gui/migration.c:1061
+#: ../calendar/gui/tasks-component.c:189 ../mail/em-folder-tree-model.c:198
+#: ../mail/em-folder-tree-model.c:200 ../mail/mail-component.c:298
 #: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "在此電腦"
@@ -663,59 +661,59 @@ msgstr "在此電腦"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:145
-#: ../addressbook/gui/component/addressbook-migrate.c:510
+#: ../addressbook/gui/component/addressbook-component.c:149
+#: ../addressbook/gui/component/addressbook-migrate.c:515
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../calendar/gui/calendar-component.c:216
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/migration.c:1065
-#: ../calendar/gui/tasks-component.c:196 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1043 ../mail/mail-config.c:78
+#: ../calendar/gui/memos-component.c:201 ../calendar/gui/migration.c:475
+#: ../calendar/gui/migration.c:568 ../calendar/gui/migration.c:1069
+#: ../calendar/gui/tasks-component.c:197 ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1053 ../mail/mail-config.c:86
 #: ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "個人"
 
 # addressbook/gui/component/addressbook-config.c:148
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:155
-#: ../addressbook/gui/component/addressbook-migrate.c:520
+#: ../addressbook/gui/component/addressbook-component.c:159
+#: ../addressbook/gui/component/addressbook-migrate.c:525
 msgid "On LDAP Servers"
 msgstr "在 LDAP 伺服器"
 
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:227
 msgid "_Contact"
 msgstr "連絡人(_C)"
 
 # ui/evolution-addressbook.xml.h:2
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "Create a new contact"
 msgstr "建立新的連絡人"
 
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:235
 msgid "Contact _List"
 msgstr "連絡人清單(_L)"
 
 # ui/evolution-addressbook.xml.h:2
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "Create a new contact list"
 msgstr "建立新的連絡人清單"
 
 # importers/pine-importer.c:661
-#: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1202
+#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-config.c:1204
 msgid "New Address Book"
 msgstr "新通訊錄"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:243
 msgid "Address _Book"
 msgstr "通訊錄(_B)"
 
 # ui/evolution-tasks.xml.h:2
-#: ../addressbook/gui/component/addressbook-component.c:243
+#: ../addressbook/gui/component/addressbook-component.c:244
 msgid "Create a new address book"
 msgstr "建立新通訊錄"
 
-#: ../addressbook/gui/component/addressbook-component.c:385
+#: ../addressbook/gui/component/addressbook-component.c:386
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "升級通訊錄設定或資料夾失敗。"
 
@@ -734,36 +732,36 @@ msgstr "類型(_T):"
 msgid "Copy book content locally for offline operation"
 msgstr "複製通訊錄內容至本地用於離線作業"
 
-#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/addressbook-config.c:983
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:85
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "一般"
 
 # importers/pine-importer.c:661
-#: ../addressbook/gui/component/addressbook-config.c:982
-#: ../mail/importers/pine-importer.c:393
+#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../mail/importers/pine-importer.c:392
 msgid "Addressbook"
 msgstr "目錄服務"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: ../addressbook/gui/component/addressbook-config.c:986
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Server Information"
 msgstr "伺服器資訊"
 
 # mail/mail-config.glade.h:10
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:990
 msgid "Authentication"
 msgstr "驗證"
 
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:993
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
@@ -771,45 +769,45 @@ msgstr "詳細資料"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Searching"
 msgstr "搜尋中"
 
 # mail/mail-ops.c:898
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:996
 msgid "Downloading"
 msgstr "下載中"
 
 # addressbook/gui/component/addressbook-config.glade.h:2
-#: ../addressbook/gui/component/addressbook-config.c:1200
+#: ../addressbook/gui/component/addressbook-config.c:1202
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "通訊錄內容"
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: ../addressbook/gui/component/addressbook-migrate.c:72
-#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
+#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../calendar/gui/migration.c:147 ../mail/em-migrate.c:1200
 msgid "Migrating..."
 msgstr "正在移轉..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:124
-#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
+#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../calendar/gui/migration.c:194 ../mail/em-migrate.c:1241
 #, c-format
 msgid "Migrating `%s':"
 msgstr "正在移轉 `%s'："
 
 # addressbook/gui/component/addressbook-config.c:148
-#: ../addressbook/gui/component/addressbook-migrate.c:648
+#: ../addressbook/gui/component/addressbook-migrate.c:653
 msgid "LDAP Servers"
 msgstr "LDAP 伺服器"
 
 # mail/mail-config.glade.h:76
-#: ../addressbook/gui/component/addressbook-migrate.c:763
+#: ../addressbook/gui/component/addressbook-migrate.c:768
 msgid "Autocompletion Settings"
 msgstr "自動完成設定"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -820,7 +818,7 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1157
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -830,7 +828,7 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1166
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -840,7 +838,7 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1176
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -859,11 +857,11 @@ msgstr "新增通訊錄(_N)"
 #: ../addressbook/gui/component/addressbook-view.c:770
 #: ../addressbook/gui/widgets/e-addressbook-view.c:966
 #: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/e-calendar-table.c:1194
-#: ../calendar/gui/e-calendar-view.c:1583 ../calendar/gui/e-memo-table.c:869
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1050 ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
+#: ../calendar/gui/e-calendar-table.c:1196
+#: ../calendar/gui/e-calendar-view.c:1573 ../calendar/gui/e-memo-table.c:871
+#: ../calendar/gui/tasks-component.c:442 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:34
+#: ../ui/evolution-calendar.xml.h:38 ../ui/evolution-mail-list.xml.h:27
 #: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "刪除(_D)"
@@ -874,7 +872,7 @@ msgstr "刪除(_D)"
 # ui/evolution.xml.h:60
 #: ../addressbook/gui/component/addressbook-view.c:772
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
+#: ../calendar/gui/tasks-component.c:443
 msgid "_Properties..."
 msgstr "屬性(_P)..."
 
@@ -1003,7 +1001,7 @@ msgid "Add Address Book"
 msgstr "新增通訊錄"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
+#: ../mail/em-account-editor.c:304 ../mail/em-account-editor.c:767
 msgid "Always"
 msgstr "永遠"
 
@@ -1040,7 +1038,7 @@ msgstr "登入(_G):"
 
 # calendar/gui/event-editor-dialog.glade.h:10
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:766
 msgid "Never"
 msgstr "永不"
 
@@ -1180,7 +1178,7 @@ msgid "Using email address"
 msgstr "使用電子郵件位址"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:45
-#: ../mail/em-account-editor.c:301
+#: ../mail/em-account-editor.c:303
 msgid "Whenever Possible"
 msgstr "每次可能的時候"
 
@@ -1210,6 +1208,7 @@ msgid "_Name:"
 msgstr "名稱(_N):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Port:"
 msgstr "連接埠(_P):"
 
@@ -1219,6 +1218,7 @@ msgstr "搜尋範圍(_S):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../mail/mail-config.glade.h:171
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "伺服器(_S):"
 
@@ -1239,13 +1239,14 @@ msgid "cards"
 msgstr "名片"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:57
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/alarm-notify/util.c:64
 #: ../calendar/gui/alarm-notify/util.c:66
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/misc.c:111 ../calendar/gui/misc.c:113
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:111
+#: ../calendar/gui/misc.c:113 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:1987
 #: ../plugins/calendar-http/calendar-http.c:263
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
@@ -1257,7 +1258,6 @@ msgstr "分鐘"
 #: ../addressbook/gui/contact-editor/im.glade.h:1
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
@@ -1335,7 +1335,7 @@ msgstr "連絡人"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:526
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:541
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2373
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2379
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
@@ -1382,8 +1382,8 @@ msgstr "電話"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:202
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
-#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1052
+#: ../mail/mail-config.c:85 ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "工作"
 
@@ -1416,7 +1416,7 @@ msgid "_Calendar:"
 msgstr "行事曆(_C):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../ui/evolution-event-editor.xml.h:26 ../ui/evolution-task-editor.xml.h:18
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "分類(_C)"
 
@@ -1537,7 +1537,7 @@ msgstr "地址"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1770 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
 #: ../widgets/text/e-text.c:3585
 msgid "Editable"
@@ -2522,7 +2522,7 @@ msgstr "辛巴威"
 #: ../plugins/exchange-operations/exchange-delegates.c:936
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
 #: ../plugins/plugin-manager/plugin-manager.c:44
-#: ../plugins/save-attachments/save-attachments.c:362
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "名稱"
@@ -2555,8 +2555,8 @@ msgstr "服務"
 
 # addressbook/backend/ebook/e-card.c:3442
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:594
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../plugins/publish-calendar/publish-calendar.c:461
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "位置"
@@ -2627,21 +2627,21 @@ msgstr "已變更"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:536
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2368
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2374
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "連絡人編輯器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2681
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2687
 msgid "Please select an image for this contact"
 msgstr "請選取此連絡人的影像"
 
 # addressbook/gui/component/addressbook-config.glade.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2682
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2688
 msgid "No image"
 msgstr "沒有影像"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2961
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2967
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2651,7 +2651,7 @@ msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3013
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3019
 msgid "Invalid contact."
 msgstr "無效的連絡人。"
 
@@ -2945,8 +2945,8 @@ msgstr ""
 
 # widgets/misc/e-filter-bar.c:239
 #. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: ../widgets/misc/e-filter-bar.c:156
+#: ../addressbook/gui/search/e-addressbook-search-dialog.c:165
+#: ../widgets/misc/e-filter-bar.c:162
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
@@ -3002,7 +3002,7 @@ msgstr "電子郵件開始於"
 
 # calendar/gui/e-calendar-table.c:150
 #: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:53
+#: ../calendar/gui/cal-search-bar.c:50
 msgid "Category is"
 msgstr "分類為"
 
@@ -3010,7 +3010,7 @@ msgstr "分類為"
 # calendar/gui/gnome-cal.c:233
 #. We attach subitems below
 #: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../calendar/gui/cal-search-bar.c:48
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "任何欄位包含"
 
@@ -3030,7 +3030,7 @@ msgstr "來源"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:245
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:377
+#: ../calendar/gui/e-meeting-list-view.c:479
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
@@ -3051,9 +3051,9 @@ msgid "Save as VCard..."
 msgstr "儲存為 VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:944
-#: ../calendar/gui/dialogs/comp-editor.c:1055
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1563 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/dialogs/comp-editor.c:1069
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1553 ../calendar/gui/e-memo-table.c:854
 #: ../ui/evolution-addressbook.xml.h:38
 msgid "_Open"
 msgstr "開啟(_O)"
@@ -3129,13 +3129,13 @@ msgstr "剪下(_T)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:964
 #: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/dialogs/comp-editor.c:432
-#: ../calendar/gui/e-calendar-table.c:1182
-#: ../calendar/gui/e-calendar-view.c:1570 ../calendar/gui/e-memo-table.c:860
-#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:3075
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1036
-#: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
+#: ../calendar/gui/dialogs/comp-editor.c:433
+#: ../calendar/gui/e-calendar-table.c:1184
+#: ../calendar/gui/e-calendar-view.c:1560 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/tasks-component.c:441 ../composer/e-msg-composer.c:3074
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1716 ../ui/evolution-addressbook.xml.h:32
+#: ../ui/evolution-calendar.xml.h:37 ../ui/evolution-composer-entries.xml.h:7
 #: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
@@ -3337,7 +3337,7 @@ msgstr "無線電電話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:388
+#: ../calendar/gui/e-meeting-list-view.c:490
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 msgid "Role"
@@ -3643,11 +3643,11 @@ msgstr "通訊協定不支援"
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:61
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:232
-#: ../calendar/gui/e-cal-model-tasks.c:348
-#: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2375
-msgid "Cancelled"
+#: ../calendar/gui/e-cal-component-preview.c:234
+#: ../calendar/gui/e-cal-model-tasks.c:349
+#: ../calendar/gui/e-cal-model-tasks.c:662
+#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2375
+msgid "Canceled"
 msgstr "已取消"
 
 # camel/providers/local/camel-mbox-summary.c:655
@@ -3820,7 +3820,7 @@ msgstr ""
 "開啟 %d 個連絡人會一併開啟 %d 個新視窗。\n"
 "確定要顯示這個連絡人？"
 "開啟 %d 個連絡人會一併開啟 %d 個新視窗。\n"
-"確定要顯示這個連絡人？"
+"確定要顯示所有的連絡人？"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:320
 #, c-format
@@ -3988,27 +3988,27 @@ msgid "GTK Tree View"
 msgstr "GTK 網路樹檢視"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:583
-#: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:311
-#: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
 msgid "Importing ..."
 msgstr "正在匯入..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:761
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP 資料互換格式 (.ldif)"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: ../addressbook/importers/evolution-ldif-importer.c:755
+#: ../addressbook/importers/evolution-ldif-importer.c:762
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 輸入器"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:529
+#: ../addressbook/importers/evolution-vcard-importer.c:554
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf、.gcrd)"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: ../addressbook/importers/evolution-vcard-importer.c:530
+#: ../addressbook/importers/evolution-vcard-importer.c:555
 msgid "Evolution VCard Importer"
 msgstr "Evolution VCard 輸入器"
 
@@ -4020,13 +4020,13 @@ msgid "Print envelope"
 msgstr "列印信封"
 
 # ui/evolution-addressbook.xml.h:11
-#: ../addressbook/printing/e-contact-print.c:1027
+#: ../addressbook/printing/e-contact-print.c:1033
 msgid "Print contacts"
 msgstr "列印連絡人"
 
 # ui/evolution-addressbook.xml.h:11
-#: ../addressbook/printing/e-contact-print.c:1118
-#: ../addressbook/printing/e-contact-print.c:1146
+#: ../addressbook/printing/e-contact-print.c:1124
+#: ../addressbook/printing/e-contact-print.c:1152
 msgid "Print contact"
 msgstr "列印連絡人"
 
@@ -4151,7 +4151,7 @@ msgstr "選項"
 
 # addressbook/printing/e-contact-print.glade.h:24
 #: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:118
+#: ../e-util/eggtrayicon.c:120
 msgid "Orientation"
 msgstr "紙張方向"
 
@@ -4212,7 +4212,7 @@ msgstr "網底"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:939
+#: ../plugins/exchange-operations/exchange-account-setup.c:949
 #: ../plugins/exchange-operations/exchange-calendar.c:224
 #: ../plugins/exchange-operations/exchange-contacts.c:197
 msgid "Size:"
@@ -4270,19 +4270,19 @@ msgid "This should test the contact print code"
 msgstr "這可以測試連絡人列印代碼"
 
 # camel/camel-filter-driver.c:671
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:664
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:700
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "無法開啟檔案"
 
 # camel/camel-provider.c:140
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
 msgid "Couldn't get list of addressbooks"
 msgstr "無法取得通訊錄清單"
 
 # addressbook/gui/component/addressbook.c:438
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
 msgstr "無法開啟通訊錄"
 
@@ -4363,127 +4363,115 @@ msgstr "沒有提供檔案名稱。"
 
 #: ../calendar/calendar.error.xml.h:1
 msgid ""
-" There are few attachments getting downloaded. Saving the appointment will "
-"cause the appointment to be saved without those pending attachments "
-msgstr "這裡有一些附件要下載。儲存此約會將無法一併儲存接下來的附件"
-
-#: ../calendar/calendar.error.xml.h:2
-msgid ""
-" There are few attachments getting downloaded. Saving the task will cause "
-"the task to be saved without those pending attachments "
-msgstr "這裡有一些附件要下載。儲存此工作將無法一併儲存接下來的附件"
-
-#: ../calendar/calendar.error.xml.h:3
-msgid ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
+"Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
-msgstr "新增有意義的摘要到您的約會，可以讓收件者知道您的約會和什麼事有關。"
+msgstr "新增有意義的摘要到您的約會可以讓收件者知道您的約會和什麼事有關。"
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:2
 msgid ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
+"Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
-msgstr "新增有意義的摘要到您的工作，可以讓收件者知道您的工作和什麼事有關。"
+msgstr "新增有意義的摘要到您的工作可以讓收件者知道您的工作和什麼事有關。"
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:3
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
 msgstr "會刪除這些日誌項目的所有資訊而且無法復原。"
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:4
 msgid ""
 "All information in this journal will be deleted and can not be restored."
 msgstr "會刪除此日誌的所有資訊而且無法復原。"
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr "會刪除這些約會的所有資訊而且無法復原。"
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:6
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "會刪除這些工作的所有資訊而且無法復原。"
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:7
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr "會刪除此約會的所有資訊而且無法復原。"
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:8
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
 msgstr "會刪除此日誌項目的所有資訊而且無法復原。"
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr "會刪除此會議的所有資訊而且無法復原。"
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "會刪除此工作的所有資訊而且無法復原。"
 
 # calendar/gui/dialogs/delete-comp.c:93
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:11
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "確定要刪除 '{0}'工作？"
 
 # calendar/gui/dialogs/delete-comp.c:84
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:12
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "確定要刪除標題為 '{0}' 的約會？"
 
 # calendar/gui/dialogs/delete-comp.c:102
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "確定要刪除日誌項目 '{0}'？"
 
 # calendar/gui/dialogs/delete-comp.c:84
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:14
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "確定要刪除這 {0} 約會？"
 
 # calendar/gui/dialogs/delete-comp.c:102
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete these {0} journal entries?"
 msgstr "確定要刪除這 {0} 日誌項目？"
 
 # calendar/gui/dialogs/delete-comp.c:93
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "確定要刪除這 {0} 工作？"
 
 # calendar/gui/dialogs/delete-comp.c:120
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete this appointment?"
 msgstr "確定要刪除此約會？"
 
 # calendar/gui/dialogs/delete-comp.c:130
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "確定要刪除此日誌項目？"
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete this meeting?"
 msgstr "確定要刪除此會議？"
 
 # calendar/gui/dialogs/delete-comp.c:125
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete this task?"
 msgstr "確定要刪除此工作？"
 
 # mail/mail-callbacks.c:1085
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "您確定要傳送沒有摘要的約會？"
 
 # mail/mail-callbacks.c:1085
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "您確定要傳送沒有摘要的工作？"
 
@@ -4498,106 +4486,129 @@ msgstr "您確定要傳送沒有摘要的工作？"
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:23
 msgid "Delete calendar '{0}'?"
 msgstr "刪除行事曆「{0}」？"
 
 # ui/evolution-contact-editor.xml.h:2
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:24
 msgid "Delete memo list '{0}'?"
 msgstr "刪除備忘錄清單「{0}」？"
 
 # ui/evolution-contact-editor.xml.h:2
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:25
 msgid "Delete task list '{0}'?"
 msgstr "刪除工作清單「{0}」？"
 
 # shell/e-shortcuts-view.c:265
-#: ../calendar/calendar.error.xml.h:28
-msgid "Don't Send"
+#: ../calendar/calendar.error.xml.h:26
+msgid "Do not Send"
 msgstr "不要傳送"
 
 # calendar/gui/dialogs/delete-comp.c:120
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:27
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "下載尚在進行中。您是否要儲存此約會？"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:28
 msgid "Download in progress. Do you want to save the task?"
 msgstr "下載尚在進行中。您是否要儲存此工作？"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:29
 msgid "Editor could not be loaded."
 msgstr "無法載入編輯器。"
 
-#: ../calendar/calendar.error.xml.h:32
-msgid ""
-"Email invitations will be sent to all participants and allow them to RSVP."
-msgstr "電子郵件邀請會傳送給所有參與者並讓他們儘快回覆。"
-
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:30
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr "電子郵件邀請會傳送給所有參與者並讓他們接受此工作。"
 
+#: ../calendar/calendar.error.xml.h:31
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+"電子郵件邀請函會傳送給所有參與者並讓他們回覆。"
+
 # calendar/conduits/calendar/calendar-conduit.c:687
 # calendar/conduits/todo/todo-conduit.c:501
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:32
 msgid "Error loading calendar"
 msgstr "載入行事曆時發生錯誤"
 
 # shell/e-shell-importer.c:404
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:33
 msgid "Error loading memo list"
 msgstr "載入備忘錄清單時發生錯誤"
 
 # shell/e-shell-importer.c:404
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:34
 msgid "Error loading task list"
 msgstr "載入工作清單時發生錯誤"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:35
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
 "the journal has been deleted."
-msgstr "如果未傳送取消通知，其他參與者可能不知道日誌已經刪除。"
+msgstr ""
+"如果未傳送取消通知，其他參與者可能不知道"
+"日誌已經刪除。"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:36
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
-msgstr "如果您未傳送取消通知，其他參與者可能不知道會議已經取消。"
+msgstr ""
+"如果不傳送取消通知，其他參與者可能不知道會議"
+"已經取消。"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
-msgstr "如果未傳送取消通知，其他參與者可能不知道工作已經刪除。"
+msgstr ""
+"如果未傳送取消通知，其他參與者可能不知道"
+"工作已經刪除。"
 
 # ui/evolution-message-composer.xml.h:26
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:38
 #: ../ui/evolution-message-composer.xml.h:28
 msgid "Send"
 msgstr "傳送"
 
 # ui/evolution-message-composer.xml.h:26
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:39
 msgid "Send Notice"
 msgstr "傳送通知"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "傳送更新的資訊允許其他參與者保有最新的行事曆。"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:41
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "傳送更新的資訊讓其他參與者保有最新的工作清單。"
 
+#: ../calendar/calendar.error.xml.h:42
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr "這裡有一些需要下載的附件。儲存此約會將會失去這些附件。"
+
+#: ../calendar/calendar.error.xml.h:43
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr "這裡有一些需要下載的附件。儲存此工作將會失去這些附件。"
+
+#: ../calendar/calendar.error.xml.h:44
+msgid "Some features may not work properly with your current server."
+msgstr "某些功能可能無法在您目前的伺服器版本上正常運作。"
+
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
@@ -4608,16 +4619,16 @@ msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution 工作已經意外結束。"
 
 #: ../calendar/calendar.error.xml.h:47
-msgid "The calendar is not marked for offline usage"
-msgstr "此行事曆尚未標記為離線使用"
+msgid "The calendar is not marked for offline usage."
+msgstr "此行事曆尚未標記為離線使用。"
 
 #: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
 msgstr "此備忘錄清單尚未標記為離線使用"
 
 #: ../calendar/calendar.error.xml.h:49
-msgid "The task list is not marked for offline usage"
-msgstr "此工作清單尚未標記為離線使用"
+msgid "The task list is not marked for offline usage."
+msgstr "此工作清單尚未標記為離線使用。"
 
 #: ../calendar/calendar.error.xml.h:50
 msgid "This calendar will be removed permanently."
@@ -4643,11 +4654,11 @@ msgstr "要儲存對此工作所做的變更？"
 
 # calendar/gui/dialogs/delete-comp.c:102
 #: ../calendar/calendar.error.xml.h:55
-msgid "Would you like to send a cancellation notice for this journal entry?"
+msgid "Would you like to send a cancelation notice for this journal entry?"
 msgstr "要傳送此日誌項目的取消通知？"
 
 #: ../calendar/calendar.error.xml.h:56
-msgid "Would you like to send all the participants a cancellation notice?"
+msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "要傳送取消通知給所有的參與者？"
 
 #: ../calendar/calendar.error.xml.h:57
@@ -4666,6 +4677,15 @@ msgstr "要傳送會議更新資訊給參與者？"
 msgid "Would you like to send updated task information to participants?"
 msgstr "要傳送更新的工作資訊給參與者？"
 
+#: ../calendar/calendar.error.xml.h:61
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+"您正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的"
+"解決方案是將該伺服器升級至支援的版本。"
+
 #: ../calendar/calendar.error.xml.h:62
 msgid "You have changed this appointment, but not yet saved them."
 msgstr "您已經變更此約會，但尚未儲存它們。"
@@ -4699,7 +4719,7 @@ msgstr "儲存變更(_S)"
 
 # ui/evolution-message-composer.xml.h:26
 #: ../calendar/calendar.error.xml.h:69
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:129
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
 msgid "_Send"
 msgstr "傳送(_S)"
 
@@ -4712,15 +4732,15 @@ msgstr "{0}."
 msgid "Enter password"
 msgstr "輸入密碼"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:248
+#: ../calendar/conduits/calendar/calendar-conduit.c:255
 msgid "Split Multi-Day Events:"
 msgstr "分割多日事件:"
 
 # addressbook/conduit/address-conduit.c:654
 # calendar/conduits/calendar/calendar-conduit.c:731
 # calendar/conduits/todo/todo-conduit.c:545
-#: ../calendar/conduits/calendar/calendar-conduit.c:1425
-#: ../calendar/conduits/calendar/calendar-conduit.c:1426
+#: ../calendar/conduits/calendar/calendar-conduit.c:1432
+#: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
 #: ../calendar/conduits/memo/memo-conduit.c:855
 #: ../calendar/conduits/todo/todo-conduit.c:1032
@@ -4730,8 +4750,8 @@ msgstr "無法啟動 Evolution 資料伺服器"
 
 # calendar/conduits/calendar/calendar-conduit.c:786
 # calendar/conduits/calendar/calendar-conduit.c:789
-#: ../calendar/conduits/calendar/calendar-conduit.c:1522
-#: ../calendar/conduits/calendar/calendar-conduit.c:1525
+#: ../calendar/conduits/calendar/calendar-conduit.c:1529
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
 msgid "Could not read pilot's Calendar application block"
 msgstr "無法讀取 pilot 行事曆程式區塊"
 
@@ -4777,7 +4797,7 @@ msgstr "行事曆與工作"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1309
+#: ../calendar/gui/calendar-component.c:1290
 msgid "Calendars"
 msgstr "行事曆"
 
@@ -4827,17 +4847,17 @@ msgstr "備忘錄(_S)"
 
 # calendar/gui/goto-dialog.glade.h:12
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1092 ../calendar/gui/memos-component.c:528
-#: ../calendar/gui/memos-component.c:998 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memos.c:1092 ../calendar/gui/memos-component.c:529
+#: ../calendar/gui/memos-component.c:999 ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "備忘錄"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
 #: ../calendar/gui/e-tasks.c:1334 ../calendar/gui/print.c:1831
-#: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:472
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:707
+#: ../calendar/gui/tasks-component.c:520
+#: ../calendar/gui/tasks-component.c:1014 ../calendar/gui/tasks-control.c:472
+#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4858,7 +4878,7 @@ msgstr "工作(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution 行事曆鬧鈴通知服務"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 #: ../calendar/gui/alarm-notify/util.c:64
 #: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:111
 #: ../calendar/gui/misc.c:113
@@ -4867,19 +4887,30 @@ msgid_plural "minutes"
 msgstr[0] "分"
 msgstr[1] "分"
 
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/calendar-http/calendar-http.c:264
+#: ../plugins/calendar-weather/calendar-weather.c:564
+msgid "hours"
+msgid_plural "hours"
+msgstr[0] "時"
+
 # calendar/gui/event-editor-dialog.glade.h:31
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "開始時刻"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:356
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:374
 #, c-format
 msgid ""
 "<big><b>%s</b></big>\n"
-"%s until %s"
+"%s %s"
 msgstr ""
 "<big><b>%s</b></big>\n"
-"%s 直到 %s"
+"%s %s"
 
 # calendar/gui/event-editor-dialog.glade.h:3
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
@@ -4890,9 +4921,9 @@ msgstr "約會"
 # addressbook/backend/ebook/e-card.c:3442
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1419
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1425
-#: ../calendar/gui/e-itip-control.c:1117
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1503
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1509
+#: ../calendar/gui/e-itip-control.c:1119
 #: ../plugins/itip-formatter/itip-view.c:883
 msgid "Location:"
 msgstr "位置:"
@@ -4903,17 +4934,18 @@ msgid "Snooze _time:"
 msgstr "忽略時間(_T):"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:41
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:45
 #: ../ui/evolution-signature-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:34
 msgid "_Edit"
 msgstr "編輯(_E)"
 
@@ -4922,58 +4954,58 @@ msgid "_Snooze"
 msgstr "延期(_S)"
 
 # calendar/gui/event-editor-dialog.glade.h:44
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "location of appointment"
 msgstr "約會的地點"
 
 # data/evolution.keys.in.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1097
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1127
 msgid "<b>Calendars</b>"
 msgstr "<b>行事曆</b>"
 
 # calendar/gui/event-editor-dialog.glade.h:13
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1163
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1193
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1176
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1206
 msgid "_Configure Alarms"
 msgstr "設定鬧鈴(_C)"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1178 ../ui/evolution.xml.h:41
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1208 ../ui/evolution.xml.h:42
 msgid "_Quit"
 msgstr "離開(_Q)"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1284
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1401
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1356
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1293
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1295
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1365
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1367
 msgid "No description available."
 msgstr "沒有可用的描述。"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1303
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1375
 msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1339
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1414
 #, c-format
 msgid "You have %d alarms"
 msgstr "您有 %d 個鬧鈴"
 
 # widgets/misc/e-messagebox.c:159
 #. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1502
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1506
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1590
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4985,7 +5017,7 @@ msgstr ""
 "送出電子郵件。  Evolution 會顯示\n"
 "普通的提醒對話方塊來代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -5005,7 +5037,7 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1546
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1630
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
@@ -5019,12 +5051,12 @@ msgstr "不要再詢問我關於這個程式。"
 # calendar/conduits/todo/todo-conduit.c:965
 # calendar/gui/alarm-notify/notify-main.c:98
 # calendar/gui/main.c:57
-#: ../calendar/gui/alarm-notify/notify-main.c:155
+#: ../calendar/gui/alarm-notify/notify-main.c:140
 msgid "Could not initialize Bonobo"
 msgstr "無法初始化 Bonobo"
 
 # calendar/gui/alarm-notify/notify-main.c:108
-#: ../calendar/gui/alarm-notify/notify-main.c:166
+#: ../calendar/gui/alarm-notify/notify-main.c:153
 msgid "Could not create the alarm notify service factory"
 msgstr "無法建立聲音提醒服務元件工廠"
 
@@ -5164,13 +5196,13 @@ msgstr "預設提醒的數值"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Free/busy server urls"
+msgid "Free/busy server URLs"
 msgstr "空閒/忙碌伺服器網址"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Free/busy template url"
-msgstr "空閒/忙碌樣板網址"
+msgid "Free/busy template URL"
+msgstr "空閒/忙碌範本網址"
 
 # ui/evolution-mail.xml.h:43
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
@@ -5209,8 +5241,8 @@ msgid "Last alarm time"
 msgstr "上次鬧鈴時刻"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-msgid "List of server urls for free/busy publishing."
-msgstr "用於空閒/忙碌發佈的伺服器 url 清單"
+msgid "List of server URLs for free/busy publishing."
+msgstr "用於空閒/忙碌發佈的伺服器 URL 清單。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
@@ -5241,7 +5273,7 @@ msgid "Month view vertical pane position"
 msgstr "月檢視的垂直窗格位置"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
-msgid "Number of units for determining for a default reminder."
+msgid "Number of units for determining a default reminder."
 msgstr "決定預設提醒的單位數目。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
@@ -5349,22 +5381,22 @@ msgstr "今天到期工作的色彩"
 msgid "Tasks vertical pane position"
 msgstr "工作垂直窗格位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#, no-c-format
 msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
 msgstr ""
-"用於行事曆中日期與時刻的預設時區，未翻譯的 Olsen 時區資料庫位置就像 "
-"\"America/New York\"。"
+"要做為空閒/忙碌資料回饋之用的網址範本，%u 要以郵件位址的使用者部分來取代，而 "
+"%d 要替換為網域名稱。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
-#, no-c-format
 msgid ""
-"The url template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
-"要做為空閒/忙碌資料回饋之用的網址範例，%u 要以郵件位址的使用者部分來取代，而 "
-"%d 要替換為網域名稱。"
+"用於行事曆中日期與時刻的預設時區，未翻譯的 Olsen 時區資料庫位置就像 "
+"\"America/New York\"。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
@@ -5499,12 +5531,12 @@ msgid "Workday start minute"
 msgstr "工作日開始分鐘"
 
 # calendar/gui/gnome-cal.c:234
-#: ../calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "主旨包含"
 
 # calendar/gui/gnome-cal.c:235
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:49
 msgid "Description contains"
 msgstr "描述包含"
 
@@ -5529,16 +5561,16 @@ msgstr "沒有相符資料"
 # ui/evolution-calendar.xml.h:23
 # ui/evolution-mail.xml.h:65
 # ui/evolution-tasks.xml.h:4
-#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2512
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-memos.xml.h:11
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2512
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "列印"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: ../calendar/gui/calendar-commands.c:120
+#: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/gnome-cal.c:2117
@@ -5547,10 +5579,11 @@ msgstr "列印"
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
 #: ../plugins/hula-account-setup/camel-hula-listener.c:374
 #: ../plugins/hula-account-setup/camel-hula-listener.c:403
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "行事曆"
 
-#: ../calendar/gui/calendar-commands.c:355
+#: ../calendar/gui/calendar-commands.c:348
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5558,11 +5591,11 @@ msgid ""
 msgstr ""
 "此作業會永久性刪除比選取時間還舊的所有事件。如果您繼續，將無法復原這些事件。"
 
-#: ../calendar/gui/calendar-commands.c:361
+#: ../calendar/gui/calendar-commands.c:354
 msgid "Purge events older than"
 msgstr "清除事件早於"
 
-#: ../calendar/gui/calendar-commands.c:366
+#: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
@@ -5576,13 +5609,13 @@ msgstr "天"
 #. Create the Webcal source group
 #. Create the LDAP source group
 #: ../calendar/gui/calendar-component.c:234
-#: ../calendar/gui/memos-component.c:219 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1084
-#: ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/memos-component.c:220 ../calendar/gui/migration.c:494
+#: ../calendar/gui/migration.c:587 ../calendar/gui/migration.c:1088
+#: ../calendar/gui/tasks-component.c:216
 msgid "On The Web"
 msgstr "在網站上"
 
-#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
+#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:396
 msgid "Birthdays & Anniversaries"
 msgstr "生日和週年紀念日"
 
@@ -5598,81 +5631,81 @@ msgid "_New Calendar"
 msgstr "新增行事曆(_N)"
 
 # calendar/gui/e-itip-control.glade.h:8
-#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:839
 msgid "Failed upgrading calendars."
 msgstr "升級行事曆失敗。"
 
-#: ../calendar/gui/calendar-component.c:1157
+#: ../calendar/gui/calendar-component.c:1138
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "無法開啟行事曆 '%s' 來建立事件和會議"
 
-#: ../calendar/gui/calendar-component.c:1170
+#: ../calendar/gui/calendar-component.c:1151
 msgid "There is no calendar available for creating events and meetings"
 msgstr "沒有行事曆可用來建立事件和會議"
 
 # data/evolution.keys.in.h:2
-#: ../calendar/gui/calendar-component.c:1284
+#: ../calendar/gui/calendar-component.c:1265
 msgid "Calendar Source Selector"
 msgstr "行事曆來源選擇器"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1456
 msgid "New appointment"
 msgstr "新增約會"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1457
 msgid "_Appointment"
 msgstr "約會(_A)"
 
 # ui/evolution-calendar.xml.h:5
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1458
 msgid "Create a new appointment"
 msgstr "建立一個新的約會"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1464
 msgid "New meeting"
 msgstr "新增會議"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1465
 msgid "M_eeting"
 msgstr "會議(_M)"
 
 # ui/evolution-tasks.xml.h:2
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1466
 msgid "Create a new meeting request"
 msgstr "建立新會議要求"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1472
 msgid "New all day appointment"
 msgstr "新的全日約會"
 
-#: ../calendar/gui/calendar-component.c:1492
+#: ../calendar/gui/calendar-component.c:1473
 msgid "All Day A_ppointment"
 msgstr "全日約會(_P)"
 
 # ui/evolution-calendar.xml.h:5
-#: ../calendar/gui/calendar-component.c:1493
+#: ../calendar/gui/calendar-component.c:1474
 msgid "Create a new all-day appointment"
 msgstr "建立新的全日約會"
 
 # ui/evolution-addressbook.xml.h:7
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1480
 msgid "New calendar"
 msgstr "新行事曆"
 
-#: ../calendar/gui/calendar-component.c:1500
-#: ../calendar/gui/dialogs/event-page.c:857
+#: ../calendar/gui/calendar-component.c:1481
+#: ../calendar/gui/dialogs/event-page.c:870
 msgid "Cale_ndar"
 msgstr "行事曆(_N)"
 
 # ui/evolution.xml.h:10
-#: ../calendar/gui/calendar-component.c:1501
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Create a new calendar"
 msgstr "建立新行事曆"
 
@@ -5713,7 +5746,7 @@ msgstr "拒絕許可權來開啟行事曆"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1267
+#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1279
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
@@ -5829,14 +5862,6 @@ msgstr "提醒間隔每"
 msgid "hour(s)"
 msgstr "時"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:564
-msgid "hours"
-msgstr "時"
-
 # calendar/gui/event-editor-dialog.glade.h:42
 # mail/mail-config.glade.h:87
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
@@ -5863,77 +5888,6 @@ msgstr "加入(_A)"
 msgid "Alarms"
 msgstr "鬧鈴"
 
-# composer/e-msg-composer-attachment-bar.c:104
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:110
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:106
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-# composer/e-msg-composer-attachment-bar.c:108
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:113
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:109
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-# composer/e-msg-composer-attachment-bar.c:112
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:116
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:311
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2599
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:138
-#: ../mail/em-utils.c:483 ../mail/em-utils.c:520
-#: ../widgets/misc/e-attachment-bar.c:341
-msgid "attachment"
-msgstr "附件"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1056
-#: ../calendar/gui/dialogs/event-page.c:1762
-#: ../calendar/gui/dialogs/meeting-page.c:909
-#: ../calendar/gui/dialogs/task-page.c:1183
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3571
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:18
-msgid "_Remove"
-msgstr "移除(_R)"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1057
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3572 ../mail/em-folder-tree.c:2058
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "_Properties"
-msgstr "屬性(_P)"
-
-# composer/e-msg-composer-attachment-bar.c:500
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1059
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3574
-msgid "_Add attachment..."
-msgstr "新增附件(_A)..."
-
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:736
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:994
-msgid "Attachment Bar"
-msgstr "附加檔案列"
-
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:6
@@ -5947,37 +5901,9 @@ msgstr "建議自動顯示附件"
 # composer/e-msg-composer-attachment-bar.c:421
 # ui/evolution-message-composer.xml.h:2
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:239
 msgid "Attach file(s)"
 msgstr "附加檔案"
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../calendar/gui/dialogs/cal-attachment.c:211
-#: ../calendar/gui/dialogs/cal-attachment.c:227
-#: ../calendar/gui/dialogs/cal-attachment.c:320
-#: ../calendar/gui/dialogs/cal-attachment.c:336
-#: ../composer/e-msg-composer-attachment.c:188
-#: ../composer/e-msg-composer-attachment.c:204
-#: ../composer/e-msg-composer-attachment.c:298
-#: ../composer/e-msg-composer-attachment.c:314
-#: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
-#: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "不能附加檔案 %s： %s"
-
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
-#: ../calendar/gui/dialogs/cal-attachment.c:219
-#: ../calendar/gui/dialogs/cal-attachment.c:328
-#: ../composer/e-msg-composer-attachment.c:196
-#: ../composer/e-msg-composer-attachment.c:306
-#: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "不能附加檔案 %s：不是一個合法的檔案"
-
 # composer/e-msg-composer-attachment.glade.h:2
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
 #: ../composer/e-msg-composer-attachment.glade.h:2
@@ -5989,8 +5915,8 @@ msgstr "附件內容"
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1163
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1165
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
@@ -6011,335 +5937,274 @@ msgstr "檔案名稱:"
 msgid "MIME type:"
 msgstr "MIME 類型:"
 
-# mail/mail-accounts.c:199
-# mail/mail-config.glade.h:30
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:583
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:930
-#: ../plugins/plugin-manager/plugin-manager.c:213
-msgid "Enabled"
-msgstr "已啟用"
-
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:740
-msgid "Are you sure you want to remove this URL?"
-msgstr "確定要移除此 URL？"
-
-# addressbook/gui/component/select-names/e-select-names-popup.c:161
-# composer/e-msg-composer-attachment-bar.c:468
-# shell/e-shortcuts-view.c:265
-# shell/e-shortcuts-view.c:388
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:743
-msgid "Remove"
-msgstr "移除"
-
-# shell/e-shortcuts-view.c:265
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:748
-msgid "Don't Remove"
-msgstr "不要移除"
-
-# mail/mail-accounts.c:197
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:797
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:830
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:863
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:406
-msgid "Disable"
-msgstr "停用"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:797
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:830
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:408
-msgid "Enable"
-msgstr "啟用"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "05 minutes"
-msgstr "05 分"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "10 minutes"
-msgstr "10 分"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 分"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "30 minutes"
-msgstr "30 分"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
+msgstr ""
+"60 分鐘\n"
+"30 分鐘\n"
+"15 分鐘\n"
+"10 分鐘\n"
+"05 分鐘"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "60 minutes"
-msgstr "60 分"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "<b>Alerts</b>"
-msgstr "<b>警告</b>"
+msgid "<b>Publishing</b>"
+msgstr "<b>發佈</b>"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "<b>Default Free/Busy Server</b>"
-msgstr "<b>預設空閒/忙碌伺服器</b>"
+#, no-c-format
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr "<i>%u 與 %d 會被替換為電子郵件位址中的使用者與網域名稱。</i>"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-# calendar/gui/event-editor-dialog.glade.h:21
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<b>General</b>"
-msgstr "<b>一般</b>"
+#: ../mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">警告</span>"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "<b>Publishing</b>"
-msgstr "<b>發佈</b>"
+msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgstr "<span weight=\"bold\">預設空閒/忙碌伺服器</span>"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "<b>Task List</b>"
-msgstr "<b>工作清單</b>"
+#: ../mail/mail-config.glade.h:18
+#: ../plugins/itip-formatter/itip-formatter.c:1977
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">一般</span>"
 
+# views/mail/galview.xml.h:4
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<b>Time</b>"
-msgstr "<b>時刻</b>"
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span weight=\"bold\">工作清單</span>"
 
-# ui/evolution-calendar.xml.h:35
+# views/mail/galview.xml.h:4
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "<b>Work Week</b>"
-msgstr "<b>工作週</b>"
+msgid "<span weight=\"bold\">Time</span>"
+msgstr "<span weight=\"bold\">時間</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i>%u 與 %d 會被替換為電子郵件位址中的使用者與網域名稱。</i>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr "<span weight=\"bold\">工作週</span>"
 
-# ui/evolution-mail.xml.h:110
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar and Tasks Settings"
-msgstr "行事曆與工作設定"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Color for overdue tasks"
-msgstr "過期的工作色彩"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Color for tasks due today"
-msgstr "今天到期的工作色彩"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "一日結束於(_E):"
 
-# ui/evolution-calendar.xml.h:7
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Days"
-msgstr "天"
-
 # calendar/gui/calendar-summary.c:622
 # mail/mail-config.glade.h:24
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "顯示"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../mail/mail-config.glade.h:74
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
 msgid "E_nable"
 msgstr "啟用(_E)"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:555
-#: ../ui/evolution-event-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:7
 msgid "Free/Busy"
 msgstr "空閒/忙碌"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "星期五"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Hours"
-msgstr "小時"
-
-# executive-summary/test-service/rdf-summary.c:806
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Minutes"
-msgstr "分"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
+"分鐘\n"
+"小時\n"
+"日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "星期一"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
+"星期一\n"
+"星期二\n"
+"星期三\n"
+"星期四\n"
+"星期五\n"
+"星期六\n"
+"星期日"
+
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Publishing Table"
 msgstr "發佈的表格"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "S_un"
 msgstr "週日(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: ../calendar/gui/dialogs/recurrence-page.c:1051
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "星期六"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "顯示提醒於約會(_O)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Show week _numbers in date navigator"
 msgstr "在日期導覽顯示週數(_N)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1052
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "星期日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
 msgstr "今天到期的工作(_A):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
 msgstr "週四(_H)"
 
 # addressbook/contact-editor/e-contact-editor.c:1259
 # addressbook/gui/widgets/e-addressbook-view.c:722
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Template:"
 msgstr "樣板:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "Time _zone:"
 msgstr "時區(_Z):"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Time format:"
 msgstr "時刻格式:"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 # calendar/gui/event-editor.c:476
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "W_eek starts:"
 msgstr "一週開始於(_E):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "星期三"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Work days:"
 msgstr "工作日:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_12 hour (AM/PM)"
 msgstr "_12 小時 (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_24 hour"
 msgstr "_24 小時"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Add URL"
 msgstr "加入網址(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "當刪除項目時先確認(_A)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "一日開始於(_D):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Fri"
 msgstr "週五(_F)"
 
 # ui/evolution-mail.xml.h:43
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Hide completed tasks after"
 msgstr "隱藏已完成的工作(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Mon"
 msgstr "週一(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Overdue tasks:"
 msgstr "過期的工作(_O):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Sat"
 msgstr "週六(_S)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "_Show appointment end times in week and month views"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+msgid "_Show appointment end times in week and month view"
 msgstr "在週及月的檢視內顯示約會的結束時間(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Time divisions:"
 msgstr "時間間隔(_T):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Tue"
 msgstr "週二(_T)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_Wed"
 msgstr "週三(_W)"
 
 # calendar/gui/event-editor.c:1612
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "before every appointment"
 msgstr "前"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "option menu to choose reminder units"
-msgstr "用來選擇提醒單位的選項選單"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "option menu to choose time units"
-msgstr "用來選擇時刻單位的選項選單"
-
 #: ../calendar/gui/dialogs/calendar-setup.c:287
 msgid "Copy calendar contents locally for offline operation"
 msgstr "複製行事曆內容至本地用於離線作業"
@@ -6389,7 +6254,7 @@ msgstr "工作清單"
 
 # ui/evolution-addressbook.xml.h:17
 #: ../calendar/gui/dialogs/calendar-setup.c:594
-#: ../calendar/gui/memos-component.c:448
+#: ../calendar/gui/memos-component.c:449
 msgid "New Memo List"
 msgstr "新增備忘錄清單"
 
@@ -6522,39 +6387,39 @@ msgid "Due "
 msgstr "期限 "
 
 # mail/mail-tools.c:219
-#: ../calendar/gui/dialogs/comp-editor.c:194 ../composer/e-msg-composer.c:2826
+#: ../calendar/gui/dialogs/comp-editor.c:195 ../composer/e-msg-composer.c:2825
 #, c-format
 msgid "Attached message - %s"
 msgstr "附加訊息 - %s"
 
 # composer/e-msg-composer-attachment-bar.c:501
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:199
-#: ../calendar/gui/dialogs/comp-editor.c:369 ../composer/e-msg-composer.c:2831
-#: ../composer/e-msg-composer.c:3010
+#: ../calendar/gui/dialogs/comp-editor.c:200
+#: ../calendar/gui/dialogs/comp-editor.c:370 ../composer/e-msg-composer.c:2830
+#: ../composer/e-msg-composer.c:3009
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "附加 1 個訊息"
 msgstr[1] "附加 %d 個訊息"
 
-#: ../calendar/gui/dialogs/comp-editor.c:433 ../composer/e-msg-composer.c:3076
+#: ../calendar/gui/dialogs/comp-editor.c:434 ../composer/e-msg-composer.c:3075
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:932 ../mail/message-list.c:1719
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1717
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:435 ../composer/e-msg-composer.c:3078
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
+#: ../calendar/gui/dialogs/comp-editor.c:436 ../composer/e-msg-composer.c:3077
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1719
 msgid "Cancel _Drag"
 msgstr "取消拖拉(_D)"
 
 # shell/e-setup.c:163
-#: ../calendar/gui/dialogs/comp-editor.c:778
+#: ../calendar/gui/dialogs/comp-editor.c:782
 msgid "Could not update object"
 msgstr "無法更新物件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:914 ../composer/e-msg-composer.c:2469
+#: ../calendar/gui/dialogs/comp-editor.c:928 ../composer/e-msg-composer.c:2468
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6564,46 +6429,72 @@ msgstr[1] "<b>%d</b> 個附加檔案"
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../calendar/gui/dialogs/comp-editor.c:944
+#: ../calendar/gui/dialogs/comp-editor.c:958
 msgid "Hide Attachment _Bar"
 msgstr "隱藏附加檔案列(_B)"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../calendar/gui/dialogs/comp-editor.c:947
-#: ../calendar/gui/dialogs/comp-editor.c:1381
+#: ../calendar/gui/dialogs/comp-editor.c:961
+#: ../calendar/gui/dialogs/comp-editor.c:1401
 msgid "Show Attachment _Bar"
 msgstr "顯示附加檔案列(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1070
+#: ../calendar/gui/dialogs/event-page.c:1861
+#: ../calendar/gui/dialogs/meeting-page.c:909
+#: ../calendar/gui/dialogs/task-page.c:1183
+#: ../composer/e-msg-composer-attachment-bar.c:470
+#: ../composer/e-msg-composer.c:3573
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:18
+msgid "_Remove"
+msgstr "移除(_R)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../composer/e-msg-composer-attachment-bar.c:471
+#: ../composer/e-msg-composer.c:3574 ../mail/em-folder-tree.c:2058
+#: ../ui/evolution-mail-list.xml.h:29
+msgid "_Properties"
+msgstr "屬性(_P)"
+
+# composer/e-msg-composer-attachment-bar.c:500
+#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../composer/e-msg-composer-attachment-bar.c:473
+#: ../composer/e-msg-composer.c:3576
+msgid "_Add attachment..."
+msgstr "新增附件(_A)..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1425
 msgid "Attachment Button: Press space key to toggle attachment bar"
 msgstr "附件按鈕：按下空白鍵切換附加檔案列"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: ../calendar/gui/dialogs/comp-editor.c:2008
-#: ../calendar/gui/dialogs/comp-editor.c:2051
+#: ../calendar/gui/dialogs/comp-editor.c:2028
+#: ../calendar/gui/dialogs/comp-editor.c:2071
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: ../calendar/gui/dialogs/comp-editor.c:2014
-#: ../calendar/gui/dialogs/comp-editor.c:2057
+#: ../calendar/gui/dialogs/comp-editor.c:2034
+#: ../calendar/gui/dialogs/comp-editor.c:2077
 #, c-format
 msgid "Meeting - %s"
 msgstr "會議 - %s"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: ../calendar/gui/dialogs/comp-editor.c:2016
-#: ../calendar/gui/dialogs/comp-editor.c:2059
+#: ../calendar/gui/dialogs/comp-editor.c:2036
+#: ../calendar/gui/dialogs/comp-editor.c:2079
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
 
 # calendar/gui/calendar-model.c:1578
-#: ../calendar/gui/dialogs/comp-editor.c:2020
-#: ../calendar/gui/dialogs/comp-editor.c:2063
+#: ../calendar/gui/dialogs/comp-editor.c:2040
+#: ../calendar/gui/dialogs/comp-editor.c:2083
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "指派的工作 - %s"
@@ -6611,31 +6502,38 @@ msgstr "指派的工作 - %s"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: ../calendar/gui/dialogs/comp-editor.c:2022
-#: ../calendar/gui/dialogs/comp-editor.c:2065
+#: ../calendar/gui/dialogs/comp-editor.c:2042
+#: ../calendar/gui/dialogs/comp-editor.c:2085
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2025
-#: ../calendar/gui/dialogs/comp-editor.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:2045
+#: ../calendar/gui/dialogs/comp-editor.c:2088
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日誌項目 - %s"
 
 # calendar/gui/e-calendar-table.c:159
-#: ../calendar/gui/dialogs/comp-editor.c:2036
-#: ../calendar/gui/dialogs/comp-editor.c:2078
+#: ../calendar/gui/dialogs/comp-editor.c:2056
+#: ../calendar/gui/dialogs/comp-editor.c:2098
 msgid "No summary"
 msgstr "沒有摘要"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2692
-#: ../calendar/gui/dialogs/comp-editor.c:2725
-#: ../calendar/gui/dialogs/comp-editor.c:2749
+#: ../calendar/gui/dialogs/comp-editor.c:2608
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:155
+#: ../mail/em-utils.c:501 ../mail/em-utils.c:538
+#: ../widgets/misc/e-attachment-bar.c:341
+msgid "attachment"
+msgstr "附件"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2701
+#: ../calendar/gui/dialogs/comp-editor.c:2734
+#: ../calendar/gui/dialogs/comp-editor.c:2758
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果有新的更新，則會放棄對此項目所做的變更"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2773
+#: ../calendar/gui/dialogs/comp-editor.c:2782
 msgid "Unable to use current version!"
 msgstr "無法使用目前的版本！"
 
@@ -6723,83 +6621,83 @@ msgstr "約會(_M)"
 
 # calendar/gui/event-editor-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:535
-#: ../ui/evolution-event-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:13
 msgid "Recurrence"
 msgstr "週期性"
 
-#: ../calendar/gui/dialogs/event-page.c:863
+#: ../calendar/gui/dialogs/event-page.c:876
 #: ../calendar/gui/dialogs/task-page.c:444
 msgid "Or_ganizer"
 msgstr "召集人(_G)"
 
-#: ../calendar/gui/dialogs/event-page.c:901
+#: ../calendar/gui/dialogs/event-page.c:914
 msgid "_Delegatees"
 msgstr "代理者(_D)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:744
-#: ../calendar/gui/dialogs/event-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "Atte_ndees"
 msgstr "到會者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1062
+#: ../calendar/gui/dialogs/event-page.c:1073
 msgid "Event with no start date"
 msgstr "無開始日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1065
+#: ../calendar/gui/dialogs/event-page.c:1076
 msgid "Event with no end date"
 msgstr "無結束日期的事件"
 
 # calendar/gui/e-calendar-table.c:154
-#: ../calendar/gui/dialogs/event-page.c:1230
+#: ../calendar/gui/dialogs/event-page.c:1242
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "開始日期錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1240
+#: ../calendar/gui/dialogs/event-page.c:1252
 msgid "End date is wrong"
 msgstr "結束日期錯誤"
 
 # calendar/gui/event-editor-dialog.glade.h:31
-#: ../calendar/gui/dialogs/event-page.c:1263
+#: ../calendar/gui/dialogs/event-page.c:1275
 msgid "Start time is wrong"
 msgstr "開始時間錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1270
+#: ../calendar/gui/dialogs/event-page.c:1282
 msgid "End time is wrong"
 msgstr "結束時間錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1425
+#: ../calendar/gui/dialogs/event-page.c:1437
 #: ../calendar/gui/dialogs/meeting-page.c:464
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "選取的召集人已經沒有帳號。"
 
-#: ../calendar/gui/dialogs/event-page.c:1431
+#: ../calendar/gui/dialogs/event-page.c:1443
 #: ../calendar/gui/dialogs/meeting-page.c:470
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "需要一個召集人。"
 
-#: ../calendar/gui/dialogs/event-page.c:1446
+#: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:485
 #: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "最少需要一個到會者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1763
+#: ../calendar/gui/dialogs/event-page.c:1862
 #: ../calendar/gui/dialogs/meeting-page.c:910
 #: ../calendar/gui/dialogs/task-page.c:1184
 msgid "_Add "
 msgstr "新增(_A)"
 
 # shell/e-storage.c:475
-#: ../calendar/gui/dialogs/event-page.c:2453
+#: ../calendar/gui/dialogs/event-page.c:2567
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "無法開啟行事曆 '%s'。"
 
 # calendar/gui/event-editor.c:1612
-#: ../calendar/gui/dialogs/event-page.c:2702
+#: ../calendar/gui/dialogs/event-page.c:2823
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6807,7 +6705,7 @@ msgstr[0] "在每個約會前 %d 天"
 msgstr[1] "在每個約會前 %d 天"
 
 # calendar/gui/event-editor-dialog.glade.h:36
-#: ../calendar/gui/dialogs/event-page.c:2710
+#: ../calendar/gui/dialogs/event-page.c:2831
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6815,7 +6713,7 @@ msgstr[0] "約會前 %d 小時"
 msgstr[1] "約會前 %d 小時"
 
 # calendar/gui/event-editor.c:1612
-#: ../calendar/gui/dialogs/event-page.c:2718
+#: ../calendar/gui/dialogs/event-page.c:2839
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -6896,7 +6794,7 @@ msgid "for"
 msgstr "舉行"
 
 # calendar/gui/event-editor-dialog.glade.h:45
-#: ../calendar/gui/dialogs/event-page.glade.h:20
+#: ../calendar/gui/dialogs/event-page.glade.h:21
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "直至"
@@ -6916,16 +6814,16 @@ msgstr "<b>從:</b>"
 #. is not permitted.
 #: ../calendar/gui/dialogs/meeting-page.c:316
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1103 ../composer/e-msg-composer.c:2264
-#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
-#: ../mail/em-folder-view.c:1065 ../mail/em-junk-hook.c:78
+#: ../calendar/gui/e-cal-model-tasks.c:654
+#: ../calendar/gui/e-itip-control.c:1105 ../composer/e-msg-composer.c:2260
+#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:691
+#: ../mail/em-account-editor.c:1356 ../mail/em-account-prefs.c:465
+#: ../mail/em-folder-view.c:1106 ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 #: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:474
 #: ../widgets/misc/e-dateedit.c:1513 ../widgets/misc/e-dateedit.c:1727
 msgid "None"
@@ -6975,8 +6873,9 @@ msgstr "語言"
 msgid "Member"
 msgstr "成員"
 
+#. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:399
+#: ../calendar/gui/e-meeting-list-view.c:502
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -6985,7 +6884,7 @@ msgstr "RSVP"
 # mail/message-list.c:1081
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:410
+#: ../calendar/gui/e-meeting-list-view.c:513
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
@@ -7040,8 +6939,8 @@ msgstr "分類(_F):"
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
 #: ../calendar/gui/dialogs/memo-page.glade.h:5
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:368
 msgid "Confidential"
 msgstr "機密"
 
@@ -7049,8 +6948,8 @@ msgstr "機密"
 # calendar/gui/calendar-model.c:900
 # calendar/gui/e-calendar-table.c:324
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:365
+#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:367
 msgid "Private"
 msgstr "私人"
 
@@ -7058,8 +6957,8 @@ msgstr "私人"
 # calendar/gui/calendar-model.c:898
 # calendar/gui/e-calendar-table.c:323
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:364
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:366
 msgid "Public"
 msgstr "公開"
 
@@ -7126,21 +7025,21 @@ msgid "Task List Name"
 msgstr "工作清單名稱"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
-msgid "You are modifying a recurring event, what would you like to modify?"
-msgstr "您正在修改週期性事件，您想要修改什麼?"
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr "您正在修改週期性事件。您想要修改什麼？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
-msgid "You are delegating a recurring event, what would like to delegate?"
-msgstr "您正在委任週期性事件，您想要委派什麼？"
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr "您正在委任週期性事件。您想要委派什麼？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring task, what would you like to modify?"
-msgstr "您正在修改週期性工作，您想要修改什麼？"
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr "您正在修改週期性工作。您想要修改什麼？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
 msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "您正在修改週期性日誌項目，您想要修改什麼？"
+"You are modifying a recurring journal entry. What would you like to modify?"
+msgstr "您正在修改週期性日誌項目。您想要修改什麼？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -7292,11 +7191,11 @@ 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:229
-#: ../calendar/gui/e-cal-model-tasks.c:346
-#: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:895
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:660
+#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/e-itip-control.c:897
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
 #: ../calendar/gui/print.c:2372 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "已完成"
@@ -7307,8 +7206,8 @@ msgstr "已完成"
 # calendar/gui/e-calendar-table.c:345
 # mail/message-list.c:689
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1018
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1016
 msgid "High"
 msgstr "高"
 
@@ -7317,11 +7216,11 @@ msgstr "高"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:11
 # calendar/gui/e-calendar-table.c:420
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:226
-#: ../calendar/gui/e-cal-model-tasks.c:344
-#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2369
+#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-model-tasks.c:345
+#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-cal-model-tasks.c:733
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2369
 msgid "In Progress"
 msgstr "進行中"
 
@@ -7331,15 +7230,15 @@ msgstr "進行中"
 # calendar/gui/e-calendar-table.c:347
 # mail/message-list.c:687
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1016
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-calendar-table.c:390 ../mail/message-list.c:1014
 msgid "Low"
 msgstr "低"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:387
-#: ../mail/message-list.c:1017
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:389
+#: ../mail/message-list.c:1015
 msgid "Normal"
 msgstr "正常"
 
@@ -7348,10 +7247,10 @@ msgstr "正常"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:342
-#: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2366
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:656
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2366
 msgid "Not Started"
 msgstr "未開始"
 
@@ -7368,7 +7267,7 @@ msgstr "狀態(_U):"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-calendar-table.c:391
 msgid "Undefined"
 msgstr "未指定"
 
@@ -7386,7 +7285,7 @@ msgid "_Web Page:"
 msgstr "網頁(_W):"
 
 #: ../calendar/gui/dialogs/task-editor.c:419
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1173
 msgid "_Task"
 msgstr "工作(_T)"
 
@@ -7460,16 +7359,19 @@ msgid "_Manual"
 msgstr "手動(_M)"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 msgid "_Password:"
 msgstr "密碼(_P):"
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "記住密碼(_R)"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
 msgstr "使用者名稱(_U):"
 
@@ -7575,18 +7477,18 @@ msgstr "%s 為未知的觸發類型"
 
 # calendar/gui/e-calendar-table.c:163
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2728
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2829
 #, c-format
 msgid "Click to open %s"
 msgstr "按一下來開啟 %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
+#: ../calendar/gui/e-cal-component-memo-preview.c:201
 msgid "Memo:"
 msgstr "備忘錄:"
 
 # addressbook/contact-editor/contact-editor.glade.h:16
-#: ../calendar/gui/e-cal-component-memo-preview.c:232
-#: ../calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-component-memo-preview.c:234
+#: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "網頁："
 
@@ -7595,35 +7497,35 @@ msgid "Untitled"
 msgstr "未命名"
 
 # calendar/gui/e-itip-control.glade.h:11
-#: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1107
+#: ../calendar/gui/e-cal-component-preview.c:188
+#: ../calendar/gui/e-itip-control.c:1109
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "摘要:"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:18
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
 msgid "Start Date:"
 msgstr "開始日期："
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:25
-#: ../calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "截止日期："
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1131
-#: ../plugins/exchange-operations/exchange-account-setup.c:265
+#: ../calendar/gui/e-cal-component-preview.c:224
+#: ../calendar/gui/e-itip-control.c:1133
+#: ../plugins/exchange-operations/exchange-account-setup.c:267
 #: ../plugins/itip-formatter/itip-view.c:908
 msgid "Status:"
 msgstr "狀態:"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:248
 msgid "Priority:"
 msgstr "優先程度："
 
@@ -7647,19 +7549,19 @@ msgstr "摘要"
 
 # ui/evolution-calendar.xml.h:36
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:438
+#: ../calendar/gui/e-calendar-table.c:440
 msgid "Free"
 msgstr "空閒"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:393
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:441
 #: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "Busy"
 msgstr "忙碌"
 
 # calendar/gui/calendar-model.c:970
-#: ../calendar/gui/e-cal-model-tasks.c:607
+#: ../calendar/gui/e-cal-model-tasks.c:608
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7670,18 +7572,18 @@ msgstr ""
 "45.436845,125.862501"
 
 # calendar/gui/calendar-model.c:1584
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
 #: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
-#: ../calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:809
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "是"
 
 # calendar/gui/calendar-model.c:1584
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "否"
@@ -7689,12 +7591,12 @@ msgstr "否"
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
 #: ../calendar/gui/e-cal-popup.c:106 ../calendar/gui/e-cal-popup.c:121
-#: ../calendar/gui/e-cal-popup.c:165 ../calendar/gui/e-itip-control.c:1148
-#: ../calendar/gui/e-itip-control.c:1289
+#: ../calendar/gui/e-cal-popup.c:165 ../calendar/gui/e-itip-control.c:1150
+#: ../calendar/gui/e-itip-control.c:1291
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1283
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/e-meeting-store.c:225 ../mail/em-utils.c:1311
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
@@ -7720,7 +7622,7 @@ msgid "Save As..."
 msgstr "另存新檔..."
 
 # mail/mail-display.c:196
-#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1812
+#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1842
 msgid "Select folder to save selected attachments..."
 msgstr "選擇用來儲存選定的附加檔案的資料夾..."
 
@@ -7730,9 +7632,9 @@ msgstr "選擇用來儲存選定的附加檔案的資料夾..."
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1564 ../calendar/gui/e-memo-table.c:854
-#: ../mail/em-folder-view.c:1046 ../mail/em-popup.c:553 ../mail/em-popup.c:564
+#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1178
+#: ../calendar/gui/e-calendar-view.c:1554 ../calendar/gui/e-memo-table.c:856
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:553 ../mail/em-popup.c:564
 msgid "_Save As..."
 msgstr "另存新檔(_S)..."
 
@@ -7752,137 +7654,137 @@ msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
 
 # calendar/gui/e-calendar-table.c:367
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "0%"
 msgstr "0%"
 
 # calendar/gui/e-calendar-table.c:368
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "10%"
 msgstr "10%"
 
 # calendar/gui/e-calendar-table.c:369
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "20%"
 msgstr "20%"
 
 # calendar/gui/e-calendar-table.c:370
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "30%"
 msgstr "30%"
 
 # calendar/gui/e-calendar-table.c:371
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "40%"
 msgstr "40%"
 
 # calendar/gui/e-calendar-table.c:372
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "50%"
 msgstr "50%"
 
 # calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "60%"
 msgstr "60%"
 
 # calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "70%"
 msgstr "70%"
 
 # calendar/gui/e-calendar-table.c:375
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "80%"
 msgstr "80%"
 
 # calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "90%"
 msgstr "90%"
 
 # calendar/gui/e-calendar-table.c:377
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:420
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:525
+#: ../calendar/gui/e-calendar-table.c:527
 msgid "Task Table"
 msgstr "工作表格"
 
 # calendar/gui/e-calendar-table.c:714
-#: ../calendar/gui/e-calendar-table.c:703
-#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:433
+#: ../calendar/gui/e-calendar-table.c:705
+#: ../calendar/gui/e-calendar-view.c:678 ../calendar/gui/e-memo-table.c:435
 msgid "Deleting selected objects"
 msgstr "刪除選定的物件"
 
-#: ../calendar/gui/e-calendar-table.c:882
-#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:610
+#: ../calendar/gui/e-calendar-table.c:884
+#: ../calendar/gui/e-calendar-view.c:806 ../calendar/gui/e-memo-table.c:612
 msgid "Updating objects"
 msgstr "更新物件"
 
 # composer/e-msg-composer.c:774
-#: ../calendar/gui/e-calendar-table.c:1032
-#: ../calendar/gui/e-calendar-view.c:1140 ../calendar/gui/e-memo-table.c:742
-#: ../composer/e-msg-composer.c:1346
+#: ../calendar/gui/e-calendar-table.c:1034
+#: ../calendar/gui/e-calendar-view.c:1141 ../calendar/gui/e-memo-table.c:744
+#: ../composer/e-msg-composer.c:1339
 msgid "Save as..."
 msgstr "另存新檔..."
 
-#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1177 ../calendar/gui/e-memo-table.c:855
 msgid "Open _Web Page"
 msgstr "開啟網頁(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1177
-#: ../calendar/gui/e-calendar-view.c:1544
-#: ../calendar/gui/e-calendar-view.c:1565 ../calendar/gui/e-memo-table.c:855
-#: ../mail/em-folder-view.c:1047
+#: ../calendar/gui/e-calendar-table.c:1179
+#: ../calendar/gui/e-calendar-view.c:1539
+#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:857
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:122 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "列印(_P)..."
 
-#: ../calendar/gui/e-calendar-table.c:1181
-#: ../calendar/gui/e-calendar-view.c:1569 ../calendar/gui/e-memo-table.c:859
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1559 ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:1 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪下(_U)"
 
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:1547
-#: ../calendar/gui/e-calendar-view.c:1571 ../calendar/gui/e-memo-table.c:861
-#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:43
+#: ../calendar/gui/e-calendar-table.c:1185
+#: ../calendar/gui/e-calendar-view.c:1542
+#: ../calendar/gui/e-calendar-view.c:1561 ../calendar/gui/e-memo-table.c:863
+#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:9 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1189 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "指派工作(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
+#: ../calendar/gui/e-calendar-table.c:1190 ../calendar/gui/e-memo-table.c:867
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "以 iCalendar 轉寄(_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1189
+#: ../calendar/gui/e-calendar-table.c:1191
 msgid "_Mark as Complete"
 msgstr "標示為完成(_M)"
 
 # calendar/gui/e-calendar-table.c:713
-#: ../calendar/gui/e-calendar-table.c:1190
+#: ../calendar/gui/e-calendar-table.c:1192
 msgid "_Mark Selected Tasks as Complete"
 msgstr "標示選定的工作為已完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1195
+#: ../calendar/gui/e-calendar-table.c:1197
 msgid "_Delete Selected Tasks"
 msgstr "刪除選定的工作(_D)"
 
 # calendar/gui/e-calendar-table.c:163
-#: ../calendar/gui/e-calendar-table.c:1428
+#: ../calendar/gui/e-calendar-table.c:1430
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "請按這裡增加新的工作"
@@ -7930,108 +7832,113 @@ msgid "Task sort"
 msgstr "工作排序"
 
 # mail/mail-ops.c:898
-#: ../calendar/gui/e-calendar-view.c:1266
+#: ../calendar/gui/e-calendar-view.c:1267
 msgid "Moving items"
 msgstr "移動項目"
 
 # mail/mail-ops.c:898
-#: ../calendar/gui/e-calendar-view.c:1268
+#: ../calendar/gui/e-calendar-view.c:1269
 msgid "Copying items"
 msgstr "複製項目"
 
-#: ../calendar/gui/e-calendar-view.c:1538
+#: ../calendar/gui/e-calendar-view.c:1533
 msgid "New _Appointment..."
 msgstr "新增約會(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1539
+#: ../calendar/gui/e-calendar-view.c:1534
 msgid "New All Day _Event"
 msgstr "新增全天事件(_E)"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1535
 msgid "New _Meeting"
 msgstr "新增會議(_M)"
 
 # ui/evolution-tasks.xml.h:3
-#: ../calendar/gui/e-calendar-view.c:1541
+#: ../calendar/gui/e-calendar-view.c:1536
 msgid "New _Task"
 msgstr "新增工作(_T)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1551
+#: ../calendar/gui/e-calendar-view.c:1546
 #: ../widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
 msgstr "目前檢視(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1553
+#: ../calendar/gui/e-calendar-view.c:1548
 msgid "Select T_oday"
 msgstr "選擇今天(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1554
+#: ../calendar/gui/e-calendar-view.c:1549
 msgid "_Select Date..."
 msgstr "選擇日期(_S)..."
 
-#. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1559 ../ui/evolution-calendar.xml.h:45
-msgid "_Publish Free/Busy Information"
-msgstr "發佈空閒/忙碌資訊(_P)"
-
-#: ../calendar/gui/e-calendar-view.c:1575
+#: ../calendar/gui/e-calendar-view.c:1565
 msgid "Cop_y to Calendar..."
 msgstr "複製至行事曆(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1576
+#: ../calendar/gui/e-calendar-view.c:1566
 msgid "Mo_ve to Calendar..."
 msgstr "移至行事曆(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1577
+#: ../calendar/gui/e-calendar-view.c:1567
 msgid "_Delegate Meeting..."
 msgstr "委派會議(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1578
+#: ../calendar/gui/e-calendar-view.c:1568
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1579
+#: ../calendar/gui/e-calendar-view.c:1569
 msgid "_Forward as iCalendar..."
 msgstr "以 iCalendar 轉寄(_F)..."
 
 # calendar/gui/e-day-view.c:3175
 # calendar/gui/e-week-view.c:3309
-#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1574
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示成可移動(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1585
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "Delete this _Occurrence"
 msgstr "刪除這個事件(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1586
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "Delete _All Occurrences"
 msgstr "刪除全部事件(_A)"
 
+# calendar/gui/e-itip-control.glade.h:9
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-view.c:1959
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "召集人: %s <%s>"
+
+# addressbook/backend/ebook/e-card.c:3442
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:1973 ../calendar/gui/print.c:2339
+#, c-format
+msgid "Location: %s"
+msgstr "位置：%s"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2004
+#, c-format
+msgid "Time: %s %s"
+msgstr "時刻: %s %s"
+
 # calendar/gui/calendar-model.c:794
 # e-util/e-time-utils.c:278
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:115 ../e-util/e-time-utils.c:180
-#: ../e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:115
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 # calendar/gui/calendar-model.c:797
 # e-util/e-time-utils.c:287
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
-#: ../e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:118
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
@@ -8086,12 +7993,12 @@ msgid "pm"
 msgstr "下午"
 
 # calendar/gui/event-editor-dialog.glade.h:26
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:762
 msgid "Yes. (Complex Recurrence)"
 msgstr "是。(複雜循環)"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: ../calendar/gui/e-itip-control.c:771
+#: ../calendar/gui/e-itip-control.c:773
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -8099,14 +8006,14 @@ msgstr[0] "每天"
 msgstr[1] "每 %d 天"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: ../calendar/gui/e-itip-control.c:776
+#: ../calendar/gui/e-itip-control.c:778
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "每週"
 msgstr[1] "每 %d 週"
 
-#: ../calendar/gui/e-itip-control.c:778
+#: ../calendar/gui/e-itip-control.c:780
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -8114,21 +8021,21 @@ msgstr[0] "每週於"
 msgstr[1] "每 %d 週於"
 
 # ui/evolution-message-composer.xml.h:26
-#: ../calendar/gui/e-itip-control.c:786
+#: ../calendar/gui/e-itip-control.c:788
 msgid " and "
 msgstr " 和 "
 
-#: ../calendar/gui/e-itip-control.c:793
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "The %s day of "
 msgstr "%s 日於 "
 
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:808
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s 日於 "
 
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -8136,57 +8043,57 @@ msgstr[0] "每月"
 msgstr[1] "每 %d 月"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:819
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "每年"
 msgstr[1] "每 %d 年"
 
-#: ../calendar/gui/e-itip-control.c:828
+#: ../calendar/gui/e-itip-control.c:830
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "總共 %d 次"
 msgstr[1] "總共 %d 次"
 
-#: ../calendar/gui/e-itip-control.c:837
+#: ../calendar/gui/e-itip-control.c:839
 msgid ", ending on "
 msgstr "，結束於 "
 
 # calendar/gui/e-meeting-dialog.glade.h:23
 # mail/message-list.c:1081
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:863
 msgid "Starts"
 msgstr "開始"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:876
 msgid "Ends"
 msgstr "結束"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 # calendar/gui/e-calendar-table.c:155
-#: ../calendar/gui/e-itip-control.c:908
+#: ../calendar/gui/e-itip-control.c:910
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "截止"
 
 # data/evolution.keys.in.h:2
-#: ../calendar/gui/e-itip-control.c:948 ../calendar/gui/e-itip-control.c:1005
+#: ../calendar/gui/e-itip-control.c:950 ../calendar/gui/e-itip-control.c:1007
 msgid "iCalendar Information"
 msgstr "iCalendar 資訊"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #. Title
-#: ../calendar/gui/e-itip-control.c:965
+#: ../calendar/gui/e-itip-control.c:967
 msgid "iCalendar Error"
 msgstr "iCalendar 錯誤"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/gui/e-itip-control.c:1037 ../calendar/gui/e-itip-control.c:1053
-#: ../calendar/gui/e-itip-control.c:1064 ../calendar/gui/e-itip-control.c:1081
+#: ../calendar/gui/e-itip-control.c:1039 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:1066 ../calendar/gui/e-itip-control.c:1083
 #: ../plugins/itip-formatter/itip-view.c:337
 #: ../plugins/itip-formatter/itip-view.c:338
 #: ../plugins/itip-formatter/itip-view.c:405
@@ -8195,324 +8102,328 @@ msgid "An unknown person"
 msgstr "不明人士"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1088
+#: ../calendar/gui/e-itip-control.c:1090
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> 請查閱下列資訊，然後在下面的選單中選擇一個動作。"
 
-#: ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1138
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/itip-utils.c:546
 #: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "Accepted"
 msgstr "接受"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: ../calendar/gui/e-itip-control.c:1140 ../calendar/gui/itip-utils.c:549
+#: ../calendar/gui/e-itip-control.c:1142 ../calendar/gui/itip-utils.c:549
 #: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
 
-#: ../calendar/gui/e-itip-control.c:1144
+#: ../calendar/gui/e-itip-control.c:1146
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:552 ../calendar/gui/itip-utils.c:581
 #: ../plugins/itip-formatter/itip-formatter.c:1646
 msgid "Declined"
 msgstr "婉拒"
 
-#: ../calendar/gui/e-itip-control.c:1228
+#: ../calendar/gui/e-itip-control.c:1230
 msgid ""
-"The meeting has been cancelled, however it could not be found in your "
+"The meeting has been canceled, however it could not be found in your "
 "calendars"
-msgstr "會議已經取消，但是在您的行事曆中找不到"
+msgstr ""
+"會議已經取消，但是在您的行事曆中"
+"找不到"
 
-#: ../calendar/gui/e-itip-control.c:1230
+#: ../calendar/gui/e-itip-control.c:1232
 msgid ""
-"The task has been cancelled, however it could not be found in your task lists"
-msgstr "工作已經取消，但是在您的工作清單中找不到"
+"The task has been canceled, however it could not be found in your task lists"
+msgstr ""
+"工作已經取消，但是在您的工作清單中"
+"找不到"
 
-#: ../calendar/gui/e-itip-control.c:1309
+#: ../calendar/gui/e-itip-control.c:1311
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 已經發佈會議資訊。"
 
 # data/evolution.keys.in.h:2
-#: ../calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1312
 msgid "Meeting Information"
 msgstr "會議資訊"
 
-#: ../calendar/gui/e-itip-control.c:1316
+#: ../calendar/gui/e-itip-control.c:1318
 #, 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:1318
+#: ../calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 邀請您出席此次會議。"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1321
 msgid "Meeting Proposal"
 msgstr "會議提案"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1325
+#: ../calendar/gui/e-itip-control.c:1327
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> 希望加入一個既存的會議。"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1328
 msgid "Meeting Update"
 msgstr "會議更新"
 
-#: ../calendar/gui/e-itip-control.c:1330
+#: ../calendar/gui/e-itip-control.c:1332
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> 希望收到最新的會議資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1333
 msgid "Meeting Update Request"
 msgstr "會議更新請求"
 
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1340
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已經答覆了會議請求。"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: ../calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1341
 msgid "Meeting Reply"
 msgstr "會議答覆"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1348
 #, c-format
-msgid "<b>%s</b> has cancelled a meeting."
+msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> 已經消取會議。"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: ../calendar/gui/e-itip-control.c:1347
-msgid "Meeting Cancellation"
+#: ../calendar/gui/e-itip-control.c:1349
+msgid "Meeting Cancelation"
 msgstr "會議取消"
 
-#: ../calendar/gui/e-itip-control.c:1357 ../calendar/gui/e-itip-control.c:1434
-#: ../calendar/gui/e-itip-control.c:1474
+#: ../calendar/gui/e-itip-control.c:1359 ../calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1476
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> 傳送了一個難以理解的訊息。"
 
 # mail/mail-search.c:268
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1360
 msgid "Bad Meeting Message"
 msgstr "不正確的會議訊息"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1387
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 已經發佈了工作資訊。"
 
 # widgets/misc/e-messagebox.c:152
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1388
 msgid "Task Information"
 msgstr "工作資訊"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> 要求 %s 進行工作。"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1397
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> 要求您進行工作。"
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1398
 msgid "Task Proposal"
 msgstr "工作計畫"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1402
+#: ../calendar/gui/e-itip-control.c:1404
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> 希望加入一項既存的工作。"
 
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1405
 msgid "Task Update"
 msgstr "工作更新"
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1409
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> 希望收到最新的工作資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1410
 msgid "Task Update Request"
 msgstr "工作更新請求"
 
-#: ../calendar/gui/e-itip-control.c:1415
+#: ../calendar/gui/e-itip-control.c:1417
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已經回覆指派的工作。"
 
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
-#: ../calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Task Reply"
 msgstr "工作回覆"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1425
 #, c-format
-msgid "<b>%s</b> has cancelled a task."
+msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> 已經取消工作。"
 
-#: ../calendar/gui/e-itip-control.c:1424
-msgid "Task Cancellation"
+#: ../calendar/gui/e-itip-control.c:1426
+msgid "Task Cancelation"
 msgstr "工作取消"
 
 # calendar/gui/e-itip-control.glade.h:4
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1437
 msgid "Bad Task Message"
 msgstr "不正確的工作訊息"
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1461
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 已經發佈空閒/忙碌資訊。"
 
 # mail/mail-config.glade.h:61
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1462
 msgid "Free/Busy Information"
 msgstr "空閒/忙碌資訊"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1466
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 請求您的空閒/忙碌資訊。"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1467
 msgid "Free/Busy Request"
 msgstr "空閒/忙碌請求"
 
-#: ../calendar/gui/e-itip-control.c:1469
+#: ../calendar/gui/e-itip-control.c:1471
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> 已經答覆空閒/忙碌請求。"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1472
 msgid "Free/Busy Reply"
 msgstr "空閒/忙碌回覆"
 
 # mail/mail-callbacks.c:1407
-#: ../calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1477
 msgid "Bad Free/Busy Message"
 msgstr "不正確的空閒/忙碌訊息"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: ../calendar/gui/e-itip-control.c:1550
+#: ../calendar/gui/e-itip-control.c:1552
 msgid "The message does not appear to be properly formed"
 msgstr "郵件似乎沒有被適當地組成"
 
-#: ../calendar/gui/e-itip-control.c:1609
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message contains only unsupported requests."
 msgstr "這個郵件只包含不支援的請求。"
 
-#: ../calendar/gui/e-itip-control.c:1642
+#: ../calendar/gui/e-itip-control.c:1644
 msgid "The attachment does not contain a valid calendar message"
 msgstr "附件並未包含合法的行事曆訊息"
 
-#: ../calendar/gui/e-itip-control.c:1674
+#: ../calendar/gui/e-itip-control.c:1676
 msgid "The attachment has no viewable calendar items"
 msgstr "附件沒有可檢視的行事曆項目"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: ../calendar/gui/e-itip-control.c:1908
+#: ../calendar/gui/e-itip-control.c:1910
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1938
 msgid "Object is invalid and cannot be updated\n"
 msgstr "物件是無效的而且不能更新\n"
 
-#: ../calendar/gui/e-itip-control.c:1946
+#: ../calendar/gui/e-itip-control.c:1948
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "這個回覆並非來自目前的到會者。將他加入為到會者？"
 
-#: ../calendar/gui/e-itip-control.c:1958
+#: ../calendar/gui/e-itip-control.c:1960
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！\n"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1977
 msgid "Attendee status updated\n"
 msgstr "到會者狀態已更新\n"
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:1980
 #: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "到會者狀態不能更新，因為項目已經不存在"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#: ../calendar/gui/e-itip-control.c:2008
+#: ../calendar/gui/e-itip-control.c:2010
 msgid "Removal Complete"
 msgstr "移除完成"
 
-#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2079
+#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2081
 msgid "Item sent!\n"
 msgstr "項目傳送！\n"
 
-#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2083
+#: ../calendar/gui/e-itip-control.c:2035 ../calendar/gui/e-itip-control.c:2085
 msgid "The item could not be sent!\n"
 msgstr "無法傳送這個項目！\n"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2165
 msgid "Choose an action:"
 msgstr "選擇一個動作:"
 
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2237
 msgid "Update"
 msgstr "更新"
 
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2265
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "接受"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2266
 msgid "Tentatively accept"
 msgstr "暫時接受"
 
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2267
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "婉拒"
 
 # mail/mail-config.glade.h:61
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2296
 msgid "Send Free/Busy Information"
 msgstr "送出空閒/忙碌資訊"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2324
 msgid "Update respondent status"
 msgstr "更新回應狀態"
 
 # widgets/misc/e-messagebox.c:152
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2352
 msgid "Send Latest Information"
 msgstr "送出最新資訊"
 
 # ui/evolution-mail.xml.h:2
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:569
+#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:569
 #: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -8586,13 +8497,13 @@ msgid "Resources"
 msgstr "資源"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
+#: ../calendar/gui/e-meeting-store.c:803
 msgid "Individual"
 msgstr "個別"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
@@ -8600,62 +8511,62 @@ msgstr "群組"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Resource"
 msgstr "資源"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 msgid "Room"
 msgstr "會議室"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
 msgid "Chair"
 msgstr "主席"
 
 # mail/mail-config.glade.h:61
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:805
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/e-meeting-store.c:806
 msgid "Required Participant"
 msgstr "出席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Optional Participant"
 msgstr "列席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 msgid "Non-Participant"
 msgstr "缺席者"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:816
 msgid "Needs Action"
 msgstr "需要動作"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "Tentative"
 msgstr "暫訂"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 #: ../calendar/gui/itip-utils.c:555
 #: ../plugins/itip-formatter/itip-formatter.c:1649
 msgid "Delegated"
 msgstr "已委派"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:361
+#: ../calendar/gui/e-meeting-list-view.c:463
 msgid "Attendee                          "
 msgstr "到會者"
 
@@ -8663,7 +8574,7 @@ msgstr "到會者"
 # calendar/gui/calendar-model.c:1178
 # calendar/gui/dialogs/task-editor-dialog.glade.h:11
 # calendar/gui/e-calendar-table.c:420
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "進行中"
 
@@ -8683,11 +8594,8 @@ msgstr "%A, %B %d, %Y"
 #. 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.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
 #: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2138 ../e-util/e-time-utils.c:203
-#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel.c:2138
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -8698,12 +8606,10 @@ msgstr "%a %m/%d/%Y"
 # widgets/misc/e-dateedit.c:1465
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
 #. This is a strftime() format for a short date. %m = month,
 #. %d = day of month, %Y = year (all digits).
-#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1736
+#: ../calendar/gui/e-meeting-time-sel-item.c:452
+#: ../widgets/misc/e-dateedit.c:1736
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -8777,16 +8683,16 @@ msgstr "開始時刻(_S):"
 msgid "_End time:"
 msgstr "結束時刻(_E):"
 
-#: ../calendar/gui/e-memo-table.c:274
+#: ../calendar/gui/e-memo-table.c:276
 msgid "Memo Table"
 msgstr "備忘錄表格"
 
-#: ../calendar/gui/e-memo-table.c:870
+#: ../calendar/gui/e-memo-table.c:872
 msgid "_Delete Selected Memos"
 msgstr "刪除選定的備忘錄(_D)"
 
 # calendar/gui/e-calendar-table.c:163
-#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:995 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "請按這裡增加新的備忘錄"
 
@@ -9033,9 +8939,8 @@ msgstr "您必須是此事件的到會者。"
 # ui/evolution-event-editor.xml.h:13
 # ui/evolution-mail.xml.h:8
 # ui/evolution-task-editor-dialog.xml.h:14
-#: ../calendar/gui/memos-component.c:449 ../ui/evolution-addressbook.xml.h:3
-#: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
+#: ../calendar/gui/memos-component.c:450 ../ui/evolution-addressbook.xml.h:3
+#: ../ui/evolution-memos.xml.h:2 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "複製"
 
@@ -9050,9 +8955,9 @@ msgstr "複製"
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-#: ../calendar/gui/memos-component.c:450 ../mail/em-filter-i18n.h:11
+#: ../calendar/gui/memos-component.c:451 ../mail/em-filter-i18n.h:11
 #: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:24 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "刪除"
@@ -9061,19 +8966,19 @@ msgstr "刪除"
 # ui/evolution-mail.xml.h:115
 # ui/evolution-task-editor-dialog.xml.h:83
 # ui/evolution.xml.h:60
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/memos-component.c:452
 msgid "Properties..."
 msgstr "屬性..."
 
 # calendar/gui/event-editor.c:1558
-#: ../calendar/gui/memos-component.c:524
+#: ../calendar/gui/memos-component.c:525
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 備忘錄"
 
-#: ../calendar/gui/memos-component.c:526 ../calendar/gui/tasks-component.c:517
-#: ../mail/mail-component.c:548
+#: ../calendar/gui/memos-component.c:527 ../calendar/gui/tasks-component.c:518
+#: ../mail/mail-component.c:559
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -9081,51 +8986,51 @@ msgstr[0] "，%d 已選擇"
 msgstr[1] "，%d 已選擇"
 
 # ui/evolution-mail.xml.h:46
-#: ../calendar/gui/memos-component.c:573
+#: ../calendar/gui/memos-component.c:574
 msgid "Failed upgrading memos."
 msgstr "升級備忘錄失敗。"
 
-#: ../calendar/gui/memos-component.c:869
+#: ../calendar/gui/memos-component.c:870
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "無法開啟備忘錄清單「%s」來建立事件和會議"
 
-#: ../calendar/gui/memos-component.c:882
+#: ../calendar/gui/memos-component.c:883
 msgid "There is no calendar available for creating memos"
 msgstr "沒有可用的行事曆來建立備忘錄"
 
-#: ../calendar/gui/memos-component.c:973
+#: ../calendar/gui/memos-component.c:974
 msgid "Memo Source Selector"
 msgstr "備忘錄來源選擇器"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: ../calendar/gui/memos-component.c:1156
+#: ../calendar/gui/memos-component.c:1157
 msgid "New memo"
 msgstr "新增備忘錄"
 
-#: ../calendar/gui/memos-component.c:1157
+#: ../calendar/gui/memos-component.c:1158
 msgid "_Memo"
 msgstr "備忘錄(_M)"
 
 # ui/evolution-tasks.xml.h:2
-#: ../calendar/gui/memos-component.c:1158
+#: ../calendar/gui/memos-component.c:1159
 msgid "Create a new memo"
 msgstr "建立新的備忘錄"
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: ../calendar/gui/memos-component.c:1164
+#: ../calendar/gui/memos-component.c:1165
 msgid "New memo list"
 msgstr "新備忘錄清單"
 
-#: ../calendar/gui/memos-component.c:1165
+#: ../calendar/gui/memos-component.c:1166
 msgid "Memo l_ist"
 msgstr "備忘錄清單(_I)"
 
 # ui/evolution-tasks.xml.h:2
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1167
 msgid "Create a new memo list"
 msgstr "建立新備忘錄清單"
 
@@ -9136,7 +9041,7 @@ msgstr "建立新備忘錄清單"
 msgid "Print Memos"
 msgstr "列印備忘錄"
 
-#: ../calendar/gui/migration.c:151
+#: ../calendar/gui/migration.c:156
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -9147,7 +9052,7 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-#: ../calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:160
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -9159,20 +9064,20 @@ msgstr ""
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
+#: ../calendar/gui/migration.c:753 ../calendar/gui/migration.c:919
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "無法從 evolution/config.xmldb 移轉舊設定"
 
 # shell/e-storage.c:475
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:777
+#: ../calendar/gui/migration.c:782
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "無法移轉移行事曆 `%s'"
 
 # addressbook/gui/component/addressbook.c:438
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:944
+#: ../calendar/gui/migration.c:948
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "無法移轉工作 `%s'"
@@ -9429,12 +9334,6 @@ msgstr "工作"
 msgid "Summary: %s"
 msgstr "摘要：%s"
 
-# addressbook/backend/ebook/e-card.c:3442
-#: ../calendar/gui/print.c:2339
-#, c-format
-msgid "Location: %s"
-msgstr "位置：%s"
-
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #: ../calendar/gui/print.c:2382
 #, c-format
@@ -9489,12 +9388,12 @@ msgstr "列印項目"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: ../calendar/gui/tasks-component.c:439
+#: ../calendar/gui/tasks-component.c:440
 msgid "_New Task List"
 msgstr "新增工作清單(_N)"
 
 # ui/evolution-tasks.xml.h:3
-#: ../calendar/gui/tasks-component.c:515
+#: ../calendar/gui/tasks-component.c:516
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -9502,60 +9401,60 @@ msgstr[0] "%d 個工作"
 msgstr[1] "%d 個工作"
 
 # ui/evolution-mail.xml.h:46
-#: ../calendar/gui/tasks-component.c:564
+#: ../calendar/gui/tasks-component.c:565
 msgid "Failed upgrading tasks."
 msgstr "升級工作失敗。"
 
-#: ../calendar/gui/tasks-component.c:875
+#: ../calendar/gui/tasks-component.c:876
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "無法開啟工作清單 '%s' 來建立事件和會議"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:889
 msgid "There is no calendar available for creating tasks"
 msgstr "沒有可用的行事曆來建立工作"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:989
 msgid "Task Source Selector"
 msgstr "工作來源選擇器"
 
 # ui/evolution-tasks.xml.h:3
-#: ../calendar/gui/tasks-component.c:1171
+#: ../calendar/gui/tasks-component.c:1172
 msgid "New task"
 msgstr "新增工作"
 
 # ui/evolution-tasks.xml.h:2
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1174
 msgid "Create a new task"
 msgstr "建立一個新的工作"
 
 # calendar/gui/calendar-model.c:1578
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1180
 msgid "New assigned task"
 msgstr "新指定的工作"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1181
 msgid "Assigne_d Task"
 msgstr "指派的工作(_D)"
 
 # ui/evolution-tasks.xml.h:2
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1182
 msgid "Create a new assigned task"
 msgstr "建立新指定的工作"
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1188
 msgid "New task list"
 msgstr "新工作清單"
 
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1189
 msgid "Task l_ist"
 msgstr "工作清單(_I)"
 
 # ui/evolution-tasks.xml.h:2
-#: ../calendar/gui/tasks-component.c:1189
+#: ../calendar/gui/tasks-component.c:1190
 msgid "Create a new task list"
 msgstr "建立新工作清單"
 
@@ -9590,46 +9489,46 @@ msgstr "列印工作"
 msgid "SMTWTFS"
 msgstr "日一二三四五六"
 
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:79
 msgid "Appointments and Meetings"
 msgstr "約會和會議"
 
-#: ../calendar/importers/icalendar-importer.c:336
-#: ../calendar/importers/icalendar-importer.c:586
+#: ../calendar/importers/icalendar-importer.c:337
+#: ../calendar/importers/icalendar-importer.c:620
 msgid "Opening calendar"
 msgstr "開啟行事曆"
 
 # calendar/gui/e-itip-control.glade.h:4
-#: ../calendar/importers/icalendar-importer.c:429
+#: ../calendar/importers/icalendar-importer.c:444
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 檔案 (.ics)"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:445
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 輸入器"
 
 # calendar/gui/event-editor-dialog.glade.h:20
-#: ../calendar/importers/icalendar-importer.c:494
-msgid "Reminder!!"
-msgstr "提醒！！"
+#: ../calendar/importers/icalendar-importer.c:521
+msgid "Reminder!"
+msgstr "提醒！"
 
-#: ../calendar/importers/icalendar-importer.c:539
+#: ../calendar/importers/icalendar-importer.c:573
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar 檔案 (.vcf)"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#: ../calendar/importers/icalendar-importer.c:540
+#: ../calendar/importers/icalendar-importer.c:574
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 輸入器"
 
 # calendar/gui/e-itip-control.glade.h:4
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:736
 msgid "Calendar Events"
 msgstr "行事曆事件"
 
 # calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#: ../calendar/importers/icalendar-importer.c:739
+#: ../calendar/importers/icalendar-importer.c:773
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 行事曆智慧輸入器"
 
@@ -11163,6 +11062,56 @@ msgstr "太平洋/瓦利斯"
 msgid "Pacific/Yap"
 msgstr "太平洋/雅浦島"
 
+# composer/e-msg-composer-attachment-bar.c:104
+#: ../composer/e-msg-composer-attachment-bar.c:105
+#: ../widgets/misc/e-attachment-bar.c:106
+#, c-format
+msgid "%.0fK"
+msgstr "%.0fK"
+
+# composer/e-msg-composer-attachment-bar.c:108
+#: ../composer/e-msg-composer-attachment-bar.c:108
+#: ../widgets/misc/e-attachment-bar.c:109
+#, c-format
+msgid "%.0fM"
+msgstr "%.0fM"
+
+# composer/e-msg-composer-attachment-bar.c:112
+#: ../composer/e-msg-composer-attachment-bar.c:111
+#: ../widgets/misc/e-attachment-bar.c:112
+#, c-format
+msgid "%.0fG"
+msgstr "%.0fG"
+
+# composer/e-msg-composer-attachment.glade.h:1
+# mail/mail-config.glade.h:9
+# mail/message-list.c:1081
+#: ../composer/e-msg-composer-attachment-bar.c:740
+#: ../widgets/misc/e-attachment-bar.c:994
+msgid "Attachment Bar"
+msgstr "附加檔案列"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../composer/e-msg-composer-attachment.c:187
+#: ../composer/e-msg-composer-attachment.c:203
+#: ../composer/e-msg-composer-attachment.c:297
+#: ../composer/e-msg-composer-attachment.c:313
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:442 ../widgets/misc/e-attachment.c:458
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "不能附加檔案 %s： %s"
+
+# camel/providers/local/camel-mbox-store.c:119
+# camel/providers/local/camel-mbox-store.c:146
+#: ../composer/e-msg-composer-attachment.c:195
+#: ../composer/e-msg-composer-attachment.c:305
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:450
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "不能附加檔案 %s：不是一個合法的檔案"
+
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
@@ -11262,69 +11211,76 @@ msgstr "張貼到:"
 msgid "A_ttach"
 msgstr "附加(_T)"
 
-#: ../composer/e-msg-composer.c:837
+# composer/e-msg-composer-attachment.glade.h:1
+# mail/mail-config.glade.h:9
+# mail/message-list.c:1081
+#: ../composer/e-msg-composer-select-file.c:239
+msgid "Insert Attachment"
+msgstr "插入附加檔案"
+
+#: ../composer/e-msg-composer.c:830
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽名送出的郵件：此帳號沒有設定簽名憑證"
 
-#: ../composer/e-msg-composer.c:844
+#: ../composer/e-msg-composer.c:837
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "無法加密送出的郵件：沒有設定加密憑證(此帳號)"
 
 # camel/camel-sasl-login.c:127
-#: ../composer/e-msg-composer.c:1327 ../composer/e-msg-composer.c:1361
+#: ../composer/e-msg-composer.c:1320 ../composer/e-msg-composer.c:1354
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "不明的原因"
 
 # camel/camel-filter-driver.c:671
-#: ../composer/e-msg-composer.c:1399
+#: ../composer/e-msg-composer.c:1392
 msgid "Could not open file"
 msgstr "無法開啟檔案"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: ../composer/e-msg-composer.c:1407
+#: ../composer/e-msg-composer.c:1400
 msgid "Unable to retrieve message from editor"
 msgstr "無法從編輯器取得郵件"
 
 # mail/mail-search.c:138
-#: ../composer/e-msg-composer.c:1682
+#: ../composer/e-msg-composer.c:1678
 msgid "Untitled Message"
 msgstr "未命名的郵件"
 
 # composer/e-msg-composer.c:966
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1717
+#: ../composer/e-msg-composer.c:1713
 msgid "Open File"
 msgstr "開啟檔案"
 
-#: ../composer/e-msg-composer.c:2144 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
+#: ../composer/e-msg-composer.c:2140 ../mail/em-account-editor.c:596
+#: ../mail/em-account-editor.c:641 ../mail/em-account-editor.c:708
 msgid "Autogenerated"
 msgstr "自動產生的"
 
 # mail/mail-config.glade.h:74
-#: ../composer/e-msg-composer.c:2247
+#: ../composer/e-msg-composer.c:2243
 msgid "Si_gnature:"
 msgstr "簽名檔(_G):"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: ../composer/e-msg-composer.c:2498 ../composer/e-msg-composer.c:3699
-#: ../composer/e-msg-composer.c:3702
+#: ../composer/e-msg-composer.c:2497 ../composer/e-msg-composer.c:3701
+#: ../composer/e-msg-composer.c:3704
 msgid "Compose a message"
 msgstr "編輯郵件"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../composer/e-msg-composer.c:3817
+#: ../composer/e-msg-composer.c:3819
 msgid "_Attachment Bar"
 msgstr "附加檔案列(_A)"
 
-#: ../composer/e-msg-composer.c:4909
+#: ../composer/e-msg-composer.c:4911
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11352,7 +11308,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "因為「{0}」，所以您可能需要選取不同的郵件選項。"
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{1}&quot;."
 msgstr "因為「{1}」。"
 
@@ -11394,15 +11350,15 @@ msgstr "無法儲存至自動儲存檔案「{0}」。"
 msgid "Directories can not be attached to Messages."
 msgstr "無法附加目錄到郵件。"
 
-# calendar/gui/dialogs/save-comp.c:51
+# shell/e-shortcuts-view.c:265
 #: ../composer/mail-composer.error.xml.h:13
-msgid "Do you want to recover unfinished messages?"
-msgstr "要復原未完成的郵件？"
+msgid "Do not Recover"
+msgstr "不要復原"
 
-# shell/e-shortcuts-view.c:265
+# calendar/gui/dialogs/save-comp.c:51
 #: ../composer/mail-composer.error.xml.h:14
-msgid "Don't Recover"
-msgstr "不要復原"
+msgid "Do you want to recover unfinished messages?"
+msgstr "要復原未完成的郵件？"
 
 #: ../composer/mail-composer.error.xml.h:15
 msgid "Download in progress. Do you want to send the mail?"
@@ -11486,7 +11442,7 @@ msgstr "儲存郵件(_S)"
 # shell/e-shell-view-menu.c:228
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:509
+#: ../shell/main.c:514
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -11541,7 +11497,7 @@ msgid "I am currently out of the office"
 msgstr "我目前不在辦公室"
 
 #: ../designs/OOA/ooa.glade.h:10
-msgid "No, Don't Change Status"
+msgid "No, Do not Change Status"
 msgstr "否，請不要變更狀態"
 
 #: ../designs/OOA/ooa.glade.h:12
@@ -11648,7 +11604,7 @@ msgstr "Evolution 查詢"
 
 # mail/mail-config.glade.h:69
 #. setup a dummy error
-#: ../e-util/e-error.c:438
+#: ../e-util/e-error.c:442
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -11684,140 +11640,12 @@ msgstr "要覆寫它?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "檔案存在「{0}」。"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:128
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
-# e-util/e-time-utils.c:283
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %m/%d/%Y %I:%M %p"
-
-# e-util/e-time-utils.c:274
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %m/%d/%Y %H:%M"
-
-# e-util/e-time-utils.c:283
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:195
-msgid "%a %m/%d/%Y %I %p"
-msgstr "%a %m/%d/%Y %I %p"
-
-# e-util/e-time-utils.c:274
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:200
-msgid "%a %m/%d/%Y %H"
-msgstr "%a %m/%d/%Y %H"
-
-# calendar/gui/calendar-model.c:797
-# e-util/e-time-utils.c:287
-#. strptime format of a date and a time, in 12-hour format.
-#: ../e-util/e-time-utils.c:211
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%m/%d/%Y %I:%M:%S %p"
-
-# calendar/gui/calendar-model.c:794
-# e-util/e-time-utils.c:278
-#. strptime format of a date and a time, in 24-hour format.
-#: ../e-util/e-time-utils.c:215
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%m/%d/%Y %H:%M:%S"
-
-# e-util/e-time-utils.c:283
-#. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:220
-msgid "%m/%d/%Y %I:%M %p"
-msgstr "%m/%d/%Y %I:%M %p"
-
-# e-util/e-time-utils.c:274
-#. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:225
-msgid "%m/%d/%Y %H:%M"
-msgstr "%m/%d/%Y %H:%M"
-
-# e-util/e-time-utils.c:283
-#. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:230
-msgid "%m/%d/%Y %I %p"
-msgstr "%m/%d/%Y %I %p"
-
-# e-util/e-time-utils.c:69
-# e-util/e-time-utils.c:117
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-# widgets/misc/e-dateedit.c:1284
-# widgets/misc/e-dateedit.c:1465
-#. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:235
-msgid "%m/%d/%Y %H"
-msgstr "%m/%d/%Y %H"
-
-# e-util/e-time-utils.c:323
-#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
-#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-# e-util/e-time-utils.c:315
-#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
-#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-# e-util/e-time-utils.c:320
-# widgets/misc/e-dateedit.c:1262
-# widgets/misc/e-dateedit.c:1321
-# widgets/misc/e-dateedit.c:1500
-#. strptime format for time of day, without seconds,
-#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1447 ../widgets/misc/e-dateedit.c:1774
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-# e-util/e-time-utils.c:312
-# widgets/misc/e-dateedit.c:1259
-# widgets/misc/e-dateedit.c:1318
-# widgets/misc/e-dateedit.c:1497
-#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1444 ../widgets/misc/e-dateedit.c:1771
-msgid "%H:%M"
-msgstr "%H:%M"
-
-# e-util/e-time-utils.c:320
-# widgets/misc/e-dateedit.c:1262
-# widgets/misc/e-dateedit.c:1321
-# widgets/misc/e-dateedit.c:1500
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../e-util/e-time-utils.c:356
-msgid "%I %p"
-msgstr "%I %p"
-
 # calendar/gui/gnome-cal.c:235
-#: ../e-util/eggtrayicon.c:119
+#: ../e-util/eggtrayicon.c:121
 msgid "The orientation of the tray."
 msgstr "系統匣的方向。"
 
@@ -11894,12 +11722,12 @@ msgid "Select a time to compare against"
 msgstr "選擇要比對的時間"
 
 # ui/evolution-message-composer.xml.h:12
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "選擇一個檔案"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
+#: ../mail/em-migrate.c:1051 ../mail/mail-config.c:84
 #: ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "重要"
@@ -11907,15 +11735,15 @@ msgstr "重要"
 # mail/mail-format.c:762
 # mail/message-list.c:1083
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
-#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1054
+#: ../mail/mail-config.c:87 ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "待辦"
 
 # calendar/gui/event-editor-dialog.glade.h:33
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
-#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.c:88 ../mail/mail-config.glade.h:95
 msgid "Later"
 msgstr "稍後"
 
@@ -11924,25 +11752,25 @@ msgid "Test"
 msgstr "測試"
 
 #: ../filter/filter-rule.c:791
-msgid "_Rule name:"
-msgstr "規則名稱(_R):"
+msgid "_Search name:"
+msgstr "搜尋名稱(_S):"
 
-# addressbook/contact-editor/fullname.glade.h:4
 #: ../filter/filter-rule.c:819
-msgid "If"
-msgstr "如果"
+msgid "Find items that meet the following criteria"
+msgstr "尋找符合下列條件的項目"
 
 #: ../filter/filter-rule.c:858
-msgid "if all criteria are met"
+msgid "If all criteria are met"
 msgstr "如果全部條件符合"
 
 #: ../filter/filter-rule.c:858
-msgid "if any criteria are met"
+msgid "If any criteria are met"
 msgstr "如果任何條件符合"
 
+# mail/mail-ops.c:898
 #: ../filter/filter-rule.c:860
-msgid "Execute actions"
-msgstr "執行動作"
+msgid "Find items:"
+msgstr "尋找項目:"
 
 #: ../filter/filter-rule.c:881
 msgid "All related"
@@ -11962,11 +11790,11 @@ msgid "Include threads"
 msgstr "包括線串"
 
 #: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:330
+#: ../mail/em-utils.c:348
 msgid "Incoming"
 msgstr "內送"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:331
+#: ../filter/filter-rule.c:978 ../mail/em-utils.c:349
 msgid "Outgoing"
 msgstr "外寄"
 
@@ -11994,7 +11822,7 @@ msgid "Missing file name."
 msgstr "缺少檔案名稱。"
 
 # calendar/gui/calendar-model.c:1578
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:67
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "缺少名稱。"
 
@@ -12080,15 +11908,15 @@ msgstr "您所指定的時間"
 msgid "years"
 msgstr "年"
 
-#: ../filter/rule-editor.c:290
+#: ../filter/rule-editor.c:292
 msgid "Add Rule"
 msgstr "新增規則"
 
-#: ../filter/rule-editor.c:366
+#: ../filter/rule-editor.c:368
 msgid "Edit Rule"
 msgstr "編輯規則"
 
-#: ../filter/rule-editor.c:698
+#: ../filter/rule-editor.c:735
 msgid "Rule name"
 msgstr "規則名稱"
 
@@ -12142,11 +11970,11 @@ msgstr "Evolution 郵件撰寫器組態控制"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution 郵件優先設定控制"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:495
-#: ../mail/importers/elm-importer.c:342
-#: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:388 ../mail/mail-component.c:561
-#: ../mail/mail-component.c:648
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
+#: ../mail/importers/elm-importer.c:341
+#: ../mail/importers/netscape-importer.c:1903
+#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:577
+#: ../mail/mail-component.c:578 ../mail/mail-component.c:663
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "郵件"
@@ -12165,12 +11993,12 @@ msgstr "郵件偏好設定"
 msgid "_Mail"
 msgstr "郵件(_M)"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:395
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s 授權合約"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:402
 #, c-format
 msgid ""
 "\n"
@@ -12184,91 +12012,111 @@ msgstr ""
 "並選取核取方塊來接受它\n"
 
 # mail/mail-account-gui.c:682
-#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:495
+#: ../mail/em-account-editor.c:472 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "選擇資料夾"
 
 # composer/e-msg-composer-attachment-bar.c:501
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:768
 msgid "Ask for each message"
 msgstr "每封郵件皆詢問"
 
 # mail/mail-config.glade.h:35
-#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1747 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "身分"
 
 # mail/mail-config.glade.h:57
-#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1796 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "接收電子郵件"
 
-#: ../mail/em-account-editor.c:1943
+#: ../mail/em-account-editor.c:1979
 msgid "Automatically check for _new mail every"
 msgstr "自動檢查新郵件每(_N)"
 
 # mail/mail-config.glade.h:65
-#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:129
 msgid "Sending Email"
 msgstr "傳送電子郵件"
 
 # mail/mail-config.glade.h:21
-#: ../mail/em-account-editor.c:2165 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2219 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "預設值"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2226 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:313
+#: ../mail/em-account-editor.c:2285 ../mail/mail-config.glade.h:122
+#: ../plugins/exchange-operations/exchange-account-setup.c:315
 msgid "Security"
 msgstr "安全性"
 
 # mail/mail-config.glade.h:59
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2263 ../mail/em-account-editor.c:2337
+#: ../mail/em-account-editor.c:2322 ../mail/em-account-editor.c:2413
 msgid "Receiving Options"
 msgstr "接收選項"
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: ../mail/em-account-editor.c:2264 ../mail/em-account-editor.c:2338
+#: ../mail/em-account-editor.c:2323 ../mail/em-account-editor.c:2414
 msgid "Checking for New Mail"
 msgstr "檢查新郵件"
 
 # mail/mail-config.glade.h:3
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "帳號編輯器"
 
 # mail/mail-config-druid.c:445
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助理"
 
+# mail/mail-accounts.c:197
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:407
+msgid "Disable"
+msgstr "停用"
+
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:409
+msgid "Enable"
+msgstr "啟用"
+
 # mail/mail-config.glade.h:21
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:455
+#: ../mail/em-account-prefs.c:456
 msgid "[Default]"
 msgstr "[預設值]"
 
+# mail/mail-accounts.c:199
+# mail/mail-config.glade.h:30
+#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
+#: ../mail/em-account-prefs.c:505 ../mail/em-composer-prefs.c:930
+#: ../plugins/plugin-manager/plugin-manager.c:213
+#: ../plugins/publish-calendar/publish-calendar.c:457
+msgid "Enabled"
+msgstr "已啟用"
+
 # mail/mail-config.glade.h:5
-#: ../mail/em-account-prefs.c:510
+#: ../mail/em-account-prefs.c:511
 msgid "Account name"
 msgstr "帳號名稱"
 
-#: ../mail/em-account-prefs.c:512
+#: ../mail/em-account-prefs.c:513
 msgid "Protocol"
 msgstr "通訊協定"
 
 # mail/mail-config.glade.h:6
-#: ../mail/em-account-prefs.c:517
+#: ../mail/em-account-prefs.c:518
 msgid "Mail Accounts Table"
 msgstr "郵件帳號表"
 
 # addressbook/gui/component/addressbook-storage.c:99
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:958
+#: ../mail/mail-config.c:966
 msgid "Unnamed"
 msgstr "未命名的"
 
@@ -12309,7 +12157,7 @@ msgstr ""
 "於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} "
 "${TimeZone}，${Sender} 提到："
 
-#: ../mail/em-filter-editor.c:147
+#: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
 msgstr "過濾器規則(_F)"
 
@@ -12326,7 +12174,7 @@ msgstr "指定色彩"
 msgid "Assign Score"
 msgstr "指定目標"
 
-#: ../mail/em-filter-i18n.h:5 ../ui/evolution-editor.xml.h:1
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "附加檔案"
 
@@ -12441,7 +12289,7 @@ msgstr "沒有標幟的"
 
 # calendar/gui/goto-dialog.glade.h:9
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Junk"
 msgstr "垃圾郵件"
 
@@ -12452,7 +12300,7 @@ msgstr "垃圾郵件測試"
 
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1064
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1105
 #: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "標籤"
@@ -12499,7 +12347,7 @@ msgstr "建立程式管道"
 msgid "Play Sound"
 msgstr "播放音效"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
 msgid "Read"
 msgstr "閱讀"
 
@@ -12570,10 +12418,10 @@ msgstr "以此開始"
 msgid "Stop Processing"
 msgstr "停止處理"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1582
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
-#: ../mail/message-tag-followup.c:330
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
+#: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1131
 msgid "Subject"
@@ -12589,29 +12437,29 @@ msgid "<b>Then</b>"
 msgstr "<b>然後</b>"
 
 # ui/evolution-mail.xml.h:10
-#: ../mail/em-folder-browser.c:134
+#: ../mail/em-folder-browser.c:143
 msgid "C_reate Search Folder From Search..."
 msgstr "從搜尋建立搜尋資料夾(_R)..."
 
 # camel/providers/smtp/camel-smtp-transport.c:178
 #. TODO: can this be done in a loop?
-#: ../mail/em-folder-properties.c:144
-msgid "Total message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:145
+msgid "Total messages:"
 msgid_plural "Total messages:"
-msgstr[0] "全部的郵件:"
-msgstr[1] "全部的郵件:"
+msgstr[0] "所有郵件:"
 
 # mail/mail-search.c:138
-#: ../mail/em-folder-properties.c:156
-msgid "Unread message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:158
+msgid "Unread messages:"
 msgid_plural "Unread messages:"
-msgstr[0] "未閱讀的郵件:"
-msgstr[1] "未閱讀的郵件:"
+msgstr[0] "未讀郵件:"
 
 # mail/folder-browser-factory.c:198
 # ui/evolution-event-editor.xml.h:39
 # ui/evolution-task-editor-dialog.xml.h:42
-#: ../mail/em-folder-properties.c:278
+#: ../mail/em-folder-properties.c:289
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "資料夾內容"
@@ -12630,37 +12478,37 @@ msgid "Folder _name:"
 msgstr "資料夾名稱(_N):"
 
 # mail/mail-account-gui.c:682
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
+#: ../mail/em-folder-tree-model.c:202 ../mail/em-folder-tree-model.c:204
+#: ../mail/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "搜尋資料夾"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:208 ../mail/em-folder-tree-model.c:210
 msgid "UNMATCHED"
 msgstr "不符合"
 
-#: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:483 ../mail/mail-component.c:150
 msgid "Drafts"
 msgstr "草稿"
 
 # mail/local-config.glade.h:8
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:486 ../mail/mail-component.c:149
 msgid "Inbox"
 msgstr "收件匣"
 
-#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
+#: ../mail/em-folder-tree-model.c:489 ../mail/mail-component.c:151
 msgid "Outbox"
 msgstr "寄件匣"
 
-#: ../mail/em-folder-tree-model.c:477 ../mail/mail-component.c:146
+#: ../mail/em-folder-tree-model.c:491 ../mail/mail-component.c:152
 msgid "Sent"
 msgstr "已傳送"
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: ../mail/em-folder-tree-model.c:499 ../mail/em-folder-tree-model.c:803
+#: ../mail/em-folder-tree-model.c:513 ../mail/em-folder-tree-model.c:817
 msgid "Loading..."
 msgstr "載入中..."
 
@@ -12683,13 +12531,13 @@ msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
 # mail/mail-ops.c:898
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1621
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
 # mail/mail-ops.c:898
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1625
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1623
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
@@ -12703,12 +12551,12 @@ msgstr "無法將郵件拖放到最上層的儲存區"
 msgid "_Copy to Folder"
 msgstr "複製至資料夾(_C)"
 
-#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:116
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:117
 msgid "_Move to Folder"
 msgstr "移至資料夾(_M)"
 
 # mail/mail-ops.c:992
-#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1058
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "掃描「%s」內的資料夾"
@@ -12742,7 +12590,7 @@ msgstr "新增資料夾(_N)..."
 msgid "_Rename..."
 msgstr "重新命名(_R)..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:125
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:128
 msgid "_Empty Trash"
 msgstr "清空垃圾桶(_E)"
 
@@ -12753,13 +12601,13 @@ msgid "Copying `%s' to `%s'"
 msgstr "將「%s」複製到「%s」"
 
 # shell/e-shell-importer.c:601
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:932
-#: ../mail/em-folder-view.c:947 ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:947
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "複製(_O)"
 
@@ -12797,304 +12645,307 @@ msgstr "建立資料夾"
 msgid "Specify where to create the folder:"
 msgstr "指定要建立資料夾的位置："
 
-#: ../mail/em-folder-view.c:1040 ../mail/em-popup.c:558 ../mail/em-popup.c:569
-msgid "Reply to _All"
-msgstr "回覆所有人(_A)"
-
-#: ../mail/em-folder-view.c:1041 ../ui/evolution-mail-message.xml.h:125
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/em-folder-view.c:1042 ../mail/em-popup.c:560 ../mail/em-popup.c:571
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../mail/em-folder-view.c:1082 ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../ui/evolution-mail-message.xml.h:82
+msgid "Reply to _All"
+msgstr "回覆所有人(_A)"
+
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:560 ../mail/em-popup.c:571
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: ../mail/em-folder-view.c:1045 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)..."
 
-#: ../mail/em-folder-view.c:1051
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "復原(_N)"
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:37
+#: ../mail/em-folder-view.c:1093 ../ui/evolution-addressbook.xml.h:37
 msgid "_Move to Folder..."
 msgstr "移至資料夾(_M)..."
 
-#: ../mail/em-folder-view.c:1053 ../ui/evolution-addressbook.xml.h:33
+#: ../mail/em-folder-view.c:1094 ../ui/evolution-addressbook.xml.h:33
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)..."
 
-#: ../mail/em-folder-view.c:1056
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "標示成已閱讀(_K)"
 
-#: ../mail/em-folder-view.c:1057
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_U)"
 
-#: ../mail/em-folder-view.c:1058
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
-#: ../mail/em-folder-view.c:1059
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "標示成不重要(_M)"
 
-#: ../mail/em-folder-view.c:1060
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "標示成垃圾郵件(_J)"
 
-#: ../mail/em-folder-view.c:1061
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "標示成非垃圾郵件(_N)"
 
-#: ../mail/em-folder-view.c:1062
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "標示為跟隨(_W)..."
 
-#: ../mail/em-folder-view.c:1070
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "標幟已完成(_G)"
 
-#: ../mail/em-folder-view.c:1071
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "清除標幟(_E)"
 
-#: ../mail/em-folder-view.c:1074
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "從郵件建立規則(_T)"
 
 # mail/folder-browser.c:653
-#: ../mail/em-folder-view.c:1075
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "從主旨建立搜尋資料夾(_S)"
 
 # mail/folder-browser.c:656
-#: ../mail/em-folder-view.c:1076
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "從寄件者建立搜尋資料夾(_N)"
 
 # mail/folder-browser.c:659
-#: ../mail/em-folder-view.c:1077
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "從收件者建立搜尋資料夾(_R)"
 
 # mail/folder-browser.c:662
-#: ../mail/em-folder-view.c:1078
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "從郵件清單建立搜尋資料夾(_L)"
 
-#: ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "從主旨建立過濾器(_J)"
 
-#: ../mail/em-folder-view.c:1083
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "從寄件者建立過濾器(_D)"
 
-#: ../mail/em-folder-view.c:1084
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "收件者過濾器(_C)"
 
-#: ../mail/em-folder-view.c:1085
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "從通信論壇建立過濾器(_M)"
 
 # mail/mail-config.glade.h:21
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1923 ../mail/em-folder-view.c:1967
+#: ../mail/em-folder-view.c:1974 ../mail/em-folder-view.c:2018
 msgid "Default"
 msgstr "預設值"
 
 # mail/mail-callbacks.c:1407
-#: ../mail/em-folder-view.c:2066
+#: ../mail/em-folder-view.c:2117
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "列印郵件"
 
-#: ../mail/em-folder-view.c:2222
+#: ../mail/em-folder-view.c:2273
 msgid "Unable to retrieve message"
 msgstr "無法接收郵件"
 
-#: ../mail/em-folder-view.c:2415
+#: ../mail/em-folder-view.c:2466
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
 # ui/evolution.xml.h:10
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2468
 msgid "Create _Search Folder"
 msgstr "建立搜尋資料夾(_S)"
 
 # addressbook/gui/widgets/e-addressbook-view.c:710
-#: ../mail/em-folder-view.c:2418
+#: ../mail/em-folder-view.c:2469
 msgid "_From this Address"
 msgstr "從這個位址(_F)"
 
 # addressbook/gui/widgets/e-addressbook-view.c:724
-#: ../mail/em-folder-view.c:2419
+#: ../mail/em-folder-view.c:2470
 msgid "_To this Address"
 msgstr "到這個位址(_T)"
 
 # calendar/gui/e-calendar-table.c:163
-#: ../mail/em-folder-view.c:2723
+#: ../mail/em-folder-view.c:2824
 #, c-format
 msgid "Click to mail %s"
 msgstr "按一下來傳送郵件 %s"
 
 # mail/mail-search.c:319
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:461
+#: ../mail/em-format-html-display.c:472
 #, c-format
 msgid "Matches: %d"
 msgstr "符合：%d"
 
 # calendar/gui/calendar-model.c:1578
-#: ../mail/em-format-html-display.c:712 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:729 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "未簽名"
 
 # mail/mail-format.c:1161
-#: ../mail/em-format-html-display.c:712
+#: ../mail/em-format-html-display.c:729
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "此郵件未簽名。不保證此郵件已驗證。"
 
 # mail/mail-config.glade.h:74
-#: ../mail/em-format-html-display.c:713 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:730 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "有效的簽名"
 
 # mail/mail-format.c:1161
-#: ../mail/em-format-html-display.c:713
+#: ../mail/em-format-html-display.c:730
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "此郵件已簽名而且有效，表示它非常有可能是驗證的郵件。"
 
 # mail/mail-config.glade.h:74
-#: ../mail/em-format-html-display.c:714 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:731 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "無效的簽名"
 
-#: ../mail/em-format-html-display.c:714
+#: ../mail/em-format-html-display.c:731
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "郵件的簽名無法檢驗，可能已在傳送時被更動了。"
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:732
 msgid "Valid signature, cannot verify sender"
 msgstr "簽名有效，但無法檢驗寄件者"
 
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:732
 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:721 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:738 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../mail/em-format-html-display.c:721
+#: ../mail/em-format-html-display.c:738
 msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
+"This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
-msgstr "此郵件未加密。它的內容在透過網際網路傳送可能會被檢視。"
+msgstr ""
+"此郵件未加密。它的內容在透過網際網路傳送可能會被"
+"檢閱。"
 
-#: ../mail/em-format-html-display.c:722 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:739 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "已加密，不嚴密"
 
-#: ../mail/em-format-html-display.c:722
+#: ../mail/em-format-html-display.c:739
 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 "
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
-"此郵件已加密，但是使用不嚴密的加密演算法。外面的人很難檢視內容，但只要一些時"
-"日，並不是無法檢視此郵件的內容。"
+"此郵件已加密，但是使用不嚴密的加密演算法。外面的人很難檢閱內容，"
+"但只要一些時日，並不是無法檢視此郵件的內容。"
 
 # ui/evolution-message-composer.xml.h:13
-#: ../mail/em-format-html-display.c:723 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:740 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "已加密"
 
-#: ../mail/em-format-html-display.c:723
+#: ../mail/em-format-html-display.c:740
 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:724 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:741 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "已加密，嚴密"
 
-#: ../mail/em-format-html-display.c:724
+#: ../mail/em-format-html-display.c:741
 msgid ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
+"This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
-"此郵件已加密，使用嚴密的加密演算法。縱使經過一段時間， 外面的人很難檢視此郵件"
+"此郵件已加密，使用嚴密的加密演算法。縱使經過一段時間，外面的人很難檢閱此郵件"
 "的內容。"
 
-#: ../mail/em-format-html-display.c:825 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:842 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "檢視憑證(_V)"
 
-#: ../mail/em-format-html-display.c:840
+#: ../mail/em-format-html-display.c:857
 msgid "This certificate is not viewable"
 msgstr "此憑證無法檢視"
 
 # mail/message-list.c:977
-#: ../mail/em-format-html-display.c:1122
+#: ../mail/em-format-html-display.c:1145
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "完成於 %B %d, %Y, %l:%M %p"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../mail/em-format-html-display.c:1130
+#: ../mail/em-format-html-display.c:1153
 msgid "Overdue:"
 msgstr "逾期:"
 
 # mail/message-list.c:977
-#: ../mail/em-format-html-display.c:1133
+#: ../mail/em-format-html-display.c:1156
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "作者 %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1193
+#: ../mail/em-format-html-display.c:1216
 msgid "_View Inline"
 msgstr "檢視行內(_V)"
 
-#: ../mail/em-format-html-display.c:1194
+#: ../mail/em-format-html-display.c:1217
 msgid "_Hide"
 msgstr "隱藏(_H)"
 
-#: ../mail/em-format-html-display.c:1195
+#: ../mail/em-format-html-display.c:1218
 msgid "_Fit to Width"
 msgstr "符合寬度(_F)"
 
-#: ../mail/em-format-html-display.c:1196
+#: ../mail/em-format-html-display.c:1219
 msgid "Show _Original Size"
 msgstr "顯示原始大小(_O)"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../mail/em-format-html-display.c:1566
+#: ../mail/em-format-html-display.c:1596
 msgid "Attachment Button"
 msgstr "附件按鈕"
 
 # mail/mail-display.c:196
-#: ../mail/em-format-html-display.c:1773
+#: ../mail/em-format-html-display.c:1803
 msgid "Select folder to save all attachments..."
 msgstr "選擇用來儲存所有的附加檔案的資料夾..."
 
-#: ../mail/em-format-html-display.c:1820
+#: ../mail/em-format-html-display.c:1850
 msgid "Save Selected..."
 msgstr "儲存選取的..."
 
@@ -13102,7 +12953,7 @@ msgstr "儲存選取的..."
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1887
+#: ../mail/em-format-html-display.c:1917
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
@@ -13112,13 +12963,20 @@ msgstr[1] "%d 個附件"
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../mail/em-format-html-display.c:1951
+#: ../mail/em-format-html-display.c:1980
+msgid "Toggle Attachment Bar"
+msgstr "切換附件列"
+
+# composer/e-msg-composer-attachment.glade.h:1
+# mail/mail-config.glade.h:9
+# mail/message-list.c:1081
+#: ../mail/em-format-html-display.c:1982
 msgid "No Attachment"
 msgstr "無附件"
 
 # ui/evolution-calendar.xml.h:27
 # ui/evolution-message-composer.xml.h:18
-#: ../mail/em-format-html-display.c:1954
+#: ../mail/em-format-html-display.c:1985
 msgid "Save All"
 msgstr "儲存全部"
 
@@ -13129,115 +12987,115 @@ msgid "Page %d of %d"
 msgstr "第 %d / %d 頁"
 
 # mail/mail-ops.c:1498
-#: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
+#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "正在擷取 `%s'"
 
-#: ../mail/em-format-html.c:600
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "簽名有效，但是無法檢驗寄件者"
 
 # mail/mail-format.c:1842
-#: ../mail/em-format-html.c:870
+#: ../mail/em-format-html.c:880
 msgid "Malformed external-body part."
 msgstr "格式不良的外加本文部分。"
 
 # mail/mail-format.c:1787
-#: ../mail/em-format-html.c:900
+#: ../mail/em-format-html.c:910
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 站指示 (%s)"
 
 # mail/mail-format.c:1799
-#: ../mail/em-format-html.c:911
+#: ../mail/em-format-html.c:921
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "本地端檔案 (%s) 於 「%s」有效的指示"
 
 # mail/mail-format.c:1803
-#: ../mail/em-format-html.c:913
+#: ../mail/em-format-html.c:923
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "本地檔案指示 (%s)"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:944
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "遠端資料指示 (%s)"
 
 # mail/mail-format.c:1837
-#: ../mail/em-format-html.c:945
+#: ../mail/em-format-html.c:955
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明的外部檔案指示 (「%s」類型)"
 
 # mail/mail-ops.c:898
-#: ../mail/em-format-html.c:1171
+#: ../mail/em-format-html.c:1181
 msgid "Formatting message"
 msgstr "格式化郵件"
 
 # mail/mail-format.c:756
 # mail/message-list.c:1082
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "寄件者"
 
 # mail/mail-format.c:759
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "回覆"
 
 # mail/mail-format.c:762
 # mail/message-list.c:1083
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "收件者"
 
 # mail/mail-format.c:765
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "副本"
 
 # composer/e-msg-composer-hdrs.c:394
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "密件副本"
 
 # addressbook/backend/ebook/e-card.c:3428
 #. pseudo-header
-#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:992
+#: ../mail/em-format-html.c:1586 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1000
 msgid "Mailer"
 msgstr "寄件者"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1603
+#: ../mail/em-format-html.c:1613
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1606
+#: ../mail/em-format-html.c:1616
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
 # mail/mail-format.c:640
 # mail/message-list.c:1082
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1626 ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "日期"
 
-#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1649 ../mail/em-format.c:851
+#: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "新聞群組"
 
@@ -13274,25 +13132,25 @@ msgid "Unknown error verifying signature"
 msgstr "檢驗簽名發生不明錯誤"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: ../mail/em-mailer-prefs.c:101
+#: ../mail/em-mailer-prefs.c:103
 msgid "Every time"
 msgstr "每次"
 
 # calendar/gui/event-editor.c:1545
-#: ../mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:104
 msgid "Once per day"
 msgstr "每天一次"
 
 # calendar/gui/event-editor.c:1550
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:105
 msgid "Once per week"
 msgstr "每週一次"
 
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:106
 msgid "Once per month"
 msgstr "每月一次"
 
-#: ../mail/em-migrate.c:1198
+#: ../mail/em-migrate.c:1208
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13305,55 +13163,55 @@ msgstr ""
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../mail/em-migrate.c:1632
+#: ../mail/em-migrate.c:1647
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "無法建立新資料夾 `%s'：%s"
 
 # mail/mail-ops.c:1728
-#: ../mail/em-migrate.c:1658
+#: ../mail/em-migrate.c:1673
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "無法複製製資料夾 `%s' 至 `%s'：%s"
 
 # mail/mail-ops.c:1728
-#: ../mail/em-migrate.c:1843
+#: ../mail/em-migrate.c:1858
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "無法掃描 `%s' 現有的信箱：%s"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../mail/em-migrate.c:2047
+#: ../mail/em-migrate.c:2062
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "無法開啟舊的 POP 儲存在伺服器上的資料 `%s':%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../mail/em-migrate.c:2061
+#: ../mail/em-migrate.c:2076
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "無法建立 POP 儲存在伺服器上的資料目錄 `%s':%s"
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:2105
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "無法複製 POP 儲存在伺服器上的資料 `%s':%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2576 ../mail/em-migrate.c:2588
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "無法建立本地郵件儲存區 `%s':%s"
 
 # mail/mail-ops.c:1728
-#: ../mail/em-migrate.c:2693
+#: ../mail/em-migrate.c:2711
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "無法在 `%s' 建立本地郵件資料夾:%s"
 
-#: ../mail/em-migrate.c:2711
+#: ../mail/em-migrate.c:2730
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -13365,7 +13223,7 @@ msgid "_Reply to sender"
 msgstr "回覆寄件者(_R)"
 
 #: ../mail/em-popup.c:557 ../mail/em-popup.c:568
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
@@ -13382,67 +13240,67 @@ msgstr "傳送新郵件至(_S)…"
 msgid "_Add to Addressbook"
 msgstr "加入到目錄服務(_A)"
 
-#: ../mail/em-subscribe-editor.c:614
+#: ../mail/em-subscribe-editor.c:615
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "此儲存區不支援訂閱，或者未啟用它們。"
 
 # ui/evolution-subscribe.xml.h:8
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
 msgstr "已訂閱"
 
-#: ../mail/em-subscribe-editor.c:647
+#: ../mail/em-subscribe-editor.c:648
 msgid "Folder"
 msgstr "資料夾"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:862
+#: ../mail/em-subscribe-editor.c:869
 msgid "Please select a server."
 msgstr "請選擇一個伺服器。"
 
-#: ../mail/em-subscribe-editor.c:883
+#: ../mail/em-subscribe-editor.c:890
 msgid "No server has been selected"
 msgstr "尚未選擇伺服器"
 
 # widgets/misc/e-messagebox.c:224
-#: ../mail/em-utils.c:106
-msgid "Don't show this message again."
+#: ../mail/em-utils.c:123
+msgid "Do not show this message again."
 msgstr "不要再顯示這個訊息。"
 
 # importers/netscape-importer.c:795
 # mail/mail-callbacks.c:1359
-#: ../mail/em-utils.c:338
+#: ../mail/em-utils.c:356
 msgid "Filters"
 msgstr "過濾器"
 
-#: ../mail/em-utils.c:481 ../mail/em-utils.c:518
+#: ../mail/em-utils.c:499 ../mail/em-utils.c:536
 msgid "message"
 msgstr "郵件"
 
 # mail/mail-callbacks.c:1188
-#: ../mail/em-utils.c:653
+#: ../mail/em-utils.c:671
 msgid "Save Message..."
 msgstr "儲存郵件…"
 
 # addressbook/backend/ebook/e-card.c:3346
-#: ../mail/em-utils.c:702
+#: ../mail/em-utils.c:720
 msgid "Add address"
 msgstr "新增地址"
 
 # mail/mail-autofilter.c:229
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1181
+#: ../mail/em-utils.c:1204
 #, c-format
 msgid "Messages from %s"
 msgstr "來自 %s 的郵件"
 
 # mail/mail-account-gui.c:682
-#: ../mail/em-vfolder-editor.c:104
+#: ../mail/em-vfolder-editor.c:112
 msgid "Search _Folders"
 msgstr "搜尋資料夾(_F)"
 
 # mail/mail-account-gui.c:682
-#: ../mail/em-vfolder-rule.c:575
+#: ../mail/em-vfolder-rule.c:576
 msgid "Search Folder source"
 msgstr "搜尋資料夾來源"
 
@@ -13680,8 +13538,8 @@ msgid "Message Window default width"
 msgstr "郵件視窗預設寬度"
 
 #: ../mail/evolution-mail.schemas.in.in.h:50
-msgid "Message-display style (normal, full headers, source)"
-msgstr "訊息顯示樣式 (一般、完整標頭、來源)"
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr "訊息顯示樣式 (「一般」、「完整標頭」、「來源」)"
 
 #: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
@@ -13935,78 +13793,78 @@ msgid ""
 msgstr "當郵件不包含 In-Reply-To 或 References 標頭時，是否按照主旨放回線串。"
 
 # shell/e-shell-importer.c:363
-#: ../mail/importers/elm-importer.c:193
+#: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "輸入 Elm 資料"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:381
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 輸入器"
 
-#: ../mail/importers/elm-importer.c:383
+#: ../mail/importers/elm-importer.c:382
 msgid "Import mail from Elm."
 msgstr "從 Elm 匯入郵件。"
 
 # ui/evolution.xml.h:47
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../mail/importers/evolution-outlook-importer.c:131
+#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-outlook-importer.c:136
 msgid "Destination folder:"
 msgstr "目的地資料夾:"
 
 # mail/mail-account-gui.c:682
-#: ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder to import into"
 msgstr "選取資料夾來輸入"
 
-#: ../mail/importers/evolution-mbox-importer.c:216
+#: ../mail/importers/evolution-mbox-importer.c:223
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley 郵件箱 (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:217
+#: ../mail/importers/evolution-mbox-importer.c:224
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "匯入 Berkeley 郵件箱格式資料夾"
 
 # shell/e-shell-importer.c:363
-#: ../mail/importers/evolution-outlook-importer.c:257
-#: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
+#: ../mail/importers/evolution-outlook-importer.c:262
+#: ../mail/importers/mail-importer.c:234 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "輸入 `%s'"
 
 # shell/e-shell-importer.c:363
-#: ../mail/importers/evolution-outlook-importer.c:259
-#: ../mail/importers/netscape-importer.c:1251
+#: ../mail/importers/evolution-outlook-importer.c:264
+#: ../mail/importers/netscape-importer.c:1252
 msgid "Importing..."
 msgstr "匯入..."
 
-#: ../mail/importers/evolution-outlook-importer.c:261
-#: ../mail/importers/netscape-importer.c:1253
+#: ../mail/importers/evolution-outlook-importer.c:266
+#: ../mail/importers/netscape-importer.c:1254
 #: ../plugins/startup-wizard/startup-wizard.c:236
-#: ../shell/e-shell-importer.c:523
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "請稍候"
 
 # shell/e-shell-importer.c:363
-#: ../mail/importers/evolution-outlook-importer.c:305
-#: ../mail/importers/mail-importer.c:144
+#: ../mail/importers/evolution-outlook-importer.c:310
+#: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
 msgstr "輸入信箱"
 
 # mail/mail-ops.c:599
-#: ../mail/importers/mail-importer.c:373
+#: ../mail/importers/mail-importer.c:377
 #, c-format
 msgid "Scanning %s"
 msgstr "掃描 %s"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: ../mail/importers/netscape-importer.c:73
+#: ../mail/importers/netscape-importer.c:74
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "優先順序過濾器「%s」"
 
-#: ../mail/importers/netscape-importer.c:662
+#: ../mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -14032,7 +13890,7 @@ msgstr ""
 "代替優先權。請檢查匯入的過濾器以確定一切仍然\n"
 "照您想要的方式運作。"
 
-#: ../mail/importers/netscape-importer.c:686
+#: ../mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14044,7 +13902,7 @@ msgstr ""
 "功能，而 Evolution 並不支援它。\n"
 "這些過濾器則會被丟棄。"
 
-#: ../mail/importers/netscape-importer.c:703
+#: ../mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -14058,24 +13916,24 @@ msgstr ""
 "會被修改成測試郵件的內文是否包含\n"
 "該字串。"
 
-#: ../mail/importers/netscape-importer.c:1250
+#: ../mail/importers/netscape-importer.c:1251
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution 正在匯入您舊有的 Netscape 資料"
 
-#: ../mail/importers/netscape-importer.c:1707
+#: ../mail/importers/netscape-importer.c:1708
 msgid "Importing Netscape data"
 msgstr "輸入 Netscape 資料"
 
-#: ../mail/importers/netscape-importer.c:1907
+#: ../mail/importers/netscape-importer.c:1908
 msgid "Settings"
 msgstr "設定值"
 
-#: ../mail/importers/netscape-importer.c:1912
+#: ../mail/importers/netscape-importer.c:1913
 msgid "Mail Filters"
 msgstr "郵件規則"
 
 # importers/netscape-importer.c:847
-#: ../mail/importers/netscape-importer.c:1933
+#: ../mail/importers/netscape-importer.c:1934
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14084,50 +13942,50 @@ msgstr ""
 "您是否要將它們匯入至 Evolution？"
 
 # shell/e-shell-importer.c:363
-#: ../mail/importers/pine-importer.c:230
+#: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
 msgstr "輸入管道資料"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:433
 msgid "Evolution Pine importer"
 msgstr "Evolution 管道輸入器"
 
-#: ../mail/importers/pine-importer.c:435
+#: ../mail/importers/pine-importer.c:434
 msgid "Import mail from Pine."
 msgstr "從 Pine 匯入郵件。"
 
 # mail/mail-autofilter.c:70
-#: ../mail/mail-autofilter.c:78
+#: ../mail/mail-autofilter.c:79
 #, c-format
 msgid "Mail to %s"
 msgstr "郵件送到 %s"
 
 # mail/mail-autofilter.c:229
-#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
 #, c-format
 msgid "Mail from %s"
 msgstr "郵件來自 %s "
 
 # mail/mail-autofilter.c:213
-#: ../mail/mail-autofilter.c:265
+#: ../mail/mail-autofilter.c:266
 #, c-format
 msgid "Subject is %s"
 msgstr "主旨是 %s"
 
 # mail/mail-autofilter.c:285
-#: ../mail/mail-autofilter.c:300
+#: ../mail/mail-autofilter.c:301
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 郵件列表"
 
 # mail/mail-autofilter.c:335
 # mail/mail-autofilter.c:356
-#: ../mail/mail-autofilter.c:369
+#: ../mail/mail-autofilter.c:372
 msgid "Add Filter Rule"
 msgstr "新增過濾器規則"
 
-#: ../mail/mail-component.c:509
+#: ../mail/mail-component.c:520
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -14135,7 +13993,7 @@ msgstr[0] "%d 已選擇"
 msgstr[1] "%d 已選擇"
 
 # calendar/gui/event-editor.c:1558
-#: ../mail/mail-component.c:511
+#: ../mail/mail-component.c:522
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -14143,7 +14001,7 @@ msgstr[0] "%d 垃圾"
 msgstr[1] "%d 垃圾"
 
 # mail/mail-config.glade.h:26
-#: ../mail/mail-component.c:534
+#: ../mail/mail-component.c:545
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -14151,7 +14009,7 @@ msgstr[0] "%d 個草稿"
 msgstr[1] "%d 個草稿"
 
 # calendar/gui/event-editor.c:1558
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:547
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -14159,14 +14017,14 @@ msgstr[0] "%d 已傳送"
 msgstr[1] "%d 已傳送"
 
 # calendar/gui/event-editor.c:1558
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:549
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d 未傳送"
 msgstr[1] "%d 未傳送"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:553
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -14174,7 +14032,7 @@ msgstr[0] "全部 %d"
 msgstr[1] "全部 %d"
 
 # calendar/gui/event-editor.c:1558
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:555
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
@@ -14182,35 +14040,35 @@ msgstr[0] "%d 未傳送"
 msgstr[1] "%d 未傳送"
 
 # ui/evolution-mail.xml.h:109
-#: ../mail/mail-component.c:765
+#: ../mail/mail-component.c:778
 msgid "New Mail Message"
 msgstr "新增郵件"
 
-#: ../mail/mail-component.c:766
+#: ../mail/mail-component.c:779
 msgid "_Mail Message"
 msgstr "郵件訊息(_M)"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:780
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊息"
 
 # mail/mail-vfolder.c:438
-#: ../mail/mail-component.c:773
+#: ../mail/mail-component.c:786
 msgid "New Mail Folder"
 msgstr "新郵件資料夾"
 
-#: ../mail/mail-component.c:774
+#: ../mail/mail-component.c:787
 msgid "Mail _Folder"
 msgstr "郵件資料夾(_F)"
 
 # ui/evolution.xml.h:10
-#: ../mail/mail-component.c:775
+#: ../mail/mail-component.c:788
 msgid "Create a new mail folder"
 msgstr "建立新郵件資料夾"
 
-#: ../mail/mail-component.c:919
+#: ../mail/mail-component.c:932
 msgid "Failed upgrading Mail settings or folders."
 msgstr "升級郵件或資料夾失敗。"
 
@@ -14229,8 +14087,8 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>此 Evolution 版本不支援 SSL</b>"
 
 #: ../mail/mail-config.glade.h:5
-msgid "<b>S_ignatures</b>"
-msgstr "<b>簽章(_I)</b>"
+msgid "<b>Sig_natures</b>"
+msgstr "<b>簽章(_N)</b>"
 
 #: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
@@ -14244,10 +14102,6 @@ msgstr "<small>此會讓過濾器更可靠，但速度變慢</small>"
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">帳號資訊</span>"
 
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">警告</span>"
-
 #: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">驗證類型</span>"
@@ -14280,11 +14134,6 @@ msgstr "<span weight=\"bold\">顯示的郵件標頭(_H)</span>"
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">過濾器選項</span>"
 
-#: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">一般</span>"
-
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">標籤和色彩</span>"
@@ -14312,6 +14161,7 @@ msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">新郵件通知</span>"
 
 #: ../mail/mail-config.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">選擇性資訊</span>"
 
@@ -14398,8 +14248,8 @@ msgid "Attachment"
 msgstr "附件"
 
 #: ../mail/mail-config.glade.h:46
-msgid "Automatically _insert smiley images"
-msgstr "自動插入表情圖示(_I)"
+msgid "Automatically insert _smiley images"
+msgstr "自動插入笑臉圖片(_S)"
 
 #: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
@@ -14422,8 +14272,8 @@ msgid "Ch_eck for Supported Types "
 msgstr " 檢查可支援的類型(_E) "
 
 #: ../mail/mail-config.glade.h:52
-msgid "Check _incoming mail for junk"
-msgstr "檢查內送郵件是否為垃圾郵件(_I)"
+msgid "Check in_coming mail for junk"
+msgstr "檢查內送郵件是否為垃圾郵件(_N)"
 
 #: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
@@ -14521,24 +14371,24 @@ msgid "Encrypt out_going messages (by default)"
 msgstr "加密外送的郵件 (預設值)(_E)"
 
 #: ../mail/mail-config.glade.h:81
-msgid "Execute Command..."
-msgstr "執行指令..."
-
-#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "固定寬度(_X):"
 
 # mail/folder-browser-factory.c:198
 # ui/evolution-event-editor.xml.h:39
 # ui/evolution-task-editor-dialog.xml.h:42
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "字型內容"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "將郵件格式化為 _HTML"
 
+#: ../mail/mail-config.glade.h:84
+msgid "Full Nam_e:"
+msgstr "全名(_E):"
+
 # mail/mail-config.glade.h:36
 #: ../mail/mail-config.glade.h:86
 msgid "HTML Mail"
@@ -14692,69 +14542,75 @@ msgstr "選擇 HTML 可變寬度字型"
 msgid "Select HTML variable width font for printing"
 msgstr "選擇用於列印的 HTML 可變寬度字型"
 
-# mail/mail-ops.c:603
+# shell/e-shell-importer.c:545
+# shell/importer/import.glade.h:5
 #: ../mail/mail-config.glade.h:127
+msgid "Select sound file"
+msgstr "選擇聲音檔案"
+
+# mail/mail-ops.c:603
+#: ../mail/mail-config.glade.h:128
 msgid "Send message receipts:"
 msgstr "傳送郵件回條:"
 
 # mail/mail-config.glade.h:66
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "Sending Mail"
 msgstr "傳送郵件"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "Sent _Messages Folder:"
 msgstr "傳送郵件資料夾(_M):"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Ser_ver requires authentication"
 msgstr "伺服器要求驗證(_V)"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Server _Type: "
 msgstr "伺服器類型(_T):"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Sig_ning certificate:"
 msgstr "簽名憑證(_N):"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Signat_ure:"
 msgstr "簽名檔(_U):"
 
 # mail/mail-config.glade.h:74
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signatures"
 msgstr "簽名"
 
 # mail/mail-config.glade.h:74
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures Table"
 msgstr "簽章表"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Specify _filename:"
 msgstr "指定檔案名稱(_F):"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "T_erminal Font:"
 msgstr "終端機字型(_E):"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "類型(_Y):"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這裡的語言清單只反映出您已經安裝字典的語言。"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14764,7 +14620,7 @@ msgstr ""
 "簽名檔。您所指定的名稱將只做為\n"
 "顯示之用。"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14772,16 +14628,16 @@ msgstr ""
 "輸入您想要用來代表這個帳號的名稱。\n"
 "例如：「工作」或「個人」"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "可變寬度(_A):"
 
 # mail/mail-config.glade.h:81
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14791,30 +14647,26 @@ msgstr ""
 "\n"
 "按一下「下一步」開始。 "
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
 msgstr "加入簽名檔(_A)"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
 msgid "_Always load images from the Internet"
 msgstr "永遠自網路下載影像(_A)"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not notify me when new mail arrives"
 msgstr "當新郵件到達時不要通知我(_D)"
 
-#: ../mail/mail-config.glade.h:157
-msgid "_Don't sign meeting requests (for Outlook compatibility)"
-msgstr "不要加簽會議邀請(為了相容 Outlook)(_D)"
+#: ../mail/mail-config.glade.h:158
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr "不要簽署會議邀請(為了相容 _Outlook)"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
 msgstr "轉寄方式(_F):"
 
-#: ../mail/mail-config.glade.h:160
-msgid "_Full Name:"
-msgstr "全名(_F):"
-
 #: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr "載入由連絡人寄出的郵件中的圖片(_L)"
@@ -14837,8 +14689,8 @@ msgstr "路徑(_P):"
 
 # ui/evolution-mail.xml.h:14
 #: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr "當傳送 HTML 郵件給不想收到 HTML 郵件的連絡人時顯示提示(_P)"
+msgid "_Prompt when sending HTML messages to contacts that do not want them"
+msgstr "當傳送 _HTML 郵件給不想收到這類郵件的連絡人時顯示提示"
 
 # ui/evolution-mail.xml.h:14
 #: ../mail/mail-config.glade.h:168
@@ -14888,7 +14740,7 @@ msgstr "<span weight=\"bold\">加密</span>"
 
 # mail/mail-search.c:298
 #: ../mail/mail-dialogs.glade.h:5
-msgid "Case _Sensitive"
+msgid "Case _sensitive"
 msgstr "區分大小寫(_S)"
 
 # calendar/gui/calendar-model.c:644
@@ -14909,7 +14761,7 @@ msgstr "尋找(_I):"
 msgid "Find in Message"
 msgstr "在郵件內尋找"
 
-#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "要跟隨的標幟"
@@ -14988,29 +14840,29 @@ msgid "with all local folders"
 msgstr "包括全部本地端的資料夾"
 
 # mail/mail-ops.c:599
-#: ../mail/mail-folder-cache.c:855
+#: ../mail/mail-folder-cache.c:860
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
 # mail/mail-local.c:812
-#: ../mail/mail-ops.c:102
+#: ../mail/mail-ops.c:103
 msgid "Filtering Folder"
 msgstr "過濾資料夾"
 
 # mail/mail-config.glade.h:58
-#: ../mail/mail-ops.c:263
+#: ../mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "接收郵件"
 
 # camel/camel-movemail.c:274
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:563
+#: ../mail/mail-ops.c:564
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "無法套用外寄過濾器：%s"
 
-#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
+#: ../mail/mail-ops.c:576 ../mail/mail-ops.c:605
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15020,125 +14872,125 @@ msgstr ""
 "改附加至本地「寄件匣」。"
 
 # camel/camel-movemail.c:274
-#: ../mail/mail-ops.c:621
+#: ../mail/mail-ops.c:622
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "無法附加至本地「寄件匣」：%s"
 
 # mail/mail-ops.c:718
-#: ../mail/mail-ops.c:733
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "正在傳送郵件 %d / %d"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../mail/mail-ops.c:758
+#: ../mail/mail-ops.c:759
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "無法傳送第 %d 個郵件 (共 %d 個)"
 
 # mail/mail-send-recv.c:471
-#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
-msgid "Cancelled."
+#: ../mail/mail-ops.c:761 ../mail/mail-send-recv.c:613
+msgid "Canceled."
 msgstr "已取消。"
 
 # mail/mail-ops.c:739
 # mail/mail-send-recv.c:475
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:763
 msgid "Complete."
 msgstr "完成。"
 
 # mail/mail-ops.c:825
-#: ../mail/mail-ops.c:859
+#: ../mail/mail-ops.c:860
 msgid "Saving message to folder"
 msgstr "儲存郵件到資料夾"
 
 # mail/mail-ops.c:898
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:945
 #, c-format
 msgid "Moving messages to %s"
 msgstr "將郵件移到 %s"
 
 # mail/mail-ops.c:898
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:945
 #, c-format
 msgid "Copying messages to %s"
 msgstr "將郵件複製到 %s"
 
 # mail/mail-ops.c:1154
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1168
 msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: ../mail/mail-ops.c:1210
+#: ../mail/mail-ops.c:1211
 #, c-format
 msgid "Opening folder %s"
 msgstr "開啟資料夾 %s"
 
 # mail/mail-ops.c:1262
-#: ../mail/mail-ops.c:1282
+#: ../mail/mail-ops.c:1283
 #, c-format
 msgid "Opening store %s"
 msgstr "開啟貯藏 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: ../mail/mail-ops.c:1360
+#: ../mail/mail-ops.c:1361
 #, c-format
 msgid "Removing folder %s"
 msgstr "移除資料夾 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: ../mail/mail-ops.c:1454
+#: ../mail/mail-ops.c:1455
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "貯藏資料夾「%s」"
 
-#: ../mail/mail-ops.c:1519
+#: ../mail/mail-ops.c:1520
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "清空和儲存帳號 '%s'"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: ../mail/mail-ops.c:1520
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Storing account '%s'"
 msgstr "儲存帳號 '%s'"
 
 # mail/mail-local.c:812
-#: ../mail/mail-ops.c:1575
+#: ../mail/mail-ops.c:1576
 msgid "Refreshing folder"
 msgstr "重新載入資料夾"
 
 # mail/mail-ops.c:1449
-#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1612 ../mail/mail-ops.c:1663
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
 # shell/e-shell-importer.c:371
-#: ../mail/mail-ops.c:1659
+#: ../mail/mail-ops.c:1660
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "清空 '%s' 的垃圾筒"
 
 # mail/mail-config.glade.h:76
-#: ../mail/mail-ops.c:1660
+#: ../mail/mail-ops.c:1661
 msgid "Local Folders"
 msgstr "本機資料夾"
 
 # mail/mail-ops.c:1498
-#: ../mail/mail-ops.c:1743
+#: ../mail/mail-ops.c:1744
 #, c-format
 msgid "Retrieving message %s"
 msgstr "取回郵件 %s"
 
 # mail/mail-ops.c:1565
-#: ../mail/mail-ops.c:1853
+#: ../mail/mail-ops.c:1854
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -15146,7 +14998,7 @@ msgstr[0] "取回 %d 封郵件"
 msgstr[1] "取回 %d 封郵件"
 
 # mail/mail-ops.c:1649
-#: ../mail/mail-ops.c:1939
+#: ../mail/mail-ops.c:1940
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -15154,7 +15006,7 @@ msgstr[0] "儲存 %d 封郵件"
 msgstr[1] "儲存 %d 封郵件"
 
 # mail/mail-ops.c:1728
-#: ../mail/mail-ops.c:1989
+#: ../mail/mail-ops.c:1990
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15164,7 +15016,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1755
-#: ../mail/mail-ops.c:2017
+#: ../mail/mail-ops.c:2018
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15174,12 +15026,12 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1829
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2089
 msgid "Saving attachment"
 msgstr "儲存附件"
 
 # mail/mail-ops.c:1844
-#: ../mail/mail-ops.c:2100
+#: ../mail/mail-ops.c:2101
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15189,30 +15041,30 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1872
-#: ../mail/mail-ops.c:2110
+#: ../mail/mail-ops.c:2111
 #, c-format
 msgid "Could not write data: %s"
 msgstr "無法寫入資料：%s"
 
 # mail/mail-ops.c:1939
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2261
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "中斷與 %s 的連線"
 
 # mail/mail-ops.c:1939
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2261
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "重新連線到 %s"
 
-#: ../mail/mail-ops.c:2376
+#: ../mail/mail-ops.c:2377
 msgid "Checking Service"
 msgstr "檢查服務"
 
 # mail/mail-send-recv.c:138
 #: ../mail/mail-send-recv.c:158
-msgid "Cancelling..."
+msgid "Canceling..."
 msgstr "正在取消..."
 
 # mail/mail-config.glade.h:72
@@ -15257,8 +15109,8 @@ msgid "Checking for new mail"
 msgstr "檢查新郵件"
 
 # camel/camel-smime-context.c:194
-#: ../mail/mail-session.c:207
-#: ../plugins/exchange-operations/exchange-config-listener.c:601
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:604
 #, c-format
 msgid "Enter Password for %s"
 msgstr "請輸入 %s 所需的密碼"
@@ -15269,56 +15121,56 @@ msgstr "請輸入 %s 所需的密碼"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "輸入密碼"
 
 # mail/mail-session.c:161
-#: ../mail/mail-session.c:244
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
-msgstr "使用者取消動作。"
+msgstr "使用者已取消操作。"
 
 # mail/mail-config.glade.h:74
-#: ../mail/mail-signature-editor.c:381
+#: ../mail/mail-signature-editor.c:384
 msgid "Edit signature"
 msgstr "儲存簽名檔"
 
-#: ../mail/mail-signature-editor.c:423
+#: ../mail/mail-signature-editor.c:431
 msgid "Enter a name for this signature."
 msgstr "輸入這個簽名檔的名稱。"
 
 # addressbook/gui/component/addressbook-config.c:686
 # mail/mail-config.glade.h:43
-#: ../mail/mail-signature-editor.c:426
+#: ../mail/mail-signature-editor.c:434
 #: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "名稱:"
 
 # camel/camel-session.c:479
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:119
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "無法建立暫存序列目錄 `%s'：%s"
 
-#: ../mail/mail-tools.c:143
+#: ../mail/mail-tools.c:149
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "正在嘗試移動非 mbox 來源 `%s' 的郵件"
 
 # mail/mail-tools.c:219
-#: ../mail/mail-tools.c:249
+#: ../mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "轉寄的郵件 - %s"
 
 # mail/mail-ops.c:1154
-#: ../mail/mail-tools.c:251
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "轉寄的郵件"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: ../mail/mail-tools.c:291
+#: ../mail/mail-tools.c:297
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "資料夾無效:`%s'"
@@ -15343,12 +15195,12 @@ msgid "Updating Search Folders for '%s'"
 msgstr "更新 '%s' 的搜尋資料夾"
 
 # mail/mail-account-gui.c:682
-#: ../mail/mail-vfolder.c:1046
+#: ../mail/mail-vfolder.c:1050
 msgid "Edit Search Folder"
 msgstr "編輯搜尋資料夾"
 
 # mail/mail-account-gui.c:682
-#: ../mail/mail-vfolder.c:1130
+#: ../mail/mail-vfolder.c:1134
 msgid "New Search Folder"
 msgstr "新增搜尋資料夾"
 
@@ -15370,9 +15222,10 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;.  Send "
-"the reciept notification to {0}?"
-msgstr "「{1}」已要求傳送讀信回條。是否傳送讀信回條給 {0} ？"
+"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
+"receipt notification to {0}?"
+msgstr ""
+"「{1}」已要求傳送讀信回條。是否傳送讀信回條給 {0}？"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
@@ -15396,147 +15249,153 @@ msgstr "您確定要刪除這個帳號以及它所有的代理伺服器？"
 msgid "Are you sure you want to delete this account?"
 msgstr "您確定要刪除這個帳號？"
 
-# mail/mail-callbacks.c:1017
 #: ../mail/mail.error.xml.h:11
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr ""
+"確定要刪除這個帳號以及它所有的代理伺服器？"
+
+# mail/mail-callbacks.c:1017
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "您確定要一次開啟 {0} 封郵件？"
 
 # ui/evolution-mail.xml.h:61
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr "要永久移除所有資料夾中所有刪除的郵件？"
 
 # mail/mail-callbacks.c:1549
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
 msgstr "要永久移除資料夾「{0}」中所有刪除的郵件？"
 
 # mail/mail-callbacks.c:1085
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "要傳送 HTML 格式的郵件?"
 
 # mail/mail-callbacks.c:1085
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "要傳送只有密件副本收件者的郵件?"
 
 # mail/mail-callbacks.c:1085
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "要傳送沒有主旨的郵件？"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{0}&quot;."
 msgstr "因為「{0}」。"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
 msgid "Because &quot;{2}&quot;."
 msgstr "因為「{2}」。"
 
 # mail/mail-config.glade.h:74
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "空白簽名檔"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "無法新增搜尋資料夾「{0}」。"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "無法將「{0}」資料夾複製至「{1}」。"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "無法建立資料夾「{0}」。"
 
 # mail/mail-display.c:236
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "無法建立暫時儲存目錄。"
 
 # shell/e-setup.c:215
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "無法建立儲存目錄，因為「{1}」"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "無法刪除資料夾「{0}」。"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "無法刪除系統資料夾「{0}」。"
 
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "無法編輯搜尋資料夾「{0}」，因為它不存在。"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "無法將「{0}」資料夾移至「{1}」。"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "無法開啟來源「{1}」"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "無法開啟來源「{2}」。"
 
 # camel/camel-filter-driver.c:671
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "無法開啟目標「{2}」。"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem.  You will not be able to use this provider until you can accept its "
+"problem. You will not be able to use this provider until you can accept its "
 "license."
 msgstr ""
-"無法讀取授權條款檔案「{0}」，應該是安裝問題造成的。在您同意這項授權之前將無法"
-"使用它。"
+"無法讀取授權條款檔案「{0}」，應該是安裝問題造成的。"
+"在您同意這項授權之前將無法使用它。"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "無法將「{0}」重新命名成「{1}」。"
 
 # camel/providers/local/camel-local-store.c:237
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "無法重新命名或移動系統資料夾「{0}」。"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "無法儲存帳號變更。"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "無法儲存至目錄「{0}」。"
 
@@ -15547,24 +15406,25 @@ msgstr "無法儲存至目錄「{0}」。"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "無法儲存至檔案「{0}」。"
 
 # mail/mail-config.glade.h:74
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "無法設定簽名程序檔「{0}」。"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:41
 msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
+"Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
-"檢查確定您的密碼拼字正確。請注意很多密碼區分大小寫；您可能啟動了大寫鎖定鍵。"
+"檢查確定您的密碼拼字正確。請注意很多密碼區分大小寫；"
+"您可能啟動了大寫鎖定鍵。"
 
 # mail/mail-crypto.c:59
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:42
 msgid "Could not save signature file."
 msgstr "無法儲存簽名檔案。"
 
@@ -15579,80 +15439,89 @@ msgstr "無法儲存簽名檔案。"
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Delete &quot;{0}&quot;?"
 msgstr "刪除「{0}」？"
 
 # calendar/gui/e-calendar-table.c:714
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:44
 msgid "Delete account?"
 msgstr "刪除帳號？"
 
-#: ../mail/mail.error.xml.h:44
-msgid "Discard changed?"
-msgstr "捨棄變更？"
-
 #: ../mail/mail.error.xml.h:45
+msgid "Discard changes?"
+msgstr "是否放棄變更？"
+
+# mail/folder-browser.c:717
+# ui/evolution-mail.xml.h:121
+#: ../mail/mail.error.xml.h:46
+msgid "Do not delete"
+msgstr "不要刪除"
+
+# mail/mail-accounts.c:197
+#: ../mail/mail.error.xml.h:47
+msgid "Do not disable"
+msgstr "不要停用"
+
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "您是否想讓此項操作一併於子資料夾中進行？"
 
 # calendar/gui/dialogs/save-comp.c:51
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "要儲存所做的變更？"
 
-# mail/folder-browser.c:717
-# ui/evolution-mail.xml.h:121
-#: ../mail/mail.error.xml.h:47
-msgid "Don't delete"
-msgstr "不要刪除"
-
 # addressbook/gui/component/addressbook-config.c:165
 # camel/camel-sasl-plain.c:32
 # camel/providers/imap/camel-imap-provider.c:80
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "輸入密碼。"
 
 # mail/mail-callbacks.c:1349
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "載入過濾器定義時發生錯誤。"
 
 # mail/mail-mt.c:193
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "執行作業時，發生錯誤。"
 
 # mail/mail-mt.c:190
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "當 {0} 時發生錯誤。"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr "檔案存在但無法覆寫。"
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "檔案存在但不是一般檔案。"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "如果您繼續，將無法復原這些郵件。"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr "如果您刪除資料夾，所有它的內容和子資料夾內容會永久刪除。"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:58
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr "如果繼續，所有的代理伺服器帳號會永久刪除。"
+
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -15660,30 +15529,30 @@ msgstr ""
 "如果繼續，該帳號的資訊以及\n"
 "它所有的代理伺服器會永遠刪除。"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "如果繼續，帳號資訊會永久刪除。"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "如果您結束，再次啟動 Evolution 之前，不會傳送這些郵件。"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "忽略"
 
 # mail/mail-config.glade.h:10
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "無效的驗證"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr "郵件過濾器自動更新。"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -15695,37 +15564,37 @@ msgstr ""
 "件者：」或「副本：」收件者。"
 
 # ui/evolution-mail.xml.h:51
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "將全部的郵件標示成已閱讀"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read in the selected folder"
 msgstr "標示選定的資料夾中所有郵件為已閱讀"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:69
 msgid "Missing folder."
 msgstr "遺漏資料夾。"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "未選取來源。"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "一次開啟過多郵件可能會花費許多時間。"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "請檢查您的帳號設定並再試一次。"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr "請啟用該帳號或使用其他帳號傳送。"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -15733,7 +15602,7 @@ msgstr ""
 "請在「收件者：」欄位輸入一個有效的電子郵件地址。您可以按一下輸入方塊旁邊的"
 "「收件者：」按鈕，搜尋電子郵件地址。"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -15744,52 +15613,52 @@ msgstr ""
 "{0}\n"
 "立即傳送？"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "請輸入可供辨識這個簽名檔的獨特名稱。"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "請稍候。"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "移轉舊郵件資料夾「{0}」發生問題。"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "查詢伺服器"
 
 # camel/providers/smtp/camel-smtp-transport.c:214
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "向伺服器查詢支援的驗證演算法清單。"
 
 # mail/message-browser.c:191
 # ui/evolution-mail.xml.h:71
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "要求讀信回條。"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "確定要刪除資料夾「{0}」以及它所有的子資料夾?"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "搜尋資料夾自動更新。"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "傳送回條"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "簽名檔已經存在"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -15797,7 +15666,7 @@ msgstr ""
 "Ximian Evolution 需要系統資料夾才能正常作業，而且該資料夾不可以重新命名、移動"
 "或刪除。"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -15812,7 +15681,7 @@ msgstr ""
 "此標頭，會列示郵件中所有的收件者。要避免此情況，您應該至少新增一個「收件"
 "者：」或「副本：」收件者。 "
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -15826,7 +15695,7 @@ msgstr ""
 "    「{1}」\n"
 "而且已更新。"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -15840,22 +15709,22 @@ msgstr ""
 "    「{1}」\n"
 "而且已更新。"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:103
 msgid ""
-"The message was sent via the &quot;sendmail&quot; external application.  "
+"The message was sent via the &quot;sendmail&quot; external application. "
 "Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
+"The message is stored in the Outbox folder. Check the message for errors and "
+"resend."
 msgstr ""
 "訊息已透過「sendmail」外部應用程式傳送。Sendmail 報告以下錯誤：狀態 67：未傳"
 "送郵件。\n"
 "訊息儲存在「寄件信箱」資料夾。請檢查訊息的錯誤，然後重新傳送。"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:105
 msgid "The script file must exist and be executable."
 msgstr "程序檔必須存在而且可以執行。"
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -15863,80 +15732,82 @@ msgstr ""
 "此資料夾可能已經自動新增。\n"
 "需要時，請移至搜尋資料夾編輯器，以手動方式新增它。"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "因為您沒有啟用選擇用來寄送的帳號，所以無法傳送此郵件。"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr "因為您沒有指定任何收件者，所以無法傳送此郵件。"
 
 # camel/providers/smtp/camel-smtp-transport.c:356
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "此伺服器不支援此驗證類型而且根本不支援驗證。"
 
 # composer/e-msg-composer.c:941
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:111
 msgid "This signature has been changed, but has not been saved."
 msgstr "此簽名已經變更，但尚未儲存。"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to connect to the GroupWise server."
 msgstr "無法連線至 GroupWise 伺服器。"
 
 # composer/e-msg-composer.c:877
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:113
 msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
+"Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
-msgstr "無法開啟此帳號的草稿資料夾。使用系統草稿資料夾？"
+msgstr ""
+"無法開啟此帳號的草稿資料夾。是否使用"
+"系統草稿資料夾代替？"
 
 # mail/mail-ops.c:1728
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:114
 msgid "Unable to read license file."
 msgstr "無法讀取授權檔案。"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:115
 msgid "Use _Default"
 msgstr "使用預設值(_D)"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:116
 msgid "Use default drafts folder?"
 msgstr "使用預設的草稿資料夾？"
 
 # mail/mail-account-editor.c:105
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:117
 msgid "You have not filled in all of the required information."
 msgstr "您沒有填入所有必須的資訊。"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:118
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "您有未寄出的郵件，您無論如何都要離開嗎？"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:119
 msgid "You may not create two accounts with the same name."
 msgstr "您不能用相同的名稱建立兩個帳號。"
 
 # ui/evolution.xml.h:3
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:120
 msgid "You must name this Search Folder."
 msgstr "您必須命名此搜尋資料夾。"
 
 # ui/evolution.xml.h:3
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:121
 msgid "You must specify a folder."
 msgstr "您必須指定一個資料夾。"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -15945,116 +15816,116 @@ msgstr ""
 "您必須至少指定一個資料夾當成來源。\n"
 "個別選取資料夾，然後/或選取所有本地資料夾、所有遠端資料夾或二者皆選。"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:124
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "您登入伺服器「{0}」以「{0}」身分，但失敗。"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:125
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "未傳遞主旨為「{0}」的郵件。"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "添加(_A)"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:127
 msgid "_Discard changes"
 msgstr "放棄變更(_D)"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:129
 msgid "_Expunge"
 msgstr "清除(_E)"
 
 # ui/evolution-mail.xml.h:114
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:130
 msgid "_Open Messages"
 msgstr "開啟郵件(_O)"
 
 # mail/message-list.c:677
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:1004
 msgid "Unseen"
 msgstr "未閱讀"
 
 # mail/message-list.c:678
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1005
 msgid "Seen"
 msgstr "已閱讀"
 
 # mail/message-list.c:679
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1006
 msgid "Answered"
 msgstr "已回覆"
 
 # mail/message-list.c:680
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1007
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
 # mail/message-list.c:681
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1008
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
 # mail/message-list.c:685
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1012
 msgid "Lowest"
 msgstr "最低"
 
 # mail/message-list.c:686
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1013
 msgid "Lower"
 msgstr "低"
 
 # mail/message-list.c:690
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1017
 msgid "Higher"
 msgstr "高"
 
 # mail/message-list.c:691
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1018
 msgid "Highest"
 msgstr "最高"
 
 # mail/message-list.c:941
-#: ../mail/message-list.c:1348 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1346 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "？"
 
 # mail/message-list.c:948
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:197
+#: ../mail/message-list.c:1353 ../plugins/itip-formatter/itip-view.c:197
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "今天 %l:%M %p"
 
 # mail/message-list.c:957
-#: ../mail/message-list.c:1364 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1362 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %l:%M %p"
 
 # mail/message-list.c:969
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 # mail/message-list.c:977
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1382 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
 # mail/message-list.c:979
-#: ../mail/message-list.c:1386 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 # views/mail/galview.xml.h:4
-#: ../mail/message-list.c:2052
+#: ../mail/message-list.c:2055
 msgid "Message List"
 msgstr "郵件清單"
 
 # mail/mail-local.c:905
-#: ../mail/message-list.c:3397
+#: ../mail/message-list.c:3400
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
@@ -16089,55 +15960,56 @@ msgstr "已接收"
 
 # addressbook/printing/e-contact-print.glade.h:36
 #: ../mail/message-list.etspec.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "大小"
 
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: ../mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:75
 msgid "Call"
 msgstr "原始位置"
 
 # mail/message-browser.c:194
 # ui/evolution-mail.xml.h:33
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:76
 msgid "Do Not Forward"
 msgstr "請勿轉寄"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:77
 msgid "Follow-Up"
 msgstr "跟隨"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:78
 msgid "For Your Information"
 msgstr "給您的資訊"
 
 # mail/message-browser.c:194
 # ui/evolution-mail.xml.h:33
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:41
 msgid "Forward"
 msgstr "轉寄"
 
-#: ../mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:80
 msgid "No Response Necessary"
 msgstr "不需要回應"
 
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "回覆"
 
 # mail/message-browser.c:191
 # ui/evolution-mail.xml.h:71
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "全部回覆"
 
 # calendar/gui/event-editor-dialog.glade.h:15
-#: ../mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:84
 msgid "Review"
 msgstr "檢閱"
 
@@ -16170,6 +16042,14 @@ msgstr "主旨包含"
 msgid "Subject or Sender contains"
 msgstr "主旨或寄件者包含"
 
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+msgid "Local Address Books"
+msgstr "本地端通訊錄"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Provides core functionality for local address books."
+msgstr "提供本地端行事曆的核心功能。"
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
@@ -16253,6 +16133,7 @@ msgstr "回存設定值..."
 # addressbook/gui/component/e-address-widget.c:424
 # addressbook/gui/component/select-names/e-select-names-popup.c:347
 #: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自動加入的連絡人"
 
@@ -16282,12 +16163,6 @@ msgstr "定期從我的即時傳訊軟體同步連絡人資訊(_I)"
 msgid "Synchronize with _buddy list now"
 msgstr "立即與好友清單同步(_B)"
 
-# addressbook/gui/component/e-address-widget.c:424
-# addressbook/gui/component/select-names/e-select-names-popup.c:347
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-msgid "Automatic contacts"
-msgstr "自動加入的連絡人"
-
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
@@ -16426,6 +16301,17 @@ msgstr "您是否要將 Evolution 設為您的預設電子郵件客戶端程式�
 msgid "Mark as default folder"
 msgstr "標示為預設資料夾"
 
+# mail/mail-config.glade.h:21
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+msgid "Default Sources"
+msgstr "預設來源"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid ""
+"Provides functionallity for marking a calendar or addressbook as the default "
+"one."
+msgstr "提供標記預設行事曆或通訊錄的功能。"
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "開啟其他使用者的資料夾"
@@ -16465,11 +16351,11 @@ msgid ""
 msgstr "此選項將會連線到使用標準純文字密碼驗證的 Exchange 伺服器。"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:394
-#: ../plugins/exchange-operations/exchange-account-setup.c:253
+#: ../plugins/exchange-operations/exchange-account-setup.c:255
 msgid "Out Of Office"
 msgstr "不在辦公室"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:260
+#: ../plugins/exchange-operations/exchange-account-setup.c:262
 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."
@@ -16477,76 +16363,77 @@ msgstr ""
 "以下指定的訊息將會自動傳送給\n"
 "每一位在您離開辦公室時傳送郵件給您的人。"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:279
 msgid "I am out of the office"
 msgstr "我目前不在辦公室"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:273
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid "I am in the office"
 msgstr "我目前在辦公室"
 
 # camel/camel-smime-context.c:194
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:324
+#: ../plugins/exchange-operations/exchange-account-setup.c:326
 msgid "Change the password for Exchange account"
 msgstr "改變 Exchange 帳號的密碼"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "變更密碼"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:331
+#: ../plugins/exchange-operations/exchange-account-setup.c:333
 msgid "Manage the delegate settings for Exchange account"
 msgstr "管理 Exchange 帳號的授權設定"
 
 # shell/importer/import.glade.h:2
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Delegation Assitant"
 msgstr "委派設定助理"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Miscelleneous"
 msgstr "雜項"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:355
+#: ../plugins/exchange-operations/exchange-account-setup.c:357
 msgid "View the size of all Exchange folders"
 msgstr "檢視所有 Exchange 資料夾的大小"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "Folders Size"
 msgstr "資料夾大小"
 
 # ui/evolution-event-editor.xml.h:9
 # ui/evolution-task-editor-dialog.xml.h:10
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange 設定值"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:611
-msgid "_OWA Url:"
-msgstr "_OWA 網址:"
+#: ../plugins/exchange-operations/exchange-account-setup.c:619
+msgid "_OWA URL:"
+msgstr "_OWA URL:"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:645
 msgid "A_uthenticate"
 msgstr "驗證(_U)"
 
 # mail/mail-config.glade.h:11
-#: ../plugins/exchange-operations/exchange-account-setup.c:823
+#: ../plugins/exchange-operations/exchange-account-setup.c:833
 msgid "Authentication Type"
 msgstr "驗證類型"
 
 # mail/mail-config.glade.h:1
-#: ../plugins/exchange-operations/exchange-account-setup.c:837
+#: ../plugins/exchange-operations/exchange-account-setup.c:847
 msgid "Ch_eck for Supported Types"
 msgstr "檢查支援的類型(_E) "
 
@@ -16594,6 +16481,11 @@ msgid "Custom"
 msgstr "自訂"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Delegate Permissions"
+msgstr "委託許可權"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:202
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
 #, c-format
 msgid "Permissions for %s"
@@ -16643,35 +16535,33 @@ msgstr "讀取委託清單錯誤。"
 msgid "Author (read, create)"
 msgstr "原著者 (讀取，建立)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 msgid "C_alendar:"
 msgstr "行事曆(_A)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Co_ntacts:"
 msgstr "連絡人(_N)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Delegate Permissions"
-msgstr "委託許可權"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 msgid "Delegates"
 msgstr "委託"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr "編輯者 (讀取、建立、編輯)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid "Permissions for"
 msgstr "許可權"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr "檢閱者 (僅限讀取)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
@@ -16679,15 +16569,17 @@ msgstr ""
 "透過您給予這些使用者的許可權，它們將可以以您的身分傳送郵件，\n"
 "並存取您的資料夾。"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Delegate can see private items"
 msgstr "委託可以查看私人的項目(_D)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
 msgid "_Inbox:"
 msgstr "收件匣(_I)："
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
 msgid "_Tasks:"
 msgstr "工作(_T)："
 
@@ -16706,28 +16598,29 @@ msgstr "資料夾名稱"
 msgid "Folder Size"
 msgstr "資料夾大小"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:180
-msgid "Subscribe to Other User's"
-msgstr "訂閱其他使用者的"
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:181
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+msgid "Subscribe to Other User's Folder"
+msgstr "訂閱其他使用者的資料夾"
 
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr "Exchange 資料夾樹"
 
 #: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:227
-#: ../plugins/exchange-operations/exchange-folder.c:237
+#: ../plugins/exchange-operations/exchange-folder.c:229
+#: ../plugins/exchange-operations/exchange-folder.c:239
 msgid "Unsubscribe Folder..."
 msgstr "取消訂閱資料夾..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:524
+#: ../plugins/exchange-operations/exchange-folder.c:466
+#: ../plugins/exchange-operations/exchange-folder.c:526
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "確定要取消訂閱資料夾「%s」？"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:536
+#: ../plugins/exchange-operations/exchange-folder.c:478
+#: ../plugins/exchange-operations/exchange-folder.c:538
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "取消訂閱「%s」"
@@ -16816,6 +16709,18 @@ msgstr "訂閱其他使用者的連絡人"
 msgid "Subscribe to Other User's Calendar"
 msgstr "訂閱其他使用者的行事曆"
 
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+msgid ""
+"A plugin that handles a collection of Exchange account specific operations "
+"and features."
+msgstr "處理 Exchange 帳號指定操作與功能集合的外掛程式。"
+
+# ui/evolution-event-editor.xml.h:9
+# ui/evolution-task-editor-dialog.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
+msgid "Exchange Operations"
+msgstr "Exchange 操作"
+
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
 msgstr "因組態問題而無法變更密碼。"
@@ -16849,69 +16754,68 @@ msgstr ""
 "以及密碼，然後再試一次。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
+msgid "Could not connect to Exchange server."
+msgstr "無法連接 Exchange 伺服器。"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
 msgstr "無法連線到伺服器 {0}。"
 
 # camel/camel-movemail.c:306
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
 msgstr "無法決定委派的資料夾權限。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
 msgstr "找不到 Exchange 網頁儲存系統。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
 msgstr "無法定位伺服器 {0}。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
 msgstr "無法將 {0} 設為委託"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
 msgstr "無法讀取資料夾許可權"
 
 # camel/camel-provider.c:140
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions."
 msgstr "無法讀取資料夾權限。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read out-of-office state"
 msgstr "無法讀取「不在辦公室」狀態"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not update folder permissions."
 msgstr "無法更新資料夾許可權。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update out-of-office state"
 msgstr "無法更新「不在辦公室」狀態"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Exchange Account is offline."
 msgstr "Exchange 帳戶已離線。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Exchange Connector access error."
-msgstr "Exchange Connector 存取錯誤。"
-
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
-"to be disabled or blocked.  (This is usually \n"
-"unintentional.)  Your Exchange Administrator will \n"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
 "need to enable this functionality in order for \n"
-"you to be able to use Ximian Connector.\n"
+"you to be able to use Evolution Exchange Connector.\n"
 "\n"
 "For information to provide to your Exchange \n"
 "administrator, please follow the link below:\n"
 "\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"{0}\n"
 "  "
 msgstr ""
 "Exchange Connector 需要存取 Exchange \n"
@@ -16919,13 +16823,12 @@ msgstr ""
 "或已封鎖。(這通常不是刻意的。)您的 \n"
 "Exchange 管理員將需要開啟此功能， \n"
 "讓您可以使用 \n"
-"Ximian Connector。\n"
+"Evolution Exchange Connector。\n"
 "\n"
 "若需有關提供給您的 Exchange 管理員\n"
 "的資訊，請依照下列連結：\n"
 "\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"{0}\n"
 "  "
 
 # shell/e-storage.c:475
@@ -16947,7 +16850,7 @@ msgid "Folder offline"
 msgstr "資料夾離線"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1277
 msgid "Generic error"
 msgstr "一般錯誤"
 
@@ -17018,7 +16921,7 @@ msgstr "此 Exchange 伺服器無法與 Exchange Connector 相容。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid ""
-"The server is runinng Exchange 5.5. Exchange Connector \n"
+"The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
 "此伺服器執行的是 Exchange 5.5。Exchange Connector \n"
@@ -17088,22 +16991,24 @@ msgstr "您可以只設定一個單一的 Exchange 帳戶。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid ""
-"Your current usage is : {0}KB. Try to clear up some space by deleting some "
+"Your current usage is: {0}KB. Try to clear up some space by deleting some "
 "mails."
-msgstr "您目前的使用量為：{0} KB。請試著刪除一些郵件來空出部分空間。"
+msgstr ""
+"目前的使用量為：{0} KB。請試著刪除一些郵件來空出部分空間。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
-"Your current usage is : {0}KB. You will not be able to either send or "
-"recieve mails now."
-msgstr "您目前的使用量為：{0} KB。您現在將無法傳送或接收郵件。"
+"Your current usage is: {0}KB. You will not be able to either send or recieve "
+"mails now."
+msgstr ""
+"目前的使用量為：{0} KB。您現在將無法傳送或接收郵件。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
-"Your current usage is : {0}KB. You will not be able to send mails till you "
+"Your current usage is: {0}KB. You will not be able to send mails till you "
 "clear up some space by deleting some mails."
 msgstr ""
-"您目前的使用量為：{0} KB。除非您刪除一些郵件來空出部分空間，否則您將無法傳送"
+"目前的使用量為：{0} KB。除非您刪除一些郵件來空出部分空間，否則將無法傳送"
 "郵件。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
@@ -17130,10 +17035,6 @@ msgstr "訂閱其他使用者的工作"
 msgid "Check folder permissions"
 msgstr "檢查資料夾權限"
 
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "訂閱其他使用者的資料夾"
-
 # mail/subscribe-dialog.c:273
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
@@ -17170,7 +17071,7 @@ msgid "Junk Mail Settings..."
 msgstr "垃圾郵件設定值..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List :</b>"
+msgid "<b>Junk List:</b>"
 msgstr "<b>垃圾郵件清單：</b>"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
@@ -17200,7 +17101,7 @@ msgstr "將 傳送 選項加入 groupwise 訊息"
 
 # addressbook/printing/e-contact-print.glade.h:23
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "傳送選項"
@@ -17220,7 +17121,7 @@ msgid "Accept Tentatively"
 msgstr "暫時套用"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
-msgid "<b>Users :</b>"
+msgid "<b>Users:</b>"
 msgstr "<b>使用者：</b>"
 
 # views/mail/galview.xml.h:4
@@ -17245,7 +17146,7 @@ msgstr "連絡人(_C)..."
 
 # camel/camel-movemail.c:306
 #: ../plugins/groupwise-features/properties.glade.h:12
-msgid "_Cutomize notification message"
+msgid "_Customize notification message"
 msgstr "自訂通知訊息(_C)"
 
 # calendar/gui/calendar-model.c:638
@@ -17302,7 +17203,7 @@ msgid "Subscribe to my _notifications"
 msgstr "訂閱至我的通知(_N)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Read"
 msgstr "閱讀(_R)"
 
@@ -17315,6 +17216,7 @@ msgid "Proxy"
 msgstr "代理伺服器"
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:2
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 #: ../smime/gui/smime-ui.glade.h:49
 #: ../widgets/table/e-table-config-no-group.glade.h:20
 #: ../widgets/table/e-table-config.glade.h:21
@@ -17330,23 +17232,23 @@ msgid "Proxy Login"
 msgstr "登入代理伺服器"
 
 # camel/camel-smime-context.c:194
-#: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:262
-#: ../plugins/groupwise-features/proxy.c:501
+#: ../plugins/groupwise-features/proxy-login.c:220
+#: ../plugins/groupwise-features/proxy-login.c:263
+#: ../plugins/groupwise-features/proxy.c:502
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s請輸入 %s 所需的密碼(使用者 %s)"
 
-#: ../plugins/groupwise-features/proxy-login.c:497
+#: ../plugins/groupwise-features/proxy-login.c:505
 msgid "_Proxy Login..."
 msgstr "代理伺服器登入(_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:691
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "代理伺服器頁籤只有在帳號上線時才會出現。"
 
-#: ../plugins/groupwise-features/proxy.c:696
+#: ../plugins/groupwise-features/proxy.c:703
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "代理伺服器頁籤只有在啟用此帳號時才會出現。"
 
@@ -17439,6 +17341,46 @@ msgstr "無法開啟行事曆/工作！"
 msgid "Could not open the Evolution calendar/todo list to export data."
 msgstr "無法開啟 Evolution 行事曆/工作清單以匯出資料。"
 
+# shell/e-storage.c:475
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
+#, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr "載入行事曆「%s」失敗"
+
+#: ../plugins/itip-formatter/itip-formatter.c:407
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr "行事曆 '%s' 中的約會和這個會議相衝突"
+
+# shell/e-storage.c:475
+#: ../plugins/itip-formatter/itip-formatter.c:433
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "尋找在行事曆「%s」中的約會"
+
+# shell/e-storage.c:475
+#: ../plugins/itip-formatter/itip-formatter.c:487
+msgid "Unable to find any calendars"
+msgstr "找不到任何行事曆"
+
+# shell/e-storage.c:475
+#: ../plugins/itip-formatter/itip-formatter.c:494
+msgid "Unable to find this meeting in any calendar"
+msgstr "無法在任何行事曆中找到這個約會"
+
+#: ../plugins/itip-formatter/itip-formatter.c:498
+msgid "Unable to find this task in any task list"
+msgstr "無法在任何工作清單中找到這個工作"
+
+#: ../plugins/itip-formatter/itip-formatter.c:502
+msgid "Unable to find this journal entry in any journal"
+msgstr "無法在任何日誌中找到這個日誌項目"
+
+#: ../plugins/itip-formatter/itip-formatter.c:528
+msgid "Searching for an existing version of this appointment"
+msgstr "尋找這個約會既存的版本"
+
 # camel/providers/pop3/camel-pop3-folder.c:320
 #: ../plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
@@ -17467,8 +17409,8 @@ msgstr "傳送至行事曆 '%s' 並設為已婉拒"
 
 #: ../plugins/itip-formatter/itip-formatter.c:805
 #, c-format
-msgid "Sent to calendar '%s' as cancelled"
-msgstr "傳送至行事曆 '%s' 並設為已取消"
+msgid "Sent to calendar '%s' as canceled"
+msgstr "傳送至行事曆「%s」並設為已取消"
 
 #: ../plugins/itip-formatter/itip-formatter.c:898
 #, c-format
@@ -17477,12 +17419,12 @@ msgstr "會議召集人已移除代理人 %s"
 
 # calendar/gui/dialogs/delete-comp.c:102
 #: ../plugins/itip-formatter/itip-formatter.c:905
-msgid "Sent a cancellation notice to the delegate"
+msgid "Sent a cancelation notice to the delegate"
 msgstr "傳送取消通知給代理人"
 
 # calendar/gui/dialogs/delete-comp.c:102
 #: ../plugins/itip-formatter/itip-formatter.c:907
-msgid "Could not send the cancellation notice to the delegate"
+msgid "Could not send the cancelation notice to the delegate"
 msgstr "無法傳送取消通知給代理人"
 
 #: ../plugins/itip-formatter/itip-formatter.c:991
@@ -17506,7 +17448,7 @@ msgstr "附帶的行事曆是無效的"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1149
 msgid ""
-"The message claims to contain a calendar, but the calendar is not valid "
+"The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "此郵件宣告其含有行事曆內容，但其行事曆並非有效的 iCalendar。"
 
@@ -17556,7 +17498,7 @@ msgid "Conflict Search Table"
 msgstr "衝突的搜尋表格"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:183 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:183 ../ui/evolution-calendar.xml.h:32
 #: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:466
 msgid "Today"
 msgstr "今天"
@@ -17775,12 +17717,12 @@ msgstr "<b>%s</b> 傳送了下列會議的回覆："
 
 #: ../plugins/itip-formatter/itip-view.c:373
 #, c-format
-msgid "<b>%s</b> through %s has cancelled the following meeting:"
+msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> 由於 %s 已經消取下列會議："
 
 #: ../plugins/itip-formatter/itip-view.c:375
 #, c-format
-msgid "<b>%s</b> has cancelled the following meeting."
+msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> 已經消取下列會議。"
 
 #: ../plugins/itip-formatter/itip-view.c:378
@@ -17847,12 +17789,12 @@ msgstr "<b>%s</b> 傳送了下列指派工作的回覆："
 
 #: ../plugins/itip-formatter/itip-view.c:441
 #, c-format
-msgid "<b>%s</b> through %s has cancelled the following assigned task:"
+msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> 由於 %s 已經取消下列指派的工作："
 
 #: ../plugins/itip-formatter/itip-view.c:443
 #, c-format
-msgid "<b>%s</b> has cancelled the following assigned task:"
+msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> 已經取消下列指派的工作："
 
 #: ../plugins/itip-formatter/itip-view.c:446
@@ -17870,6 +17812,64 @@ msgstr "<b>%s</b> 由於 %s 已婉拒了下列指派的工作："
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> 已經婉拒下列指派的工作："
 
+# ui/evolution-addressbook.xml.h:7
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:704
+msgid "_Open Calendar"
+msgstr "開啟行事曆(_O)"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:709
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
+msgid "_Accept"
+msgstr "接受(_A)"
+
+#: ../plugins/itip-formatter/itip-view.c:712
+msgid "_Decline all"
+msgstr "全部拒絕(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:712
+#: ../plugins/itip-formatter/itip-view.c:717
+#: ../plugins/itip-formatter/itip-view.c:733
+#: ../plugins/itip-formatter/itip-view.c:738
+msgid "_Decline"
+msgstr "拒絕(_D)"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: ../plugins/itip-formatter/itip-view.c:713
+msgid "_Tentative all"
+msgstr "全部暫訂(_T)"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Tentative"
+msgstr "暫訂(_T)"
+
+#: ../plugins/itip-formatter/itip-view.c:714
+msgid "_Accept all"
+msgstr "全部接受(_A)"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:395
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:723
+msgid "_Send Information"
+msgstr "傳送資訊(_S)"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:727
+msgid "_Update Attendee Status"
+msgstr "更新出席狀態(_U)"
+
+#: ../plugins/itip-formatter/itip-view.c:730
+msgid "_Update"
+msgstr "更新(_U)"
+
 # calendar/gui/event-editor-dialog.glade.h:31
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:891
@@ -18154,6 +18154,19 @@ msgstr "訂閱此郵件所屬的通信論壇"
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "取消訂閱此郵件所屬的通信論壇"
 
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
+msgstr "全部標示成已讀"
+
+# ui/evolution-mail.xml.h:51
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+msgid "Mark me_ssages as read"
+msgstr "標示郵件為已讀(_S)"
+
+#: ../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 "用來將資料夾下的所有郵件標記為已讀"
+
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
 msgstr "將行事曆標為離線工作"
@@ -18196,8 +18209,10 @@ msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr "用來管理啟用或停用外掛程式的外掛程式。"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
+#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-msgid "Plugin manager"
+#: ../plugins/plugin-manager/plugin-manager.c:188
+msgid "Plugin Manager"
 msgstr "外掛管理程式"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
@@ -18238,12 +18253,6 @@ msgstr "路徑"
 msgid "Description"
 msgstr "描述:"
 
-# addressbook/gui/widgets/e-addressbook-view.c:732
-#. Setup the ui
-#: ../plugins/plugin-manager/plugin-manager.c:188
-msgid "Plugin Manager"
-msgstr "外掛管理程式"
-
 #: ../plugins/plugin-manager/plugin-manager.c:201
 msgid "Note: Some changes will not take effect until restart"
 msgstr "注意：某些變更在重新啟動後才會生效"
@@ -18300,8 +18309,8 @@ msgid "Gives an option to print mail from composer"
 msgstr "提供自郵件編輯器列印郵件的選項"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
 #: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "預覽列印(_V)"
@@ -18311,7 +18320,111 @@ msgstr "預覽列印(_V)"
 msgid "Prints the message"
 msgstr "列印此郵件"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:99
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
+msgid "Evolution Profiler"
+msgstr "Evolution 設定工具"
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+msgid "Writes a log of profiling data events."
+msgstr "寫入設定資料事件的紀錄檔。"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+msgid "Allows calendars to be published to the web"
+msgstr "允許將行事曆發佈為網頁"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+msgid "Calendar Publishing"
+msgstr "行事曆發佈"
+
+# addressbook/backend/ebook/e-card.c:3442
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Locations"
+msgstr "位置"
+
+# data/evolution.keys.in.h:2
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+msgid "_Publish Calendar Information"
+msgstr "發佈行事曆資訊(_P)"
+
+# mail/mail-accounts.c:280
+# mail/mail-accounts.c:284
+#: ../plugins/publish-calendar/publish-calendar.c:372
+msgid "Are you sure you want to remove this URL?"
+msgstr "確定要移除此 URL？"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+msgid "<span weight=\"bold\">Location</span>"
+msgstr "<span weight=\"bold\">位置</span>"
+
+# views/mail/galview.xml.h:4
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr "<span weight=\"bold\">來源</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+msgstr ""
+"每日\n"
+"每週\n"
+"手動(透過「動作」選單)"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "Publishing Location"
+msgstr "發佈位置"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+msgid "Publishing _Frequency:"
+msgstr "發佈頻率(_F):"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+msgid ""
+"SSH\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
+msgstr ""
+"SSH\n"
+"公共 FTP\n"
+"FTP (使用登入)\n"
+"Windows 共用\n"
+"WebDAV (HTTP)\n"
+"安全的 WebDAV (HTTPS)\n"
+"自訂位置"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:19
+msgid "Service _type:"
+msgstr "服務類型(_T):"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+msgid "_File:"
+msgstr "檔案(_F):"
+
+# addressbook/gui/widgets/e-addressbook-view.c:737
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+msgid "_Publish as:"
+msgstr "發佈為(_P):"
+
+# addressbook/gui/widgets/e-addressbook-view.c:737
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr ""
+"iCal\n"
+"空閒/忙碌"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:101
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (內建)"
 
@@ -18344,16 +18457,16 @@ msgstr "儲存所有的附加檔案"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: ../plugins/save-attachments/save-attachments.c:331
+#: ../plugins/save-attachments/save-attachments.c:338
 msgid "Select save base name"
 msgstr "選擇儲存的基本名稱"
 
 # composer/e-msg-composer-attachment.glade.h:6
-#: ../plugins/save-attachments/save-attachments.c:351
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "MIME 類型"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:366
 #: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:18
 #: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
@@ -18369,9 +18482,10 @@ msgstr "儲存"
 msgid "%F %T"
 msgstr "%F %T"
 
+# addressbook/contact-editor/fullname.glade.h:4
 #: ../plugins/save-calendar/csv-format.c:385
-msgid "Uid"
-msgstr "Uid"
+msgid "UID"
+msgstr "UID"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
@@ -18411,7 +18525,7 @@ msgid "percent Done"
 msgstr "％已完成"
 
 #: ../plugins/save-calendar/csv-format.c:398
-msgid "Url"
+msgid "URL"
 msgstr "網址"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:744
@@ -18502,6 +18616,10 @@ msgid "_Show only this Task List"
 msgstr "只顯示此工作清單(_S)"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "A plugin that handles the Startup wizard."
+msgstr "處理啟動精靈的外掛程式。"
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 msgid "Startup wizard"
 msgstr "啟動精靈"
 
@@ -18527,19 +18645,19 @@ msgstr ""
 "請按一下「下一步」按鈕繼續。 "
 
 #: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:145
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "請選擇您想要匯入的資訊："
 
 # composer/e-msg-composer-hdrs.c:355
 #: ../plugins/startup-wizard/startup-wizard.c:154
-#: ../shell/e-shell-importer.c:398
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "來自 %s："
 
 #: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:509
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "匯入資料。"
 
@@ -18630,7 +18748,7 @@ msgstr "印表機設定"
 msgid "Skip development warning dialog"
 msgstr "忽略開發警告對話方塊"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:473
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
@@ -18719,12 +18837,12 @@ msgstr "按「確定」關閉這些連線以離線"
 msgid "(Untitled)"
 msgstr "(未命名)"
 
-#: ../shell/e-shell-importer.c:133
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "選擇匯入服務要執行的類型："
 
 # shell/e-shell-importer.c:97
-#: ../shell/e-shell-importer.c:136
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -18737,11 +18855,11 @@ msgstr ""
 "若您不清楚檔案類型，請選擇「自動」。Evolution 會嘗試找出適當的處理方法。"
 
 # ui/evolution.xml.h:4
-#: ../shell/e-shell-importer.c:142
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "選擇此輸入的目的地"
 
-#: ../shell/e-shell-importer.c:148
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -18753,29 +18871,29 @@ msgstr ""
 "輸入的設定值。如果您想\n"
 "再試一次，請按一下「上一步」按鈕。\n"
 
-#: ../shell/e-shell-importer.c:283
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "檔案名稱(_I):"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "檔案類型(_T):"
 
-#: ../shell/e-shell-importer.c:336
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "從舊程式輸入資料和設定值(_O)"
 
-#: ../shell/e-shell-importer.c:339
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "匯入單一檔案(_S)"
 
-#: ../shell/e-shell-importer.c:698
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "匯入(_I)"
 
@@ -18830,7 +18948,7 @@ msgstr "無法執行 Bug buddy。"
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:533
+#: ../shell/e-shell-window-commands.c:530
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -18842,7 +18960,7 @@ msgstr ""
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
 
 # shell/e-shortcuts-view.c:137
-#: ../shell/e-shell-window-commands.c:547
+#: ../shell/e-shell-window-commands.c:544
 msgid "Groupware Suite"
 msgstr "Groupware 套裝軟體"
 
@@ -18860,52 +18978,52 @@ msgstr "離線工作(_W)"
 msgid "Work Offline"
 msgstr "離線工作"
 
-#: ../shell/e-shell-window.c:343
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Evolution 目前為線上模式。按一下此按鈕，離線工作。"
+#: ../shell/e-shell-window.c:370
+msgid "Evolution is currently online. Click on this button to work offline."
+msgstr "Evolution 目前為線上模式。按一下此按鈕以進行離線工作。"
 
-#: ../shell/e-shell-window.c:351
+#: ../shell/e-shell-window.c:378
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution 正在離線的程序中。"
 
-#: ../shell/e-shell-window.c:358
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution 目前離線。按一下此按鈕，線上工作。"
+#: ../shell/e-shell-window.c:385
+msgid "Evolution is currently offline. Click on this button to work online."
+msgstr "Evolution 目前為離線模式。按一下此按鈕以進行線上工作。"
 
 # mail/mail-autofilter.c:70
-#: ../shell/e-shell-window.c:735
+#: ../shell/e-shell-window.c:775
 #, c-format
 msgid "Switch to %s"
 msgstr "切換至 %s"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../shell/e-shell.c:623
+#: ../shell/e-shell.c:633
 msgid "Uknown system error."
 msgstr "不明的系統錯誤。"
 
 # calendar/gui/e-week-view-main-item.c:342
-#: ../shell/e-shell.c:825 ../shell/e-shell.c:826
+#: ../shell/e-shell.c:831 ../shell/e-shell.c:832
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
 # widgets/misc/e-cell-date-edit.c:245
-#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1269 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "確認"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../shell/e-shell.c:1259
+#: ../shell/e-shell.c:1271
 msgid "Invalid arguments"
 msgstr "無效的參數"
 
-#: ../shell/e-shell.c:1261
+#: ../shell/e-shell.c:1273
 msgid "Cannot register on OAF"
 msgstr "不能於 OAF 註冊"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1275
 msgid "Configuration Database not found"
 msgstr "找不到組態資料庫"
 
@@ -19032,32 +19150,32 @@ msgstr ""
 msgid "Don't tell me again"
 msgstr "不要再顯示這個訊息"
 
-#: ../shell/main.c:466
+#: ../shell/main.c:471
 msgid "Start Evolution activating the specified component"
 msgstr "啟動 Evolution 會啟動指定的元件"
 
-#: ../shell/main.c:470
+#: ../shell/main.c:475
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:478
 msgid "Forcibly shut down all Evolution components"
 msgstr "強制關閉所有 Evoultion 元件"
 
-#: ../shell/main.c:477
+#: ../shell/main.c:482
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "強制從 Evolution 1.4 重新移轉"
 
 # shell/main.c:185
-#: ../shell/main.c:480
+#: ../shell/main.c:485
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:487
 msgid "Disable loading of any plugins."
 msgstr "停用對任何外掛程式的載入。"
 
-#: ../shell/main.c:513
+#: ../shell/main.c:518
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19086,7 +19204,7 @@ msgstr "Evolution 無法啟動。"
 #: ../shell/shell.error.xml.h:5
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed. "
+"reprompted next time they are needed."
 msgstr ""
 "遺忘您的密碼會刪除所有已記憶的密碼。在下次需要使用密碼時將會提示您輸入。"
 
@@ -19102,7 +19220,7 @@ msgstr "確定要刪除舊資料？"
 
 #: ../shell/shell.error.xml.h:9
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory is about to be be "
+"The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
 "\n"
 "It is suggested you manually verify that all of your mail, contact, and "
@@ -19124,14 +19242,15 @@ msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
 "If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently.  If you choose to "
-"keep this data, then you may manually remove the contents of &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
 "evolution&quot; at your convenience.\n"
 msgstr ""
 "舊的 Evolution 版本將其資料儲存在不同的位置。\n"
 "\n"
-"如果您選擇移除此資料，將會永久移除「evolution」目錄的所有內容。如果您選擇保留"
-"此資料，就可以在方便的時候，手動移除「evolution」的內容。\n"
+"如果選擇移除此資料，將會永久移除「evolution」目錄的"
+"所有內容。如果選擇保留此資料，就可以在方便的時候，"
+"手動移除「evolution」的內容。\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
@@ -19197,7 +19316,7 @@ msgstr ""
 "\n"
 "如果您選擇繼續，可能無法存取部份舊資料。\n"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19208,7 +19327,7 @@ msgstr ""
 "\n"
 "編輯信任設定值："
 
-#: ../smime/gui/cert-trust-dialog.c:145
+#: ../smime/gui/cert-trust-dialog.c:153
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -19217,7 +19336,7 @@ msgstr ""
 "因為您信任發出此憑證的憑證單位，所以除非在此指示，否則您將信任此憑證的有效"
 "性。"
 
-#: ../smime/gui/cert-trust-dialog.c:149
+#: ../smime/gui/cert-trust-dialog.c:157
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -19227,42 +19346,42 @@ msgstr ""
 "效性。"
 
 # mail/mail-account-gui.c:682
-#: ../smime/gui/certificate-manager.c:134
-#: ../smime/gui/certificate-manager.c:142
-#: ../smime/gui/certificate-manager.c:377
-#: ../smime/gui/certificate-manager.c:385
-#: ../smime/gui/certificate-manager.c:597
-#: ../smime/gui/certificate-manager.c:605
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:375
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:595
+#: ../smime/gui/certificate-manager.c:603
 msgid "Select a certificate to import..."
 msgstr "選取要匯入的憑證..."
 
-#: ../smime/gui/certificate-manager.c:265
-#: ../smime/gui/certificate-manager.c:474
-#: ../smime/gui/certificate-manager.c:692
+#: ../smime/gui/certificate-manager.c:267
+#: ../smime/gui/certificate-manager.c:472
+#: ../smime/gui/certificate-manager.c:690
 msgid "Certificate Name"
 msgstr "憑證名稱"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:16
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:492
+#: ../smime/gui/certificate-manager.c:276
+#: ../smime/gui/certificate-manager.c:490
 msgid "Purposes"
 msgstr "用途"
 
-#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "序號"
 
-#: ../smime/gui/certificate-manager.c:291
+#: ../smime/gui/certificate-manager.c:293
 msgid "Expires"
 msgstr "到期"
 
 # mail/mail-config.glade.h:29
-#: ../smime/gui/certificate-manager.c:483
+#: ../smime/gui/certificate-manager.c:481
 msgid "E-Mail Address"
 msgstr "電子郵件地址"
 
-#: ../smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-viewer.c:342
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "憑證檢視器:%s"
@@ -19290,7 +19409,7 @@ msgid "Enter new password"
 msgstr "輸入新密碼"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19299,7 +19418,7 @@ msgstr ""
 "發給:\n"
 "  主旨：%s\n"
 
-#: ../smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19309,7 +19428,7 @@ msgstr ""
 "  主旨：%s\n"
 
 # ui/evolution-calendar.xml.h:13
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:174
 msgid "Select certificate"
 msgstr "選取憑證"
 
@@ -19515,7 +19634,7 @@ msgid "_Edit CA Trust"
 msgstr "編輯 CA 信任(_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:651
+#: ../smime/lib/e-cert-db.c:654
 msgid "Certificate already exists"
 msgstr "憑證已經存在"
 
@@ -19565,43 +19684,6 @@ msgstr "PKCS #1 MD5 附 RSA 加密"
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 附 RSA 加密"
 
-#: ../smime/lib/e-cert.c:642
-msgid "C"
-msgstr "C"
-
-# calendar/gui/calendar-model.c:457
-#: ../smime/lib/e-cert.c:645
-msgid "CN"
-msgstr "CN"
-
-#: ../smime/lib/e-cert.c:648
-msgid "OU"
-msgstr "OU"
-
-# widgets/misc/e-cell-date-edit.c:245
-#: ../smime/lib/e-cert.c:651
-msgid "O"
-msgstr "O"
-
-#: ../smime/lib/e-cert.c:654
-msgid "L"
-msgstr "L"
-
-# calendar/gui/calendar-model.c:457
-#: ../smime/lib/e-cert.c:657
-msgid "DN"
-msgstr "DN"
-
-#: ../smime/lib/e-cert.c:660
-msgid "DC"
-msgstr "DC"
-
-# camel/providers/smtp/camel-smtp-provider.c:38
-# mail/mail-config.glade.h:62
-#: ../smime/lib/e-cert.c:663
-msgid "ST"
-msgstr "ST"
-
 #: ../smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA 加密"
@@ -19618,16 +19700,6 @@ msgstr "Netscape 憑證類型"
 msgid "Certificate Authority Key Identifier"
 msgstr "憑證單位鑰匙識別碼"
 
-# addressbook/contact-editor/fullname.glade.h:4
-#: ../smime/lib/e-cert.c:678
-msgid "UID"
-msgstr "UID"
-
-# calendar/gui/calendar-model.c:459
-#: ../smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
 #: ../smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
@@ -19745,16 +19817,16 @@ msgstr "主旨獨有 ID"
 msgid "Certificate Signature Value"
 msgstr "憑證簽名值"
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 檔案密碼"
 
 # camel/camel-smime-context.c:194
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "輸入 PKCS12 檔案的密碼:"
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr "輸入的憑證"
 
@@ -19861,7 +19933,7 @@ msgstr "貼上"
 
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:15
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿"
 
@@ -19927,7 +19999,7 @@ msgstr "停止載入"
 msgid "View the current contact"
 msgstr "檢視目前的連絡人"
 
-#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:36
 #: ../ui/evolution-mail-list.xml.h:26 ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "執行(_A)"
@@ -19967,34 +20039,28 @@ msgstr "刪除這個約會"
 msgid "Delete this Occurrence"
 msgstr "刪除此例項"
 
-# calendar/gui/e-day-view.c:3177
-# calendar/gui/e-week-view.c:3311
-#: ../ui/evolution-calendar.xml.h:9
-msgid "Delete this occurrence"
-msgstr "刪除此例項"
-
 # ui/evolution-calendar.xml.h:8
-#: ../ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:9
 msgid "Go To"
 msgstr "移至"
 
 # ui/evolution-calendar.xml.h:9
-#: ../ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:10
 msgid "Go back"
 msgstr "向後"
 
 # ui/evolution-calendar.xml.h:10
-#: ../ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go forward"
 msgstr "向前"
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: ../ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:12
 msgid "List"
 msgstr "清單"
 
 # ui/evolution-calendar.xml.h:15
-#: ../ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "月"
 
@@ -20003,12 +20069,12 @@ msgstr "月"
 # ui/evolution-event-editor.xml.h:29
 # ui/evolution-mail.xml.h:57
 # ui/evolution-task-editor-dialog.xml.h:32
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-calendar.xml.h:14 ../ui/evolution-mail-message.xml.h:58
 msgid "Next"
 msgstr "下一個"
 
 # ui/evolution-calendar.xml.h:22
-#: ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:16
 msgid "Previews the calendar to be printed"
 msgstr "預覽將要列印的行事曆內容"
 
@@ -20016,86 +20082,82 @@ msgstr "預覽將要列印的行事曆內容"
 # ui/evolution-event-editor.xml.h:33
 # ui/evolution-mail.xml.h:64
 # ui/evolution-task-editor-dialog.xml.h:36
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-calendar.xml.h:17 ../ui/evolution-mail-message.xml.h:74
 msgid "Previous"
 msgstr "上一個"
 
 # ui/evolution-calendar.xml.h:26
-#: ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-calendar.xml.h:20
 msgid "Print this calendar"
 msgstr "列印這個行事曆"
 
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy information for this calendar"
-msgstr "發佈此行事曆的空閒/忙碌資訊"
-
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "清除(_E)"
 
-#: ../ui/evolution-calendar.xml.h:24
+#: ../ui/evolution-calendar.xml.h:22
 msgid "Purge old appointments and meetings"
 msgstr "刪除舊約會和會議"
 
-#: ../ui/evolution-calendar.xml.h:25
+#: ../ui/evolution-calendar.xml.h:23
 msgid "Select _Date"
 msgstr "選擇日期(_D)"
 
-#: ../ui/evolution-calendar.xml.h:26
+#: ../ui/evolution-calendar.xml.h:24
 msgid "Select _Today"
 msgstr "選擇今天(_T)"
 
 # ui/evolution-calendar.xml.h:13
-#: ../ui/evolution-calendar.xml.h:27
+#: ../ui/evolution-calendar.xml.h:25
 msgid "Select a specific date"
 msgstr "選取特定日期"
 
 # shell/e-shell-importer.c:601
-#: ../ui/evolution-calendar.xml.h:28
+#: ../ui/evolution-calendar.xml.h:26
 msgid "Select today"
 msgstr "選取今日"
 
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: ../ui/evolution-calendar.xml.h:29
+#: ../ui/evolution-calendar.xml.h:27
 msgid "Show as list"
 msgstr "顯示成清單"
 
 # ui/evolution-calendar.xml.h:30
-#: ../ui/evolution-calendar.xml.h:30
+#: ../ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "顯示一天"
 
 # ui/evolution-calendar.xml.h:31
-#: ../ui/evolution-calendar.xml.h:31
+#: ../ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "顯示一個月"
 
 # ui/evolution-calendar.xml.h:32
-#: ../ui/evolution-calendar.xml.h:32
+#: ../ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "顯示一週"
 
 # ui/evolution-calendar.xml.h:33
-#: ../ui/evolution-calendar.xml.h:33
+#: ../ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "顯示工作週"
 
-#: ../ui/evolution-calendar.xml.h:35
+#: ../ui/evolution-calendar.xml.h:33
 msgid "View the current appointment"
 msgstr "檢視目前的約會"
 
 # ui/evolution-calendar.xml.h:36
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:34
 msgid "Week"
 msgstr "週"
 
 # ui/evolution-calendar.xml.h:35
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:35
 msgid "Work Week"
 msgstr "工作週"
 
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:40
 msgid "_Open Appointment"
 msgstr "開啟約會(_O)"
 
@@ -20126,6 +20188,11 @@ msgstr "全選(_A)"
 msgid "Select all text"
 msgstr "選取所有文字"
 
+# ui/evolution-message-composer.xml.h:1
+#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "附加"
+
 #: ../ui/evolution-editor.xml.h:2
 msgid "Click here to attach a file"
 msgstr "按這裡以附加檔案"
@@ -20143,7 +20210,7 @@ msgid "Click here to save the current window"
 msgstr "按這裡以儲存目前視窗"
 
 #: ../ui/evolution-editor.xml.h:5
-msgid "Click here to view help availabe"
+msgid "Click here to view help available"
 msgstr "按這裡以檢視可用的說明"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:1
@@ -20159,9 +20226,9 @@ msgstr "按這裡以檢視可用的說明"
 msgid "Close"
 msgstr "關閉"
 
-#: ../ui/evolution-editor.xml.h:14
-msgid "_Attachments"
-msgstr "附加檔案(_A)"
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:40
+msgid "_Attachment..."
+msgstr "附件(_A)..."
 
 #: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:43 ../ui/evolution-subscribe.xml.h:9
@@ -20171,11 +20238,11 @@ msgstr "關閉(_C)"
 #: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:34
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:35
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:35
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:36
 msgid "_Help"
 msgstr "說明(_H)"
 
@@ -20207,126 +20274,125 @@ msgstr "分類為私人"
 msgid "Classify as public"
 msgstr "分類為公開"
 
-#: ../ui/evolution-event-editor.xml.h:7 ../ui/evolution-task-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:6
+msgid "Click here to set or unset alarms for this event"
+msgstr "按這裡以設定或取消這個事件的鬧鈴"
+
+#: ../ui/evolution-event-editor.xml.h:8 ../ui/evolution-task-editor.xml.h:5
 msgid "Insert advanced send options"
 msgstr "插入進階傳送選項"
 
 # calendar/gui/e-day-view.c:3175
 # calendar/gui/e-week-view.c:3309
-#: ../ui/evolution-event-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:9
 msgid "Make this a recurring event"
 msgstr "將此項設為循環事件"
 
 # calendar/gui/calendar-model.c:360
 # calendar/gui/calendar-model.c:898
 # calendar/gui/e-calendar-table.c:323
-#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:10 ../ui/evolution-task-editor.xml.h:6
 msgid "Pu_blic"
 msgstr "公開(_B)"
 
-#: ../ui/evolution-event-editor.xml.h:10
+#: ../ui/evolution-event-editor.xml.h:11
 msgid "Query free / busy information for the attendees"
 msgstr "查詢此到會者的空閒/忙碌資訊"
 
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-task-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:12 ../ui/evolution-task-editor.xml.h:7
 msgid "R_ole Field"
 msgstr "角色欄位(_O)"
 
-#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:9
+#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:9
 msgid "Show Time _Zone"
 msgstr "顯示時區(_Z)"
 
-#: ../ui/evolution-event-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:16
 msgid "Show time as b_usy"
 msgstr "顯示時間為忙碌(_U)"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:16 ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "切換是否顯示「到會者類型」欄位"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切換是否顯示「RSVP」欄位"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "切換是否顯示「角色」欄位"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "切換是否顯示「狀態」欄位"
 
 # ui/evolution-message-composer.xml.h:39
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "切換是否顯示「時區」"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:17
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "切換是否顯示「分類」"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:23
 msgid "Toggles whether to have All day Event"
 msgstr "切換是否要有全天事件"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:23
+#: ../ui/evolution-event-editor.xml.h:24
 msgid "Toggles whether to show time as busy"
 msgstr "切換是否將時間顯示為忙碌"
 
 # calendar/gui/e-calendar-table.c:162
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:25
 msgid "_Alarms"
 msgstr "鬧鈴(_A)"
 
-#: ../ui/evolution-event-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:26
 msgid "_All day Event"
 msgstr "全天事件(_A)"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:5
 # calendar/gui/e-calendar-table.c:151
 # calendar/gui/event-editor-dialog.glade.h:6
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:19
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "分類(_C)"
 
 # calendar/gui/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:20
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "機密(_C)"
 
 # calendar/gui/calendar-model.c:363
 # calendar/gui/calendar-model.c:900
 # calendar/gui/e-calendar-table.c:324
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:21
+#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:24
 msgid "_Status Field"
 msgstr "狀態欄位(_S)"
 
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:25
 msgid "_Type Field"
 msgstr "類型欄位(_T)"
 
-# shell/e-shell-view.c:1203
-#: ../ui/evolution-executive-summary.xml.h:1
-msgid "Customize My Evolution"
-msgstr "自訂我的 Evolution"
-
 # ui/evolution-mail.xml.h:3
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
@@ -20410,7 +20476,7 @@ msgstr "移動資料夾到(_M)..."
 # mail/mail-account-gui.c:682
 #: ../ui/evolution-mail-global.xml.h:19
 msgid "_New Search _Folder (FIXME)"
-msgstr "新增搜尋資料夾(_N)"
+msgstr "新增搜尋資料夾(_F)"
 
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_New..."
@@ -20431,13 +20497,13 @@ msgid "Change the properties of this folder"
 msgstr "變更這個資料夾的屬性"
 
 # ui/evolution-mail.xml.h:9
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:11
 msgid "Copy selected message(s) to the clipboard"
 msgstr "複製已選定的郵件到剪貼簿"
 
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-#: ../ui/evolution-mail-list.xml.h:4 ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:4 ../ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "將郵件剪下並貼到剪貼簿"
 
@@ -20473,7 +20539,7 @@ msgstr "標示郵件為已閱讀(_K)"
 
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-#: ../ui/evolution-mail-list.xml.h:13 ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-list.xml.h:13 ../ui/evolution-mail-message.xml.h:67
 msgid "Paste message(s) from the clipboard"
 msgstr "自剪貼簿貼上郵件"
 
@@ -20535,7 +20601,7 @@ msgstr "將選定的郵件暫時隱藏"
 msgid "Threaded Message list"
 msgstr "相關郵件清單"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "郵件(_M)"
@@ -20586,382 +20652,381 @@ msgid "Compose a reply to the sender of the selected message"
 msgstr "撰寫回郵給所選定的郵件的寄件者"
 
 # ui/evolution-mail.xml.h:9
-#: ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
 msgstr "複製已選定的郵件到另一個資料夾"
 
 # ui/evolution.xml.h:10
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Create R_ule"
 msgstr "建立規則(_U)"
 
 # ui/evolution-mail.xml.h:15
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create a Search Folder for these recipients"
 msgstr "為這些收件者建立一個搜尋資料夾"
 
 # ui/evolution-mail.xml.h:16
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for this mailing list"
 msgstr "為這個通信論壇建立一個搜尋資料夾"
 
 # ui/evolution-mail.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this sender"
 msgstr "為這個寄件者建立一個搜尋資料夾"
 
 # ui/evolution-mail.xml.h:18
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this subject"
 msgstr "為這個主旨建立一個搜尋資料夾"
 
 # ui/evolution-mail.xml.h:11
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a rule to filter messages from this sender"
 msgstr "為這個寄件者建立過濾器規則"
 
 # ui/evolution-mail.xml.h:12
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages to these recipients"
 msgstr "為這些收件者建立過濾器規則"
 
 # ui/evolution-mail.xml.h:13
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "為這個通信論壇建立過濾器規則"
 
 # ui/evolution-mail.xml.h:14
-#: ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages with this subject"
 msgstr "為這個主旨建立過濾器規則"
 
-#: ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "減少文字大小"
 
 # ui/evolution-mail.xml.h:23
-#: ../ui/evolution-mail-message.xml.h:26
+#: ../ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr "顯示下一封重要的郵件"
 
 # ui/evolution-mail.xml.h:23
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr "顯示下一封郵件"
 
 # ui/evolution-mail.xml.h:23
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr "顯示下一封未閱讀的郵件"
 
 # ui/evolution-mail.xml.h:23
-#: ../ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr "顯示下一封未閱讀的相關郵件"
 
 # ui/evolution-mail.xml.h:24
-#: ../ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr "顯示上一封重要的郵件"
 
 # ui/evolution-mail.xml.h:24
-#: ../ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr "顯示上一封郵件"
 
 # ui/evolution-mail.xml.h:24
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr "顯示上一封未閱讀的郵件"
 
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "F_orward As..."
 msgstr "轉寄為(_O)..."
 
-#: ../ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr "通信論壇過濾器(_L)..."
 
-#: ../ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "寄件者過濾器(_N)..."
 
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "收件者過濾器(_R)..."
 
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "主旨過濾器(_S)..."
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter the selected messages for junk status"
 msgstr "篩選所選信件的垃圾郵件狀態"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Flag selected message(s) for follow-up"
 msgstr "將選定的郵件加上跟隨標幟"
 
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Follow _Up..."
 msgstr "跟隨(_U)..."
 
 # ui/evolution-mail.xml.h:30
-#: ../ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Force images in HTML mail to be loaded"
 msgstr "閱讀 HTML 格式的郵件時強迫載入影像"
 
 # ui/evolution-mail.xml.h:38
-#: ../ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message in the body of a new message"
 msgstr "將需要轉寄的郵件夾附於新郵件的內文中"
 
 # ui/evolution-mail.xml.h:39
-#: ../ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message quoted like a reply"
 msgstr "將需要轉寄的郵件以回覆郵件方式寄出"
 
 # ui/evolution-mail.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone"
 msgstr "將選定的郵件轉寄給某人"
 
 # ui/evolution-mail.xml.h:41
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone as an attachment"
 msgstr "將選定的郵件以附加檔案形式轉寄給某人"
 
 # ui/evolution-message-composer.xml.h:10
-#: ../ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Increase the text size"
 msgstr "增加文字大小"
 
-#: ../ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as"
 msgstr "標示成(_K)"
 
 # ui/evolution-mail.xml.h:52
-#: ../ui/evolution-mail-message.xml.h:50
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as having been read"
 msgstr "將選定的郵件標示成已經閱讀"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as important"
 msgstr "將選定的郵件標示成重要"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:52
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as junk"
 msgstr "將選取的郵件標示成垃圾郵件"
 
 # ui/evolution-mail.xml.h:53
-#: ../ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as not being junk"
 msgstr "將選取的郵件標示成不是垃圾郵件"
 
 # ui/evolution-mail.xml.h:53
-#: ../ui/evolution-mail-message.xml.h:54
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr "將選定的郵件標示成未閱讀"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:55
+#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr "將選定的郵件標示成不重要"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "將選定的郵件標示成要刪除"
 
-#: ../ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Message Source"
 msgstr "郵件來源"
 
-# ui/evolution-mail.xml.h:55
-#: ../ui/evolution-mail-message.xml.h:58
-msgid "Move"
-msgstr "移動"
-
 # ui/evolution-mail.xml.h:56
-#: ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:57
 msgid "Move selected message(s) to another folder"
 msgstr "將選定的郵件移至另一個資料夾"
 
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
 msgstr "下一封重要郵件(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
 msgstr "下一封相關郵件(_T)"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
 msgstr "下一封未閱讀的郵件(_U)"
 
 # calendar/gui/calendar-commands.c:266
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
 msgstr "不是垃圾郵件"
 
 # ui/evolution-mail.xml.h:58
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
 msgstr "開啟視窗以便撰寫郵件"
 
 # ui/evolution-mail.xml.h:59
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Open the selected message in a new window"
 msgstr "使用新視窗開啟選定的郵件"
 
 # ui/evolution-mail.xml.h:60
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected message in the composer for editing"
 msgstr "在撰寫視窗開啟選取的郵件來編輯"
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
 msgstr "上一封未閱讀的郵件(_R)"
 
 # mail/mail-ops.c:825
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "Pos_t New Message to Folder"
 msgstr "張貼新郵件到資料夾(_T)"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a Repl_y"
 msgstr "張貼回覆(_Y)"
 
 # mail/mail-ops.c:825
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a message to a Public folder"
 msgstr "張貼新郵件到公開資料夾"
 
 # ui/evolution-message-composer.xml.h:25
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../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:74
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "上一封重要郵件(_E)"
 
 # ui/evolution-addressbook.xml.h:8
 # ui/evolution-mail.xml.h:63
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Preview the message to be printed"
 msgstr "預覽需要列印的郵件"
 
 # mail/mail-callbacks.c:1407
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Print this message"
 msgstr "列印郵件"
 
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Re_direct"
 msgstr "重新導向(_D)"
 
 # ui/evolution-mail.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "將選定的郵件重新導向給某人"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
 msgstr "重設文字為原始大小"
 
 # ui/evolution-mail.xml.h:74
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Save the message as a text file"
 msgstr "另存郵件成文字檔案"
 
 # ui/evolution-mail.xml.h:95
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
 msgstr "通信論壇搜尋資料夾(_L)..."
 
 # ui/evolution-mail.xml.h:97
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Recipients..."
 msgstr "收件者搜尋資料夾..."
 
 # ui/evolution-mail.xml.h:98
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
 msgstr "主旨搜尋資料夾(_U)..."
 
 # ui/evolution-mail.xml.h:96
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
 msgstr "寄件者搜尋資料夾(_D)..."
 
 # ui/evolution-mail.xml.h:75
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
 msgstr "搜尋顯示的郵件本文中的文字"
 
 # ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
 msgstr "選取所有文字(_A)"
 
 # ui/evolution-mail.xml.h:80
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Select all the text in a message"
 msgstr "選擇郵件中的所有文字"
 
 # ui/evolution-event-editor.xml.h:50
 # ui/evolution-task-editor-dialog.xml.h:59
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Set up the page settings for your current printer"
 msgstr "設定您目前印表機的版面設定"
 
 # ui/evolution-mail.xml.h:75
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在顯示的郵件內文中顯示閃爍游標"
 
 # ui/evolution-mail.xml.h:86
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show message in the normal style"
 msgstr "使用正常模式顯示郵件"
 
 # ui/evolution-mail.xml.h:87
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show message with all email headers"
 msgstr "顯示郵件及詳細檔頭"
 
 # ui/evolution-mail.xml.h:89
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Show the raw email source of the message"
 msgstr "顯示郵件原始檔"
 
 # ui/evolution-mail.xml.h:94
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Un-delete the selected messages"
 msgstr "復原選定的郵件"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Zoom _Out"
 msgstr "縮小(_O)"
 
 # ui/evolution-message-composer.xml.h:1
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Attached"
 msgstr "已附加(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Caret Mode"
 msgstr "漏字模式(_C)"
 
+#: ../ui/evolution-mail-message.xml.h:103
+msgid "_Clear Flag"
+msgstr "清除標幟(_C)"
+
 #: ../ui/evolution-mail-message.xml.h:106
 msgid "_Delete Message"
 msgstr "刪除郵件(_D)"
@@ -20971,68 +21036,72 @@ msgstr "刪除郵件(_D)"
 msgid "_Find in Message..."
 msgstr "在郵件內尋找(_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:109
+msgid "_Flag Completed"
+msgstr "標幟已完成(_F)"
+
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Go To"
 msgstr "移至(_G)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Important"
 msgstr "重要(_I)"
 
 # mail/mail-config.glade.h:37
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "行內(_I)"
 
 # calendar/gui/goto-dialog.glade.h:9
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Junk"
 msgstr "垃圾郵件(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Load Images"
 msgstr "載入圖片(_L)"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "下一封郵件(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "一般大小(_N)"
 
 # calendar/gui/calendar-commands.c:266
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "不是垃圾郵件(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "在新視窗開啟(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "上一封郵件(_P)"
 
 # mail/mail-config.glade.h:56
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "已引用(_Q)"
 
 # mail/mail-callbacks.c:1188
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Save Message..."
 msgstr "儲存郵件(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Undelete Message"
 msgstr "復原刪除郵件(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Unread"
 msgstr "未閱讀(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Zoom In"
 msgstr "放大(_Z)"
 
@@ -21087,11 +21156,6 @@ msgstr "檢視選取的備忘錄"
 msgid "_Open Memo"
 msgstr "開啟備忘錄(_O)"
 
-# ui/evolution-message-composer.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "附加"
-
 # composer/e-msg-composer-attachment-bar.c:421
 # ui/evolution-message-composer.xml.h:2
 #: ../ui/evolution-message-composer.xml.h:2
@@ -21263,10 +21327,6 @@ msgstr "切換回覆欄位的顯示狀態"
 msgid "Toggles whether the To field is displayed"
 msgstr "切換是否顯示「收件者」欄位"
 
-#: ../ui/evolution-message-composer.xml.h:40
-msgid "_Attachment..."
-msgstr "附件(_A)..."
-
 #: ../ui/evolution-message-composer.xml.h:41
 msgid "_Bcc Field"
 msgstr "密件副本欄位(_B)"
@@ -21530,87 +21590,88 @@ msgstr "偏好設定(_N)"
 msgid "Send / Receive"
 msgstr "傳送/接收"
 
-# ui/evolution-mail.xml.h:82
+# ui/evolution-mail.xml.h:81
 #: ../ui/evolution.xml.h:21
+msgid "Send / _Receive"
+msgstr "傳送/接收(_R)"
+
+# ui/evolution-mail.xml.h:82
+#: ../ui/evolution.xml.h:22
 msgid "Send queued items and retrieve new items"
 msgstr "傳送待送的項目並接收新的項目"
 
 # mail/mail-config.glade.h:40
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:23
 msgid "Set up Pilot configuration"
 msgstr "設定 Pilot 組態"
 
 # ui/evolution.xml.h:27
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:24
 msgid "Show information about Evolution"
 msgstr "顯示 Evolution 相關資訊"
 
 # ui/evolution.xml.h:28
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:25
 msgid "Submit Bug Report"
 msgstr "傳送錯誤報告"
 
-#: ../ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:26
 msgid "Submit _Bug Report"
 msgstr "傳送錯誤報告(_B)"
 
 # ui/evolution.xml.h:30
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:27
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使用 Bug Buddy 送出錯誤報告。"
 
 # ui/evolution.xml.h:34
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:28
 msgid "Toggle whether we are working offline."
 msgstr "切換離線/在線工作的狀態。"
 
 # ui/evolution.xml.h:22
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:29
 msgid "Tool_bar"
 msgstr "工具列(_B)"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:30
 msgid "Tool_bar style"
 msgstr "工具列風格(_B)"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:31
 msgid "View/Hide the Status Bar"
 msgstr "顯示/隱藏狀態列"
 
 # ui/evolution.xml.h:1
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:32
 msgid "_About Evolution..."
 msgstr "關於 Evolution(_A)..."
 
 # ui/evolution.xml.h:6
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:33
 msgid "_Close Window"
 msgstr "關閉視窗(_C)"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:37
 msgid "_Hide buttons"
 msgstr "隱藏按鈕(_H)"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:38
 msgid "_Icons only"
 msgstr "只有圖示(_I)"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:39
 msgid "_Import..."
 msgstr "匯入(_I)..."
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:40
 msgid "_New"
 msgstr "新增(_N)"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:41
 msgid "_Quick Reference"
 msgstr "快速偏好設定(_Q)"
 
-#: ../ui/evolution.xml.h:42
-msgid "_Send / Receive"
-msgstr "傳送/接收(_S)"
-
 #: ../ui/evolution.xml.h:43
 msgid "_Switcher Appearance"
 msgstr "切換外觀(_S)"
@@ -21700,8 +21761,8 @@ msgstr "到期日(_D):"
 msgid "With _Status"
 msgstr "設定狀態(_S)"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:645
 msgid "UTC"
 msgstr "UTC"
 
@@ -21791,17 +21852,17 @@ msgstr "置換現存的檢視(_R)"
 
 # widgets/menus/gal-view-menus.c:176
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-instance.c:586
 #: ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "自訂檢視"
 
-#: ../widgets/menus/gal-view-instance.c:586
+#: ../widgets/menus/gal-view-instance.c:587
 msgid "Save Custom View"
 msgstr "儲存自訂檢視"
 
 # widgets/menus/gal-view-menus.c:202
-#: ../widgets/menus/gal-view-instance.c:590
+#: ../widgets/menus/gal-view-instance.c:591
 #: ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "定義檢視..."
@@ -21859,17 +21920,17 @@ msgstr "上一步按鈕"
 msgid "Month Calendar"
 msgstr "月行事曆"
 
-#: ../widgets/misc/e-canvas-background.c:456
-#: ../widgets/misc/e-canvas-background.c:457 ../widgets/text/e-entry.c:1284
+#: ../widgets/misc/e-canvas-background.c:459
+#: ../widgets/misc/e-canvas-background.c:460 ../widgets/text/e-entry.c:1284
 #: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3540
 #: ../widgets/text/e-text.c:3541
 msgid "Fill color"
 msgstr "填入色彩"
 
-#: ../widgets/misc/e-canvas-background.c:463
-#: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:470
-#: ../widgets/misc/e-canvas-background.c:471 ../widgets/text/e-entry.c:1291
+#: ../widgets/misc/e-canvas-background.c:466
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:473
+#: ../widgets/misc/e-canvas-background.c:474 ../widgets/text/e-entry.c:1291
 #: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
 #: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3547
 #: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3555
@@ -21877,30 +21938,30 @@ msgstr "填入色彩"
 msgid "GDK fill color"
 msgstr "GDK 填色"
 
-#: ../widgets/misc/e-canvas-background.c:477
-#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
+#: ../widgets/misc/e-canvas-background.c:480
+#: ../widgets/misc/e-canvas-background.c:481 ../widgets/text/e-entry.c:1305
 #: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3562
 #: ../widgets/text/e-text.c:3563
 msgid "Fill stipple"
 msgstr "填入網點"
 
-#: ../widgets/misc/e-canvas-background.c:484
-#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:487
+#: ../widgets/misc/e-canvas-background.c:488
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:491
-#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:494
+#: ../widgets/misc/e-canvas-background.c:495
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:498
-#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:501
+#: ../widgets/misc/e-canvas-background.c:502
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:505
-#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:508
+#: ../widgets/misc/e-canvas-background.c:509
 msgid "Y2"
 msgstr "Y2"
 
@@ -21947,7 +22008,7 @@ msgstr "波羅的海文"
 
 #: ../widgets/misc/e-charset-picker.c:64
 msgid "Central European"
-msgstr "中歐字母"
+msgstr "中歐語系"
 
 #: ../widgets/misc/e-charset-picker.c:65
 msgid "Chinese"
@@ -21963,7 +22024,7 @@ msgstr "希臘文"
 
 #: ../widgets/misc/e-charset-picker.c:68
 msgid "Hebrew"
-msgstr "希伯來"
+msgstr "希伯來語"
 
 #: ../widgets/misc/e-charset-picker.c:69
 msgid "Japanese"
@@ -21975,7 +22036,7 @@ msgstr "韓文"
 
 #: ../widgets/misc/e-charset-picker.c:71
 msgid "Turkish"
-msgstr "土耳其文"
+msgstr "土耳其語"
 
 #: ../widgets/misc/e-charset-picker.c:72
 msgid "Unicode"
@@ -21983,17 +22044,17 @@ msgstr "Unicode"
 
 #: ../widgets/misc/e-charset-picker.c:73
 msgid "Western European"
-msgstr "西歐字母"
+msgstr "西歐語系"
 
 #: ../widgets/misc/e-charset-picker.c:74
 msgid "Western European, New"
-msgstr "西歐，新"
+msgstr "西歐語系，新"
 
 # camel/providers/smtp/camel-smtp-transport.c:206
 #: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
 #: ../widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
-msgstr "繁體"
+msgstr "正體"
 
 #: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
 #: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
@@ -22002,7 +22063,7 @@ msgstr "簡體"
 
 #: ../widgets/misc/e-charset-picker.c:100
 msgid "Ukrainian"
-msgstr "烏黑蘭語"
+msgstr "烏克蘭語"
 
 #: ../widgets/misc/e-charset-picker.c:103
 msgid "Visual"
@@ -22066,6 +22127,24 @@ msgstr "用以選擇時刻的組合式方塊"
 msgid "Time Combo Box"
 msgstr "時刻的組合式方塊"
 
+# e-util/e-time-utils.c:312
+# widgets/misc/e-dateedit.c:1259
+# widgets/misc/e-dateedit.c:1318
+# widgets/misc/e-dateedit.c:1497
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: ../widgets/misc/e-dateedit.c:1444 ../widgets/misc/e-dateedit.c:1771
+msgid "%H:%M"
+msgstr "%H:%M"
+
+# e-util/e-time-utils.c:320
+# widgets/misc/e-dateedit.c:1262
+# widgets/misc/e-dateedit.c:1321
+# widgets/misc/e-dateedit.c:1500
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: ../widgets/misc/e-dateedit.c:1447 ../widgets/misc/e-dateedit.c:1774
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
 # ui/evolution-mail.xml.h:104
 #: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
@@ -22120,18 +22199,17 @@ msgstr "指示器間距"
 msgid "Spacing around expander arrow"
 msgstr "展開器箭頭周圍的間距"
 
-#: ../widgets/misc/e-filter-bar.c:195
+#: ../widgets/misc/e-filter-bar.c:201
 msgid "_Searches"
 msgstr "搜尋(_S)"
 
-# mail/mail-search.c:299
-#: ../widgets/misc/e-filter-bar.c:197
-msgid "Search Editor"
-msgstr "尋找編輯器"
+#: ../widgets/misc/e-filter-bar.c:203
+msgid "Searches"
+msgstr "搜尋"
 
 # widgets/misc/e-filter-bar.c:168
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:220
+#: ../widgets/misc/e-filter-bar.c:226
 msgid "Save Search"
 msgstr "儲存搜尋結果"
 
@@ -22154,11 +22232,11 @@ msgid "Choose Image"
 msgstr "選擇影像"
 
 # addressbook/contact-editor/fulladdr.glade.h:5
-#: ../widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:651
 msgid "World Map"
 msgstr "世界地圖"
 
-#: ../widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:653
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -22195,42 +22273,42 @@ msgstr "欄寬"
 # addressbook/gui/component/addressbook-config.c:430
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:346
+#: ../widgets/misc/e-search-bar.c:372
 msgid "Search Text Entry"
 msgstr "搜尋文字項目"
 
-#: ../widgets/misc/e-search-bar.c:550
+#: ../widgets/misc/e-search-bar.c:591
 msgid "_Search"
 msgstr "尋找(_S)"
 
-#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Find Now"
 msgstr "立即搜尋(_F)"
 
-#: ../widgets/misc/e-search-bar.c:557 ../widgets/misc/e-search-bar.c:944
+#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:985
 msgid "_Clear"
 msgstr "清除(_C)"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:689
 msgid "Search Type"
 msgstr "搜尋類型"
 
-#: ../widgets/misc/e-search-bar.c:852
+#: ../widgets/misc/e-search-bar.c:893
 msgid "Item ID"
 msgstr "項目 ID"
 
-#: ../widgets/misc/e-search-bar.c:859
+#: ../widgets/misc/e-search-bar.c:900
 msgid "Subitem ID"
 msgstr "子項目 ID"
 
-#: ../widgets/misc/e-search-bar.c:866 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:907 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
 #: ../widgets/text/e-text.c:3463
 msgid "Text"
 msgstr "文字"
 
-#: ../widgets/misc/e-search-bar.c:946
+#: ../widgets/misc/e-search-bar.c:987
 msgid "Find _Now"
 msgstr "立即尋找(_N)"
 
@@ -22257,7 +22335,7 @@ msgstr "選擇區模式"
 msgid "Cursor Mode"
 msgstr "游標模式"
 
-#: ../widgets/misc/e-send-options.c:521
+#: ../widgets/misc/e-send-options.c:524
 msgid "When de_leted:"
 msgstr "刪除時(_L):"
 
@@ -22353,24 +22431,24 @@ msgstr ""
 "標準\n"
 "低"
 
-# addressbook/printing/e-contact-print.glade.h:41
 #: ../widgets/misc/e-send-options.glade.h:23
-msgid "W_ithin"
-msgstr "於內(_I)"
-
-#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "當接受時(_P):"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When co_mpleted:"
 msgstr "當完成時(_M)："
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When decli_ned:"
 msgstr "當拒絕時(_N):"
 
+# addressbook/printing/e-contact-print.glade.h:41
+#: ../widgets/misc/e-send-options.glade.h:26
+msgid "Wi_thin"
+msgstr "於內(_T)"
+
 # calendar/gui/event-editor-dialog.glade.h:33
 #: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
@@ -22428,8 +22506,8 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
 #: ../widgets/misc/e-url-entry.c:107
-msgid "click here to go to url"
-msgstr "按這裏移至網址"
+msgid "Click here to go to URL"
+msgstr "按這裡以移至 URL"
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
@@ -22475,23 +22553,23 @@ msgstr "聚焦的欄"
 msgid "Unselected Column"
 msgstr "未選擇的欄"
 
-#: ../widgets/table/e-cell-text.c:1740
+#: ../widgets/table/e-cell-text.c:1742
 msgid "Strikeout Column"
 msgstr "刪除線欄"
 
-#: ../widgets/table/e-cell-text.c:1747
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Underline Column"
 msgstr "底線欄"
 
-#: ../widgets/table/e-cell-text.c:1754
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Bold Column"
 msgstr "粗體欄"
 
-#: ../widgets/table/e-cell-text.c:1761
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Color Column"
 msgstr "色彩欄"
 
-#: ../widgets/table/e-cell-text.c:1775
+#: ../widgets/table/e-cell-text.c:1777
 msgid "BG Color Column"
 msgstr "背景色彩欄"
 
@@ -22843,9 +22921,9 @@ msgstr "表格模型"
 msgid "Cursor row"
 msgstr "游標列"
 
-# widgets/misc/e-filter-bar.c:168
-#: ../widgets/table/e-table.c:3330
-msgid "Always Search"
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-tree.c:3305
+msgid "Always search"
 msgstr "總是搜尋"
 
 # calendar/gui/e-calendar-table.c:163
@@ -22857,10 +22935,6 @@ msgstr "請按這裡加入"
 msgid "ETree table adapter"
 msgstr "ETree 表格橋接器"
 
-#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
-msgid "Always search"
-msgstr "總是搜尋"
-
 #: ../widgets/table/e-tree.c:3311
 msgid "Retro Look"
 msgstr "懷舊外觀"
@@ -23015,3 +23089,39 @@ msgstr "IM 快顯選單"
 msgid "Handle Popup"
 msgstr "處理彈出式項目"
 
+#~ msgid "C"
+#~ msgstr "C"
+
+# calendar/gui/calendar-model.c:457
+#~ msgid "CN"
+#~ msgstr "CN"
+
+#~ msgid "OU"
+#~ msgstr "OU"
+
+# widgets/misc/e-cell-date-edit.c:245
+#~ msgid "O"
+#~ msgstr "O"
+
+#~ msgid "L"
+#~ msgstr "L"
+
+# calendar/gui/calendar-model.c:457
+#~ msgid "DN"
+#~ msgstr "DN"
+
+#~ msgid "DC"
+#~ msgstr "DC"
+
+# camel/providers/smtp/camel-smtp-provider.c:38
+# mail/mail-config.glade.h:62
+#~ msgid "ST"
+#~ msgstr "ST"
+
+# calendar/gui/calendar-model.c:459
+#~ msgid "E"
+#~ msgstr "E"
+
+# shell/e-shell-view.c:1203
+#~ msgid "Customize My Evolution"
+#~ msgstr "自訂我的 Evolution"
author	Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>	2006-01-07 07:09:28 +0800
committer	Chao-Hsiung Liao <chliao@src.gnome.org>	2006-01-07 07:09:28 +0800
commit	7b43323bbe43d846c7dcd32a25192dba93413625 (patch)
tree	f57a4f4b335d49a8b2193f76547f8e8c6e641222 /po/zh_TW.po
parent	5bbcf0da7a587e171b6931553792e2884002fb41 (diff)
download	gsoc2013-evolution-7b43323bbe43d846c7dcd32a25192dba93413625.tar gsoc2013-evolution-7b43323bbe43d846c7dcd32a25192dba93413625.tar.gz gsoc2013-evolution-7b43323bbe43d846c7dcd32a25192dba93413625.tar.bz2 gsoc2013-evolution-7b43323bbe43d846c7dcd32a25192dba93413625.tar.lz gsoc2013-evolution-7b43323bbe43d846c7dcd32a25192dba93413625.tar.xz gsoc2013-evolution-7b43323bbe43d846c7dcd32a25192dba93413625.tar.zst gsoc2013-evolution-7b43323bbe43d846c7dcd32a25192dba93413625.zip