bump version

2004-05-19 JP Rosevear <jpr@novell.com> * configure.in: bump version svn path=/trunk/; revision=25982
author: JP Rosevear <jpr@novell.com> 2004-05-20 02:35:59 +0800
committer: JP Rosevear <jpr@src.gnome.org> 2004-05-20 02:35:59 +0800
commit: c7dbb95e79df331a75d7ba49cedc1b8e816422cf (patch)
tree: f8c9851496db10145da1c5bd7e482dc3fd9e1c1d /po/zh_TW.po
parent: a9b7ecefe5f6cce56289744e0b68679835634c02 (diff)
download: gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar
gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.gz
gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.bz2
gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.lz
gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.xz
gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.zst
gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.zip
1 files changed, 4535 insertions, 3663 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b042511723..a0296bdd4e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.3.1.99\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-0400\n"
 "PO-Revision-Date: 2003-03-23 11:33+0800\n"
 "Last-Translator: Chao-Hsiung Liao <pesder.liao@msa.hinet.net>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -23,6 +23,18 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolution 目錄服務迷你名片檢視"
 
+# ui/evolution-addressbook.xml.h:17
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "連絡人: "
+
+# ui/evolution.xml.h:17
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution 視窗(_W)"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -58,18 +70,6 @@ msgstr "名片"
 msgid " card"
 msgstr "1 張名片"
 
-# ui/evolution-addressbook.xml.h:17
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "連絡人: "
-
-# ui/evolution.xml.h:17
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution 視窗(_W)"
-
 # mail/mail-config.glade.h:29
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -89,83 +89,21 @@ msgstr "無法載入 %s：%s"
 msgid "Could not read pilot's Address application block"
 msgstr "無法讀取 pilot 通訊錄程式區塊"
 
-# mail/mail-config.glade.h:76
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Autocompletion"
-msgstr "自動補齊資料夾"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Certificates"
-msgstr "憑證 ID(_C):"
-
-# ui/evolution-mail.xml.h:19
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomple here"
-msgstr "在此設定您的郵件帳號"
-
-# ui/evolution-addressbook.xml.h:17
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "連絡人"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Evolution 目錄服務迷你名片檢視"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution 目錄服務迷你名片檢視"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution 目錄服務迷你名片檢視"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution 目錄服務迷你名片檢視"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolution 測試元件。"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution 目錄服務迷你名片檢視"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution 郵件執行摘要元件。"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "正以匿名方式存取 LDAP 伺服器"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "驗證憑證失敗。\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+# camel/camel-smime-context.c:194
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s請輸入 %s 所需的密碼(使用者 %s)"
 
 # ui/evolution-addressbook.xml.h:7
 #: addressbook/gui/component/addressbook-component.c:93
@@ -217,49 +155,53 @@ msgstr "連絡人(_C):"
 msgid "Create a new contacts group"
 msgstr "新增功能群組"
 
+#: addressbook/gui/component/addressbook-component.c:182
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr ""
+
 # camel/providers/imap/camel-imap-store.c:531
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-config.c:483
 msgid "Failed to connect to LDAP server"
 msgstr "無法連線至 LDAP 伺服器"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: addressbook/gui/component/addressbook-config.c:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr "無法驗證進入 LDAP 伺服器"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr "無法在 Root DSE 上執行查詢"
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr "伺服器回報了不支援的搜尋起點"
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr "這個伺服器不支援 LDAPv3 模式的資訊"
 
 # mail/mail-callbacks.c:1349
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "接收模式資訊時發生錯誤"
 
 # camel/providers/imap/camel-imap-command.c:487
-#: addressbook/gui/component/addressbook-config.c:1245
+#: addressbook/gui/component/addressbook-config.c:1274
 msgid "Server did not respond with valid schema information"
 msgstr "伺服器沒有回應有效的模式資訊"
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 #, fuzzy
 msgid "Migrating..."
 msgstr "正在等待..."
 
 # mail/mail-ops.c:599
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Pinging %s"
@@ -267,8 +209,8 @@ msgstr "Pinging %s"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
@@ -276,7 +218,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "個人"
@@ -329,21 +271,59 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "正以匿名方式存取 LDAP 伺服器"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "驗證憑證失敗。\n"
+# importers/pine-importer.c:661
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "目錄服務"
 
-# camel/camel-smime-context.c:194
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s請輸入 %s 所需的密碼(使用者 %s)"
+# addressbook/gui/component/addressbook-config.glade.h:3
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+# addressbook/gui/widgets/e-addressbook-view.c:616
+# calendar/gui/e-meeting-dialog.glade.h:8
+# calendar/gui/event-editor-dialog.glade.h:9
+# mail/mail-config.glade.h:23
+# mail/message-browser.c:202
+# ui/evolution-addressbook.xml.h:3
+# ui/evolution-event-editor.xml.h:17
+# ui/evolution-mail.xml.h:22
+# ui/evolution-task-editor-dialog.xml.h:18
+#: addressbook/gui/component/addressbook-view.c:762
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
+#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "刪除"
+
+# ui/evolution-event-editor.xml.h:70
+# ui/evolution-mail.xml.h:115
+# ui/evolution-task-editor-dialog.xml.h:83
+# ui/evolution.xml.h:60
+#: addressbook/gui/component/addressbook-view.c:763
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+msgid "Properties..."
+msgstr "屬性..."
+
+# ui/evolution-addressbook.xml.h:17
+#. Fix me *
+#. can not get name, should be a bug of e-book.Anyway, should set a default name.
+#.
+#. name = e_book_get_name (book);
+#: addressbook/gui/component/addressbook-view.c:1002
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "連絡人"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -363,6 +343,77 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+# mail/mail-config.glade.h:76
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "自動補齊資料夾"
+
+# ui/evolution-addressbook.xml.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "連絡人"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "憑證 ID(_C):"
+
+# ui/evolution-mail.xml.h:19
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "在此設定您的郵件帳號"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Evolution 目錄服務迷你名片檢視"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution 目錄服務迷你名片檢視"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution 目錄服務迷你名片檢視"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution 目錄服務迷你名片檢視"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution 測試元件。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution 郵件執行摘要元件。"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
+
 # mail/mail-config.glade.h:1
 #: addressbook/gui/component/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
@@ -385,6 +436,7 @@ msgstr " 顯示支援的起點(_S) "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -465,7 +517,7 @@ msgstr "連絡人(_C):"
 msgid "Address Book Properties"
 msgstr "目錄服務來源"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "永遠"
@@ -480,132 +532,113 @@ msgstr "匿名"
 msgid "Basic"
 msgstr "基本"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:1
-# ui/evolution-contact-editor.xml.h:1
-# ui/evolution-event-editor.xml.h:10
-# ui/evolution-message-composer.xml.h:3
-# ui/evolution-subscribe.xml.h:2
-# ui/evolution-task-editor-dialog.xml.h:11
-# ui/evolution.xml.h:5
-#: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "顏色(_O)"
-
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Connecting"
 msgstr "連線中"
 
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "詳細資料"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "'辨別的名稱(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "'辨別的名稱(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "下載限制(_D):"
 
 # mail/mail-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "電子郵件位址(_A):"
 
 # mail/mail-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
 msgid "Email address:"
 msgstr "電子郵件位址(_A):"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution 會使用這個 DN 透過伺服器來驗證您"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution 會使用電子郵件位址透過伺服器來驗證您"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "支援的搜尋起點"
 
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "一般"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "永不"
 
 # addressbook/gui/component/addressbook-config.c:179
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "一層"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-# mail/mail-config.glade.h:54
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "選取顏色"
-
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "搜尋範圍(_E):"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "搜尋起點(_S):"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "搜尋起點(_S):"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "搜尋範圍(_E):"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "搜尋中"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -614,7 +647,7 @@ msgstr ""
 "選擇這個選項代表 Evolution 只有在您的 LDAP 伺服器支援 SSL 或 TLS 時\n"
 "才會連線到您的 LDAP 伺服器。"
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -630,7 +663,7 @@ msgstr ""
 "那麼 Evolution 就不需要使用 SSL/TLS，因為您的連線已經\n"
 "很安全了。"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -642,20 +675,20 @@ msgstr ""
 "表示您的連線將是不安全的，同時您在安全性上是有\n"
 "弱點的。"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
 # calendar/gui/print.c:362
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "子目錄"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "支援的搜尋起點"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -665,7 +698,7 @@ msgstr ""
 "搜尋起點是您的搜尋起始處的辨認的名稱 (DN)。\n"
 "如果您讓它保持空白，搜尋會從樹狀目錄的根目錄開始。"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -678,13 +711,13 @@ msgstr ""
 "“子目錄”的搜尋範圍會包括在您的搜尋起點之下的所有項目。\n"
 "“一層”的搜尋範圍只會包括在您的起點下一層的項目。\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "這是您的 ldap 伺服器的完整名稱。例如：“ldap.mycompany.com”。"
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -694,7 +727,7 @@ msgstr ""
 "這是要下載的項目的最大數量。把這個數量設得\n"
 "太大會減慢您的目錄服務的速度。"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -703,7 +736,7 @@ msgstr ""
 "這是 Evolution 將要用驗證您的方法。注意要設定此項至“電子郵件位址”需要您的 "
 "LDAP 伺服器的匿名存取。"
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -712,7 +745,7 @@ msgstr ""
 "這是此伺服器出現於您的 Evolution 資料夾清單中的名稱。\n"
 "它僅做為顯示之用。"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -723,102 +756,102 @@ msgstr ""
 "這裡提供了標準連接埠的清單。請詢問您的系統管理者\n"
 "您應該指定哪個連接埠。"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid "This option controls how long a search will be run."
 msgstr "這個選項控制搜尋會執行多久的時間。"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "時間格式:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "使用 SSL/TLS(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "使用辨認的名稱 (DN)"
 
 # mail/mail-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "使用電子郵件位址"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "每次可能的時候"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "連絡人(_C):"
 
 # calendar/gui/calendar-summary.c:622
 # mail/mail-config.glade.h:24
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:74
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 msgid "_Display name:"
 msgstr "顯示名稱(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "下載限制(_D):"
 
 # mail/mail-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "電子郵件位址(_A):"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "登入方法(_L):"
 
 # addressbook/gui/component/addressbook-config.c:686
 # mail/mail-config.glade.h:43
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "名稱(_N):"
 
 # addressbook/gui/component/addressbook-config.c:409
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "連接埠號碼(_P):"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "優先順序(_P):"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "搜尋起點(_S):"
 
 # calendar/gui/e-itip-control.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "伺服器名稱(_S):"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "每(_E)"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:4
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "逾時時間（分鐘）(_T):"
 
 # mail/mail-config.glade.h:79
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "使用安全連線 (SSL)(_U):"
@@ -827,23 +860,23 @@ msgstr "使用安全連線 (SSL)(_U):"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "名片"
 
 # mail/mail-ops.c:1939
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "general-tab"
 
 # executive-summary/test-service/rdf-summary.c:806
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: calendar/gui/dialogs/alarm-options.glade.h:14
 #: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:182
@@ -852,31 +885,38 @@ msgstr "分"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "searching-tab"
 
-# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution 目錄服務名稱選擇界面。"
-
-# addressbook/gui/component/select-names/e-select-names-popup.c:176
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "全部移除"
+msgid "Select Contacts from Address Book"
+msgstr "從目錄服務選擇連絡人"
 
 # 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
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "移除"
 
+# addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "名稱"
+
+# addressbook/gui/component/select-names/e-select-names-popup.c:176
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "全部移除"
+
 # ui/evolution-addressbook.xml.h:17
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
@@ -908,13 +948,6 @@ msgstr "新增到連絡人"
 msgid "Unnamed Contact"
 msgstr "未命名的連絡人"
 
-# addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "名稱"
-
 # addressbook/gui/widgets/e-addressbook-view.c:735
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
@@ -922,11 +955,11 @@ msgstr "名稱"
 msgid "Source"
 msgstr "來源"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "從目錄服務選擇連絡人"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution 目錄服務名稱選擇界面。"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -1008,71 +1041,60 @@ msgid "<b>Work</b>"
 msgstr "工作週"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:361
 msgid "AIM"
 msgstr ""
 
-# addressbook/contact-editor/fulladdr.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#, fuzzy
-msgid "Address 2:"
-msgstr "地址 _2:"
-
 # addressbook/contact-editor/fulladdr.glade.h:7
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
 msgid "Address:"
 msgstr "地址(_A):"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "週年紀念(_V):"
 
 # addressbook/contact-editor/e-contact-editor.c:1242
 # addressbook/gui/widgets/e-addressbook-view.c:733
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "助理"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "生日(_Y):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "波隆納"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "行事曆(_A):"
 
 # addressbook/contact-editor/fulladdr.glade.h:8
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "縣/市(_C):"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "公司電話"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor.c:271
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -1080,98 +1102,111 @@ msgid "Contact"
 msgstr "連絡人"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
 # addressbook/contact-editor/fulladdr.glade.h:4
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "國家(_Y):"
 
 # addressbook/contact-editor/contact-editor.glade.h:24
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "部門(_E):"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "空閒/忙碌 URL(_R):"
 
 # addressbook/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "全名(_N)..."
 
 # addressbook/contact-editor/e-contact-editor.c:1249
 # addressbook/contact-editor/e-contact-editor.c:1311
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "住家電話"
 
+# addressbook/contact-editor/e-contact-editor.c:1251
+# addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#, fuzzy
+msgid "Home Page:"
+msgstr "住家傳真"
+
 # addressbook/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Job title:"
 msgstr "職稱(_J):"
 
 # addressbook/backend/ebook/e-card.c:3442
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: calendar/gui/e-itip-control.c:936
 msgid "Location:"
 msgstr "位置:"
 
 # ui/evolution-mail.xml.h:109
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "郵件訊息(_M)"
 
 # mail/mail-config.glade.h:29
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "電子郵件地址:"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "主管"
 
 # addressbook/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "暱稱(_N):"
 
 # addressbook/contact-editor/contact-editor.glade.h:12
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "備註(_T):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
 # addressbook/contact-editor/e-contact-editor.c:1254
 # addressbook/contact-editor/e-contact-editor.c:1312
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "其它"
 
+# addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "郵箱(_P):"
+
 # mail/mail-config.glade.h:47
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
@@ -1204,9 +1239,9 @@ msgstr "頁"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "工作"
@@ -1243,26 +1278,46 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+# mail/mail-accounts.c:280
+# mail/mail-accounts.c:284
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"您確定要刪除\n"
+"這些連絡人？"
+
+# mail/mail-accounts.c:280
+# mail/mail-accounts.c:284
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"您確定要刪除\n"
+"這個連絡人？"
+
 # addressbook/backend/ebook/e-card.c:3346
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 msgid "Address"
 msgstr "地址"
 
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: addressbook/gui/contact-editor/e-contact-editor.c:292
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
+#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "可編輯的"
 
@@ -2341,113 +2396,132 @@ msgstr "尚比亞"
 msgid "Zimbabwe"
 msgstr "辛巴威"
 
-# mail/mail-callbacks.c:1407
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "張貼郵件(_P)"
-
 # addressbook/gui/component/addressbook-storage.c:99
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Jabber"
 msgstr "未命名的清單"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-# camel/providers/smtp/camel-smtp-transport.c:180
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "服務已就緒"
-
-# addressbook/backend/ebook/e-card.c:3442
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "位置:"
-
-# mail/mail-config.glade.h:80
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "使用者名稱(_N):"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:347
+#: addressbook/gui/widgets/eab-contact-display.c:366
 #, fuzzy
 msgid "Yahoo"
 msgstr "約羅"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "MSN"
 msgstr ""
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/widgets/eab-contact-display.c:344
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "ICQ"
+msgstr ""
+
 # shell/e-shortcuts-view.c:137
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "組別"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "來源"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
 # ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 #, fuzzy
 msgid "Is New Contact"
 msgstr "新增連絡人"
 
 # ui/evolution-message-composer.xml.h:47
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "可寫的欄位"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "已變更"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "類別編輯器無法使用。"
 
 # addressbook/contact-editor/e-contact-editor.c:603
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "此連絡人屬於這些類別:"
 
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+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:1836
+#, fuzzy
+msgid "No image"
+msgstr "諾姆"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "以下是目前接通的連線："
+
 # camel/providers/local/camel-local-store.c:279
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#: addressbook/gui/contact-editor/e-contact-editor.c:2738
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "無法找到此欄位之界面工具：“%s”"
 
+# mail/mail-callbacks.c:1407
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "張貼郵件(_P)"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr ""
+
+# camel/providers/smtp/camel-smtp-transport.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#, fuzzy
+msgid "Service"
+msgstr "服務已就緒"
+
+# addressbook/backend/ebook/e-card.c:3442
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#, fuzzy
+msgid "Location"
+msgstr "位置:"
+
+# mail/mail-config.glade.h:80
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "使用者名稱(_N):"
+
 # addressbook/contact-editor/e-contact-quick-add.c:233
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
@@ -2472,26 +2546,6 @@ msgstr "全名(_F):"
 msgid "E-_mail:"
 msgstr "電子郵件"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"您確定要刪除\n"
-"這些連絡人？"
-
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"您確定要刪除\n"
-"這個連絡人？"
-
 # addressbook/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
@@ -2679,8 +2733,8 @@ msgstr "連絡人清單編輯器"
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:215
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "書本"
 
@@ -2751,6 +2805,543 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:12
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+#, fuzzy
+msgid "List Members"
+msgstr "會員"
+
+# addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#, fuzzy
+msgid "E-mail"
+msgstr "電子郵件"
+
+# addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "團體"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "波士頓"
+
+# shell/e-shortcuts-view.c:137
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "組別"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+# mail/mail-config.glade.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "朋榭"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "工作"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+#, fuzzy
+msgid "Blog"
+msgstr "波隆納"
+
+# addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "行動電話"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "個人"
+
+# addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "備註"
+
+# addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:548
+#, fuzzy
+msgid "Job Title"
+msgstr "職稱(_J):"
+
+# addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "電子郵件"
+
+# addressbook/contact-editor/e-contact-editor.c:1251
+# addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Home page"
+msgstr "住家傳真"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "成功"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+# shell/e-shell-view-menu.c:602
+# shell/e-shell-view-menu.c:614
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "資料庫離線"
+
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "目錄服務不存在"
+
+# ui/evolution-addressbook.xml.h:17
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "新增連絡人清單"
+
+# shell/e-storage.c:475
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Permission denied"
+msgstr "權限不足"
+
+# calendar/gui/calendar-commands.c:266
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact not found"
+msgstr "找不到名片"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+#, fuzzy
+msgid "Contact ID already exists"
+msgstr "名片 ID 已經存在"
+
+# shell/e-storage.c:477
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "通訊協定不支援"
+
+# calendar/gui/calendar-model.c:647
+# calendar/gui/calendar-model.c:1182
+# calendar/gui/dialogs/task-editor-dialog.glade.h:4
+# calendar/gui/e-calendar-table.c:422
+# camel/camel-service.c:544
+# camel/camel-service.c:580
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
+#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
+#: camel/camel-service.c:728 camel/camel-service.c:766
+#: camel/camel-service.c:850 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "已取消"
+
+# camel/providers/local/camel-mbox-summary.c:655
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "無法開啟共用的資料夾：%s。"
+
+# camel/camel-sasl-anonymous.c:110
+# camel/camel-sasl-plain.c:87
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "驗証失敗"
+
+# camel/providers/smtp/camel-smtp-transport.c:218
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "要求驗證"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr "TLS 無法使用"
+
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:68
+#, fuzzy
+msgid "No such source"
+msgstr "沒有這封郵件"
+
+# shell/e-storage.c:467
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "其他錯誤"
+
+# addressbook/gui/component/addressbook.c:458
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"無法開啟這個目錄服務。 請檢查路徑是否存在及\n"
+"您是否擁有存取權限。"
+
+# addressbook/gui/component/addressbook.c:445
+#: addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"我們無法開啟這個目錄服務。\n"
+"這表示您輸入了一個錯誤的 URI，\n"
+"或者 LDAP 伺服器沒有啟動。"
+
+# addressbook/gui/component/addressbook.c:450
+#: addressbook/gui/widgets/eab-gui-util.c:115
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution you must compile the program from the CVS "
+"sources after retrieving OpenLDAP from the link below."
+msgstr ""
+"這個版本的 Evolution 沒有內建支援 LDAP 目錄服務。\n"
+"如果您想使用 LDAP 目錄服務， 請到以下超連結下載\n"
+"及安裝 OpenLDAP，然後再重新編譯 Evolution。\n"
+
+# addressbook/gui/component/addressbook.c:445
+#: addressbook/gui/widgets/eab-gui-util.c:124
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"我們無法開啟這個目錄服務。\n"
+"這表示您輸入了一個錯誤的 URI，\n"
+"或者伺服器沒有啟動。"
+
+# addressbook/gui/component/addressbook.c:438
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr "無法開啟目錄服務"
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"在伺服器設定傳回的或是 Evolution 設定顯示的\n"
+"有許多名片符合此次查詢。\n"
+"請使用更加明確的查詢或是提高此目錄服務的目錄\n"
+"伺服器偏好設定中的結果上限。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"執行此次查詢的時間超過了伺服器的限制或是您為\n"
+"此目錄服務所設定的上限。請使用更加明確的查詢\n"
+"或是提高此目錄服務的目錄伺服器偏好設定中的\n"
+"結果上限。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "此目錄服務的後端程式無法解析這次的查詢。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "此目錄服務的後端程式拒絕執行這次的查詢。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+msgid "This query did not complete successfully."
+msgstr "這次的查詢並未完全成功。"
+
+# calendar/gui/dialogs/save-comp.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:206
+msgid "Do you want to save changes?"
+msgstr "您是否須要儲存變更？"
+
+# ui/evolution-calendar.xml.h:25
+#: addressbook/gui/widgets/eab-gui-util.c:208
+msgid "_Discard"
+msgstr "放棄(_D)"
+
+# shell/e-shell-importer.c:404
+#: addressbook/gui/widgets/eab-gui-util.c:229
+msgid "Error adding list"
+msgstr "新增清單時發生錯誤"
+
+# shell/e-shell-importer.c:404
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+#, fuzzy
+msgid "Error adding contact"
+msgstr "新增名片時發生錯誤"
+
+# shell/e-shell-importer.c:404
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "編輯清單時發生錯誤"
+
+# shell/e-shell-importer.c:404
+#: addressbook/gui/widgets/eab-gui-util.c:240
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "編輯名片時發生錯誤"
+
+# executive-summary/component/e-summary.c:940
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "移除清單時發生錯誤"
+
+# executive-summary/component/e-summary.c:940
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+#, fuzzy
+msgid "Error removing contact"
+msgstr "移除名片時發生錯誤"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, fuzzy, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"開啟 %d 張名片也會同時開啟 %d 個新視窗。\n"
+"您真的要顯示所有這些名片嗎？"
+
+#: addressbook/gui/widgets/eab-gui-util.c:360
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s 已經存在\n"
+"您是否要複寫它？"
+
+# mail/mail-callbacks.c:1140
+# mail/mail-display.c:92
+#: addressbook/gui/widgets/eab-gui-util.c:364
+msgid "Overwrite"
+msgstr "覆寫"
+
+# composer/e-msg-composer.c:785
+#: addressbook/gui/widgets/eab-gui-util.c:400
+#, c-format
+msgid "Error saving %s: %s"
+msgstr "儲存 %s 時發生錯誤：%s"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:437
+msgid "card.vcf"
+msgstr "card.vcf"
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "清單"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "移動名片到"
+
+# calendar/gui/e-calendar-table.c:714
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "複製名片到"
+
+# calendar/gui/calendar-model.c:638
+# calendar/gui/calendar-model.c:1176
+# calendar/gui/dialogs/task-editor-dialog.glade.h:14
+# calendar/gui/e-calendar-table.c:419
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "移動名片到"
+
+# calendar/gui/calendar-model.c:638
+# calendar/gui/calendar-model.c:1176
+# calendar/gui/dialogs/task-editor-dialog.glade.h:14
+# calendar/gui/e-calendar-table.c:419
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "複製名片到"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "從目錄服務選擇連絡人"
+
+# addressbook/backend/ebook/e-card.c:3745
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "多重 VCard"
+
+# addressbook/backend/ebook/e-card.c:3753
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "給 %s 的 VCard"
+
+# shell/e-storage.c:178
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * contact.
+#.
+#: addressbook/gui/widgets/eab-popup-control.c:199
+msgid "(none)"
+msgstr "(沒有)"
+
+# addressbook/contact-editor/contact-editor.glade.h:14
+# addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "主要電子郵件"
+
+# addressbook/contact-editor/e-contact-editor.c:1285
+# addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "電子郵件 2"
+
+# addressbook/contact-editor/e-contact-editor.c:1286
+# addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "電子郵件 3"
+
+# shell/e-shell-importer.c:545
+# shell/importer/import.glade.h:5
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "選擇一個動作"
+
+# ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "建立新的連絡人 “%s”"
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "新增住址到既存之連絡人 “%s”"
+
+# addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "查詢目錄服務..."
+
+# addressbook/gui/component/e-address-widget.c:388
+# addressbook/gui/component/select-names/e-select-names-popup.c:281
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "編輯連絡人資訊"
+
+# mail/mail-config.glade.h:29
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "合併電子郵件地址"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "和 1 個其他名片。"
+msgstr[1] "和 1 個其他名片。"
+
+# addressbook/printing/e-contact-print.glade.h:11
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "顯示全部檔頭(_H)"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+# addressbook/gui/widgets/e-addressbook-view.c:551
+# addressbook/gui/widgets/e-addressbook-view.c:611
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "儲存成 VCard 檔案格式"
+
+# addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "存入目錄服務"
+
 # ui/evolution-addressbook.xml.h:17
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
@@ -2768,8 +3359,8 @@ msgstr[1] "連絡人"
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
 #: addressbook/gui/widgets/e-addressbook-view.c:229
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "查詢"
 
@@ -2838,9 +3429,10 @@ msgstr "目錄服務"
 # addressbook/gui/widgets/e-addressbook-view.c:611
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "儲存成 VCard 檔案格式"
 
 # ui/evolution-addressbook.xml.h:7
@@ -2934,7 +3526,7 @@ msgstr "剪下"
 # ui/evolution-mail.xml.h:8
 # ui/evolution-task-editor-dialog.xml.h:14
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2947,30 +3539,9 @@ msgstr "複製"
 msgid "Paste"
 msgstr "貼上"
 
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-# addressbook/gui/widgets/e-addressbook-view.c:616
-# calendar/gui/e-meeting-dialog.glade.h:8
-# calendar/gui/event-editor-dialog.glade.h:9
-# mail/mail-config.glade.h:23
-# mail/message-browser.c:202
-# ui/evolution-addressbook.xml.h:3
-# ui/evolution-event-editor.xml.h:17
-# ui/evolution-mail.xml.h:22
-# ui/evolution-task-editor-dialog.xml.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "刪除"
-
 # widgets/menus/gal-view-menus.c:176
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "目前檢視"
 
@@ -2987,7 +3558,7 @@ msgstr ""
 
 # calendar/gui/e-tasks.c:155
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "任何類別"
@@ -3039,26 +3610,6 @@ msgstr "類別"
 msgid "Company Phone"
 msgstr "公司電話"
 
-# addressbook/gui/widgets/e-addressbook-view.c:701
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "電子郵件"
-
-# addressbook/contact-editor/e-contact-editor.c:1285
-# addressbook/gui/widgets/e-addressbook-view.c:725
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "電子郵件 2"
-
-# addressbook/contact-editor/e-contact-editor.c:1286
-# addressbook/gui/widgets/e-addressbook-view.c:726
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "電子郵件 3"
-
 # addressbook/contact-editor/e-contact-quick-add.c:276
 # addressbook/gui/widgets/e-addressbook-view.c:700
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
@@ -3109,34 +3660,16 @@ msgstr "約旦"
 msgid "Manager"
 msgstr "主管"
 
-# addressbook/gui/widgets/e-addressbook-view.c:711
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "行動電話"
-
 # addressbook/gui/widgets/e-addressbook-view.c:734
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "暱稱"
 
-# addressbook/gui/widgets/e-addressbook-view.c:736
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "備註"
-
 # addressbook/gui/widgets/e-addressbook-view.c:729
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "辦公室"
 
-# addressbook/gui/widgets/e-addressbook-view.c:708
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "團體"
-
 # addressbook/contact-editor/e-contact-editor.c:1255
 # addressbook/gui/widgets/e-addressbook-view.c:719
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
@@ -3206,22 +3739,33 @@ msgid "Web Site"
 msgstr "網址"
 
 # addressbook/printing/e-contact-print.glade.h:41
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "寬度"
 
 # addressbook/printing/e-contact-print.glade.h:15
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "高度"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "得到焦點"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "已選擇"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "有游標"
+
 # ui/evolution-message-composer.xml.h:47
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
@@ -3241,10 +3785,6 @@ msgstr "文字模型"
 msgid "Max field name length"
 msgstr "最大欄位名稱長度"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "欄寬"
-
 # addressbook/gui/widgets/e-minicard-view.c:216
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
@@ -3275,512 +3815,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "轉接器"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "已選擇"
-
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "有游標"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:12
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "會員"
-
-# addressbook/gui/widgets/e-addressbook-view.c:701
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "電子郵件"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "波士頓"
-
-# shell/e-shortcuts-view.c:137
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "組別"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-# mail/mail-config.glade.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "朋榭"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "工作"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-#, fuzzy
-msgid "Blog"
-msgstr "波隆納"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "個人"
-
-# addressbook/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "職稱(_J):"
-
-# addressbook/contact-editor/e-contact-editor.c:1251
-# addressbook/gui/widgets/e-addressbook-view.c:714
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "住家傳真"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "成功"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-# shell/e-shell-view-menu.c:602
-# shell/e-shell-view-menu.c:614
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "資料庫離線"
-
-# camel/providers/local/camel-maildir-store.c:100
-# camel/providers/local/camel-mbox-store.c:101
-# camel/providers/local/camel-mh-store.c:97
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "目錄服務不存在"
-
-# ui/evolution-addressbook.xml.h:17
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "新增連絡人清單"
-
-# shell/e-storage.c:475
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Permission denied"
-msgstr "權限不足"
-
-# calendar/gui/calendar-commands.c:266
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact not found"
-msgstr "找不到名片"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "名片 ID 已經存在"
-
-# shell/e-storage.c:477
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "通訊協定不支援"
-
-# calendar/gui/calendar-model.c:647
-# calendar/gui/calendar-model.c:1182
-# calendar/gui/dialogs/task-editor-dialog.glade.h:4
-# calendar/gui/e-calendar-table.c:422
-# camel/camel-service.c:544
-# camel/camel-service.c:580
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "已取消"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "無法開啟共用的資料夾：%s。"
-
-# camel/camel-sasl-anonymous.c:110
-# camel/camel-sasl-plain.c:87
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "驗証失敗"
-
-# camel/providers/smtp/camel-smtp-transport.c:218
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "要求驗證"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr "TLS 無法使用"
-
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "沒有這封郵件"
-
-# shell/e-storage.c:467
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "其他錯誤"
-
-# addressbook/gui/component/addressbook.c:458
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"無法開啟這個目錄服務。 請檢查路徑是否存在及\n"
-"您是否擁有存取權限。"
-
-# addressbook/gui/component/addressbook.c:445
-#: addressbook/gui/widgets/eab-gui-util.c:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"我們無法開啟這個目錄服務。\n"
-"這表示您輸入了一個錯誤的 URI，\n"
-"或者 LDAP 伺服器沒有啟動。"
-
-# addressbook/gui/component/addressbook.c:450
-#: addressbook/gui/widgets/eab-gui-util.c:114
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
-msgstr ""
-"這個版本的 Evolution 沒有內建支援 LDAP 目錄服務。\n"
-"如果您想使用 LDAP 目錄服務， 請到以下超連結下載\n"
-"及安裝 OpenLDAP，然後再重新編譯 Evolution。\n"
-
-# addressbook/gui/component/addressbook.c:445
-#: addressbook/gui/widgets/eab-gui-util.c:123
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"我們無法開啟這個目錄服務。\n"
-"這表示您輸入了一個錯誤的 URI，\n"
-"或者伺服器沒有啟動。"
-
-# addressbook/gui/component/addressbook.c:438
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "無法開啟目錄服務"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"在伺服器設定傳回的或是 Evolution 設定顯示的\n"
-"有許多名片符合此次查詢。\n"
-"請使用更加明確的查詢或是提高此目錄服務的目錄\n"
-"伺服器偏好設定中的結果上限。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"執行此次查詢的時間超過了伺服器的限制或是您為\n"
-"此目錄服務所設定的上限。請使用更加明確的查詢\n"
-"或是提高此目錄服務的目錄伺服器偏好設定中的\n"
-"結果上限。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "此目錄服務的後端程式無法解析這次的查詢。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "此目錄服務的後端程式拒絕執行這次的查詢。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr "這次的查詢並未完全成功。"
-
-# calendar/gui/dialogs/save-comp.c:51
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "您是否須要儲存變更？"
-
-# ui/evolution-calendar.xml.h:25
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "放棄(_D)"
-
-# shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "新增清單時發生錯誤"
-
-# shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-#, fuzzy
-msgid "Error adding contact"
-msgstr "新增名片時發生錯誤"
-
-# shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "編輯清單時發生錯誤"
-
-# shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:239
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "編輯名片時發生錯誤"
-
-# executive-summary/component/e-summary.c:940
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "移除清單時發生錯誤"
-
-# executive-summary/component/e-summary.c:940
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-#, fuzzy
-msgid "Error removing contact"
-msgstr "移除名片時發生錯誤"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, fuzzy, c-format
-msgid ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr ""
-"開啟 %d 張名片也會同時開啟 %d 個新視窗。\n"
-"您真的要顯示所有這些名片嗎？"
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s 已經存在\n"
-"您是否要複寫它？"
-
-# mail/mail-callbacks.c:1140
-# mail/mail-display.c:92
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "覆寫"
-
-# composer/e-msg-composer.c:785
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "儲存 %s 時發生錯誤：%s"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-# addressbook/contact-editor/fullname.glade.h:8
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "清單"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "移動名片到"
-
-# calendar/gui/e-calendar-table.c:714
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "複製名片到"
-
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "移動名片到"
-
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "複製名片到"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "從目錄服務選擇連絡人"
-
-# addressbook/backend/ebook/e-card.c:3745
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "多重 VCard"
-
-# addressbook/backend/ebook/e-card.c:3753
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "給 %s 的 VCard"
-
-# shell/e-storage.c:178
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: addressbook/gui/widgets/eab-popup-control.c:199
-msgid "(none)"
-msgstr "(沒有)"
-
-# addressbook/contact-editor/contact-editor.glade.h:14
-# addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "主要電子郵件"
-
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "選擇一個動作"
-
-# ui/evolution-addressbook.xml.h:2
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "建立新的連絡人 “%s”"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "新增住址到既存之連絡人 “%s”"
-
-# addressbook/gui/widgets/e-minicard-control.c:282
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "查詢目錄服務..."
-
-# addressbook/gui/component/e-address-widget.c:388
-# addressbook/gui/component/select-names/e-select-names-popup.c:281
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "編輯連絡人資訊"
-
-# mail/mail-config.glade.h:29
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "合併電子郵件地址"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "和 1 個其他名片。"
-msgstr[1] "和 1 個其他名片。"
-
-# addressbook/printing/e-contact-print.glade.h:11
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "顯示全部檔頭(_H)"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-# addressbook/gui/widgets/e-addressbook-view.c:551
-# addressbook/gui/widgets/e-addressbook-view.c:611
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "儲存成 VCard 檔案格式"
-
-# addressbook/gui/widgets/e-minicard-control.c:282
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "存入目錄服務"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "欄寬"
 
 # addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
@@ -3833,13 +3870,6 @@ msgstr "Evolution 郵件編輯器。"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-# addressbook/gui/widgets/e-addressbook-view.c:615
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "列印信封"
-
 # ui/evolution-addressbook.xml.h:11
 #: addressbook/printing/e-contact-print.c:998
 #, fuzzy
@@ -3853,6 +3883,13 @@ msgstr "列印選定的連絡人"
 msgid "Print contact"
 msgstr "列印選定的連絡人"
 
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+# addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "列印信封"
+
 # addressbook/printing/e-contact-print.glade.h:1
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -4084,20 +4121,6 @@ msgstr "連絡人清單(_L)"
 msgid "This should test the contact print code"
 msgstr ""
 
-# camel/camel-filter-driver.c:671
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
-#, fuzzy
-msgid "Can not open file"
-msgstr "不能開啟郵件"
-
-# calendar/gui/calendar-commands.c:266
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
-msgid "Can not load URI"
-msgstr "找不到名片"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -4160,6 +4183,20 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "內部錯誤"
 
+# camel/camel-filter-driver.c:671
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#, fuzzy
+msgid "Can not open file"
+msgstr "不能開啟郵件"
+
+# calendar/gui/calendar-commands.c:266
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "找不到名片"
+
 # composer/e-msg-composer.c:805
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -4176,7 +4213,7 @@ msgid "No filename provided."
 msgstr "沒有提供檔案名稱。"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "未命名的清單"
 
@@ -4186,7 +4223,8 @@ msgstr "未命名的清單"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "輸入密碼"
@@ -4230,166 +4268,70 @@ msgstr "預設優先順序:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "無法讀取 pilot 待辦事項程式區塊"
 
-# ui/evolution-mail.xml.h:110
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "行事曆與工作"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "行事曆"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "在這裡設定您的時區、行事曆與工作清單"
-
-# ui/evolution-mail.xml.h:110
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "行事曆與工作"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:5
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution 郵件資料夾元件工廠。"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution 行事曆 iTip/iMip 檢視器"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution 行事曆 iTip/iMip 檢視器"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution 行事曆 iTip/iMip 檢視器"
-
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution 提醒"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:4
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution 郵件資料夾顯示元件。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution 測試元件。"
-
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "工作"
-
-# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "聲音提醒服務的元件工廠"
-
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "開始:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "結束:"
 
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolution 提醒"
 
 # calendar/gui/e-calendar-table.c:162
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "提醒於 %s"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:1
-# ui/evolution-contact-editor.xml.h:1
-# ui/evolution-event-editor.xml.h:10
-# ui/evolution-message-composer.xml.h:3
-# ui/evolution-subscribe.xml.h:2
-# ui/evolution-task-editor-dialog.xml.h:11
-# ui/evolution.xml.h:5
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "關閉(_L)"
-
-# calendar/gui/alarm-notify/alarm-queue.c:877
-# calendar/gui/dialogs/alarm-notify.glade.h:3
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "延期(_Z)"
-
 # calendar/gui/dialogs/alarm-notify.glade.h:4
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "延遲時間（分鐘）"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "編輯約會(_E)"
 
+# calendar/gui/alarm-notify/alarm-queue.c:877
+# calendar/gui/dialogs/alarm-notify.glade.h:3
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "延期(_Z)"
+
 # calendar/gui/e-day-view.c:3162
 # calendar/gui/e-week-view.c:3292
 # ui/evolution-calendar.xml.h:19
 # ui/evolution-message-composer.xml.h:11
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "開啟"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "沒有可用的描述。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4399,12 +4341,12 @@ msgid ""
 msgstr ""
 
 # widgets/misc/e-messagebox.c:159
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "警告"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: calendar/gui/alarm-notify/alarm-queue.c:1073
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4416,7 +4358,7 @@ msgstr ""
 "送出電子邸件。  Evolution 會顯示\n"
 "普通的提醒對話方塊來代替。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4436,10 +4378,16 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
+# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "聲音提醒服務的元件工廠"
+
 # addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 # addressbook/backend/ebook/load-pine-addressbook.c:22
 # addressbook/backend/ebook/test-client-list.c:23
@@ -4450,26 +4398,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:164
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "無法初始化 Bonobo"
 
-# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-# addressbook/backend/ebook/load-pine-addressbook.c:22
-# addressbook/backend/ebook/test-client-list.c:23
-# addressbook/backend/ebook/test-client.c:33
-# addressbook/conduit/address-conduit.c:1092
-# addressbook/gui/component/addressbook-factory.c:42
-# calendar/conduits/calendar/calendar-conduit.c:1151
-# calendar/conduits/todo/todo-conduit.c:965
-# calendar/gui/alarm-notify/notify-main.c:98
-# calendar/gui/main.c:57
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "無法始初化 gnome-vfs"
-
 # calendar/gui/alarm-notify/notify-main.c:108
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "無法建立聲音提醒服務元件工廠"
 
@@ -4586,69 +4520,50 @@ msgid "Weekday the week starts on"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Whether or not to use the notification tray for display alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 #, fuzzy
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "當刪除項目時先確認(_A)"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "當刪除項目時先確認(_A)"
 
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 #, fuzzy
 msgid "Whether to hide completed tasks"
 msgstr "刪除已完成的工作"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr ""
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "在日期導覽顯示週數(_N)"
 
-# calendar/gui/gnome-cal.c:234
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "主旨包含"
-
-# calendar/gui/gnome-cal.c:235
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "描述包含"
-
-# calendar/gui/gnome-cal.c:236
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "備註包含"
-
-# calendar/gui/gnome-cal.c:235
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "描述包含"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "沒有相符資料"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
+#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/gnome-cal.c:1703
 #: camel/providers/groupwise/camel-gw-listener.c:304
 #: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Calendar"
 msgstr "行事曆"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -4660,12 +4575,12 @@ msgstr ""
 "\n"
 "確定清除這些工作？"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "傳回小於"
 
-#: calendar/gui/calendar-commands.c:362
+#: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
 #: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
 msgid "days"
@@ -4674,7 +4589,7 @@ msgstr "天"
 # calendar/gui/e-day-view-top-item.c:274
 # calendar/gui/e-day-view.c:1294
 # calendar/gui/e-week-view-main-item.c:325
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
@@ -4683,22 +4598,26 @@ msgstr "%A %d %B %Y"
 # calendar/gui/e-week-view-main-item.c:334
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 # calendar/gui/print.c:1093
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:509
+#: calendar/gui/calendar-component.c:514 calendar/gui/calendar-component.c:516
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
 # calendar/gui/e-day-view-top-item.c:274
 # calendar/gui/e-day-view.c:1294
 # calendar/gui/e-week-view-main-item.c:325
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
+#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-component.c:528 calendar/gui/calendar-component.c:535
+#: calendar/gui/calendar-component.c:541 calendar/gui/calendar-component.c:543
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
@@ -4706,114 +4625,120 @@ msgstr "%d %B %Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:464
+#: calendar/gui/calendar-commands.c:465 calendar/gui/calendar-component.c:533
 #: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
 # ui/evolution-addressbook.xml.h:7
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "新喀里多尼亞島"
 
-# ui/evolution-event-editor.xml.h:70
-# ui/evolution-mail.xml.h:115
-# ui/evolution-task-editor-dialog.xml.h:83
-# ui/evolution.xml.h:60
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "屬性..."
+# calendar/gui/e-itip-control.glade.h:8
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "載入行事曆..."
 
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: calendar/gui/calendar-component.c:963
 msgid ""
 "Selected calendar is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Calendars"
+msgstr "行事曆"
+
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/calendar-component.c:1095
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "新增約會"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "約會(_A)"
 
 # ui/evolution-calendar.xml.h:5
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "建立一個新的約會"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "新增會議"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 #, fuzzy
 msgid "M_eeting"
 msgstr "會議"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 #, fuzzy
 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:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "新增全天約會"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "全天約會(_D)"
 
 # ui/evolution-calendar.xml.h:5
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "建立一個新的約會"
 
 # ui/evolution-addressbook.xml.h:7
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "新喀里多尼亞島"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "行事曆(_A):"
 
 # ui/evolution.xml.h:10
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "新增一個資料夾"
@@ -4848,19 +4773,44 @@ msgstr "週檢視"
 msgid "Month View"
 msgstr "月檢視"
 
+# calendar/gui/gnome-cal.c:234
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "主旨包含"
+
+# calendar/gui/gnome-cal.c:235
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "描述包含"
+
+# calendar/gui/gnome-cal.c:236
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "備註包含"
+
+# calendar/gui/gnome-cal.c:235
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "描述包含"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "沒有相符資料"
+
 # calendar/conduits/calendar/calendar-conduit.c:687
 # calendar/conduits/todo/todo-conduit.c:501
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/comp-editor-factory.c:409
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "與行事曆伺服器通訊時發生錯誤"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
 # shell/e-storage.c:475
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "權限不足"
@@ -4870,21 +4820,6 @@ msgstr "權限不足"
 msgid "open_client(): %s"
 msgstr ""
 
-# calendar/gui/gnome-cal.c:840
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "無法開啟“%s”內的資料夾"
-
-# calendar/gui/control-factory.c:126
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "行事曆將顯示的 URI "
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "要顯示的檢視類型"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
@@ -4965,7 +4900,7 @@ msgstr "提醒間隔每"
 msgid "hours"
 msgstr "時"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4991,17 +4926,16 @@ msgstr "基本"
 msgid "Date/Time:"
 msgstr "日期/時間:"
 
-# ui/evolution-mail.xml.h:23
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "顯示郵件"
-
 # calendar/gui/event-editor-dialog.glade.h:14
 # calendar/gui/event-editor.c:1588
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "播放這個音效"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr ""
+
 # calendar/gui/event-editor-dialog.glade.h:20
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 #, fuzzy
@@ -5023,6 +4957,7 @@ msgstr "傳送電子郵件"
 # calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
+#: calendar/gui/e-cal-component-preview.c:187
 #: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "摘要:"
@@ -5070,12 +5005,143 @@ msgstr "分"
 msgid "start of appointment"
 msgstr "約會開始"
 
+# ui/evolution.xml.h:3
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "您必須指定一個檔案名稱。"
+
+# calendar/gui/e-tasks.c:310
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "不支援載入“%s”必須的方法"
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+# ui/evolution-addressbook.xml.h:7
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "新喀里多尼亞島"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "工作清單"
+
+# calendar/gui/dialogs/alarm-notify.glade.h:1
+# ui/evolution-contact-editor.xml.h:1
+# ui/evolution-event-editor.xml.h:10
+# ui/evolution-message-composer.xml.h:3
+# ui/evolution-subscribe.xml.h:2
+# ui/evolution-task-editor-dialog.xml.h:11
+# ui/evolution.xml.h:5
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "顏色(_O)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/calendar-setup.glade.h:5
+#, fuzzy
+msgid "Calendar Properties"
+msgstr "iCalendar 錯誤"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+# mail/mail-config.glade.h:54
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+msgid "Pick a color"
+msgstr "選取顏色"
+
+# 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/calendar-setup.glade.h:8
+#, fuzzy
+msgid "Remote"
+msgstr "移除"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "Task List Properties"
+msgstr "工作清單"
+
+# ui/evolution-addressbook.xml.h:7
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "新喀里多尼亞島"
+
+# shell/e-shortcuts-view.c:291
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_Add Group"
+msgstr "新增群組(_N)..."
+
+# ui/evolution-subscribe.xml.h:4
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+#, fuzzy
+msgid "_Refresh Interval:"
+msgstr "重整清單"
+
+# ui/evolution-subscribe.xml.h:4
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#, fuzzy
+msgid "_Refresh:"
+msgstr "重整清單"
+
+# addressbook/gui/widgets/e-addressbook-view.c:735
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
+#, fuzzy
+msgid "_Source URL:"
+msgstr "POP 來源 URI"
+
+# addressbook/printing/e-contact-print.glade.h:40
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#, fuzzy
+msgid "_Type:"
+msgstr "類型:"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "網址:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "週"
+
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
 msgid "Enabled"
 msgstr "已啟用"
 
@@ -5095,10 +5161,10 @@ msgstr "不要移除"
 # mail/mail-accounts.c:197
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
 msgid "Disable"
 msgstr "停用"
 
@@ -5106,10 +5172,10 @@ msgstr "停用"
 # mail/mail-config.glade.h:30
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
 msgid "Enable"
 msgstr "啟用"
 
@@ -5139,207 +5205,220 @@ msgid "60 minutes"
 msgstr "60 分"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "警報"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>開始:</b>"
 
-# ui/evolution-mail.xml.h:110
+# 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:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "提醒"
+
+# data/evolution.keys.in.h:2
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "行事曆資訊"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>逾期:</b>"
+
+# ui/evolution-calendar.xml.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "工作週"
+
+# ui/evolution-mail.xml.h:110
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "行事曆與工作設定"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "過期的工作色彩"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Color for tasks due today"
 msgstr "今天到期的工作色彩"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "結束日(_E):"
 
 # ui/evolution-calendar.xml.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "天"
 
+# calendar/gui/calendar-summary.c:622
+# mail/mail-config.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "顯示(_D)"
+
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "啟用(_E)"
 
+# addressbook/gui/widgets/e-addressbook-view.c:737
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+msgstr "空閒/忙碌請求"
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 # calendar/gui/event-editor.c:479
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
 #: calendar/gui/e-itip-control.c:563
 msgid "Friday"
 msgstr "星期五"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "小時"
 
 # executive-summary/test-service/rdf-summary.c:806
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "分"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 # calendar/gui/event-editor.c:475
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "星期一"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "週日(_U)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 # calendar/gui/event-editor.c:480
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "星期六"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "顯示提醒(_O)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "在日期導覽顯示週數(_N)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 # calendar/gui/event-editor.c:481
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "星期日"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "今天到期的工作(_A):"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "週四(_H)"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "工作清單"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 # calendar/gui/event-editor.c:478
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "星期四"
 
-# addressbook/gui/widgets/e-addressbook-view.c:730
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "時間"
-
 # addressbook/backend/ebook/e-card.c:3434
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "時區(_Z):"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 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:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "星期二"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "一週開始於(_E):"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 # calendar/gui/event-editor.c:477
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "星期三"
 
-# ui/evolution-calendar.xml.h:35
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "工作週"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "工作日:"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 小時 (AM/PM)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 小時"
 
 # addressbook/contact-editor/contact-editor.glade.h:17
 # mail/mail-config.glade.h:84
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "新增(_A) ->"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 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:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示(_C)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "開始日(_D):"
 
-# calendar/gui/calendar-summary.c:622
-# mail/mail-config.glade.h:24
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "顯示(_D)"
-
 # mail/mail-config.glade.h:86
 # ui/evolution-event-editor.xml.h:58
 # ui/evolution-message-composer.xml.h:45
 # ui/evolution-subscribe.xml.h:10
 # ui/evolution-task-editor-dialog.xml.h:70
 # ui/evolution.xml.h:48
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
 #: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -5349,181 +5428,56 @@ msgstr "顯示(_D)"
 msgid "_Edit"
 msgstr "編輯 (_E)"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "空閒/忙碌請求"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "週五(_F)"
 
-# addressbook/contact-editor/contact-editor.glade.h:10
-# executive-summary/component/executive-summary-config.glade.h:3
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "一般(_G)"
-
 # ui/evolution-mail.xml.h:43
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "隱藏已完成的工作(_H)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "週一(_M)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "過期的工作(_O):"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "週六(_S)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "在週及月的檢視內顯示約會的結束時間(_S)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "時間間隔(_T):"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "週二(_T)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "週三(_W)"
 
 # calendar/gui/event-editor.c:1612
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "在每個約會前"
 
-# ui/evolution.xml.h:3
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "您必須指定一個檔案名稱。"
-
-# calendar/gui/e-tasks.c:310
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "不支援載入“%s”必須的方法"
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-
-# ui/evolution-addressbook.xml.h:7
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "新喀里多尼亞島"
-
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "工作清單"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "iCalendar 錯誤"
-
-# 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/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "移除"
-
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "工作清單"
-
-# ui/evolution-addressbook.xml.h:7
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "新喀里多尼亞島"
-
-# shell/e-shortcuts-view.c:291
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, fuzzy
-msgid "_Add Group"
-msgstr "新增群組(_N)..."
-
-# ui/evolution-subscribe.xml.h:4
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#, fuzzy
-msgid "_Refresh Interval:"
-msgstr "重整清單"
-
-# ui/evolution-subscribe.xml.h:4
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
-#, fuzzy
-msgid "_Refresh:"
-msgstr "重整清單"
-
-# addressbook/gui/widgets/e-addressbook-view.c:735
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "POP 來源 URI"
-
-# addressbook/printing/e-contact-print.glade.h:40
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
-#, fuzzy
-msgid "_Type:"
-msgstr "類型:"
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "網址:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "週"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -5603,56 +5557,20 @@ msgstr "%s  您已經做了些變更。放棄這些變更並且更新這個編�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您沒有做任何變更，更新這個編輯器？"
 
-# camel/providers/local/camel-mbox-summary.c:879
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "確認上的錯誤： %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " 到 "
-
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (已完成) "
-
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "已完成 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr "(期限)"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/e-calendar-table.c:155
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "期限 "
-
 # shell/e-setup.c:163
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "無法更新物件"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
@@ -5660,43 +5578,79 @@ 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:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日誌項目 - %s"
 
 # calendar/gui/e-calendar-table.c:159
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "沒有摘要"
 
 # composer/e-msg-composer.c:774
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "另存新檔..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: calendar/gui/dialogs/comp-editor.c:1479
+#: calendar/gui/dialogs/comp-editor.c:1514
+#: calendar/gui/dialogs/comp-editor.c:1540
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果有更新透過電子郵件到達，對此項目所做的變更可能被放棄"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "無法取得目前的版本！"
 
+# camel/providers/local/camel-mbox-summary.c:879
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "確認上的錯誤： %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " 到 "
+
+# calendar/gui/calendar-model.c:644
+# calendar/gui/calendar-model.c:1180
+# calendar/gui/dialogs/task-editor-dialog.glade.h:6
+# calendar/gui/e-calendar-table.c:421
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (已完成) "
+
+# calendar/gui/calendar-model.c:644
+# calendar/gui/calendar-model.c:1180
+# calendar/gui/dialogs/task-editor-dialog.glade.h:6
+# calendar/gui/e-calendar-table.c:421
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "已完成 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr "(期限)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+# calendar/gui/e-calendar-table.c:155
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "期限 "
+
 # camel/providers/local/camel-mbox-summary.c:655
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
@@ -5840,32 +5794,32 @@ msgid "Enter Delegate"
 msgstr "輸入代表"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "約會"
 
 # calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "提醒"
 
 # calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "週期性"
 
 # ui/evolution-event-editor.xml.h:46
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "會議排程"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:229
+#: calendar/gui/dialogs/event-editor.c:298
+#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "會議"
 
@@ -5878,7 +5832,7 @@ msgid "Event with no end date"
 msgstr ""
 
 # calendar/gui/e-calendar-table.c:154
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "開始日期錯誤"
 
@@ -6008,10 +5962,10 @@ msgstr "開始時間(_S):"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
+#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
+#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -6032,7 +5986,7 @@ msgstr "最少需要一個到會者。"
 
 # calendar/gui/e-calendar-table.c:708
 # ui/evolution-task-editor-dialog.xml.h:19
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "委派給(_D)..."
 
@@ -6044,10 +5998,10 @@ msgstr "委派給(_D)..."
 # ui/evolution-task-editor-dialog.xml.h:69
 # ui/evolution.xml.h:46
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
+#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -6406,33 +6360,24 @@ msgstr "放棄變更(_D)"
 msgid "Save Event"
 msgstr "行事曆事件"
 
-# mail/mail-account-gui.c:682
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
-#, fuzzy
-msgid "Select source"
-msgstr "選擇匯入服務"
-
 # shell/e-shell-importer.c:602
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+#: calendar/gui/dialogs/select-source-dialog.c:65
+#, fuzzy
+msgid "Select destination"
 msgstr "選擇用來匯入這些資料的目的資料夾"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: calendar/gui/dialogs/select-source-dialog.c:71
+# ui/evolution.xml.h:47
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "行事曆"
+msgid "_Destination"
+msgstr "刪除這個資料夾"
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "工作清單"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -6470,8 +6415,9 @@ msgstr "% 完成"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: calendar/gui/e-cal-component-preview.c:230
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
+#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "已完成"
@@ -6482,7 +6428,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-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "高"
 
@@ -6491,8 +6438,9 @@ 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-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-cal-component-preview.c:227
+#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
+#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "進行中"
@@ -6503,7 +6451,8 @@ 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-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "低"
 
@@ -6514,8 +6463,9 @@ msgstr "低"
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: calendar/gui/e-cal-component-preview.c:251
+#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
+#: mail/message-list.c:957
 msgid "Normal"
 msgstr "普通"
 
@@ -6524,8 +6474,9 @@ 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-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-component-preview.c:237
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
+#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "未開始"
 
@@ -6575,12 +6526,12 @@ msgstr "Web 網址(_W):"
 msgid "Assignment"
 msgstr "指派工作"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "到期日錯誤"
 
 # addressbook/gui/component/addressbook.c:438
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "無法開啟目錄服務"
@@ -6595,8 +6546,9 @@ msgstr "機密(_F)"
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-cal-component-preview.c:268
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "描述:"
@@ -6782,129 +6734,72 @@ msgstr "%s 在 %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s 為未知的觸發類型"
 
+# calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "請按這裡增加新的工作"
+
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "未命名"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
+msgstr "開始日期(_R):"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "到期日(_D):"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "狀態:"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: calendar/gui/e-cal-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "優先順序(_P):"
+
+# addressbook/contact-editor/contact-editor.glade.h:16
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Web 網址(_W):"
+
 # calendar/gui/calendar-model.c:360
 # calendar/gui/calendar-model.c:898
 # calendar/gui/e-calendar-table.c:323
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
 msgid "Public"
 msgstr "公開"
 
 # calendar/gui/calendar-model.c:363
 # calendar/gui/calendar-model.c:900
 # calendar/gui/e-calendar-table.c:324
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330
 msgid "Private"
 msgstr "私人"
 
 # calendar/gui/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332
 msgid "Confidential"
 msgstr "機密"
 
-# calendar/gui/e-calendar-table.c:153
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "結束日期"
-
-# calendar/gui/e-calendar-table.c:154
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "開始日期"
-
-# calendar/gui/e-calendar-table.c:159
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "摘要"
-
-# ui/evolution-calendar.xml.h:36
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "空閒"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "忙碌"
-
-# calendar/gui/calendar-model.c:457
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-# calendar/gui/calendar-model.c:457
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-# calendar/gui/calendar-model.c:459
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
-
-# calendar/gui/calendar-model.c:459
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
-
-# calendar/gui/calendar-model.c:970
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"經緯必須依此格式輸入：\n"
-"\n"
-"45.436845,125.862501"
-
-# calendar/gui/calendar-model.c:1584
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "是"
-
-# calendar/gui/calendar-model.c:1584
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "否"
-
-# calendar/gui/calendar-model.c:369
-# calendar/gui/event-editor.c:1601
-# calendar/gui/event-editor.c:1628
-# camel/providers/smtp/camel-smtp-transport.c:221
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "不明"
-
-# calendar/gui/calendar-model.c:1576
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "循環模式"
-
-# calendar/gui/calendar-model.c:1578
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "已指定"
-
 # calendar/gui/e-calendar-table.c:367
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -6960,19 +6855,30 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
+# ui/evolution-calendar.xml.h:36
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "空閒"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "忙碌"
+
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "刪除選定的物件"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr "更新物件"
 
 # mail/folder-browser.c:686
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -6987,8 +6893,8 @@ msgstr "開啟郵件(_O)"
 # ui/evolution-mail.xml.h:118
 # ui/evolution-tasks.xml.h:8
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
+#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "另存新檔(_S)..."
@@ -6997,10 +6903,10 @@ msgstr "另存新檔(_S)..."
 # ui/evolution-calendar.xml.h:42
 # ui/evolution-contact-editor.xml.h:15
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
+#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "列印(_P)..."
@@ -7008,7 +6914,7 @@ msgstr "列印(_P)..."
 # ui/evolution-event-editor.xml.h:6
 # ui/evolution-task-editor-dialog.xml.h:7
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
@@ -7017,8 +6923,9 @@ msgstr "剪下(_U)"
 # ui/evolution-event-editor.xml.h:55
 # ui/evolution-task-editor-dialog.xml.h:67
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
+#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
+#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
@@ -7027,10 +6934,10 @@ msgstr "複製(_C)"
 # ui/evolution-event-editor.xml.h:68
 # ui/evolution-task-editor-dialog.xml.h:81
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
+#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "貼上(_P)"
 
@@ -7104,6 +7011,12 @@ msgstr "優先順序"
 msgid "Start date"
 msgstr "開始日期"
 
+# calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
+msgid "Summary"
+msgstr "摘要"
+
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
@@ -7113,94 +7026,183 @@ msgstr "工作排序"
 
 # calendar/gui/e-week-view.c:3277
 # calendar/gui/e-week-view.c:3300
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "新增約會(_A)..."
 
 # calendar/gui/e-day-view.c:3148
 # calendar/gui/e-week-view.c:3279
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "新增全天事件(_E)"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "新增會議"
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "新增工作"
 
 # ui/evolution-mail.xml.h:77
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "選擇相關郵件(_T)"
 
 # ui/evolution-contact-editor.xml.h:3
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "刪除..."
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "發佈空閒/忙碌資訊(_P)"
 
 # mail/folder-browser.c:713
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "複製至資料夾..."
 
 # mail/folder-browser.c:711
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "移至資料夾(_V)..."
 
 # ui/evolution-event-editor.xml.h:46
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)..."
 
 # calendar/gui/calendar-summary.c:721
 # calendar/gui/e-itip-control.glade.h:7
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "以 iCalendar 轉寄(_F)..."
 
 # calendar/gui/e-day-view.c:3177
 # calendar/gui/e-week-view.c:3311
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "刪除這個事件(_O)"
 
 # calendar/gui/e-week-view.c:3313
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "刪除全部事件(_A)"
 
 # ui/evolution-calendar.xml.h:12
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "移至今日(_T)"
 
 # calendar/gui/e-day-view.c:3155
 # calendar/gui/e-week-view.c:3286
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "到指定日期(_G)..."
 
 # ui/evolution-mail.xml.h:110
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "設定值(_S)..."
 
+# calendar/gui/e-calendar-table.c:153
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "結束日期"
+
+# calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+msgstr "開始日期"
+
+# calendar/gui/calendar-model.c:369
+# calendar/gui/event-editor.c:1601
+# calendar/gui/event-editor.c:1628
+# camel/providers/smtp/camel-smtp-transport.c:221
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-meeting-list-view.c:144
+#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
+#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1534
+#: camel/providers/imap4/camel-imap4-engine.c:1561
+#: camel/providers/imap4/camel-imap4-engine.c:1591
+#: camel/providers/imap4/camel-imap4-engine.c:1631
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#: camel/providers/imap4/camel-imap4-utils.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
+#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "不明"
+
+# calendar/gui/calendar-model.c:1576
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "循環模式"
+
+# calendar/gui/calendar-model.c:1578
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "已指定"
+
+# calendar/gui/calendar-model.c:1584
+#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
+#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "是"
+
+# calendar/gui/calendar-model.c:1584
+#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
+#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "否"
+
+# calendar/gui/calendar-model.c:457
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+# calendar/gui/calendar-model.c:457
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+# calendar/gui/calendar-model.c:459
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+# calendar/gui/calendar-model.c:459
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+# calendar/gui/calendar-model.c:970
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"經緯必須依此格式輸入：\n"
+"\n"
+"45.436845,125.862501"
+
 # 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.
@@ -7229,18 +7231,30 @@ msgstr ""
 "\n"
 "%s"
 
-# calendar/gui/e-day-view-time-item.c:519
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "間隔 %02i 分鐘"
+# calendar/gui/e-day-view.c:570
+# calendar/gui/e-week-view.c:300
+# calendar/gui/print.c:617
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "上午"
+
+# calendar/gui/e-day-view.c:573
+# calendar/gui/e-week-view.c:303
+# calendar/gui/print.c:616
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "下午"
 
 # calendar/gui/e-day-view-top-item.c:274
 # calendar/gui/e-day-view.c:1294
 # calendar/gui/e-week-view-main-item.c:325
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1572
+#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -7250,28 +7264,16 @@ msgstr "%A %d %B"
 # calendar/gui/e-week-view-main-item.c:348
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-# calendar/gui/e-day-view.c:570
-# calendar/gui/e-week-view.c:300
-# calendar/gui/print.c:617
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "上午"
-
-# calendar/gui/e-day-view.c:573
-# calendar/gui/e-week-view.c:303
-# calendar/gui/print.c:616
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "下午"
+# calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "間隔 %02i 分鐘"
 
 # calendar/gui/event-editor-dialog.glade.h:26
 #: calendar/gui/e-itip-control.c:592
@@ -7394,11 +7396,6 @@ msgstr "<br> 請查閱下列資訊，然後在下面的選單中選擇一個動�
 msgid "<i>None</i>"
 msgstr "<i>無</i>"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "狀態:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -7432,7 +7429,7 @@ msgstr "更新"
 #: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
 #: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
 #: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "確認"
 
@@ -7667,61 +7664,57 @@ msgstr "附件並未包含合法的行事曆訊息"
 msgid "The attachment has no viewable calendar items"
 msgstr "附件沒有可檢視的行事曆項目"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "無法更新行事曆檔案！\n"
-
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "到會者狀態不能更新，因為項目已經不存在"
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr "物件是無效的而且不能更新\n"
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "這個回覆並非來自目前的到會者。將他加入為到會者？"
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "CORBA 系統發生錯誤\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "找不到物件\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "您沒有正確的權限可以更新行事曆\n"
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "到會者狀態已更新\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "無法更新到會者狀態！\n"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "移除完成"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "項目傳送！\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "無法傳送這個項目！\n"
 
@@ -7862,38 +7855,6 @@ msgstr "已委派"
 msgid "In Process"
 msgstr "進行中"
 
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-# e-util/e-time-utils.c:269
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a %m/%d/%Y"
-
-# e-util/e-time-utils.c:69
-# e-util/e-time-utils.c:117
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-# widgets/misc/e-dateedit.c:1284
-# widgets/misc/e-dateedit.c:1465
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
 # widgets/meeting-time-sel/e-meeting-time-sel.c:394
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
@@ -7969,8 +7930,46 @@ msgstr "會議開始時間(_S):"
 msgid "Meeting _end time:"
 msgstr "會議結束時間(_E):"
 
+# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2060
+#: calendar/gui/e-meeting-time-sel-item.c:452
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+# e-util/e-time-utils.c:269
+# widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+# widgets/meeting-time-sel/e-meeting-time-sel.c:2505
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2093
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a %m/%d/%Y"
+
+# e-util/e-time-utils.c:69
+# e-util/e-time-utils.c:117
+# widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+# widgets/misc/e-dateedit.c:1284
+# widgets/misc/e-dateedit.c:1465
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
+# camel/camel-smime-context.c:194
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "請輸入 %s 所需的密碼"
+
 # mail/mail-mt.c:190
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7979,23 +7978,21 @@ msgstr ""
 "發生於 %s 的錯誤：\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
 # mail/mail-ops.c:1262
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "開啟在 %s 的工作"
 
 # mail/mail-mt.c:190
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -8005,65 +8002,138 @@ msgstr ""
 " %s"
 
 # ui/evolution-mail.xml.h:46
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "載入影像"
 
 # calendar/gui/e-calendar-table.c:152
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "正在完成工作..."
 
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "正在刪除選定的物件..."
 
 # mail/mail-ops.c:1449
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "除去中"
 
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: calendar/gui/e-tasks.c:960
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
+#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "工作"
+
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "無約會"
 
 # ui/evolution-mail.xml.h:46
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "載入影像"
 
 # mail/mail-display.c:299
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "在 %s 內開啟..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 # camel/camel-store.c:378
 # mail/mail-ops.c:1007
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "杜林"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+# ui/evolution-mail.xml.h:110
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "行事曆與工作"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "在這裡設定您的時區、行事曆與工作清單"
+
+# ui/evolution-mail.xml.h:110
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "行事曆與工作"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution 郵件資料夾元件工廠。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution 行事曆 iTip/iMip 檢視器"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution 行事曆 iTip/iMip 檢視器"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution 郵件資料夾顯示元件。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution 測試元件。"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "行事曆"
+
+# ui/evolution-tasks.xml.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "工作(_T)"
+
 # calendar/gui/goto-dialog.glade.h:1
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
@@ -8223,6 +8293,25 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+# shell/e-storage.c:475
+#. FIXME: domain/code
+#: calendar/gui/migration.c:737
+#, fuzzy, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "權限不足"
+
+# addressbook/gui/component/addressbook.c:438
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "無法開啟目錄服務"
+
 # calendar/gui/print.c:300
 #: calendar/gui/print.c:489
 msgid "1st"
@@ -8504,7 +8593,7 @@ msgstr "連絡人: "
 # ui/evolution-addressbook.xml.h:10
 # ui/evolution-calendar.xml.h:24
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "預覽列印"
 
@@ -8521,7 +8610,7 @@ msgstr "列印項目"
 msgid "Print Setup"
 msgstr "列印設定"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
@@ -8529,43 +8618,64 @@ msgstr ""
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "工作清單"
 
-#: calendar/gui/tasks-component.c:464
+# ui/evolution-tasks.xml.h:3
+#: calendar/gui/tasks-component.c:398
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "無工作"
+msgstr[1] "無工作"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d 已選擇"
+msgstr[1] "%d 已選擇"
+
+# ui/evolution-mail.xml.h:46
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "載入影像"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "新增工作"
 
 # ui/evolution-tasks.xml.h:9
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "工作(_T)"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "建立一個新的工作"
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "新增工作"
@@ -8573,29 +8683,18 @@ msgstr "新增工作"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "工作清單"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "建立一個新的工作"
 
-# calendar/gui/tasks-control.c:108
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "工作資料夾顯示的 URI"
-
-# calendar/gui/e-tasks.c:298
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "無法載入“%s”裡的工作"
-
-#: calendar/gui/tasks-control.c:478
+#: calendar/gui/tasks-control.c:367
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8610,12 +8709,12 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "不要再顯示這個訊息。"
 
 # ui/evolution-calendar.xml.h:25
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "列印工作"
 
@@ -10321,7 +10420,7 @@ msgstr ""
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "準備資料夾“%s”供離線使用"
@@ -10443,38 +10542,6 @@ msgstr "無效的參數給 (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "執行過濾器搜尋發生錯誤： %s: %s"
 
-# camel/camel-folder-search.c:328
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"不能分析搜尋詞句：%s:\n"
-"%s"
-
-# camel/camel-folder-search.c:338
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"執行搜尋詞句時發生錯誤：%s:\n"
-"%s"
-
-# camel/camel-folder-search.c:485
-# camel/camel-folder-search.c:513
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(符合-全部) 需要單一布林值結果"
-
-# camel/camel-folder-search.c:559
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "在不明的檔頭內執行查詢：%s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -10511,7 +10578,61 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "取回 %d 封郵件"
 
-#: camel/camel-gpg-context.c:712
+# camel/camel-folder-search.c:328
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"不能分析搜尋詞句：%s:\n"
+"%s"
+
+# camel/camel-folder-search.c:338
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"執行搜尋詞句時發生錯誤：%s:\n"
+"%s"
+
+# camel/camel-folder-search.c:485
+# camel/camel-folder-search.c:513
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(符合-全部) 需要單一布林值結果"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
+msgid "(match-threads) requires a match type string"
+msgstr ""
+
+# camel/camel-folder-search.c:485
+# camel/camel-folder-search.c:513
+#: camel/camel-folder-search.c:785
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(符合-全部) 需要單一布林值結果"
+
+# camel/camel-folder-search.c:485
+# camel/camel-folder-search.c:513
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(符合-全部) 需要單一布林值結果"
+
+# camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "在不明的檔頭內執行查詢：%s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -10522,15 +10643,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "解析 gpg userid 提示時失敗。"
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "解析 gpg passphrase 要求時失敗。"
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -10540,31 +10661,31 @@ msgstr ""
 "“%s”"
 
 # mail/mail-send-recv.c:471
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
+#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
+#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "已取消。"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "解鎖私密金鑰時失敗：輸入了 3 次錯誤的 passhprase 。"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "從 GnuPG 傳回意外的回應： %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "不能加密郵件：沒有提供有效的收件者。"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -10577,96 +10698,74 @@ msgstr ""
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "無法 GPG %s： %s\n"
 
 # mail/mail-ops.c:1872
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "無法寫入資料：%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
+#: camel/camel-gpg-context.c:1753
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "執行 gpg 失敗： %s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
+#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
+#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
 msgid "Failed to execute gpg."
 msgstr "執行 gpg 失敗。"
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "這是數位加簽的郵件"
 
 # camel/camel-pgp-context.c:890
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
+#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
+#: camel/camel-smime-context.c:739
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "不能驗證此郵件的簽章：無法建立暫存檔案：%s"
 
 # camel/camel-pgp-context.c:890
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "不能驗證此郵件的簽章：無法建立暫存檔案：%s"
 
 # mail/mail-ops.c:1872
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "無法寫入資料：%s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "這是數位加簽的郵件"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "索引內文包含"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "無法從編輯器取得郵件"
 
-# camel/camel-movemail.c:306
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "不能建立鎖定 helper 導管：%s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "不能分叉鎖定 helper ： %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "無法鎖定“%s”： lock-helper 協定錯誤"
-
-# camel/camel-movemail.c:318
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "無法鎖定“%s”"
-
 # camel/camel-lock.c:92
 # camel/camel-lock.c:111
 # camel/camel-movemail.c:138
@@ -10695,6 +10794,28 @@ msgstr "使用 fcntl(2) 取得鎖失敗： %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "使用 flock(2) 取得鎖失敗： %s"
 
+# camel/camel-movemail.c:306
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "不能建立鎖定 helper 導管：%s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "不能分叉鎖定 helper ： %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "無法鎖定“%s”： lock-helper 協定錯誤"
+
+# camel/camel-movemail.c:318
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "無法鎖定“%s”"
+
 # camel/camel-movemail.c:101
 #: camel/camel-movemail.c:107
 #, c-format
@@ -10977,7 +11098,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "來自伺服器的不良許可回應。"
 
@@ -11209,7 +11330,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "憑證 ID(_C):"
 
 #: camel/camel-smime-context.c:360
@@ -11228,7 +11349,7 @@ msgstr "無法建立一個 S/MIME 解密文本。"
 msgid "Failed to add data to CMS encoder"
 msgstr "儲存郵件至暫存檔案時失敗 %s：%s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "驗證憑證失敗。\n"
@@ -11316,107 +11437,107 @@ msgid "Cannot set message digests"
 msgstr "無法取得郵件 %s： %s"
 
 # mail/mail-crypto.c:59
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "憑證簽章失敗"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
 # mail/mail-config.glade.h:74
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "儲存簽名檔"
 
 # mail/mail-config.glade.h:72
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "伺服器： %s，類型： %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "IMAP 指令失敗： %s"
 
 # camel/camel-smime-context.c:327
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "無法找到“%s”的憑證。"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "無法找到通用分散運算法。"
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
 # mail/folder-browser.c:731
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "從郵件建立規則(_T)"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
 # mail/mail-crypto.c:251
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "無法建立一個 S/MIME 解密文本。"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "無法連線至 LDAP 伺服器"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
 # camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "指令沒有實作"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -11437,24 +11558,37 @@ msgstr "不能取得資料夾：%s：%s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "不能建立資料夾：在此儲存空間上無效的操作"
 
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "不能取得資料夾：%s：%s"
+
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "不能刪除資料夾： %s ：無效的操作"
 
+# camel/providers/local/camel-mbox-summary.c:655
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "不能重新命名資料夾： %s ：無效的操作"
+
 # camel/camel-store.c:378
 # mail/mail-ops.c:1007
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-#: camel/camel-store.c:793
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "垃圾桶"
 
 # calendar/gui/goto-dialog.glade.h:9
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -11581,7 +11715,7 @@ msgstr "金鑰的用途並不支援憑證加簽"
 msgid "Error in application verification"
 msgstr "應用程式驗證時錯誤"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -11594,11 +11728,11 @@ msgstr ""
 "指紋:              %s\n"
 "簽章:              %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "良好"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "不良"
 
@@ -11624,7 +11758,7 @@ msgstr ""
 # camel/camel-tcp-stream-openssl.c:428
 # camel/camel-tcp-stream-ssl.c:364
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -11639,7 +11773,7 @@ msgstr ""
 "\n"
 "您想要接受嗎？"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -11648,7 +11782,7 @@ msgstr ""
 "憑證問題： %s\n"
 "發照者： %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -11657,7 +11791,7 @@ msgstr ""
 "不正確的憑證網域： %s\n"
 "發照者： %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -11666,7 +11800,7 @@ msgstr ""
 "憑證已逾期： %s\n"
 "發照者： %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -11682,19 +11816,19 @@ msgid "Could not parse URL `%s'"
 msgstr "無法分析 URL“%s”"
 
 # shell/e-shell-importer.c:384
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "儲存“%s”時發生錯誤： %s"
 
 # camel/camel-vee-folder.c:451
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "沒有 %s 這類郵件在 %s 中"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "不能複製或移動郵件到虛擬資料夾中"
 
@@ -11705,12 +11839,6 @@ msgstr "不能複製或移動郵件到虛擬資料夾中"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
 
-# camel/providers/local/camel-mbox-summary.c:655
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "不能重新命名資料夾： %s ：無效的操作"
-
 # camel/providers/local/camel-local-store.c:237
 #: camel/camel-vee-store.c:398
 #, c-format
@@ -11732,11 +11860,13 @@ msgstr "無法關閉暫存資料夾： %s"
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "檢查新郵件"
 
 # camel/providers/imap/camel-imap-provider.c:45
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
 msgid "Check for new messages in all folders"
 msgstr "檢查所有資料夾裡的新郵件"
@@ -11779,6 +11909,7 @@ msgstr ""
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
@@ -11799,6 +11930,385 @@ msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
 msgid "Checklist"
 msgstr "濃靄"
 
+# camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "從 IMAP 伺服器傳回不當的回應： %s"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "不能刪除資料夾： %s ：無效的操作"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/camel-remote-store.c:476
+#: camel/providers/imap4/camel-imap4-engine.c:1144
+#: camel/providers/imap4/camel-imap4-engine.c:1533
+#: camel/providers/imap4/camel-imap4-engine.c:1560
+#: camel/providers/imap4/camel-imap4-engine.c:1590
+#: camel/providers/imap4/camel-imap4-engine.c:1630
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "伺服器突然中斷連線： %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1145
+msgid "Got BYE response"
+msgstr ""
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-folder.c:335
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"不能取得郵件：%s 從資料夾 %s\n"
+"  %s"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"不能取得郵件：%s 從資料夾 %s\n"
+"  %s"
+
+# camel/providers/local/camel-mh-folder.c:149
+# camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "不能將郵件儲存到 mh 資料夾： %s： %s"
+
+# camel/providers/local/camel-mh-folder.c:149
+# camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "不能將郵件儲存到 mh 資料夾： %s： %s"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/imap4/camel-imap4-folder.c:854
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"不能取得郵件：%s 從資料夾 %s\n"
+"  %s"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/imap4/camel-imap4-folder.c:858
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"不能取得郵件：%s 從資料夾 %s\n"
+"  %s"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/imap4/camel-imap4-folder.c:866
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"不能取得郵件：%s 從資料夾 %s\n"
+"  %s"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/imap4/camel-imap4-folder.c:870
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"不能取得郵件：%s 從資料夾 %s\n"
+"  %s"
+
+# camel/providers/imap/camel-imap-provider.c:48
+# shell/e-shell-view.c:552
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "資料夾"
+
+# camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "只顯示已訂閱的資料夾"
+
+# camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "覆蓋伺服器提供之資料夾的命名空間"
+
+# camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "命名空間"
+
+# mail/mail-config.glade.h:34
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+# camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
+
+# camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
+
+# camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP 伺服器 %s"
+
+# camel/camel-remote-store.c:195
+#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap/camel-imap-store.c:431
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s 的 IMAP 服務於 %s"
+
+# camel/camel-remote-store.c:255
+# camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/imap4/camel-imap4-store.c:208
+#: camel/providers/imap4/camel-imap4-store.c:225
+#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:571
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:285
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "無法連線至 %s (埠號 %d)： %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:210
+#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+#, fuzzy
+msgid "SSL unavailable"
+msgstr "TLS 無法使用"
+
+# camel/camel-remote-store.c:252
+#: camel/providers/imap4/camel-imap4-store.c:222
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "連線已取消"
+
+# camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/imap4/camel-imap4-store.c:261
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： %s"
+
+# camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/imap4/camel-imap4-store.c:286
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： %s"
+
+# camel/providers/imap/camel-imap-command.c:241
+# shell/e-storage.c:481
+#: camel/providers/imap4/camel-imap4-store.c:287
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/pop3/camel-pop3-store.c:538
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+msgid "Unknown error"
+msgstr "不明的錯誤"
+
+# camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr "無法連線到 POP 伺服器 %s：不支援所要求的驗證機制。"
+
+# camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%s 請輸入 %s@%s 的 SMTP 密碼"
+
+# camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "無法驗證 POP 伺服器 %s：%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "不能取得資料夾：%s：%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:782
+#: camel/providers/imap/camel-imap-store.c:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "資料夾名稱“%s”無效，因為它包含字元“%c”"
+
+# camel/providers/local/camel-mbox-summary.c:655
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "不能重新命名資料夾： %s ：無效的操作"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "不能刪除資料夾： %s ：無效的操作"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "不能刪除資料夾： %s ：無效的操作"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1248
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "公司電話"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "不能刪除資料夾： %s ：無效的操作"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/local/camel-mbox-summary.c:655
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "不能重新命名資料夾： %s ：無效的操作"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "從 IMAP 伺服器傳回不當的回應： %s"
+
+# ui/evolution-tasks.xml.h:3
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "無工作"
+
+# camel/camel-remote-store.c:476
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "伺服器突然中斷連線： %s"
+
 # camel/camel-remote-store.c:337
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
@@ -11806,26 +12316,17 @@ msgstr "濃靄"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "作業已取消"
 
 # camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "伺服器突然中斷連線： %s"
 
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1089
-msgid "Unknown error"
-msgstr "不明的錯誤"
-
 # camel/providers/imap/camel-imap-command.c:232
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
@@ -11878,18 +12379,18 @@ msgstr "無法建立目錄 %s： %s"
 msgid "Could not load summary for %s"
 msgstr "無法載入給 %s 的摘要"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "資料夾已破壞並在伺服器上重建。"
 
 # mail/mail-ops.c:1649
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "掃描變更過的郵件"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "無法從取回郵件： %s"
@@ -11901,7 +12402,7 @@ msgstr "無法從取回郵件： %s"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: camel/providers/imap/camel-imap-folder.c:1977
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -11920,7 +12421,7 @@ msgstr ""
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: camel/providers/imap/camel-imap-folder.c:1977
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
@@ -11929,20 +12430,20 @@ msgstr "沒有這封郵件"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "這封郵件目前仍未可用"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "正取得新郵件的摘要資訊"
 
 # camel/providers/imap/camel-imap-folder.c:1075
 # camel/providers/imap/camel-imap-folder.c:1314
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "在 FETCH 的回應內找不到郵件的內文。"
 
@@ -11995,28 +12496,6 @@ msgstr "無法連線至 LDAP 伺服器"
 msgid "Command:"
 msgstr "公司電話"
 
-# camel/providers/imap/camel-imap-provider.c:48
-# shell/e-shell-view.c:552
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "資料夾"
-
-# camel/providers/imap/camel-imap-provider.c:50
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "只顯示已訂閱的資料夾"
-
-# camel/providers/imap/camel-imap-provider.c:52
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "覆蓋伺服器提供之資料夾的命名空間"
-
-# camel/providers/imap/camel-imap-provider.c:54
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "命名空間"
-
 # camel/providers/imap/camel-imap-provider.c:57
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
@@ -12044,91 +12523,42 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
 
-# camel/providers/smtp/camel-smtp-transport.c:534
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP 伺服器 %s"
-
-# camel/camel-remote-store.c:195
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s 的 IMAP 服務於 %s"
-
-# camel/camel-remote-store.c:255
-# camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "無法連線至 %s (埠號 %d)： %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS 無法使用"
-
-# camel/camel-remote-store.c:252
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "連線已取消"
-
-# camel/providers/pop3/camel-pop3-store.c:379
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： %s"
-
 # shell/e-storage.c:477
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "不支援 SSL/TLS 擴充機能。"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL 協商失敗"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "無法連線至 %s (埠號 %d)： %s"
 
 # camel/providers/imap/camel-imap-store.c:456
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 伺服器 %s 不支援所要求的驗證類別 %s"
 
 # camel/providers/imap/camel-imap-store.c:466
 # camel/providers/smtp/camel-smtp-transport.c:366
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "不支援驗證類別 %s"
 
 # camel/providers/imap/camel-imap-store.c:490
-#: camel/providers/imap/camel-imap-store.c:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
@@ -12136,12 +12566,12 @@ msgstr "%s 請輸入 %s@%s 的 IMAP 密碼"
 
 # camel/providers/imap/camel-imap-store.c:505
 # camel/providers/smtp/camel-smtp-transport.c:410
-#: camel/providers/imap/camel-imap-store.c:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "您沒有輸入密碼。"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -12154,27 +12584,20 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "沒有這個資料夾 %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "資料夾名稱“%s”無效，因為它包含字元“%c”"
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "母資料夾並不允許包含子資料夾"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -12183,7 +12606,7 @@ msgid "Cannot create folder `%s': folder exists."
 msgstr "不能取得資料夾：%s：%s"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "不明的母資料夾： %s"
@@ -12300,8 +12723,8 @@ msgstr ""
 "也可以用來讀 Elm 、 Pine 或 Mutt 形式資料夾的樹狀結構。"
 
 # camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:253
 #: camel/providers/local/camel-mbox-store.c:356
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
@@ -12309,59 +12732,59 @@ msgid "Store root %s is not an absolute path"
 msgstr "儲存根目錄 %s 不是絕對路徑"
 
 # camel/providers/local/camel-local-store.c:134
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "儲存根目錄 %s 不是合法的目錄"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:166
+#: camel/providers/local/camel-local-store.c:264
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "不能取得資料夾：%s：%s"
 
 # camel/providers/local/camel-local-store.c:173
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "本地端的存儲沒有收件匣"
 
 # camel/providers/local/camel-local-store.c:183
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "本地端郵件檔案 %s"
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "無法將資料夾 %s 重新命名為 %s： %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "無法重新命名“%s”：%s "
 
 # camel/providers/local/camel-local-store.c:279
-#: camel/providers/local/camel-local-store.c:385
+#: camel/providers/local/camel-local-store.c:423
 #: camel/providers/local/camel-mbox-store.c:284
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "無法刪除資料夾摘要檔案“%s”： %s"
 
 # camel/providers/local/camel-local-store.c:289
-#: camel/providers/local/camel-local-store.c:395
+#: camel/providers/local/camel-local-store.c:433
 #: camel/providers/local/camel-mbox-store.c:296
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "無法刪除資料夾索引檔案“%s”： %s"
 
 # camel/providers/local/camel-local-store.c:279
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, fuzzy, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -12450,7 +12873,7 @@ msgstr "不是一個 maildir 目錄"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -12869,7 +13292,7 @@ msgstr ""
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: camel/providers/nntp/camel-nntp-folder.c:263
 #: camel/providers/pop3/camel-pop3-folder.c:262
 #: camel/providers/pop3/camel-pop3-folder.c:430
 #: camel/providers/pop3/camel-pop3-folder.c:491
@@ -12885,8 +13308,8 @@ msgstr "使用者已取消"
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -12895,51 +13318,51 @@ msgstr "使用者已取消"
 msgid "Cannot get message %s: %s"
 msgstr "無法取得郵件 %s： %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: camel/providers/nntp/camel-nntp-folder.c:188
+#: camel/providers/nntp/camel-nntp-folder.c:228
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
 # camel/camel-movemail.c:306
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: camel/providers/nntp/camel-nntp-folder.c:201
 #, fuzzy, c-format
 msgid "Could not get article %s from NNTP server"
 msgstr "無法取得群組：%s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: camel/providers/nntp/camel-nntp-folder.c:373
 #, c-format
 msgid "Failed to send newsgroups header: %s: message not posted"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: camel/providers/nntp/camel-nntp-folder.c:413
+#: camel/providers/nntp/camel-nntp-folder.c:426
 #, c-format
 msgid "Error posting to newsgroup: %s: message not posted"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:438
 msgid "Error reading response to posted message: message not posted"
 msgstr ""
 
 # mail/mail-ops.c:1755
-#: camel/providers/nntp/camel-nntp-folder.c:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "自動儲存郵件時發生錯誤： %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "無法關閉暫存資料夾： %s"
@@ -13078,7 +13501,7 @@ msgstr "無法取得群組：%s"
 # camel/providers/sendmail/camel-sendmail-transport.c:150
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "郵件無法傳送： %s"
 
 # camel/providers/imap/camel-imap-command.c:240
@@ -13146,8 +13569,8 @@ msgid "Retrieving POP message %d"
 msgstr "接收 POP 郵件 %d"
 
 # camel/camel-sasl-login.c:127
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "不明的原因"
 
@@ -13689,7 +14112,7 @@ msgstr "%.0fG"
 
 # composer/e-msg-composer-attachment-bar.c:332
 # mail/mail-display.c:122
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "附件"
 
@@ -13744,6 +14167,108 @@ msgstr "MIME 類型:"
 msgid "Suggest automatic display of attachment"
 msgstr "建議自動顯示附件"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "當使用這個帳號時永遠在寄送的郵件上加簽(_A)"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "當使用這個帳號時永遠在寄送的郵件上加簽(_A)"
+
+# camel/camel-filter-driver.c:671
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "不能開啟郵件"
+
+# camel/providers/pop3/camel-pop3-folder.c:320
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "無法從編輯器取得郵件"
+
+# mail/mail-search.c:138
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(未命名的郵件)"
+
+# composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "開啟檔案"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "自動產生的"
+
+# mail/mail-config.glade.h:74
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "簽名檔:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+# composer/e-msg-composer.c:1526
+# composer/e-msg-composer.c:1871
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:3114
+msgid "Compose a message"
+msgstr "編輯郵件"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"無法建立郵件編輯視窗：\n"
+"無法作用位址選擇器控制元。"
+
+# composer/evolution-composer.c:355
+#: composer/e-msg-composer.c:3175
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+"無法建立郵件編輯視窗：\n"
+"無法作用 HTML 編輯器元件。\n"
+"請確定您已經安裝了正確版本\n"
+"的 gtkhtml 與 libgtkhtml 。\n"
+
+# composer/evolution-composer.c:355
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"無法建立郵件編輯視窗：\n"
+"無法作用 HTML 編輯器元件。"
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr "<b>（郵件編輯器包含不能編輯的非文字的郵件內文。）<b>"
+
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
@@ -13841,233 +14366,151 @@ msgstr "<按這裏選擇資料夾>"
 msgid "Attach file(s)"
 msgstr "附加檔案"
 
-#: composer/e-msg-composer.c:695
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "當使用這個帳號時永遠在寄送的郵件上加簽(_A)"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-
-# camel/camel-filter-driver.c:671
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "不能開啟郵件"
-
-# camel/providers/pop3/camel-pop3-folder.c:320
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "無法從編輯器取得郵件"
-
-# mail/mail-search.c:138
-#: composer/e-msg-composer.c:1551
+# composer/e-msg-composer-attachment-bar.c:501
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Untitled Message"
-msgstr "(未命名的郵件)"
-
-# composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "開啟檔案"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "自動產生的"
-
-# mail/mail-config.glade.h:74
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "簽名檔:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-# composer/e-msg-composer.c:1526
-# composer/e-msg-composer.c:1871
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "編輯郵件"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "附加檔案至郵件"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"無法建立郵件編輯視窗：\n"
-"無法作用位址選擇器控制元。"
 
-# composer/evolution-composer.c:355
-#: composer/e-msg-composer.c:3165
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
+#. mail-composer:attach-notfile primary
+#: composer/mail-composer-errors.xml.h:6
+msgid "The file `${0}' is not a regular file and cannot be sent in a message."
 msgstr ""
-"無法建立郵件編輯視窗：\n"
-"無法作用 HTML 編輯器元件。\n"
-"請確定您已經安裝了正確版本\n"
-"的 gtkhtml 與 libgtkhtml 。\n"
 
-# composer/evolution-composer.c:355
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"無法建立郵件編輯視窗：\n"
-"無法作用 HTML 編輯器元件。"
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr "<b>（郵件編輯器包含不能編輯的非文字的郵件內文。）<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-# calendar/gui/dialogs/delete-comp.c:87
-#: composer/mail-composer-errors.xml.in.h:3
+# mail/mail-search.c:138
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "您確定要刪除這個未命名的約會？"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "下一封未閱讀的郵件(_U)"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+# calendar/gui/dialogs/save-comp.c:51
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "您是否須要儲存變更？"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 msgid ""
-"Closing this composer window will discard the message permanently, unless "
-"you choose to save the message in your Drafts folder. This will allow you to "
-"continue the message at a later date."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-# camel/camel-movemail.c:306
-#: composer/mail-composer-errors.xml.in.h:7
+# shell/e-shortcuts-view.c:265
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "無法建立導管：%s"
+msgid "Don't Recover"
+msgstr "不要移除"
 
-# mail/mail-crypto.c:59
-#: composer/mail-composer-errors.xml.in.h:8
+# addressbook/gui/component/select-names/e-select-names-popup.c:161
+# composer/e-msg-composer-attachment-bar.c:468
+# shell/e-shortcuts-view.c:265
+# shell/e-shortcuts-view.c:388
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "無法儲存簽名檔： %s"
+msgid "Recover"
+msgstr "移除"
 
 # mail/mail-crypto.c:59
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "無法儲存簽名檔： %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "放棄變更(_D)"
-
-# calendar/gui/dialogs/save-comp.c:51
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "您是否須要儲存變更？"
-
-# shell/e-shortcuts-view.c:265
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "不要移除"
-
 # shell/e-shortcuts.c:381
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "儲存功能項目時發生錯誤。"
 
-#: composer/mail-composer-errors.xml.in.h:15
+# mail/mail-ops.c:1154
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "警告：編輯過的郵件"
+
+# calendar/gui/dialogs/delete-comp.c:87
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
+#, fuzzy
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "您確定要刪除這個未命名的約會？"
+
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
 msgstr ""
 
-# addressbook/gui/component/select-names/e-select-names-popup.c:161
-# composer/e-msg-composer-attachment-bar.c:468
-# shell/e-shortcuts-view.c:265
-# shell/e-shortcuts-view.c:388
-#: composer/mail-composer-errors.xml.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "移除"
+msgid "Discard Changes"
+msgstr "放棄變更(_D)"
 
 # mail/mail-callbacks.c:1188
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "另存郵件..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+# camel/camel-movemail.c:306
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "無法建立導管：%s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
+#. mail-composer:no-build-message secondary
+#: composer/mail-composer-errors.xml.h:34
+msgid "Because \"${0}\", you may need to select different mail options."
 msgstr ""
 
-# mail/mail-search.c:138
-#: composer/mail-composer-errors.xml.in.h:20
+# mail/mail-crypto.c:59
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "下一封未閱讀的郵件(_U)"
+msgid "Could not read signature file \"{0}\"."
+msgstr "無法儲存簽名檔： %s"
 
-# mail/mail-ops.c:1154
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "警告：編輯過的郵件"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-# composer/e-msg-composer-attachment-bar.c:501
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "附加檔案至郵件"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
 # mail/mail-callbacks.c:146
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
@@ -14215,7 +14658,8 @@ msgstr ""
 
 # mail/mail-callbacks.c:1140
 # mail/mail-display.c:92
-#: e-util/e-dialog-utils.c:251
+#. system:ask-save-file-exists-overwrite title
+#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "覆蓋檔案？"
 
@@ -14431,91 +14875,107 @@ msgstr "選擇要比對的時間"
 msgid "_Filter Rules"
 msgstr "過濾器規則"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"正規表示式內有錯誤“%s”：\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "排程器“%s”不存在或不是一個合法的檔案。"
-
 # widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "會議更新"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "您必須選取日期。"
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "'辨別的名稱(_N):"
 
+# ui/evolution.xml.h:3
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "您必須指定一個檔案名稱。"
+
+# camel/providers/local/camel-mbox-store.c:119
+# camel/providers/local/camel-mbox-store.c:146
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+#, fuzzy
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "排程器“%s”不存在或不是一個合法的檔案。"
+
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Missing folder."
 msgstr "移除資料夾 %s"
 
-# calendar/gui/calendar-model.c:1578
-#: filter/filter-errors.xml.in.h:7
-#, fuzzy
-msgid "Missing name."
-msgstr "指派工作"
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+# ui/evolution.xml.h:3
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "您必須指定一個資料夾。"
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "尚未選擇伺服器"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"正規表示式內有錯誤“%s”：\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "您必須選取日期。"
+# calendar/gui/calendar-model.c:1578
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "指派工作"
 
 # ui/evolution.xml.h:3
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "您必須為這個過濾器命名。"
 
 # ui/evolution.xml.h:3
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "您必須為這個虛擬資料夾命名。"
 
-# ui/evolution.xml.h:3
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "您必須指定一個檔案名稱。"
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-# ui/evolution.xml.h:3
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "您必須指定一個資料夾。"
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "尚未選擇伺服器"
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
 msgstr ""
 
 # ui/evolution-message-composer.xml.h:12
@@ -14530,69 +14990,11 @@ msgid "<b>Then</b>"
 msgstr "<b>逾期:</b>"
 
 # mail/mail-account-gui.c:682
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "選擇資料夾"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "重要"
-
-# mail/mail-format.c:762
-# mail/message-list.c:1083
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "待辦"
-
-# calendar/gui/event-editor-dialog.glade.h:33
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "稍後"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "測試"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "規則名稱:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "未命名"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>逾期:</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "執行動作"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "如果全部條件符合"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "如果任何條件符合"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "內送"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "外寄"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr ""
@@ -14683,6 +15085,81 @@ msgstr "包括全部本地端的資料夾"
 msgid "years"
 msgstr "年"
 
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
+#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+msgid "Important"
+msgstr "重要"
+
+# mail/mail-format.c:762
+# mail/message-list.c:1083
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
+#: mail/mail-config.glade.h:145
+msgid "To Do"
+msgstr "待辦"
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
+#: mail/mail-config.glade.h:94
+msgid "Later"
+msgstr "稍後"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "測試"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "規則名稱:"
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>逾期:</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "如果全部條件符合"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "如果任何條件符合"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "執行動作"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "已委派"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "收件者"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "回覆"
+
+# addressbook/printing/e-contact-print.glade.h:17
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "包含:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "內送"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "外寄"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -14817,7 +15294,7 @@ msgstr "6月"
 
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "標籤"
@@ -14862,7 +15339,7 @@ msgstr "離開這個程式"
 msgid "Play Sound"
 msgstr "播放音效"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "閱讀"
 
@@ -14939,9 +15416,9 @@ msgstr "停止處理"
 
 # mail/mail-format.c:767
 # mail/message-list.c:1082
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
 msgstr "主旨"
@@ -15008,130 +15485,74 @@ msgstr "主旨不包含"
 msgid "Virtual _Folders"
 msgstr "虛擬資料夾"
 
-#: filter/vfolder-rule.c:572
+# addressbook/contact-editor/contact-editor.glade.h:17
+# mail/mail-config.glade.h:84
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "新增(_A)"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "虛擬資料夾來源"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "郵件編輯器偏好設定"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "在此設定郵件的偏好設定，包含安全性與訊息的顯示"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "在此設定拼字檢查、簽名檔與郵件編輯器"
-
-# ui/evolution-mail.xml.h:19
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "在此設定您的郵件帳號"
-
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-# mail/mail-account-editor.c:173
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution 帳號編輯器"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolution 郵件編輯器。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolution 郵件編輯器。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution 郵件編輯器。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:4
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution 郵件資料夾顯示元件。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution 郵件執行摘要元件。"
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "郵件"
-
-# mail/mail-config.glade.h:6
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "郵件帳號"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "郵件偏好設定"
-
 # mail/mail-config.glade.h:21
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[預設值]"
 
 # mail/mail-config.glade.h:5
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "帳號名稱"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "通訊協定"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "未命名的"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "語言"
 
 # mail/mail-config.glade.h:74
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "加入簽名檔(_A)"
 
 # mail/mail-config.glade.h:74
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "簽名檔"
 
+# mail/mail-ops.c:1154
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "轉寄的郵件"
+
+# camel/providers/imap/camel-imap-command.c:241
+# shell/e-storage.c:481
+#: mail/em-composer-utils.c:1499
+msgid "an unknown sender"
+msgstr "不明的寄件者"
+
+#. translators: attribution string used when quoting messages,
+#. it must contain a single single %%+05d followed by a single '%%s'
+#: mail/em-composer-utils.c:1509
+#, fuzzy
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "在 %a, %Y-%m-%d %H:%M, %%s 寫道："
+
 # ui/evolution-mail.xml.h:10
-#: mail/em-folder-browser.c:139
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "從搜尋建立虛擬資料夾(_V)..."
 
@@ -15180,103 +15601,119 @@ msgid "Create New Folder"
 msgstr "建立新資料夾"
 
 # shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "指定建立資料夾的位置："
 
+# calendar/gui/event-editor-dialog.glade.h:15
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "克里斯由"
+
 # shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "資料夾名稱:"
 
-# camel/providers/imap/camel-imap-provider.c:48
-# shell/e-shell-view.c:552
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "虛擬資料夾"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-# mail/local-config.glade.h:8
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "收件匣"
-
-# mail/mail-send-recv.c:287
-# mail/mail-send-recv.c:333
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "載入中..."
-
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "移除資料夾 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "開啟資料夾 %s"
 
 # mail/mail-ops.c:898
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "將郵件移到 %s"
 
 # mail/mail-ops.c:898
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "將郵件複製到 %s"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "不能複製或移動郵件到虛擬資料夾中"
 
+# ui/evolution-mail.xml.h:101
+#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+msgid "_Copy to Folder"
+msgstr "複製至資料夾(_C)"
+
+# ui/evolution-mail.xml.h:112
+#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+msgid "_Move to Folder"
+msgstr "移至資料夾(_M)"
+
+# ui/evolution-mail.xml.h:55
+#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
+#: mail/message-list.c:1645
+#, fuzzy
+msgid "_Move"
+msgstr "移動"
+
+# ui/evolution-mail.xml.h:2
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "取消工作"
+
 # shell/e-shell-importer.c:601
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "選擇資料夾"
 
+# ui/evolution-event-editor.xml.h:13
+# ui/evolution-mail.xml.h:8
+# ui/evolution-task-editor-dialog.xml.h:14
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "複製"
+
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "貯藏資料夾“%s”"
 
 # ui/evolution.xml.h:10
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "新增一個資料夾"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "重新命名資料夾“%s”為："
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 #, fuzzy
 msgid "Rename Folder"
 msgstr "重新命名資料夾"
@@ -15285,33 +15722,27 @@ msgstr "重新命名資料夾"
 # ui/evolution-message-composer.xml.h:55
 # ui/evolution-task-editor-dialog.xml.h:90
 # ui/evolution.xml.h:65
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "檢視(_V)"
 
 # ui/evolution.xml.h:24
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "在新視窗開啟"
 
-# ui/evolution-mail.xml.h:55
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "移動"
-
 # ui/evolution.xml.h:59
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 #, fuzzy
 msgid "_New Folder..."
 msgstr "新增資料夾(_N)"
 
 # ui/evolution.xml.h:61
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "重新命名(_R)"
 
@@ -15319,13 +15750,48 @@ msgstr "重新命名(_R)"
 # ui/evolution-mail.xml.h:115
 # ui/evolution-task-editor-dialog.xml.h:83
 # ui/evolution.xml.h:60
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "屬性(_P)..."
 
+# camel/providers/imap/camel-imap-provider.c:48
+# shell/e-shell-view.c:552
+#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
+#: mail/mail-vfolder.c:889
+msgid "VFolders"
+msgstr "虛擬資料夾"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+# mail/local-config.glade.h:8
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "收件匣"
+
+# mail/mail-send-recv.c:287
+# mail/mail-send-recv.c:333
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+msgid "Loading..."
+msgstr "載入中..."
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:551
+msgid "Mail"
+msgstr "郵件"
+
 # ui/evolution-mail.xml.h:66
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)..."
 
@@ -15333,37 +15799,37 @@ msgstr "編輯為新郵件(_E)..."
 # ui/evolution-event-editor.xml.h:69
 # ui/evolution-task-editor-dialog.xml.h:82
 # ui/evolution-tasks.xml.h:7
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "列印(_P)"
 
 # mail/folder-browser.c:697
 # ui/evolution-mail.xml.h:117
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
 # mail/folder-browser.c:701
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "跟隨(_W)..."
 
@@ -15371,485 +15837,471 @@ msgstr "跟隨(_W)..."
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "標幟已完成(_G)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "清除標幟(_E)"
 
 # mail/folder-browser.c:704
-#: mail/em-folder-view.c:787 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "標示成已閱讀(_K)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_U)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "標示成不重要(_M)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "標示成未閱讀(_U)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "標示成重要(_I)"
 
 # mail/folder-browser.c:717
 # ui/evolution-mail.xml.h:121
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "復原(_N)"
 
 # mail/folder-browser.c:711
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "移至資料夾(_V)..."
 
 # mail/folder-browser.c:713
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)..."
 
 # addressbook/gui/component/addressbook-config.c:662
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "新增寄件者到目錄服務(_B)"
 
 # mail/folder-browser.c:727
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "套用過濾器(_Y)"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "過濾器規則"
 
 # mail/folder-browser.c:731
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "從郵件建立規則(_T)"
 
 # mail/folder-browser.c:653
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "從主旨建立虛擬資料夾(_S)"
 
 # mail/folder-browser.c:656
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "從寄件者建立虛擬資料夾(_N)"
 
 # mail/folder-browser.c:659
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "從收件者建立虛擬資料夾(_R)"
 
 # mail/folder-browser.c:662
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "從郵件清單建立虛擬資料夾(_L)"
 
-# mail/folder-browser.c:656
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "從寄件者建立虛擬資料夾(_N)"
-
 # mail/folder-browser.c:668
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "從主旨建立過濾器(_J)"
 
 # mail/folder-browser.c:671
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "從寄件者建立過濾器(_D)"
 
 # mail/folder-browser.c:674
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "收件者過濾器(_C)"
 
 # mail/folder-browser.c:677
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "從郵件清單建立過濾器(_M)"
 
-# mail/folder-browser.c:671
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "從寄件者建立過濾器(_D)"
-
 # mail/mail-config.glade.h:21
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "預設值"
 
 # mail/mail-callbacks.c:1407
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "列印郵件"
 
 # ui/evolution-event-editor.xml.h:14
 # ui/evolution-task-editor-dialog.xml.h:15
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "複製連結位址"
 
 # calendar/gui/e-calendar-table.c:163
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "請按這裡增加新的工作"
 
-# calendar/gui/e-calendar-table.c:163
-#: mail/em-folder-view.c:2214
-#, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "請按這裡增加新的工作"
+# mail/mail-format.c:756
+# mail/message-list.c:1082
+#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "寄件者"
 
-# mail/mail-search.c:319
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
+# mail/mail-format.c:759
+#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "回覆"
+
+# mail/mail-format.c:762
+# mail/message-list.c:1083
+#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "收件者"
+
+# mail/mail-format.c:765
+#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "副本"
+
+# composer/e-msg-composer-hdrs.c:394
+#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "密件副本"
+
+# mail/mail-format.c:640
+# mail/message-list.c:1082
+#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "日期"
+
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr ""
+
+# mail/mail-format.c:527
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s 附加檔案"
+
+# mail/mail-format.c:573
+#: mail/em-format.c:1024 mail/em-format.c:1143
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+# mail/mail-format.c:573
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
+
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "不支援的基模"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "驗證 leaf 憑證失敗。"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "驗證 leaf 憑證失敗。"
+
+# mail/mail-ops.c:1498
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "符合的資料:"
+msgid "Retrieving `%s'"
+msgstr "取回郵件 %s"
 
 # calendar/gui/calendar-model.c:1578
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 #, fuzzy
 msgid "Unsigned"
 msgstr "已指定"
 
-# mail/mail-format.c:1161
-#: mail/em-format-html-display.c:646
-#, fuzzy
-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:647 mail/em-format-html.c:570
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 #, fuzzy
 msgid "Valid signature"
 msgstr "儲存簽名檔"
 
-# mail/mail-format.c:1161
-#: mail/em-format-html-display.c:647
-#, fuzzy
-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:648 mail/em-format-html.c:571
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 #, fuzzy
 msgid "Invalid signature"
 msgstr "儲存簽名檔"
 
-#: mail/em-format-html-display.c:648
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
-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:655 mail/em-format-html.c:578
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 #, fuzzy
 msgid "Unencrypted"
 msgstr "已中斷"
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm.  It would "
-"be difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
-msgstr ""
-
 # ui/evolution-message-composer.xml.h:13
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 #, fuzzy
 msgid "Encrypted"
 msgstr "PGP 加密"
 
-#: mail/em-format-html-display.c:657
-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:658 mail/em-format-html.c:581
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:658
-msgid ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
-msgstr ""
-
-#: mail/em-format-html-display.c:755
-#, fuzzy
-msgid "_View Certificate"
-msgstr "憑證 ID(_C):"
-
-#: mail/em-format-html-display.c:770
-#, fuzzy
-msgid "This certificate is not viewable"
-msgstr "憑證尚未生效"
-
-# mail/message-list.c:977
-#: mail/em-format-html-display.c:1002
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "by %B %d, %Y, %l:%M %P"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: mail/em-format-html-display.c:1010
-msgid "Overdue:"
-msgstr "逾期:"
-
-# mail/message-list.c:977
-#: mail/em-format-html-display.c:1013
-#, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "by %B %d, %Y, %l:%M %P"
-
-# mail/mail-display.c:301
-#: mail/em-format-html-display.c:1083
-#, fuzzy
-msgid "_View Inline"
-msgstr "檢視行內"
-
-# mail/mail-display.c:363
-#: mail/em-format-html-display.c:1084
-#, fuzzy
-msgid "_Hide"
-msgstr "隱藏"
-
-# camel/camel-filter-driver.c:748
-#: mail/em-format-html-print.c:125
-#, c-format
-msgid "Page %d of %d"
-msgstr "第 %d / %d 頁"
-
-# mail/mail-ops.c:1498
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "取回郵件 %s"
-
 # mail/mail-format.c:1842
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "格式不良的外加本文部分。"
 
 # mail/mail-format.c:1787
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 站指示 (%s)"
 
 # mail/mail-format.c:1799
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:861
 #, 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:886
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "本地檔案指示 (%s)"
 
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "遠端資料指示 (%s)"
 
 # mail/mail-format.c:1837
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明的外部檔案指示 (“%s”類型)"
 
 # mail/mail-ops.c:898
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1137
 #, fuzzy
 msgid "Formatting message"
 msgstr "移動郵件"
 
-# mail/mail-format.c:756
-# mail/message-list.c:1082
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "寄件者"
-
-# mail/mail-format.c:759
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "回覆"
-
-# mail/mail-format.c:762
-# mail/message-list.c:1083
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "收件者"
-
-# mail/mail-format.c:765
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "副本"
-
-# composer/e-msg-composer-hdrs.c:394
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "密件副本"
-
 # addressbook/backend/ebook/e-card.c:3428
 #. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
 msgid "Mailer"
 msgstr "寄件者"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-# mail/mail-format.c:640
-# mail/message-list.c:1082
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "日期"
+# mail/mail-search.c:319
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "符合的資料:"
 
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
+# mail/mail-format.c:1161
+#: mail/em-format-html-display.c:644
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
+
+# mail/mail-format.c:1161
+#: mail/em-format-html-display.c:645
+#, fuzzy
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
+
+#: mail/em-format-html-display.c:646
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-# mail/mail-format.c:527
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s 附加檔案"
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
+msgstr ""
 
-# mail/mail-format.c:573
-#: mail/em-format.c:1065 mail/em-format.c:1184
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
+#: mail/em-format-html-display.c:647
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
 
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:653
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-# mail/mail-format.c:573
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
+#: mail/em-format-html-display.c:654
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
 
-#: mail/em-format.c:1339
+#: mail/em-format-html-display.c:655
+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:656
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:757
 #, fuzzy
-msgid "Unsupported signature format"
-msgstr "不支援的基模"
+msgid "_View Certificate"
+msgstr "憑證 ID(_C):"
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:772
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "驗證 leaf 憑證失敗。"
+msgid "This certificate is not viewable"
+msgstr "憑證尚未生效"
 
-#: mail/em-format.c:1347
+# mail/message-list.c:977
+#: mail/em-format-html-display.c:1007
 #, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "驗證 leaf 憑證失敗。"
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "by %B %d, %Y, %l:%M %P"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: mail/em-format-html-display.c:1015
+msgid "Overdue:"
+msgstr "逾期:"
 
-#: mail/em-junk-filter.c:82
+# mail/message-list.c:977
+#: mail/em-format-html-display.c:1018
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "by %B %d, %Y, %l:%M %P"
+
+# mail/mail-display.c:301
+#: mail/em-format-html-display.c:1088
+#, fuzzy
+msgid "_View Inline"
+msgstr "檢視行內"
+
+# mail/mail-display.c:363
+#: mail/em-format-html-display.c:1089
+#, fuzzy
+msgid "_Hide"
+msgstr "隱藏"
+
+# camel/camel-filter-driver.c:748
+#: mail/em-format-html-print.c:126
+#, c-format
+msgid "Page %d of %d"
+msgstr "第 %d / %d 頁"
+
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "每"
 
 # calendar/gui/event-editor.c:1545
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "一天(_O)"
 
 # calendar/gui/event-editor.c:1550
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "一週(_E)"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "一個月(_H)"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -15857,34 +16309,68 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-# camel/camel-filter-driver.c:670
-# camel/camel-filter-driver.c:679
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "快取 %s 失敗： %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "不能取得資料夾：%s：%s"
 
-# camel/camel-filter-driver.c:670
-# camel/camel-filter-driver.c:679
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+# mail/mail-ops.c:1728
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "快取 %s 失敗： %s"
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"無法複製檔案描述項： %s\n"
+"%s"
+
+# mail/mail-ops.c:1728
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr ""
+"無法建立輸出檔案：%s\n"
+" %s"
+
+# camel/providers/pop3/camel-pop3-store.c:199
+#: mail/em-migrate.c:1919
+#, fuzzy, 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:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1933
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "建立到“%s”的導管失敗： %s"
 
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
 msgstr "建立到“%s”的導管失敗： %s"
 
+# mail/mail-ops.c:1728
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"無法建立輸出檔案：%s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
 # widgets/misc/e-filter-bar.h:94
 # widgets/misc/e-filter-bar.h:101
 #: mail/em-popup.c:699
@@ -15897,118 +16383,99 @@ msgstr "另存新檔..."
 msgid "untitled_image.%s"
 msgstr "未命名的郵件"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
 # mail/folder-browser.c:697
 # ui/evolution-mail.xml.h:117
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "回覆寄件者(_R)"
 
 # mail/mail-display.c:1256
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器內開啟連結"
 
 # ui/evolution-contact-editor.xml.h:13
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "傳送郵件給清單(_M)..."
 
 # addressbook/gui/component/addressbook-config.c:662
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "新增寄件者到目錄服務"
 
 # mail/mail-display.c:299
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "這個伺服器不支援 LDAPv3 模式的資訊"
 
 # ui/evolution-subscribe.xml.h:8
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "訂閱"
 
 # mail/subscribe-dialog.c:76
 # shell/e-storage-set-view.c:48
-#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "資料夾"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "請選擇一個伺服器。"
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "尚未選擇伺服器"
 
 # widgets/misc/e-messagebox.c:224
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "不要再顯示這個訊息。"
 
 # importers/netscape-importer.c:795
 # mail/mail-callbacks.c:1359
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "過濾器"
 
-# mail/mail-ops.c:1154
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "轉寄的郵件"
-
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
-#: mail/em-utils.c:1137
-msgid "an unknown sender"
-msgstr "不明的寄件者"
-
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1147
-#, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "在 %a, %Y-%m-%d %H:%M, %%s 寫道："
-
 # widgets/misc/e-messagebox.c:180
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "訊息"
 
 # mail/mail-callbacks.c:1188
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "另存郵件..."
 
 # addressbook/backend/ebook/e-card.c:3346
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "地址"
 
 # mail/mail-autofilter.c:229
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "郵件來自 %s "
@@ -16030,11 +16497,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -16156,136 +16623,146 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 # mail/mail-config.glade.h:6
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "郵件帳號"
 
+# mail/mail-config.glade.h:6
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "郵件帳號"
+
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "執行動作"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "預設優先順序:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
 # mail/mail-config.glade.h:40
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "新郵件通知"
 
 # mail/mail-config.glade.h:40
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "新郵件通知"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
 # ui/evolution-mail.xml.h:14
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
@@ -16293,33 +16770,25 @@ msgid ""
 msgstr "當傳送 HTML 郵件給不想收到 HTML 郵件的連絡人時顯示提示(_P)"
 
 # ui/evolution-mail.xml.h:14
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "當傳送的郵件只有指定密件副本收件者時顯示提示(_O)"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 # addressbook/gui/component/select-names/e-select-names-popup.c:200
@@ -16380,9 +16849,11 @@ msgstr ""
 msgid "Spell check inline"
 msgstr "拼字檢查(_C)"
 
+# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "預設優先順序:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -16535,41 +17006,81 @@ msgstr ""
 msgid "spamd port"
 msgstr "匯入"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "郵件編輯器偏好設定"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "在此設定郵件的偏好設定，包含安全性與訊息的顯示"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "在此設定拼字檢查、簽名檔與郵件編輯器"
+
+# ui/evolution-mail.xml.h:19
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "在此設定您的郵件帳號"
+
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 #, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Evolution 郵件編輯器。"
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+# mail/mail-account-editor.c:173
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution 帳號編輯器"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
+msgid "Evolution Mail component"
 msgstr "Evolution 郵件編輯器。"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Evolution Pine importer"
+msgid "Evolution Mail composer"
 msgstr "Evolution 郵件編輯器。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Mail composer configuration control"
 msgstr "Evolution 郵件編輯器。"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution 郵件執行摘要元件。"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
+# mail/mail-config.glade.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "郵件帳號"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "郵件偏好設定"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "郵件(_M)"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:1
 #: mail/importers/elm-importer.c:88
@@ -16579,15 +17090,15 @@ msgstr "Evolution 正在匯入您舊有的 Elm 郵件"
 # shell/e-shell-importer.c:363
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "匯入..."
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "請稍候"
 
@@ -16624,21 +17135,57 @@ msgstr "選擇匯入服務"
 
 # shell/e-shell-importer.c:363
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "匯入中"
 
 # shell/e-shell-importer.c:363
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "匯入檔案中"
 
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolution 郵件編輯器。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution 郵件編輯器。"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Evolution 郵件編輯器。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolution 郵件編輯器。"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
 # mail/mail-ops.c:599
-#: mail/importers/mail-importer.c:354
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "掃描 %s"
@@ -16649,7 +17196,7 @@ msgstr "掃描 %s"
 msgid "Priority Filter \"%s\""
 msgstr "優先順序過濾器“%s”"
 
-#: mail/importers/netscape-importer.c:651
+#: mail/importers/netscape-importer.c:662
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -16675,7 +17222,7 @@ msgstr ""
 "代替優先權。請檢查匯入的過濾器以確定一切仍然\n"
 "照您想要的方式運作。"
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -16687,7 +17234,7 @@ msgstr ""
 "功能，而 Evolution 並不支援它。\n"
 "這些過濾器則會被丟棄。"
 
-#: mail/importers/netscape-importer.c:692
+#: mail/importers/netscape-importer.c:703
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -16701,27 +17248,27 @@ msgstr ""
 "會被修改成測試郵件的內文是否包含\n"
 "該字串。"
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution 正在匯入您舊有的 Netscape 資料"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution 正在匯入您舊有的 Netscape 資料"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "設定"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "郵件規則"
 
 # importers/netscape-importer.c:847
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -16766,153 +17313,165 @@ msgstr "Pine"
 
 # mail/mail-account-editor.c:173
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution 帳號編輯器"
 
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
 # addressbook/gui/component/addressbook-config.c:401
 # mail/mail-config.glade.h:33
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "主機(_H):"
 
 # mail/mail-config.glade.h:80
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
 # addressbook/gui/component/addressbook-config.c:520
 # mail/mail-config.glade.h:53
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "路徑(_P):"
 
 # mail/mail-autofilter.c:70
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "郵件送到 %s"
 
 # mail/mail-autofilter.c:213
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "主旨是 %s"
 
 # mail/mail-autofilter.c:229
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "郵件來自 %s "
 
 # mail/mail-autofilter.c:285
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 郵件列表"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "回覆"
-
 # mail/mail-autofilter.c:335
 # mail/mail-autofilter.c:356
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "新增過濾器規則"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d 已選擇"
 
 # calendar/gui/event-editor.c:1558
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d 未傳送"
 
 # mail/mail-config.glade.h:26
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "草稿"
 
 # calendar/gui/event-editor.c:1558
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d 已傳送"
 
 # calendar/gui/event-editor.c:1558
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d 未傳送"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d 全部"
 
 # calendar/gui/event-editor.c:1558
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d 未傳送"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d 已選擇"
-
 # ui/evolution-mail.xml.h:109
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "新增郵件"
 
 # ui/evolution-mail.xml.h:109
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "郵件訊息(_M)"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊息"
 
 # mail/mail-vfolder.c:438
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "新增虛擬資料夾"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "郵件規則"
 
 # ui/evolution.xml.h:10
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "新增一個資料夾"
 
-# calendar/gui/control-factory.c:126
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "行事曆將顯示的 URI "
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "檢查服務"
+
+# mail/mail-config.c:1213
+# mail/mail-config.c:1216
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "正在連線至伺服器..."
 
 # mail/mail-config.glade.h:35
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "身分"
 
 # mail/mail-config-druid.c:99
-#: mail/mail-config-druid.c:366
+#: mail/mail-config-druid.c:364
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -16922,14 +17481,14 @@ msgstr ""
 "郵件內包含這些資訊。"
 
 # mail/mail-config.glade.h:58
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "接收郵件(_R)"
 
 # mail/mail-config-druid.c:101
-#: mail/mail-config-druid.c:374
+#: mail/mail-config-druid.c:372
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -16937,18 +17496,18 @@ msgstr ""
 "請輸入以下關於您的收件伺服器的資訊。如果您不清楚，請聯絡您的系統管理員或網路"
 "服務供應商。"
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "請在下列選項中選擇"
 
 # mail/mail-config.glade.h:66
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Sending Mail"
 msgstr "傳送郵件(_S)"
 
 # mail/mail-config-druid.c:105
-#: mail/mail-config-druid.c:386
+#: mail/mail-config-druid.c:384
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -16957,12 +17516,12 @@ msgstr ""
 "服務供應商。"
 
 # mail/mail-config.glade.h:5
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "帳號總管"
 
 # mail/mail-config-druid.c:107
-#: mail/mail-config-druid.c:393
+#: mail/mail-config-druid.c:391
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -16974,16 +17533,6 @@ msgstr ""
 "理為一個 Evolution 郵件帳號。現請在下面的空白處為這個帳號輸入一個名稱。這個名"
 "稱僅用作顯示用途。"
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "檢查服務"
-
-# mail/mail-config.c:1213
-# mail/mail-config.c:1216
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "正在連線至伺服器..."
-
 # mail/mail-config.glade.h:1
 #: mail/mail-config.glade.h:1
 #, fuzzy
@@ -17340,7 +17889,8 @@ msgid "Execute Command..."
 msgstr "執行指令..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "固定寬度(_X):"
 
 # mail/folder-browser-factory.c:198
@@ -17723,170 +18273,269 @@ msgstr "顏色"
 msgid "description"
 msgstr "描述"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
+# mail/mail-config.glade.h:10
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "驗證"
 
-#: mail/mail-errors.xml.in.h:2
+# camel/providers/smtp/camel-smtp-transport.c:356
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP 伺服器 %s 不支援所要求的驗證類型 %s。"
+
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr ""
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "您確定要刪除這個帳號？"
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
 
-# mail/mail-callbacks.c:1549
-#: mail/mail-errors.xml.in.h:4
+# mail/mail-callbacks.c:1085
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "您確定要用新視窗開啟全部 %d 封郵件？"
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "您確定要重新傳送全部 %d 封郵件？"
 
-# ui/evolution-mail.xml.h:61
-#: mail/mail-errors.xml.in.h:5
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "永久移除在所有資料夾內的全部已刪除的郵件"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"您正要傳送一封 HTML 格式的郵件。請確定\n"
+"下列收件者願意並且能夠接收 HTML 郵件：\n"
 
-# mail/mail-callbacks.c:1085
-#: mail/mail-errors.xml.in.h:6
+# ui/evolution-message-composer.xml.h:26
+#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
 #, fuzzy
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr "您確定要重新傳送全部 %d 封郵件？"
+msgid "_Send"
+msgstr "傳送"
 
 # mail/mail-callbacks.c:1085
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "您確定要重新傳送全部 %d 封郵件？"
 
+#. mail:ask-send-no-subject secondary
+#: mail/mail-errors.xml.h:19
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+
 # mail/mail-callbacks.c:1085
-#: mail/mail-errors.xml.in.h:8
+#. mail:ask-send-only-bcc-contact primary
+#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 #, fuzzy
-msgid "Are you sure you want to send a message without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "您確定要重新傳送全部 %d 封郵件？"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. mail:ask-send-only-bcc-contact secondary
+#: mail/mail-errors.xml.h:24
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. mail:ask-send-only-bcc secondary
+#: mail/mail-errors.xml.h:31
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. mail:send-no-recipients primary
+#: mail/mail-errors.xml.h:34
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. mail:send-no-recipients secondary
+#: mail/mail-errors.xml.h:36
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
 msgstr ""
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: mail/mail-errors.xml.in.h:13
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "不能複製資料夾：%s"
+msgid "Use default drafts folder?"
+msgstr "開啟預設工作資料夾"
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: mail/mail-errors.xml.in.h:14
+# composer/e-msg-composer.c:877
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "不能取得資料夾：%s：%s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"無法開啟這個帳號的草稿資料夾。\n"
+"是否使用預設的草稿資料夾？"
 
-# mail/mail-display.c:236
-#: mail/mail-errors.xml.in.h:15
+# mail/mail-config.glade.h:21
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "無法建立暫存目錄： %s"
+msgid "Use _Default"
+msgstr "預設值"
 
-# shell/e-setup.c:215
-#: mail/mail-errors.xml.in.h:16
+# mail/mail-callbacks.c:1549
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr ""
-"不能建立目錄\n"
-"%s\n"
-"錯誤：%s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "您確定要用新視窗開啟全部 %d 封郵件？"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. mail:ask-expunge secondary
+#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
-"不能刪除資料夾：\n"
-"%s"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: mail/mail-errors.xml.in.h:18
+# ui/evolution-mail.xml.h:104
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
+msgid "_Expunge"
+msgstr "刪除(_E)"
 
-# 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-errors.xml.in.h:19
+# ui/evolution-mail.xml.h:61
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "資料夾“%s”不存在。"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "永久移除在所有資料夾內的全部已刪除的郵件"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: mail/mail-errors.xml.in.h:20
+# ui/evolution-mail.xml.h:25
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "不能移動資料夾：%s"
+msgid "_Empty Trash"
+msgstr "清空垃圾桶(_T)"
 
-# camel/providers/local/camel-mbox-summary.c:655
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "無法開啟共用的資料夾：%s。"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "您有未寄出的郵件，您無論如何都要離開嗎？"
 
-# camel/providers/local/camel-mbox-summary.c:655
-#: mail/mail-errors.xml.in.h:22
+#. mail:exit-unsaved secondary
+#: mail/mail-errors.xml.h:55
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr ""
+
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
+msgid ""
+"The message was sent via the \"sendmail\" external application.  Sendmail "
+"reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors "
+"and resend."
+msgstr ""
+
+# mail/mail-mt.c:190
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "無法開啟共用的資料夾：%s。"
+msgid "Error while {0}."
+msgstr ""
+"當“%s”時發生錯誤：\n"
+"%s"
 
-# camel/camel-filter-driver.c:671
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
+
+# mail/mail-mt.c:193
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "不能開啟郵件"
+msgid "Error while performing operation."
+msgstr ""
+"當執行這個動作時發生錯誤：\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
 msgstr ""
 
-# camel/providers/local/camel-local-store.c:237
-#: mail/mail-errors.xml.in.h:25
+#. mail:session-message-info secondary
+#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
+#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
+#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
+#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
+msgid "{0}"
+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:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "不能重新命名資料夾： %s ：沒有這個資料夾"
+msgid "Enter password."
+msgstr "輸入密碼"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+# mail/mail-callbacks.c:1349
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"載入過濾器資訊時發生錯誤：\n"
+"%s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "無法建立目錄 %s： %s"
 
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-maildir-folder.c:209
 # camel/providers/local/camel-maildir-folder.c:217
@@ -17894,30 +18543,83 @@ msgstr "無法建立目錄 %s： %s"
 # 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-errors.xml.in.h:28
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "無法儲存到“%s”\n"
 " %s"
 
-# mail/mail-config.glade.h:74
-#: mail/mail-errors.xml.in.h:29
+# shell/e-setup.c:215
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "加入簽名檔(_A)"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr ""
+"不能建立目錄\n"
+"%s\n"
+"錯誤：%s"
+
+# mail/mail-display.c:236
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+msgid "Cannot create temporary save directory."
+msgstr "無法建立暫存目錄： %s"
+
+#. mail:no-create-tmp-path secondary
+#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
+#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
+#, fuzzy
+msgid "File exists but cannot overwrite it."
+msgstr "檔案已存在，覆蓋它？"
 
-#: mail/mail-errors.xml.in.h:30
+# camel/providers/local/camel-mbox-store.c:119
+# camel/providers/local/camel-mbox-store.c:146
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+#, fuzzy
+msgid "File exists but is not a regular file."
+msgstr "排程器“%s”不存在或不是一個合法的檔案。"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr ""
+"不能刪除資料夾：\n"
+"%s"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
+
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 
-# mail/mail-crypto.c:59
-#: mail/mail-errors.xml.in.h:31
+# camel/providers/local/camel-local-store.c:237
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "Could not save signature file."
-msgstr "無法儲存簽名檔： %s"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "不能重新命名資料夾： %s ：沒有這個資料夾"
 
 # addressbook/gui/component/addressbook-config.glade.h:3
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
@@ -17930,304 +18632,275 @@ msgstr "無法儲存簽名檔： %s"
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-#: mail/mail-errors.xml.in.h:32
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
 msgid "Delete \"{0}\"?"
 msgstr "刪除“%s”"
 
-# calendar/gui/e-calendar-table.c:714
-#: mail/mail-errors.xml.in.h:33
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
 #, fuzzy
-msgid "Delete account?"
-msgstr "刪除選定的連絡人"
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "確定要刪除資料夾“%s”？"
 
-#: mail/mail-errors.xml.in.h:34
-#, fuzzy
-msgid "Discard changed?"
-msgstr "放棄變更(_D)"
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
 
-# calendar/gui/dialogs/save-comp.c:51
-#: mail/mail-errors.xml.in.h:35
-#, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "您是否須要儲存變更？"
+#. mail:no-rename-folder-exists primary
+#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr ""
 
-# shell/e-shortcuts-view.c:265
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "不要刪除"
+#. mail:no-rename-folder-exists secondary
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+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-errors.xml.in.h:37
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
+msgstr ""
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Enter password."
-msgstr "輸入密碼"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "不能移動資料夾：%s"
 
-# mail/mail-callbacks.c:1349
-#: mail/mail-errors.xml.in.h:38
+# camel/providers/local/camel-mbox-summary.c:655
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 #, fuzzy
-msgid "Error loading filter definitions."
-msgstr ""
-"載入過濾器資訊時發生錯誤：\n"
-"%s"
+msgid "Cannot open source \"{2}\"."
+msgstr "無法開啟共用的資料夾：%s。"
 
-# mail/mail-mt.c:193
-#: mail/mail-errors.xml.in.h:39
+# camel/camel-filter-driver.c:671
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"當執行這個動作時發生錯誤：\n"
-"%s"
+msgid "Cannot open target \"{2}\"."
+msgstr "不能開啟郵件"
 
-# mail/mail-mt.c:190
-#: mail/mail-errors.xml.in.h:40
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 #, fuzzy
-msgid "Error while {0}."
-msgstr ""
-"當“%s”時發生錯誤：\n"
-"%s"
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "不能複製資料夾：%s"
 
-#: mail/mail-errors.xml.in.h:41
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "檔案已存在，覆蓋它？"
+msgid "Cannot create folder \"{0}\"."
+msgstr "不能取得資料夾：%s：%s"
 
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
-#: mail/mail-errors.xml.in.h:42
+# camel/providers/local/camel-mbox-summary.c:655
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "排程器“%s”不存在或不是一個合法的檔案。"
+msgid "Cannot open source \"{1}\""
+msgstr "無法開啟共用的資料夾：%s。"
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
+#. mail:account-incomplete primary
+#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+msgid "Cannot save changes to account."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
+# mail/mail-account-editor.c:105
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "您沒有填入所有必須的資訊。"
+
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "您不能用相同的名稱建立兩個帳號。"
+
+# calendar/gui/e-calendar-table.c:714
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+#, fuzzy
+msgid "Delete account?"
+msgstr "刪除選定的連絡人"
+
+# mail/mail-accounts.c:280
+# mail/mail-accounts.c:284
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "您確定要刪除這個帳號？"
 
-#: mail/mail-errors.xml.in.h:45
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
+# shell/e-shortcuts-view.c:265
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "不要刪除"
 
-# mail/mail-config.glade.h:10
-#: mail/mail-errors.xml.in.h:47
+# mail/mail-crypto.c:59
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "驗證"
+msgid "Could not save signature file."
+msgstr "無法儲存簽名檔： %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:49
-msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
+# mail/mail-config.glade.h:74
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "加入簽名檔(_A)"
 
-#: mail/mail-errors.xml.in.h:50
-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."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+msgid "Discard changed?"
+msgstr "放棄變更(_D)"
+
+# calendar/gui/dialogs/save-comp.c:51
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+#, fuzzy
+msgid "Do you wish to save your changes?"
+msgstr "您是否須要儲存變更？"
+
+# composer/e-msg-composer.c:941
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+#, fuzzy
+msgid "This signature has been changed, but has not been saved."
 msgstr ""
-"您正要傳送一封 HTML 格式的郵件。請確定\n"
-"下列收件者願意並且能夠接收 HTML 郵件：\n"
+"這個簽名檔已變更但仍未儲存。\n"
+"\n"
+"您是否要儲存變更？"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: mail/mail-errors.xml.in.h:52
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "放棄變更(_D)"
+
+# 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:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "確定要刪除資料夾“%s”？"
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "資料夾“%s”不存在。"
 
-#: mail/mail-errors.xml.in.h:53
+#. mail:vfolder-notexist secondary
+#: mail/mail-errors.xml.h:188
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
+
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
 msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 "下列虛擬資料夾：\n"
 "%s使用刪除的資料夾：\n"
 "   “%s”\n"
 "已經更新。"
 
-#: mail/mail-errors.xml.in.h:56
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
+
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
 msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 "下列虛擬資料夾：\n"
 "%s使用刪除的資料夾：\n"
 "   “%s”\n"
 "已經更新。"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-# camel/providers/smtp/camel-smtp-transport.c:356
-#: mail/mail-errors.xml.in.h:61
-#, fuzzy
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:212
 msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP 伺服器 %s 不支援所要求的驗證類型 %s。"
-
-# composer/e-msg-composer.c:941
-#: mail/mail-errors.xml.in.h:62
-#, fuzzy
-msgid "This signature has been changed, but has not been saved."
-msgstr ""
-"這個簽名檔已變更但仍未儲存。\n"
+"A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"您是否要儲存變更？"
-
-# composer/e-msg-composer.c:877
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"無法開啟這個帳號的草稿資料夾。\n"
-"是否使用預設的草稿資料夾？"
-
-# mail/mail-config.glade.h:21
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "預設值"
-
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
-#: mail/mail-errors.xml.in.h:65
-#, fuzzy
-msgid "Use default drafts folder?"
-msgstr "開啟預設工作資料夾"
-
-# mail/mail-account-editor.c:105
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "您沒有填入所有必須的資訊。"
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "您有未寄出的郵件，您無論如何都要離開嗎？"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "您不能用相同的名稱建立兩個帳號。"
-
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "放棄變更(_D)"
-
-# ui/evolution-mail.xml.h:25
-#: mail/mail-errors.xml.in.h:72
-#, fuzzy
-msgid "_Empty Trash"
-msgstr "清空垃圾桶(_T)"
-
-# ui/evolution-mail.xml.h:104
-#: mail/mail-errors.xml.in.h:73
+# mail/mail-callbacks.c:1140
+# mail/mail-display.c:92
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
-msgid "_Expunge"
-msgstr "刪除(_E)"
+msgid "_Overwrite"
+msgstr "覆寫"
 
-# ui/evolution-message-composer.xml.h:26
-#: mail/mail-errors.xml.in.h:74
+# calendar/gui/e-day-view.c:3162
+# calendar/gui/e-week-view.c:3292
+# ui/evolution-calendar.xml.h:19
+# ui/evolution-message-composer.xml.h:11
+#: mail/mail-errors.xml.h:218
 #, fuzzy
-msgid "_Send"
-msgstr "傳送"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+msgid "_Append"
+msgstr "阿斯本"
 
 # mail/mail-ops.c:599
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -18240,22 +18913,22 @@ msgid "Working"
 msgstr "正在工作"
 
 # mail/mail-local.c:812
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "過濾資料夾"
 
 # mail/mail-config.glade.h:58
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "接收郵件"
 
 # camel/camel-movemail.c:274
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "儲存郵件至暫存檔案時失敗 %s：%s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -18263,126 +18936,126 @@ msgid ""
 msgstr ""
 
 # camel/camel-movemail.c:274
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "儲存郵件至暫存檔案時失敗 %s：%s"
 
 # mail/mail-ops.c:718
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, 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:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "解密郵件失敗。"
 
 # mail/mail-ops.c:739
 # mail/mail-send-recv.c:475
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "完成。"
 
 # mail/mail-ops.c:825
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "儲存郵件到資料夾"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "將郵件移到 %s"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "將郵件複製到 %s"
 
 # mail/mail-ops.c:992
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "掃描“%s”內的資料夾"
 
 # mail/mail-ops.c:1154
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "開啟資料夾 %s"
 
 # mail/mail-ops.c:1262
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "開啟貯藏 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "移除資料夾 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "貯藏資料夾“%s”"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "貯藏資料夾“%s”"
 
 # mail/mail-local.c:812
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "重新載入資料夾"
 
 # mail/mail-ops.c:1449
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
 # shell/e-shell-importer.c:371
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "匯入 %s 為 %s"
 
 # mail/mail-config.glade.h:76
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "本機資料夾"
 
 # mail/mail-ops.c:1498
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "取回郵件 %s"
 
 # mail/mail-ops.c:1565
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -18390,7 +19063,7 @@ msgstr[0] "取回 %d 封郵件"
 msgstr[1] "取回 %d 封郵件"
 
 # mail/mail-ops.c:1649
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -18398,7 +19071,7 @@ msgstr[0] "儲存 %d 封郵件"
 msgstr[1] "儲存 %d 封郵件"
 
 # mail/mail-ops.c:1728
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -18408,7 +19081,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1755
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -18418,12 +19091,12 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1829
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "儲存附件"
 
 # mail/mail-ops.c:1844
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -18433,19 +19106,19 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1872
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "無法寫入資料：%s"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "中斷與 %s 的連線"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "重新連線到 %s"
@@ -18524,12 +19197,12 @@ msgid "Waiting..."
 msgstr "正在等待..."
 
 # mail/mail-session.c:161
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "使用者取消動作。"
 
 # camel/camel-smime-context.c:194
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "請輸入 %s 所需的密碼"
@@ -18540,17 +19213,17 @@ 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:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "輸入密碼"
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "記住這個密碼(_R)"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "記住這個用於剩餘的工作階段的密碼(_R)"
 
@@ -18602,109 +19275,115 @@ msgstr "開啟資料夾 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "設定虛擬資料夾： %s"
 
 # mail/mail-ops.c:992
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "更新用於 URI： %s 的虛擬資料夾"
+
+# mail/mail-ops.c:992
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "更新用於 URI： %s 的虛擬資料夾"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "虛擬資料夾"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "編輯虛擬資料夾"
 
 # mail/mail-vfolder.c:438
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "新增虛擬資料夾"
 
 # mail/message-list.c:677
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "未閱讀"
 
 # mail/message-list.c:678
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "已閱讀"
 
 # mail/message-list.c:679
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "已回覆"
 
 # mail/message-list.c:680
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
 # mail/message-list.c:681
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
 # mail/message-list.c:685
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "最低"
 
 # mail/message-list.c:686
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "低"
 
 # mail/message-list.c:690
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "高"
 
 # mail/message-list.c:691
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "最高"
 
 # mail/message-list.c:941
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "？"
 
 # mail/message-list.c:948
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "今天 %l:%M %p"
 
 # mail/message-list.c:957
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %l:%M %p"
 
 # mail/message-list.c:969
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 # mail/message-list.c:977
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
 # mail/message-list.c:979
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 # mail/mail-local.c:905
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
@@ -18746,53 +19425,53 @@ msgstr "大小"
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "原始位置"
 
 # mail/message-browser.c:194
 # ui/evolution-mail.xml.h:33
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "請勿轉寄"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "跟隨"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "給您的資訊"
 
 # mail/message-browser.c:194
 # ui/evolution-mail.xml.h:33
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "轉寄"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "不需要回應"
 
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "回覆"
 
 # mail/message-browser.c:191
 # ui/evolution-mail.xml.h:71
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "全部回覆"
 
 # calendar/gui/event-editor-dialog.glade.h:15
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "檢閱"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "要跟隨的標幟"
 
@@ -18849,155 +19528,67 @@ msgstr "訂閱(_S)"
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution shell。"
-
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolution 測試元件。"
-
 # calendar/gui/e-calendar-table.c:375
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
 msgstr "380"
 
-# shell/e-shortcuts-view.c:295
-#: shell/apps_evolution_shell.schemas.in.in.h:2
-#, fuzzy
-msgid "Default shortcut group"
-msgstr "更改這個功能群組的名稱"
-
 # ui/evolution.xml.h:32
-#: shell/apps_evolution_shell.schemas.in.in.h:3
+#: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "切換資料夾清單的顯示狀態"
 
-# shell/e-shortcuts-view.c:301
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "隱藏功能列"
-
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "預設優先順序:"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "預設優先順序:"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:9
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "郵件組態界面"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: shell/apps_evolution_shell.schemas.in.in.h:7
 msgid ""
 "If set to true, Evolution will start up in offline mode instead of online "
 "mode."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "If set to true, the warning dialog in development versions of Evolution is "
 "not displayed."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "開啟預設工作資料夾"
-
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "開啟預設工作資料夾"
-
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "開啟預設工作資料夾"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "開啟預設工作資料夾"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-# ui/evolution.xml.h:32
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "切換資料夾清單的顯示狀態"
-
-# ui/evolution.xml.h:33
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "切換資料功能列的顯示狀態"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
 # addressbook/gui/widgets/e-addressbook-view.c:701
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "電子郵件"
@@ -19006,6 +19597,38 @@ msgstr "電子郵件"
 msgid "Brought to you by"
 msgstr "為您呈獻"
 
+# calendar/gui/e-week-view-main-item.c:342
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+# camel/providers/imap/camel-imap-command.c:241
+# shell/e-storage.c:481
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "不明的錯誤"
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "無效的參數"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "不能於 OAF 註冊"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "找不到組態資料庫"
+
+# shell/e-storage.c:461
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "一般錯誤"
+
 # shell/e-shell-folder-title-bar.c:459
 # shell/e-shell-folder-title-bar.c:460
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
@@ -19175,14 +19798,14 @@ msgid "_Import"
 msgstr "匯入"
 
 # shell/e-shell-offline-handler.c:554
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "關閉連線..."
 
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Evolution 設定值"
 
@@ -19222,12 +19845,33 @@ msgstr "資料夾名稱不能包含換行字元。"
 msgid "'.' and '..' are reserved folder names."
 msgstr "“.”和“..”是資料夾保留名稱。"
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Ximian Evolution 目前為線上工作。按這裡改為離線工作。"
+
+#: shell/e-shell-window.c:343
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution 現正離線中。"
+
+#: shell/e-shell-window.c:349
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Ximian Evolution 目前是離線工作。按這裡改為線上工作。"
+
+# mail/mail-autofilter.c:70
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "郵件送到 %s"
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot 工具似乎沒有安裝在系統上。"
 
 # camel/camel-filter-driver.c:871
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "執行 %s 發生錯誤。"
@@ -19245,7 +19889,8 @@ msgstr "無法執行 Bug buddy。"
 
 # ui/evolution.xml.h:1
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "關於 Ximian Evolution"
 
 # shell/e-shell-view-menu.c:590
@@ -19254,7 +19899,7 @@ msgid "_Work Online"
 msgstr "線上工作(_W)"
 
 # ui/evolution.xml.h:66
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
@@ -19263,47 +19908,6 @@ msgstr "離線工作(_W)"
 msgid "Work Offline"
 msgstr "離線工作"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr "Ximian Evolution 目前為線上工作。按這裡改為離線工作。"
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution 現正離線中。"
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr "Ximian Evolution 目前是離線工作。按這裡改為線上工作。"
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "無效的參數"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "不能於 OAF 註冊"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "找不到組態資料庫"
-
-# shell/e-storage.c:461
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "一般錯誤"
-
 # addressbook/contact-editor/e-contact-editor.c:1247
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
@@ -19389,6 +19993,57 @@ msgstr "接通連線"
 msgid "Click OK to close these connections and go offline"
 msgstr "按“確定”關閉這些連線以離線"
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "行事曆(_A):"
+
+# ui/evolution-addressbook.xml.h:17
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "連絡人: "
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "郵件(_M):"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "工作(_T):"
+
+# shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "資料夾類型:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "開啟其他使用者的資料夾"
+
+# mail/mail-config.glade.h:3
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "帳號(_A):"
+
+# shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "資料夾名稱(_F):"
+
+# mail/mail-config.glade.h:80
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "使用者(_U):"
+
 # shell/importer/import.glade.h:2
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
@@ -19436,6 +20091,26 @@ msgstr ""
 "\n"
 "單擊“完成”按鈕以儲存您的設定。"
 
+# shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution shell。"
+
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolution 測試元件。"
+
 # shell/importer/import.glade.h:1
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -19519,13 +20194,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution 可以自下列檔案匯入資料："
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
 "but some features are either unfinished or do not work properly.\n"
 "\n"
 "If you want a stable version of Evolution, we urge you to uninstall\n"
@@ -19557,10 +20232,11 @@ msgstr ""
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "謝謝\n"
 "Ximian Evolution 團隊\n"
@@ -19568,56 +20244,44 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "不要再顯示這個訊息"
 
-# shell/main.c:138
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "不能存取 Ximian Evolution shell。"
-
-# shell/main.c:138
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "不能初始化 Ximian Evolution shell： %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 #, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "強迫升級 Evolution 1.0.x 的組態檔案"
 
 # shell/main.c:185
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
 
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19626,15 +20290,83 @@ msgstr ""
 "%s： --online 和 --offline 不能一起使用。\n"
 "  使用 %s --help 取得進一步資訊。\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: shell/shell-errors.xml.h:15
+#, fuzzy
+msgid "Continue"
+msgstr "君士坦丁"
+
+# shell/main.c:138
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "不能存取 Ximian Evolution shell。"
+
+# mail/mail-config-druid.c:445
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution 帳號助理"
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
 # mail/mail-account-gui.c:682
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "選擇匯入服務"
 
 #: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "憑證 ID(_C):"
@@ -19913,12 +20645,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "憑證 ID(_C):"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "名片 ID 已經存在"
-
 # 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
@@ -20160,6 +20886,12 @@ msgstr "主旨是 %s"
 msgid "Certificate Signature Value"
 msgstr "憑證簽章失敗"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "名片 ID 已經存在"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -20207,12 +20939,12 @@ msgstr ""
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, fuzzy, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "無法重新命名“%s”：%s "
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr ""
@@ -20296,7 +21028,8 @@ msgstr "選擇全部連絡人"
 
 # calendar/gui/e-calendar-table.c:714
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "傳送郵件給選定的連絡人。"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
@@ -20336,8 +21069,8 @@ msgstr "檢視目前的連絡人"
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
 msgid "_Actions"
 msgstr "執行(_A)"
@@ -20363,7 +21096,8 @@ msgstr "預覽面板(_P)"
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "儲存成 VCard 檔案格式(_S)"
 
 # ui/evolution-event-editor.xml.h:72
@@ -20537,6 +21271,11 @@ msgstr "檢視目前的連絡人"
 msgid "Week"
 msgstr "週"
 
+# ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "工作週"
+
 # calendar/gui/event-editor-dialog.glade.h:3
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
@@ -20550,6 +21289,19 @@ msgstr "約會(_A)"
 # ui/evolution-subscribe.xml.h:2
 # ui/evolution-task-editor-dialog.xml.h:11
 # ui/evolution.xml.h:5
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
+msgid "C_lose"
+msgstr "關閉(_L)"
+
+# calendar/gui/dialogs/alarm-notify.glade.h:1
+# ui/evolution-contact-editor.xml.h:1
+# ui/evolution-event-editor.xml.h:10
+# ui/evolution-message-composer.xml.h:3
+# ui/evolution-subscribe.xml.h:2
+# ui/evolution-task-editor-dialog.xml.h:11
+# ui/evolution.xml.h:5
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -20977,6 +21729,21 @@ msgstr "反向選擇(_I)"
 msgid "_Threaded Message List"
 msgstr "相關郵件清單(_T)"
 
+# ui/evolution.xml.h:6
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "關閉這個視窗"
+
+# ui/evolution-event-editor.xml.h:53
+# ui/evolution-message-composer.xml.h:43
+# ui/evolution-task-editor-dialog.xml.h:65
+# ui/evolution.xml.h:43
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:26
+msgid "_Close"
+msgstr "關閉(_C)"
+
 # addressbook/gui/component/addressbook-config.c:662
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
@@ -21280,7 +22047,8 @@ msgstr "使用新視窗開啟選定的郵件"
 
 # ui/evolution-mail.xml.h:60
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "開啟選定的郵件然後重傳"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -21423,44 +22191,34 @@ msgstr "主旨虛擬資料夾(_S)..."
 msgid "_Attached"
 msgstr "附加(_A)"
 
-# ui/evolution-mail.xml.h:101
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "複製至資料夾(_C)"
-
 # ui/evolution-mail.xml.h:102
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "建立郵件過濾器(_C)"
 
 # ui/evolution-calendar.xml.h:8
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "移至(_G)"
 
 # mail/mail-config.glade.h:37
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "行內(_I)"
 
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "較大(_L)"
 
 # views/mail/galview.xml.h:4
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "檢視郵件(_M)"
 
-# ui/evolution-mail.xml.h:112
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "移至資料夾(_M)"
-
 # widgets/misc/e-messagebox.c:180
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "下一封郵件(_N)"
 
@@ -21470,30 +22228,25 @@ msgstr "下一封郵件(_N)"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:13
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "標準顯示(_N)"
 
 # ui/evolution-mail.xml.h:114
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "開啟郵件(_O)"
 
 # mail/mail-callbacks.c:1407
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "上一封郵件(_P)"
 
 # mail/mail-config.glade.h:56
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "引用(_Q)"
 
-# ui/evolution.xml.h:61
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "重新傳送(_R)..."
-
 # ui/evolution-addressbook.xml.h:20
 # ui/evolution-calendar.xml.h:44
 # ui/evolution-event-editor.xml.h:74
@@ -21509,21 +22262,6 @@ msgstr "工具(_T)"
 msgid "_Undelete"
 msgstr "復原(_U)"
 
-# ui/evolution.xml.h:6
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "關閉這個視窗"
-
-# ui/evolution-event-editor.xml.h:53
-# ui/evolution-message-composer.xml.h:43
-# ui/evolution-task-editor-dialog.xml.h:65
-# ui/evolution.xml.h:43
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
-msgid "_Close"
-msgstr "關閉(_C)"
-
 # ui/evolution-message-composer.xml.h:1
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
@@ -22036,6 +22774,12 @@ msgstr "郵件偏好設定"
 msgid "_Send / Receive"
 msgstr "傳送/接收 (_S)"
 
+# addressbook/gui/component/addressbook-config.c:349
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "立即搜尋(_F)"
+
 # views/addressbook/galview.xml.h:2
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
@@ -22123,11 +22867,6 @@ msgstr "到期日(_D):"
 msgid "With _Status"
 msgstr "設定狀態"
 
-# ui/evolution-tasks.xml.h:9
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "工作(_T)"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -22314,6 +23053,43 @@ msgstr "其它..."
 msgid "..."
 msgstr "..."
 
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Evolution 錯誤"
+
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution"
+
+# data/evolution.keys.in.h:2
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "會議資訊"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution 摘要元件。"
+
+# mail/mail-config.glade.h:69
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "傳送與草稿郵件"
+
 # ui/evolution-mail.xml.h:104
 #: widgets/misc/e-expander.c:181
 #, fuzzy
@@ -22451,6 +23227,49 @@ msgstr "文字"
 msgid "Find _Now"
 msgstr "立即搜尋"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
+#, fuzzy
+msgid "Do you wish to overwrite it?"
+msgstr ""
+"%s 已經存在\n"
+"您是否要複寫它？"
+
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"無法儲存到“%s”\n"
+" %s"
+
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"無法儲存到“%s”\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -22465,10 +23284,190 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
-# importers/pine-importer.c:661
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "目錄服務"
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution 目錄服務迷你名片檢視"
+
+# addressbook/contact-editor/fulladdr.glade.h:1
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "地址 _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "波隆納"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution 行事曆 iTip/iMip 檢視器"
+
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#, fuzzy
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution 提醒"
+
+# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+# addressbook/backend/ebook/load-pine-addressbook.c:22
+# addressbook/backend/ebook/test-client-list.c:23
+# addressbook/backend/ebook/test-client.c:33
+# addressbook/conduit/address-conduit.c:1092
+# addressbook/gui/component/addressbook-factory.c:42
+# calendar/conduits/calendar/calendar-conduit.c:1151
+# calendar/conduits/todo/todo-conduit.c:965
+# calendar/gui/alarm-notify/notify-main.c:98
+# calendar/gui/main.c:57
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "無法始初化 gnome-vfs"
+
+# calendar/gui/gnome-cal.c:840
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "無法開啟“%s”內的資料夾"
+
+# calendar/gui/control-factory.c:126
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "行事曆將顯示的 URI "
+
+#~ msgid "The type of view to show"
+#~ msgstr "要顯示的檢視類型"
+
+# ui/evolution-mail.xml.h:23
+#~ msgid "Display a message"
+#~ msgstr "顯示郵件"
+
+#~ msgid "Alerts"
+#~ msgstr "警報"
+
+# addressbook/gui/widgets/e-addressbook-view.c:730
+#~ msgid "Time"
+#~ msgstr "時間"
+
+# addressbook/contact-editor/contact-editor.glade.h:10
+# executive-summary/component/executive-summary-config.glade.h:3
+#~ msgid "_General"
+#~ msgstr "一般(_G)"
+
+# mail/mail-account-gui.c:682
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "選擇匯入服務"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "行事曆"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "工作清單"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "無法更新行事曆檔案！\n"
+
+# calendar/gui/tasks-control.c:108
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "工作資料夾顯示的 URI"
+
+# calendar/gui/e-tasks.c:298
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "無法載入“%s”裡的工作"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution 郵件資料夾顯示元件。"
+
+# mail/folder-browser.c:656
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "從寄件者建立虛擬資料夾(_N)"
+
+# mail/folder-browser.c:671
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "從寄件者建立過濾器(_D)"
+
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "快取 %s 失敗： %s"
+
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "快取 %s 失敗： %s"
+
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "建立到“%s”的導管失敗： %s"
+
+# calendar/gui/control-factory.c:126
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "行事曆將顯示的 URI "
+
+# shell/e-shortcuts-view.c:295
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "更改這個功能群組的名稱"
+
+# shell/e-shortcuts-view.c:301
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "隱藏功能列"
+
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "開啟預設工作資料夾"
+
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "開啟預設工作資料夾"
+
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "開啟預設工作資料夾"
+
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "開啟預設工作資料夾"
+
+# ui/evolution.xml.h:32
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "切換資料夾清單的顯示狀態"
+
+# ui/evolution.xml.h:33
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "切換資料功能列的顯示狀態"
+
+# shell/main.c:138
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "不能初始化 Ximian Evolution shell： %s"
+
+# ui/evolution.xml.h:61
+#~ msgid "_Resend..."
+#~ msgstr "重新傳送(_R)..."
 
 # calendar/gui/control-factory.c:126
 #, fuzzy
@@ -22662,11 +23661,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "S_pouse:"
 #~ msgstr "配偶(_S):"
 
-# addressbook/contact-editor/contact-editor.glade.h:17
-# mail/mail-config.glade.h:84
-#~ msgid "_Add"
-#~ msgstr "新增(_A)"
-
 # addressbook/contact-editor/e-contact-editor.c:1243
 # addressbook/contact-editor/e-contact-editor.c:1310
 #, fuzzy
@@ -22805,21 +23799,6 @@ msgstr "%s (%d%% 完成)"
 #~ "的特殊資訊。如果您需要找尋這個資訊，請連絡\n"
 #~ "您的系統管理者。"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:18
-#, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "開始日期(_R):"
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:25
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "到期日(_D):"
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#, fuzzy
-#~ msgid "Priority:"
-#~ msgstr "優先順序(_P):"
-
 # composer/e-msg-composer.c:805
 #~ msgid ""
 #~ "Error while reading file %s:\n"
@@ -22856,14 +23835,6 @@ msgstr "%s (%d%% 完成)"
 #~ "無法截短檔案： %s\n"
 #~ "%s"
 
-# mail/mail-ops.c:1728
-#~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "無法複製檔案描述項： %s\n"
-#~ "%s"
-
 # mail/mail-ops.c:1755
 #~ msgid ""
 #~ "Error autosaving message: %s\n"
@@ -23024,11 +23995,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "The view showing when the calendar starts"
 #~ msgstr "預覽將要列印的行事曆內容"
 
-# camel/camel-smime-context.c:194
-#, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "請輸入 %s 所需的密碼"
-
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
@@ -23112,43 +24078,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "找不到指定的共用資料夾。"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#~ msgid "C_alendar:"
-#~ msgstr "行事曆(_A):"
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#~ msgid "_Mail:"
-#~ msgstr "郵件(_M):"
-
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#~ msgid "_Tasks:"
-#~ msgstr "工作(_T):"
-
-# shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-#~ msgid "Folder _type:"
-#~ msgstr "資料夾類型:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "開啟其他使用者的資料夾"
-
-# mail/mail-config.glade.h:3
-#~ msgid "_Account:"
-#~ msgstr "帳號(_A):"
-
-# shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#~ msgid "_Folder Name:"
-#~ msgstr "資料夾名稱(_F):"
-
-# mail/mail-config.glade.h:80
-#~ msgid "_User:"
-#~ msgstr "使用者(_U):"
-
 # ui/evolution-tasks.xml.h:2
 #, fuzzy
 #~ msgid "Create a new window"
@@ -23561,9 +24490,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Quit Assistant"
 #~ msgstr "助理"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "以下是目前接通的連線："
-
 # ui/evolution-addressbook.xml.h:19
 #~ msgid "_Search for Contacts"
 #~ msgstr "尋找連絡人(_S)"
@@ -23881,12 +24807,6 @@ msgstr "%s (%d%% 完成)"
 #~ "This message is digitally signed but can not be proven to be authentic."
 #~ msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution 錯誤"
-
 # shell/e-shell-importer.c:353
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
@@ -24041,21 +24961,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "<b>Alarm Sound</b>"
 #~ msgstr "行事曆資訊"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-# calendar/gui/event-editor-dialog.glade.h:21
-#, fuzzy
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "提醒"
-
-#, fuzzy
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>開始:</b>"
-
-# data/evolution.keys.in.h:2
-#, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "行事曆資訊"
-
 # calendar/gui/dialogs/task-editor-dialog.glade.h:5
 # calendar/gui/e-calendar-table.c:151
 # calendar/gui/event-editor-dialog.glade.h:6
@@ -25383,11 +26288,6 @@ msgstr "%s (%d%% 完成)"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
 #, fuzzy
-#~ msgid "Evolution Summary"
-#~ msgstr "Evolution 摘要元件。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
 #~ msgid "Evolution Summary component"
 #~ msgstr "Evolution 摘要元件。"
 
@@ -25830,13 +26730,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Asia"
 #~ msgstr "亞洲"
 
-# calendar/gui/e-day-view.c:3162
-# calendar/gui/e-week-view.c:3292
-# ui/evolution-calendar.xml.h:19
-# ui/evolution-message-composer.xml.h:11
-#~ msgid "Aspen"
-#~ msgstr "阿斯本"
-
 #~ msgid "Asswan"
 #~ msgstr "Asswan"
 
@@ -27003,9 +27896,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Conroe"
 #~ msgstr "康羅"
 
-#~ msgid "Constantine"
-#~ msgstr "君士坦丁"
-
 #~ msgid "Copper Harbor"
 #~ msgstr "銅港"
 
@@ -27077,10 +27967,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Creston"
 #~ msgstr "克里斯頓"
 
-# calendar/gui/event-editor-dialog.glade.h:15
-#~ msgid "Crestview"
-#~ msgstr "克里斯由"
-
 #~ msgid "Cross City"
 #~ msgstr "十字城"
 
@@ -30479,10 +31365,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Nogales"
 #~ msgstr "諾加里"
 
-# addressbook/gui/component/addressbook-config.glade.h:5
-#~ msgid "Nome"
-#~ msgstr "諾姆"
-
 #~ msgid "Norfolk"
 #~ msgstr "諾福克"
 
@@ -33713,10 +34595,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Shown"
 #~ msgstr "顯示"
 
-# ui/evolution-tasks.xml.h:3
-#~ msgid "No tasks"
-#~ msgstr "無工作"
-
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
@@ -34926,12 +35804,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Delete news feed"
 #~ msgstr "刪除新聞發送伺服器"
 
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#~ msgid "_Mail"
-#~ msgstr "郵件(_M)"
-
 # calendar/gui/event-editor-dialog.glade.h:33
 #~ msgid "_Weather"
 #~ msgstr "天氣(_W)"
author	JP Rosevear <jpr@novell.com>	2004-05-20 02:35:59 +0800
committer	JP Rosevear <jpr@src.gnome.org>	2004-05-20 02:35:59 +0800
commit	c7dbb95e79df331a75d7ba49cedc1b8e816422cf (patch)
tree	f8c9851496db10145da1c5bd7e482dc3fd9e1c1d /po/zh_TW.po
parent	a9b7ecefe5f6cce56289744e0b68679835634c02 (diff)
download	gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.gz gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.bz2 gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.lz gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.xz gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.tar.zst gsoc2013-evolution-c7dbb95e79df331a75d7ba49cedc1b8e816422cf.zip