[evolution-data-server] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit 1eaa9b3b6af482cbc06a4a748e901a6803f6c487
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Thu Jan 16 19:36:10 2014 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 4117 ++++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po | 4123 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 4160 insertions(+), 4080 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index d0fa924..04e5fb4 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,10 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server 3.3.91\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2013-09-21 16:50+0000\n"
-"PO-Revision-Date: 2013-09-23 22:16+0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-16 19:35+0800\n"
+"PO-Revision-Date: 2014-01-16 19:35+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
@@ -19,121 +18,157 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.3\n"
 "X-Project-Style: gnome\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:115
+#: ../addressbook/backends/file/e-book-backend-file.c:117
 #, c-format
 msgid "Failed to remove file '%s': %s"
 msgstr "移除鎖定檔「%s」失敗:%s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:143
+#: ../addressbook/backends/file/e-book-backend-file.c:145
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "無法建立目錄「%s」:%s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:394
+#: ../addressbook/backends/file/e-book-backend-file.c:396
 #, c-format
 msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "無法建立資源「%s」的硬連結:%s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:499
-#: ../addressbook/backends/file/e-book-backend-file.c:1135
+#: ../addressbook/backends/file/e-book-backend-file.c:501
+#: ../addressbook/backends/file/e-book-backend-file.c:1230
 msgid "No UID in the contact"
 msgstr "在聯絡人中沒有 UID"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:773
+#: ../addressbook/backends/file/e-book-backend-file.c:828
 #, c-format
 msgid "Conflicting UIDs found in added contacts"
 msgstr "在加入的聯絡人中發現衝突的 UID"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:881
+#: ../addressbook/backends/file/e-book-backend-file.c:967
 msgid "Loading..."
 msgstr "載入中…"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:883
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4419
+#: ../addressbook/backends/file/e-book-backend-file.c:969
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4425
 msgid "Searching..."
 msgstr "搜尋中…"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1164
+#: ../addressbook/backends/file/e-book-backend-file.c:1258
 #, c-format
 msgid "Tried to modify contact '%s' with out of sync revision"
 msgstr "嘗試不使用同步修訂來修改聯絡人「%s」"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1300
-#: ../addressbook/backends/file/e-book-backend-file.c:1369
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2707
+#: ../addressbook/backends/file/e-book-backend-file.c:1449
+#: ../addressbook/backends/file/e-book-backend-file.c:1532
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077
+#: ../addressbook/libedata-book/e-book-sqlite.c:6706
 #, c-format
 msgid "Contact '%s' not found"
 msgstr "找不到聯絡人「%s」"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1411
-#: ../addressbook/backends/file/e-book-backend-file.c:1478
+#: ../addressbook/backends/file/e-book-backend-file.c:1592
+#: ../addressbook/backends/file/e-book-backend-file.c:1673
 #, c-format
 msgid "Query '%s' not supported"
 msgstr "查詢「%s」不支援"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1420
-#: ../addressbook/backends/file/e-book-backend-file.c:1487
+#: ../addressbook/backends/file/e-book-backend-file.c:1601
+#: ../addressbook/backends/file/e-book-backend-file.c:1682
 #, c-format
 msgid "Invalid Query '%s'"
 msgstr "無效的查詢「%s」"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1671
+#: ../addressbook/backends/file/e-book-backend-file.c:1947
+msgid "Requested to delete an unrelated cursor"
+msgstr "已要求刪除無關的游標"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:2014
 #, c-format
 msgid "Failed to rename old database from '%s' to '%s': %s"
 msgstr "無法將舊資料庫「%s」重新命名為「%s」: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1240
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4314
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:383
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:826
+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1244
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4320
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:378
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:820
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
-#: ../addressbook/libebook-contacts/e-phone-number.c:58
-#: ../addressbook/libedata-book/e-book-backend-sexp.c:874
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:568
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:599
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:611
-#: ../calendar/libecal/e-cal.c:2335 ../calendar/libecal/e-cal-client.c:268
-#: ../camel/camel-imapx-command.c:650 ../libedataserver/e-client.c:177
+#: ../addressbook/libebook-contacts/e-phone-number.c:56
+#: ../addressbook/libebook/e-book.c:1078
+#: ../addressbook/libebook/e-book-client.c:1882
+#: ../addressbook/libebook/e-book-client.c:2054
+#: ../addressbook/libebook/e-book-client.c:2267
+#: ../addressbook/libebook/e-book-client.c:2398
+#: ../addressbook/libebook/e-book-client.c:2557
+#: ../addressbook/libebook/e-book-client.c:2691
+#: ../addressbook/libebook/e-book-client.c:2822
+#: ../addressbook/libebook/e-book-client.c:2980
+#: ../addressbook/libebook/e-book-client.c:3175
+#: ../addressbook/libebook/e-book-client.c:3393
+#: ../addressbook/libedata-book/e-book-backend-sexp.c:878
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:605
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:617
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:270
+#: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276
+#: ../calendar/libecal/e-cal-client.c:3237
+#: ../calendar/libecal/e-cal-client.c:3410
+#: ../calendar/libecal/e-cal-client.c:3674
+#: ../calendar/libecal/e-cal-client.c:3915
+#: ../calendar/libecal/e-cal-client.c:4103
+#: ../calendar/libecal/e-cal-client.c:4295
+#: ../calendar/libecal/e-cal-client.c:4465
+#: ../calendar/libecal/e-cal-client.c:4634
+#: ../calendar/libecal/e-cal-client.c:4837
+#: ../calendar/libecal/e-cal-client.c:4987
+#: ../calendar/libecal/e-cal-client.c:5181
+#: ../calendar/libecal/e-cal-client.c:5334
+#: ../calendar/libecal/e-cal-client.c:5551
+#: ../calendar/libecal/e-cal-client.c:5705
+#: ../calendar/libecal/e-cal-client.c:5931
+#: ../calendar/libecal/e-cal-client.c:6127
+#: ../calendar/libecal/e-cal-client.c:6490
+#: ../calendar/libecal/e-cal-client.c:6704
+#: ../camel/providers/imapx/camel-imapx-command.c:654
+#: ../libedataserver/e-client.c:185
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:833
+#: ../addressbook/backends/google/e-book-backend-google.c:836
 msgid "Querying for updated contacts…"
 msgstr "查詢更新的聯絡人…"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:985
+#: ../addressbook/backends/google/e-book-backend-google.c:988
 msgid "Querying for updated groups…"
 msgstr "查詢更新的羣組…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1673
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5050
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1293
+#: ../addressbook/backends/google/e-book-backend-google.c:1705
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5056
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1268
 msgid "The backend does not support bulk additions"
 msgstr "後端不支援大量增加"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1822
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5186
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1395
+#: ../addressbook/backends/google/e-book-backend-google.c:1854
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5192
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1370
 msgid "The backend does not support bulk modifications"
 msgstr "後端不支援大量修改"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2022
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1487
+#: ../addressbook/backends/google/e-book-backend-google.c:2054
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1462
 msgid "The backend does not support bulk removals"
 msgstr "後端不支援大量移除"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2148
+#: ../addressbook/backends/google/e-book-backend-google.c:2180
 msgid "Loading…"
 msgstr "載入中…"
 
 #. System Group: My Contacts
-#: ../addressbook/backends/google/e-book-google-utils.c:1620
+#: ../addressbook/backends/google/e-book-google-utils.c:1618
 #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1
 #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1
 #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
@@ -142,129 +177,129 @@ msgid "Personal"
 msgstr "個人"
 
 #. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1622
+#: ../addressbook/backends/google/e-book-google-utils.c:1620
 msgid "Friends"
 msgstr "朋友"
 
 #. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1624
+#: ../addressbook/backends/google/e-book-google-utils.c:1622
 msgid "Family"
 msgstr "家人"
 
 #. System Group: Coworkers
-#: ../addressbook/backends/google/e-book-google-utils.c:1626
+#: ../addressbook/backends/google/e-book-google-utils.c:1624
 msgid "Coworkers"
 msgstr "同事"
 
 #. Translators: An error message shown to a user when trying to do an
 #. * operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:174
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
 msgid "Not connected"
 msgstr "未連線"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:968
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:971
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr "無法使用 v3 或 v2 的 binds 來綁定"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1091
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1094
 msgid "Reconnecting to LDAP server..."
 msgstr "正在重新連接 LDAP 伺服器…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1221
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1225
 msgid "Invalid DN syntax"
 msgstr "無效的 DN 語法"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1237
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4313
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1241
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4319
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "LDAP 錯誤 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1849
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2172
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1853
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2176
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s:從 ldap_first_entry 傳回 NULL"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2102
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2230
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2106
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2234
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s:傳回未處理的類型 %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2363
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2490
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2367
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2494
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr "%s:傳回未處理的搜尋結果類型 %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4262
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4268
 msgid "Receiving LDAP search results..."
 msgstr "正在接收 LDAP 搜尋結果…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4441
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4447
 msgid "Error performing search"
 msgstr "進行搜尋時發生錯誤"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4569
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
 #, c-format
 msgid "Downloading contacts (%d)..."
 msgstr "下載聯絡人 (%d)…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5133
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5139
 msgid "Adding contact to LDAP server..."
 msgstr "正在新增聯絡人至 LDAP 伺服器…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5214
 msgid "Modifying contact from LDAP server..."
 msgstr "正在修改 LDAP 伺服器中的聯絡人…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5274
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5280
 msgid "Removing contact from LDAP server..."
 msgstr "正在移除 LDAP 伺服器中的聯絡人…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5663
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5669
 #, c-format
 msgid "Failed to get the DN for user '%s'"
 msgstr "無法擷取 DN 給使用者「%s」"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:805
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:799
 msgid "Loading Addressbook summary..."
 msgstr "載入通訊錄摘要…"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:823
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:817
 #, c-format
 msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
 msgstr "webdav PROPFIND 失敗,HTTP 狀態:%d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:842
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836
 msgid "No response body in webdav PROPFIND result"
 msgstr "在 webdav PROPFIND 結果沒有回應本體"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:878
 #, c-format
 msgid "Loading Contacts (%d%%)"
 msgstr "載入聯絡人 (%d%%)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1215
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1191
 msgid "Cannot transform SoupURI to string"
 msgstr "不能將 SoupURI 轉換為字串"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1326
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1301
 #, c-format
 msgid "Create resource '%s' failed with HTTP status %d (%s)"
 msgstr "建立資源「%s」失敗,HTTP 狀態:%d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1424
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1399
 msgid "Contact on server changed -> not modifying"
 msgstr "伺服器上的聯絡人已更改 -> 尚未修改"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1432
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1407
 #, c-format
 msgid "Modify contact failed with HTTP status %d (%s)"
 msgstr "修改聯絡人失敗,HTTP 狀態:%d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1508
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1483
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "DELETE 失敗,HTTP 狀態:%d"
@@ -274,12 +309,12 @@ msgid "No such book"
 msgstr "沒有這個通訊錄"
 
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:26
-#: ../addressbook/libedata-book/e-data-book.c:346
+#: ../addressbook/libedata-book/e-data-book.c:371
 msgid "Contact not found"
 msgstr "找不到聯絡人"
 
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:28
-#: ../addressbook/libedata-book/e-data-book.c:347
+#: ../addressbook/libedata-book/e-data-book.c:372
 msgid "Contact ID already exists"
 msgstr "聯絡人 ID 已經存在"
 
@@ -288,12 +323,12 @@ msgid "No such source"
 msgstr "沒有這個來源"
 
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:32
-#: ../addressbook/libedata-book/e-data-book.c:363
+#: ../addressbook/libedata-book/e-data-book.c:388
 msgid "No space"
 msgstr "沒有空間"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook-contacts/e-contact.c:123
+#: ../addressbook/libebook-contacts/e-contact.c:131
 msgid "Unique ID"
 msgstr "獨特的 ID"
 
@@ -301,12 +336,12 @@ msgstr "獨特的 ID"
 #. * so we can generate its value if necessary in the getter
 #. Translators: This is an EContact field description, in this case it's a
 #. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
-#: ../addressbook/libebook-contacts/e-contact.c:128
+#: ../addressbook/libebook-contacts/e-contact.c:136
 msgid "File Under"
 msgstr "歸檔為"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook-contacts/e-contact.c:130
+#: ../addressbook/libebook-contacts/e-contact.c:138
 msgid "Book UID"
 msgstr "通訊錄 UID"
 
@@ -314,434 +349,434 @@ msgstr "通訊錄 UID"
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook-contacts/e-contact.c:136
+#: ../addressbook/libebook-contacts/e-contact.c:144
 msgid "Full Name"
 msgstr "全名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:137
+#: ../addressbook/libebook-contacts/e-contact.c:145
 msgid "Given Name"
 msgstr "名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:138
+#: ../addressbook/libebook-contacts/e-contact.c:146
 msgid "Family Name"
 msgstr "姓"
 
-#: ../addressbook/libebook-contacts/e-contact.c:139
+#: ../addressbook/libebook-contacts/e-contact.c:147
 msgid "Nickname"
 msgstr "網名"
 
 #. Email fields
-#: ../addressbook/libebook-contacts/e-contact.c:142
+#: ../addressbook/libebook-contacts/e-contact.c:150
 msgid "Email 1"
 msgstr "電子郵件 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:143
+#: ../addressbook/libebook-contacts/e-contact.c:151
 msgid "Email 2"
 msgstr "電子郵件 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:144
+#: ../addressbook/libebook-contacts/e-contact.c:152
 msgid "Email 3"
 msgstr "電子郵件 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:145
+#: ../addressbook/libebook-contacts/e-contact.c:153
 msgid "Email 4"
 msgstr "電子郵件 4"
 
-#: ../addressbook/libebook-contacts/e-contact.c:147
+#: ../addressbook/libebook-contacts/e-contact.c:155
 msgid "Mailer"
 msgstr "寄件者"
 
 #. Address Labels
-#: ../addressbook/libebook-contacts/e-contact.c:150
+#: ../addressbook/libebook-contacts/e-contact.c:158
 msgid "Home Address Label"
 msgstr "住址標籤"
 
-#: ../addressbook/libebook-contacts/e-contact.c:151
+#: ../addressbook/libebook-contacts/e-contact.c:159
 msgid "Work Address Label"
 msgstr "工作地址標籤"
 
-#: ../addressbook/libebook-contacts/e-contact.c:152
+#: ../addressbook/libebook-contacts/e-contact.c:160
 msgid "Other Address Label"
 msgstr "其他地址標籤"
 
 #. Phone fields
-#: ../addressbook/libebook-contacts/e-contact.c:155
+#: ../addressbook/libebook-contacts/e-contact.c:163
 msgid "Assistant Phone"
 msgstr "助理電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:156
+#: ../addressbook/libebook-contacts/e-contact.c:164
 msgid "Business Phone"
 msgstr "商務電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:157
+#: ../addressbook/libebook-contacts/e-contact.c:165
 msgid "Business Phone 2"
 msgstr "商務電話 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:158
+#: ../addressbook/libebook-contacts/e-contact.c:166
 msgid "Business Fax"
 msgstr "商務傅真"
 
-#: ../addressbook/libebook-contacts/e-contact.c:159
+#: ../addressbook/libebook-contacts/e-contact.c:167
 msgid "Callback Phone"
 msgstr "回撥電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:160
+#: ../addressbook/libebook-contacts/e-contact.c:168
 msgid "Car Phone"
 msgstr "汽車電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:161
+#: ../addressbook/libebook-contacts/e-contact.c:169
 msgid "Company Phone"
 msgstr "公司電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:162
+#: ../addressbook/libebook-contacts/e-contact.c:170
 msgid "Home Phone"
 msgstr "家用電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:163
+#: ../addressbook/libebook-contacts/e-contact.c:171
 msgid "Home Phone 2"
 msgstr "家用電話 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:164
+#: ../addressbook/libebook-contacts/e-contact.c:172
 msgid "Home Fax"
 msgstr "家用傳真"
 
-#: ../addressbook/libebook-contacts/e-contact.c:165
+#: ../addressbook/libebook-contacts/e-contact.c:173
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook-contacts/e-contact.c:166
+#: ../addressbook/libebook-contacts/e-contact.c:174
 msgid "Mobile Phone"
 msgstr "流動電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:167
+#: ../addressbook/libebook-contacts/e-contact.c:175
 msgid "Other Phone"
 msgstr "其它電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:168
+#: ../addressbook/libebook-contacts/e-contact.c:176
 msgid "Other Fax"
 msgstr "其它傳真"
 
-#: ../addressbook/libebook-contacts/e-contact.c:169
+#: ../addressbook/libebook-contacts/e-contact.c:177
 msgid "Pager"
 msgstr "傳呼機"
 
-#: ../addressbook/libebook-contacts/e-contact.c:170
+#: ../addressbook/libebook-contacts/e-contact.c:178
 msgid "Primary Phone"
 msgstr "主要電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:171
+#: ../addressbook/libebook-contacts/e-contact.c:179
 msgid "Radio"
 msgstr "無線電電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:172
+#: ../addressbook/libebook-contacts/e-contact.c:180
 msgid "Telex"
 msgstr "電報"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook-contacts/e-contact.c:174
+#: ../addressbook/libebook-contacts/e-contact.c:182
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook-contacts/e-contact.c:177
+#: ../addressbook/libebook-contacts/e-contact.c:185
 msgid "Organization"
 msgstr "團體"
 
-#: ../addressbook/libebook-contacts/e-contact.c:178
+#: ../addressbook/libebook-contacts/e-contact.c:186
 msgid "Organizational Unit"
 msgstr "團體單位"
 
-#: ../addressbook/libebook-contacts/e-contact.c:179
+#: ../addressbook/libebook-contacts/e-contact.c:187
 msgid "Office"
 msgstr "辦公室"
 
-#: ../addressbook/libebook-contacts/e-contact.c:180
+#: ../addressbook/libebook-contacts/e-contact.c:188
 msgid "Title"
 msgstr "銜頭"
 
-#: ../addressbook/libebook-contacts/e-contact.c:181
+#: ../addressbook/libebook-contacts/e-contact.c:189
 msgid "Role"
 msgstr "角色"
 
-#: ../addressbook/libebook-contacts/e-contact.c:182
+#: ../addressbook/libebook-contacts/e-contact.c:190
 msgid "Manager"
 msgstr "主管"
 
-#: ../addressbook/libebook-contacts/e-contact.c:183
+#: ../addressbook/libebook-contacts/e-contact.c:191
 msgid "Assistant"
 msgstr "助理"
 
 #. Web fields
-#: ../addressbook/libebook-contacts/e-contact.c:186
+#: ../addressbook/libebook-contacts/e-contact.c:194
 msgid "Homepage URL"
 msgstr "首頁 URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:187
+#: ../addressbook/libebook-contacts/e-contact.c:195
 msgid "Weblog URL"
 msgstr "網誌 URL"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:190
+#: ../addressbook/libebook-contacts/e-contact.c:198
 msgid "Categories"
 msgstr "分類"
 
 #. Collaboration fields
-#: ../addressbook/libebook-contacts/e-contact.c:193
+#: ../addressbook/libebook-contacts/e-contact.c:201
 msgid "Calendar URI"
 msgstr "行事曆 URI"
 
-#: ../addressbook/libebook-contacts/e-contact.c:194
+#: ../addressbook/libebook-contacts/e-contact.c:202
 msgid "Free/Busy URL"
 msgstr "空閒/忙碌 URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:195
+#: ../addressbook/libebook-contacts/e-contact.c:203
 msgid "ICS Calendar"
 msgstr "ICS 行事曆"
 
-#: ../addressbook/libebook-contacts/e-contact.c:196
+#: ../addressbook/libebook-contacts/e-contact.c:204
 msgid "Video Conferencing URL"
 msgstr "視像會議 URL"
 
 #. Misc fields
-#: ../addressbook/libebook-contacts/e-contact.c:199
+#: ../addressbook/libebook-contacts/e-contact.c:207
 msgid "Spouse's Name"
 msgstr "配偶姓名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:200
+#: ../addressbook/libebook-contacts/e-contact.c:208
 msgid "Note"
 msgstr "備註"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:203
+#: ../addressbook/libebook-contacts/e-contact.c:211
 msgid "AIM Home Screen Name 1"
 msgstr "AIM 家用螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:204
+#: ../addressbook/libebook-contacts/e-contact.c:212
 msgid "AIM Home Screen Name 2"
 msgstr "AIM 家用螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:205
+#: ../addressbook/libebook-contacts/e-contact.c:213
 msgid "AIM Home Screen Name 3"
 msgstr "AIM 家用螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:206
+#: ../addressbook/libebook-contacts/e-contact.c:214
 msgid "AIM Work Screen Name 1"
 msgstr "AIM 工作螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:207
+#: ../addressbook/libebook-contacts/e-contact.c:215
 msgid "AIM Work Screen Name 2"
 msgstr "AIM 工作螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:208
+#: ../addressbook/libebook-contacts/e-contact.c:216
 msgid "AIM Work Screen Name 3"
 msgstr "AIM 工作螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:209
+#: ../addressbook/libebook-contacts/e-contact.c:217
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise 家用螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:210
+#: ../addressbook/libebook-contacts/e-contact.c:218
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise 家用螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:211
+#: ../addressbook/libebook-contacts/e-contact.c:219
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise 家用螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:212
+#: ../addressbook/libebook-contacts/e-contact.c:220
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise 工作螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:213
+#: ../addressbook/libebook-contacts/e-contact.c:221
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise 工作螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:214
+#: ../addressbook/libebook-contacts/e-contact.c:222
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise 工作螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:215
+#: ../addressbook/libebook-contacts/e-contact.c:223
 msgid "Jabber Home ID 1"
 msgstr "Jabber 家用 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:216
+#: ../addressbook/libebook-contacts/e-contact.c:224
 msgid "Jabber Home ID 2"
 msgstr "Jabber 家用 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:217
+#: ../addressbook/libebook-contacts/e-contact.c:225
 msgid "Jabber Home ID 3"
 msgstr "Jabber 家用 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:218
+#: ../addressbook/libebook-contacts/e-contact.c:226
 msgid "Jabber Work ID 1"
 msgstr "Jabber 工作 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:219
+#: ../addressbook/libebook-contacts/e-contact.c:227
 msgid "Jabber Work ID 2"
 msgstr "Jabber 工作 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:220
+#: ../addressbook/libebook-contacts/e-contact.c:228
 msgid "Jabber Work ID 3"
 msgstr "Jabber 工作 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:221
+#: ../addressbook/libebook-contacts/e-contact.c:229
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo!家用螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:222
+#: ../addressbook/libebook-contacts/e-contact.c:230
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo!家用螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:223
+#: ../addressbook/libebook-contacts/e-contact.c:231
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo!家用螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:224
+#: ../addressbook/libebook-contacts/e-contact.c:232
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo!工作螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:225
+#: ../addressbook/libebook-contacts/e-contact.c:233
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo!工作螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:226
+#: ../addressbook/libebook-contacts/e-contact.c:234
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo!工作螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:227
+#: ../addressbook/libebook-contacts/e-contact.c:235
 msgid "MSN Home Screen Name 1"
 msgstr "MSN 家用螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:228
+#: ../addressbook/libebook-contacts/e-contact.c:236
 msgid "MSN Home Screen Name 2"
 msgstr "MSN 家用螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:229
+#: ../addressbook/libebook-contacts/e-contact.c:237
 msgid "MSN Home Screen Name 3"
 msgstr "MSN 家用螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:230
+#: ../addressbook/libebook-contacts/e-contact.c:238
 msgid "MSN Work Screen Name 1"
 msgstr "MSN 工作螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:231
+#: ../addressbook/libebook-contacts/e-contact.c:239
 msgid "MSN Work Screen Name 2"
 msgstr "MSN 工作螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:232
+#: ../addressbook/libebook-contacts/e-contact.c:240
 msgid "MSN Work Screen Name 3"
 msgstr "MSN 工作螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:233
+#: ../addressbook/libebook-contacts/e-contact.c:241
 msgid "ICQ Home ID 1"
 msgstr "ICQ 家用 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:234
+#: ../addressbook/libebook-contacts/e-contact.c:242
 msgid "ICQ Home ID 2"
 msgstr "ICQ 家用 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:235
+#: ../addressbook/libebook-contacts/e-contact.c:243
 msgid "ICQ Home ID 3"
 msgstr "ICQ 家用 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:236
+#: ../addressbook/libebook-contacts/e-contact.c:244
 msgid "ICQ Work ID 1"
 msgstr "ICQ 工作 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:237
+#: ../addressbook/libebook-contacts/e-contact.c:245
 msgid "ICQ Work ID 2"
 msgstr "ICQ 工作 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:238
+#: ../addressbook/libebook-contacts/e-contact.c:246
 msgid "ICQ Work ID 3"
 msgstr "ICQ 工作 ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook-contacts/e-contact.c:241
+#: ../addressbook/libebook-contacts/e-contact.c:249
 msgid "Last Revision"
 msgstr "上次改版"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * virtual field, which returns either name of the contact or the organization
 #. * name, recognized by multiple other fields, where the first filled is used.
-#: ../addressbook/libebook-contacts/e-contact.c:245
+#: ../addressbook/libebook-contacts/e-contact.c:253
 msgid "Name or Org"
 msgstr "姓名或組織"
 
 #. Address fields
-#: ../addressbook/libebook-contacts/e-contact.c:248
+#: ../addressbook/libebook-contacts/e-contact.c:256
 msgid "Address List"
 msgstr "地址清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:249
+#: ../addressbook/libebook-contacts/e-contact.c:257
 msgid "Home Address"
 msgstr "住址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:250
+#: ../addressbook/libebook-contacts/e-contact.c:258
 msgid "Work Address"
 msgstr "工作地址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:251
+#: ../addressbook/libebook-contacts/e-contact.c:259
 msgid "Other Address"
 msgstr "其它地址"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:254
+#: ../addressbook/libebook-contacts/e-contact.c:262
 msgid "Category List"
 msgstr "分類清單"
 
 #. Photo/Logo
-#: ../addressbook/libebook-contacts/e-contact.c:257
+#: ../addressbook/libebook-contacts/e-contact.c:265
 msgid "Photo"
 msgstr "相片"
 
-#: ../addressbook/libebook-contacts/e-contact.c:258
+#: ../addressbook/libebook-contacts/e-contact.c:266
 msgid "Logo"
 msgstr "標誌"
 
 #. Translators: This is an EContact field description, in this case it's a name
 #. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
-#: ../addressbook/libebook-contacts/e-contact.c:262
+#: ../addressbook/libebook-contacts/e-contact.c:270
 msgid "Name"
 msgstr "名稱"
 
-#: ../addressbook/libebook-contacts/e-contact.c:263
+#: ../addressbook/libebook-contacts/e-contact.c:271
 msgid "Email List"
 msgstr "電子郵件清單"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:266
+#: ../addressbook/libebook-contacts/e-contact.c:274
 msgid "AIM Screen Name List"
 msgstr "AIM 螢幕名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:267
+#: ../addressbook/libebook-contacts/e-contact.c:275
 msgid "GroupWise ID List"
 msgstr "GroupWise ID 清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:268
+#: ../addressbook/libebook-contacts/e-contact.c:276
 msgid "Jabber ID List"
 msgstr "Jabber ID 清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:269
+#: ../addressbook/libebook-contacts/e-contact.c:277
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo!螢幕名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:270
+#: ../addressbook/libebook-contacts/e-contact.c:278
 msgid "MSN Screen Name List"
 msgstr "MSN 螢幕名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:271
+#: ../addressbook/libebook-contacts/e-contact.c:279
 msgid "ICQ ID List"
 msgstr "ICQ ID 清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:273
+#: ../addressbook/libebook-contacts/e-contact.c:281
 msgid "Wants HTML Mail"
 msgstr "需要 HTML 郵件"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * field describing whether it's a Contact list (list of email addresses) or a
 #. * regular contact for one person/organization/...
-#: ../addressbook/libebook-contacts/e-contact.c:278
+#: ../addressbook/libebook-contacts/e-contact.c:286
 msgid "List"
 msgstr "清單"
 
@@ -749,454 +784,549 @@ msgstr "清單"
 #. * used to determine whether when sending to Contact lists the addresses should be
 #. * shown or not to other recipients - basically whether to use BCC field or CC
 #. * message header when sending messages to this Contact list.
-#: ../addressbook/libebook-contacts/e-contact.c:283
+#: ../addressbook/libebook-contacts/e-contact.c:291
 msgid "List Shows Addresses"
 msgstr "清單顯示位址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:285
+#: ../addressbook/libebook-contacts/e-contact.c:293
 msgid "Birth Date"
 msgstr "出生日期"
 
-#: ../addressbook/libebook-contacts/e-contact.c:286
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:887
+#: ../addressbook/libebook-contacts/e-contact.c:294
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:893
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #. Security fields
-#: ../addressbook/libebook-contacts/e-contact.c:289
+#: ../addressbook/libebook-contacts/e-contact.c:297
 msgid "X.509 Certificate"
 msgstr "X.509 證書"
 
-#: ../addressbook/libebook-contacts/e-contact.c:291
+#: ../addressbook/libebook-contacts/e-contact.c:299
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu 家用 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:292
+#: ../addressbook/libebook-contacts/e-contact.c:300
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu 家用 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:293
+#: ../addressbook/libebook-contacts/e-contact.c:301
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu 家用 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:294
+#: ../addressbook/libebook-contacts/e-contact.c:302
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu 工作 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:295
+#: ../addressbook/libebook-contacts/e-contact.c:303
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu 工作 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:296
+#: ../addressbook/libebook-contacts/e-contact.c:304
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu 工作 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:297
+#: ../addressbook/libebook-contacts/e-contact.c:305
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID 清單"
 
 #. Geo information
-#: ../addressbook/libebook-contacts/e-contact.c:300
+#: ../addressbook/libebook-contacts/e-contact.c:308
 msgid "Geographic Information"
 msgstr "地理資訊"
 
-#: ../addressbook/libebook-contacts/e-contact.c:302
+#: ../addressbook/libebook-contacts/e-contact.c:310
 msgid "Telephone"
 msgstr "電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:304
+#: ../addressbook/libebook-contacts/e-contact.c:312
 msgid "Skype Home Name 1"
 msgstr "Skype 住家名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:305
+#: ../addressbook/libebook-contacts/e-contact.c:313
 msgid "Skype Home Name 2"
 msgstr "Skype 住家名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:306
+#: ../addressbook/libebook-contacts/e-contact.c:314
 msgid "Skype Home Name 3"
 msgstr "Skype 住家名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:307
+#: ../addressbook/libebook-contacts/e-contact.c:315
 msgid "Skype Work Name 1"
 msgstr "Skype 工作名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:308
+#: ../addressbook/libebook-contacts/e-contact.c:316
 msgid "Skype Work Name 2"
 msgstr "Skype 工作名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:309
+#: ../addressbook/libebook-contacts/e-contact.c:317
 msgid "Skype Work Name 3"
 msgstr "Skype 工作名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:310
+#: ../addressbook/libebook-contacts/e-contact.c:318
 msgid "Skype Name List"
 msgstr "Skype 名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:312
+#: ../addressbook/libebook-contacts/e-contact.c:320
 msgid "SIP address"
 msgstr "SIP 位址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:314
+#: ../addressbook/libebook-contacts/e-contact.c:322
 msgid "Google Talk Home Name 1"
 msgstr "Google Talk 住家名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:315
+#: ../addressbook/libebook-contacts/e-contact.c:323
 msgid "Google Talk Home Name 2"
 msgstr "Google Talk 住家名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:316
+#: ../addressbook/libebook-contacts/e-contact.c:324
 msgid "Google Talk Home Name 3"
 msgstr "Google Talk 住家名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:317
+#: ../addressbook/libebook-contacts/e-contact.c:325
 msgid "Google Talk Work Name 1"
 msgstr "Google Talk 工作名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:318
+#: ../addressbook/libebook-contacts/e-contact.c:326
 msgid "Google Talk Work Name 2"
 msgstr "Google Talk 工作名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:319
+#: ../addressbook/libebook-contacts/e-contact.c:327
 msgid "Google Talk Work Name 3"
 msgstr "Google Talk 工作名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:320
+#: ../addressbook/libebook-contacts/e-contact.c:328
 msgid "Google Talk Name List"
 msgstr "Google Talk 名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:322
+#: ../addressbook/libebook-contacts/e-contact.c:330
 msgid "Twitter Name List"
 msgstr "Twitter 名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:1627
-#: ../addressbook/libebook/e-destination.c:883
+#: ../addressbook/libebook-contacts/e-contact.c:1635
+#: ../addressbook/libebook/e-destination.c:881
 msgid "Unnamed List"
 msgstr "未命名的清單"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:43
+#: ../addressbook/libebook-contacts/e-phone-number.c:41
 msgid "The library was built without phone number support."
 msgstr "程式庫組建時未加入電話號碼支援。"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:45
+#: ../addressbook/libebook-contacts/e-phone-number.c:43
 msgid "The phone number parser reported an yet unkown error code."
 msgstr "電話號碼分析器回報了不明的錯誤代碼。"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:47
+#: ../addressbook/libebook-contacts/e-phone-number.c:45
 msgid "Not a phone number"
 msgstr "不是電話號碼"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:49
+#: ../addressbook/libebook-contacts/e-phone-number.c:47
 msgid "Invalid country calling code"
 msgstr "無效的國家呼叫代碼"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:51
+#: ../addressbook/libebook-contacts/e-phone-number.c:49
 msgid ""
 "Remaining text after the country calling code is too short for a phone number"
 msgstr "國碼後的文字太短,不足電話號碼的長度"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:53
+#: ../addressbook/libebook-contacts/e-phone-number.c:51
 msgid "Text is too short for a phone number"
 msgstr "文字太短,不符合電話號碼格式"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:55
+#: ../addressbook/libebook-contacts/e-phone-number.c:53
 msgid "Text is too long for a phone number"
 msgstr "文字太長,不符合電話號碼格式"
 
-#: ../addressbook/libebook/e-book-client.c:749
+#: ../addressbook/libebook/e-book-client.c:807
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "不明的通訊錄屬性「%s」"
 
-#: ../addressbook/libebook/e-book-client.c:764
+#: ../addressbook/libebook/e-book-client.c:822
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "不能改變通訊錄屬性「%s」的數值"
 
-#: ../addressbook/libebook/e-book-client.c:1099
-#: ../addressbook/libebook/e-book-client.c:1274
-#: ../calendar/libecal/e-cal-client.c:1522
-#: ../calendar/libecal/e-cal-client.c:1704
+#: ../addressbook/libebook/e-book-client.c:1207
+#: ../addressbook/libebook/e-book-client.c:1382
+#: ../addressbook/libebook/e-book-client.c:1649
+#: ../calendar/libecal/e-cal-client.c:1530
+#: ../calendar/libecal/e-cal-client.c:1712
 #, c-format
 msgid "Unable to connect to '%s': "
 msgstr "無法連線至「%s」:"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:796
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:899
+#: ../addressbook/libedata-book/e-book-sqlite.c:2163
 #, c-format
 msgid "Error introspecting unknown summary field '%s'"
 msgstr "插補不明的摘要欄位「%s」時發生錯誤"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1295
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1509
+#: ../addressbook/libedata-book/e-book-sqlite.c:1319
 msgid "Error parsing regular expression"
 msgstr "解析正規表示式時發生錯誤"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1340
-#: ../camel/camel-db.c:544
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1554
+#: ../addressbook/libedata-book/e-book-sqlite.c:1803 ../camel/camel-db.c:545
 #, c-format
 msgid "Insufficient memory"
 msgstr "記憶體不足"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1473
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1691
 #, c-format
 msgid "Invalid contact field '%d' specified in summary"
 msgstr "在摘要中指定了無效的聯絡人欄位「%d」"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1507
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1725
+#: ../addressbook/libedata-book/e-book-sqlite.c:557
 #, c-format
 msgid ""
 "Contact field '%s' of type '%s' specified in summary, but only boolean, "
 "string and string list field types are supported"
 msgstr "在摘要中指定了類型「%2$s」的聯絡人欄位「%1$s」,但是只支援邏輯值、字串及字串清單欄位類型"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2695
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3772
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3065
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4161
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. vcards cannot be returned."
 msgstr "完整搜尋聯絡人未儲存於快取。不能傳回 vcard。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3898
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3979
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385
+#: ../addressbook/libedata-book/e-book-sqlite.c:5364
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr "查詢包含了不支援的元素"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3902
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4296
 #, c-format
 msgid "Invalid Query"
 msgstr "無效的查詢"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3926
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4320
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
 "supported."
 msgstr "完整搜尋聯絡人未儲存於快取。因此只支援摘要查詢。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3983
-#: ../addressbook/libedata-book/e-data-book.c:358
-#: ../addressbook/libedata-book/e-data-book.c:992
-#: ../calendar/libedata-cal/e-data-cal.c:412
-#: ../calendar/libedata-cal/e-data-cal.c:1299 ../libedataserver/e-client.c:164
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4389
+#: ../addressbook/libedata-book/e-data-book.c:383
+#: ../addressbook/libedata-book/e-data-book.c:1028
+#: ../calendar/libedata-cal/e-data-cal.c:420
+#: ../calendar/libedata-cal/e-data-cal.c:1307 ../libedataserver/e-client.c:172
 #, c-format
 msgid "Invalid query"
 msgstr "無效的查詢"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4026
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4432
 #, c-format
 msgid ""
 "Full vcards are not stored in cache. Hence only summary query is supported."
 msgstr "完整 vcard 未儲存於快取。因此只支援摘要查詢。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4729
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5255
 #, c-format
 msgid "Unable to remove the db file: errno %d"
 msgstr "無法移除 db 檔案:錯誤 %d"
 
-#: ../addressbook/libedata-book/e-data-book.c:342
-#: ../calendar/libedata-cal/e-data-cal.c:393
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6042
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6442
+#, c-format
+msgid "Only summary queries are supported by EbSdbCursor"
+msgstr "EbSdbCursor 只支援摘要查詢。"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6049
+#, c-format
+msgid "At least one sort field must be specified to use an EbSdbCursor"
+msgstr "必須選擇至少一項排序欄位使用 EbSdbCursor"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6063
+#, c-format
+msgid "Cannot sort by a field that is not in the summary"
+msgstr "不能排序不在摘要中的欄位"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6070
+#, c-format
+msgid "Cannot sort by a field which may have multiple values"
+msgstr "不能排序可能含有多重數值的欄位"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203
+#: ../addressbook/libedata-book/e-book-sqlite.c:7376
+#, c-format
+msgid ""
+"Tried to step a cursor in reverse, but cursor is already at the beginning of "
+"the contact list"
+msgstr "嘗試反向推進游標,但是游標已在聯絡人清單的開頭"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
+#: ../addressbook/libedata-book/e-book-sqlite.c:7384
+#, c-format
+msgid ""
+"Tried to step a cursor forwards, but cursor is already at the end of the "
+"contact list"
+msgstr "嘗試推進游標,但是游標已在聯絡人清單的結尾"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:524
+#, c-format
+msgid "Unsupported contact field '%d' specified in summary"
+msgstr "在摘要中指定了不支援的聯絡人欄位「%d」"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:1876
+msgid ""
+"Cannot upgrade contacts database from a legacy database with more than one "
+"addressbook. Delete one of the entries in the 'folders' table first."
+msgstr "有一個以上通訊錄時不能從傳統資料庫升級聯絡人資料庫。請先在「folders」表格中刪除其中一個項目。"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:5357
+#, c-format
+msgid "Invalid query: %s"
+msgstr "無效的查詢:%s"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:5532
+msgid "Invalid query for EbSqlCursor"
+msgstr "EbSqlCursor 的無效查詢"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:7198
+msgid "At least one sort field must be specified to use an EbSqlCursor"
+msgstr "要使用 EbSqlCursor 你必須指定至少一個排序欄位"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:7216
+msgid "Cannot sort by a field that is not a string type"
+msgstr "不能排序不是字串類型的欄位"
+
+#: ../addressbook/libedata-book/e-data-book.c:367
+#: ../calendar/libedata-cal/e-data-cal.c:401
 msgid "Success"
 msgstr "成功"
 
-#: ../addressbook/libedata-book/e-data-book.c:343
-#: ../calendar/libecal/e-cal.c:2303 ../calendar/libedata-cal/e-data-cal.c:394
-#: ../libedataserver/e-client.c:131
+#: ../addressbook/libedata-book/e-data-book.c:368
+#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:402
+#: ../libedataserver/e-client.c:139
 msgid "Backend is busy"
 msgstr "後端忙碌中"
 
-#: ../addressbook/libedata-book/e-data-book.c:344
-#: ../calendar/libedata-cal/e-data-cal.c:395 ../libedataserver/e-client.c:141
+#: ../addressbook/libedata-book/e-data-book.c:369
+#: ../calendar/libedata-cal/e-data-cal.c:403 ../libedataserver/e-client.c:149
 msgid "Repository offline"
 msgstr "資料庫離線"
 
-#: ../addressbook/libedata-book/e-data-book.c:345
-#: ../calendar/libecal/e-cal.c:2317 ../calendar/libedata-cal/e-data-cal.c:396
-#: ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:370
+#: ../calendar/libecal/e-cal.c:2316 ../calendar/libedata-cal/e-data-cal.c:404
+#: ../libedataserver/e-client.c:156
 msgid "Permission denied"
 msgstr "權限不足"
 
-#: ../addressbook/libedata-book/e-data-book.c:348
-#: ../calendar/libedata-cal/e-data-cal.c:401
+#: ../addressbook/libedata-book/e-data-book.c:373
+#: ../calendar/libedata-cal/e-data-cal.c:409
 msgid "Authentication Failed"
 msgstr "核對失敗"
 
-#: ../addressbook/libedata-book/e-data-book.c:349
-#: ../calendar/libedata-cal/e-data-cal.c:402
+#: ../addressbook/libedata-book/e-data-book.c:374
+#: ../calendar/libedata-cal/e-data-cal.c:410
 msgid "Authentication Required"
 msgstr "要求核對"
 
-#: ../addressbook/libedata-book/e-data-book.c:350
-#: ../calendar/libedata-cal/e-data-cal.c:403
+#: ../addressbook/libedata-book/e-data-book.c:375
+#: ../calendar/libedata-cal/e-data-cal.c:411
 msgid "Unsupported field"
 msgstr "不支援的欄位"
 
-#: ../addressbook/libedata-book/e-data-book.c:351
-#: ../calendar/libedata-cal/e-data-cal.c:405 ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:376
+#: ../calendar/libedata-cal/e-data-cal.c:413 ../libedataserver/e-client.c:164
 msgid "Unsupported authentication method"
 msgstr "不支援的核對方法"
 
-#: ../addressbook/libedata-book/e-data-book.c:352
-#: ../calendar/libedata-cal/e-data-cal.c:406 ../libedataserver/e-client.c:158
+#: ../addressbook/libedata-book/e-data-book.c:377
+#: ../calendar/libedata-cal/e-data-cal.c:414 ../libedataserver/e-client.c:166
 msgid "TLS not available"
 msgstr "無法使用 TLS"
 
-#: ../addressbook/libedata-book/e-data-book.c:353
+#: ../addressbook/libedata-book/e-data-book.c:378
 msgid "Address book does not exist"
 msgstr "通訊錄不存在"
 
-#: ../addressbook/libedata-book/e-data-book.c:354
+#: ../addressbook/libedata-book/e-data-book.c:379
 msgid "Book removed"
 msgstr "通訊錄已經移除"
 
-#: ../addressbook/libedata-book/e-data-book.c:355
-#: ../calendar/libedata-cal/e-data-cal.c:409
+#: ../addressbook/libedata-book/e-data-book.c:380
+#: ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Not available in offline mode"
 msgstr "無法在離線模式下使用"
 
-#: ../addressbook/libedata-book/e-data-book.c:356
-#: ../calendar/libedata-cal/e-data-cal.c:410 ../libedataserver/e-client.c:160
+#: ../addressbook/libedata-book/e-data-book.c:381
+#: ../calendar/libedata-cal/e-data-cal.c:418 ../libedataserver/e-client.c:168
 msgid "Search size limit exceeded"
 msgstr "超過搜尋大小限制"
 
-#: ../addressbook/libedata-book/e-data-book.c:357
-#: ../calendar/libedata-cal/e-data-cal.c:411 ../libedataserver/e-client.c:162
+#: ../addressbook/libedata-book/e-data-book.c:382
+#: ../calendar/libedata-cal/e-data-cal.c:419 ../libedataserver/e-client.c:170
 msgid "Search time limit exceeded"
 msgstr "超過搜尋時間限制"
 
-#: ../addressbook/libedata-book/e-data-book.c:359
-#: ../calendar/libedata-cal/e-data-cal.c:413 ../libedataserver/e-client.c:166
+#: ../addressbook/libedata-book/e-data-book.c:384
+#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:174
 msgid "Query refused"
 msgstr "查詢被拒絕"
 
-#: ../addressbook/libedata-book/e-data-book.c:360
-#: ../calendar/libedata-cal/e-data-cal.c:414 ../libedataserver/e-client.c:152
+#: ../addressbook/libedata-book/e-data-book.c:385
+#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:160
 msgid "Could not cancel"
 msgstr "無法取消"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,                   N_("Other error") },
 #. { OtherError,                       N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:362
-#: ../calendar/libedata-cal/e-data-cal.c:416
+#: ../addressbook/libedata-book/e-data-book.c:387
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Invalid server version"
 msgstr "無效的伺服器版本"
 
-#: ../addressbook/libedata-book/e-data-book.c:364
-#: ../calendar/libecal/e-cal.c:2301 ../calendar/libedata-cal/e-data-cal.c:417
-#: ../libedataserver/e-client.c:129
+#: ../addressbook/libedata-book/e-data-book.c:389
+#: ../calendar/libecal/e-cal.c:2300 ../calendar/libedata-cal/e-data-cal.c:425
+#: ../libedataserver/e-client.c:137
 msgid "Invalid argument"
 msgstr "無效的參數"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:366
-#: ../calendar/libecal/e-cal.c:1060 ../calendar/libecal/e-cal.c:1428
-#: ../calendar/libecal/e-cal.c:1908 ../calendar/libecal/e-cal.c:2340
-#: ../calendar/libedata-cal/e-data-cal.c:419 ../libedataserver/e-client.c:154
+#: ../addressbook/libedata-book/e-data-book.c:391
+#: ../calendar/libecal/e-cal.c:1059 ../calendar/libecal/e-cal.c:1427
+#: ../calendar/libecal/e-cal.c:1907 ../calendar/libecal/e-cal.c:2339
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:162
 #, c-format
 msgid "Not supported"
 msgstr "不支援"
 
-#: ../addressbook/libedata-book/e-data-book.c:367
-#: ../calendar/libedata-cal/e-data-cal.c:420 ../libedataserver/e-client.c:172
+#: ../addressbook/libedata-book/e-data-book.c:392
+#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:180
 msgid "Backend is not opened yet"
 msgstr "後端尚未開啟"
 
-#: ../addressbook/libedata-book/e-data-book.c:368
-#: ../libedataserver/e-client.c:174
+#: ../addressbook/libedata-book/e-data-book.c:393
+#: ../libedataserver/e-client.c:182
 msgid "Object is out of sync"
 msgstr "物件沒有同步"
 
-#: ../addressbook/libedata-book/e-data-book.c:376
-#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:170
+#: ../addressbook/libedata-book/e-data-book.c:401
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:178
 msgid "Other error"
 msgstr "其他錯誤"
 
-#: ../addressbook/libedata-book/e-data-book.c:1017
-#: ../calendar/libedata-cal/e-data-cal.c:1324
+#: ../addressbook/libedata-book/e-data-book.c:1053
+#: ../calendar/libedata-cal/e-data-cal.c:1332
 msgid "Invalid query: "
 msgstr "無效的查詢:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1069
+#: ../addressbook/libedata-book/e-data-book.c:1272
 msgid "Cannot open book: "
 msgstr "不能開啟通訊錄:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1106
+#: ../addressbook/libedata-book/e-data-book.c:1309
 msgid "Cannot refresh address book: "
 msgstr "不能重新整理通訊錄:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1137
+#: ../addressbook/libedata-book/e-data-book.c:1340
 msgid "Cannot get contact: "
 msgstr "不能取得聯絡人:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1175
+#: ../addressbook/libedata-book/e-data-book.c:1378
 msgid "Cannot get contact list: "
 msgstr "不能取得聯絡人清單:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1227
+#: ../addressbook/libedata-book/e-data-book.c:1430
 msgid "Cannot get contact list uids: "
 msgstr "不能取得聯絡人清單 uid:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1274
+#: ../addressbook/libedata-book/e-data-book.c:1477
 msgid "Cannot add contact: "
 msgstr "不能加入聯絡人:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1323
+#: ../addressbook/libedata-book/e-data-book.c:1526
 msgid "Cannot modify contacts: "
 msgstr "不能修改聯絡人"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1365
+#: ../addressbook/libedata-book/e-data-book.c:1568
 msgid "Cannot remove contacts: "
 msgstr "不能移除聯絡人:"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:273
-#: ../calendar/libedata-cal/e-data-cal-factory.c:276
+#: ../addressbook/libedata-book/e-data-book-cursor.c:772
+msgid "Cursor does not support setting the search expression"
+msgstr "游標不支援設定搜尋正規表示式"
+
+#: ../addressbook/libedata-book/e-data-book-cursor.c:855
+msgid "Cursor does not support step"
+msgstr "游標並不支援步進"
+
+#: ../addressbook/libedata-book/e-data-book-cursor.c:938
+msgid "Cursor does not support alphabetic indexes"
+msgstr "游標不支援字母排列索引"
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:268
+msgid "Unrecognized cursor origin"
+msgstr "無法辨識的游標原始"
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:336
+#, fuzzy
+msgid "Out of sync revision while moving cursor"
+msgstr "嘗試不使用同步修訂來修改聯絡人「%s」"
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:430
+msgid "Alphabetic index was set for incorrect locale"
+msgstr "字母排序索引設定了不正確地區"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:289
+#: ../calendar/libedata-cal/e-data-cal-factory.c:285
 #, c-format
 msgid "No backend name in source '%s'"
 msgstr "來源「%s」中沒有後端名稱"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:324
-#: ../calendar/libedata-cal/e-data-cal-factory.c:330
+#: ../addressbook/libedata-book/e-data-book-factory.c:377
+#: ../calendar/libedata-cal/e-data-cal-factory.c:339
 #, c-format
 msgid "Missing source UID"
 msgstr "缺少來源 UID"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:335
-#: ../calendar/libedata-cal/e-data-cal-factory.c:340
+#: ../addressbook/libedata-book/e-data-book-factory.c:388
+#: ../calendar/libedata-cal/e-data-cal-factory.c:349
 #, c-format
 msgid "No such source for UID '%s'"
 msgstr "沒有 UID「%s」的這類來源"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:566
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:572
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "無法連接伺服器 (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:597
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:603
 #, c-format
 msgid "Failed to connect to a server using SSL: %s"
 msgstr "無法使用 SSL 連線至伺服器:%s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:608
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:614
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "HTTP 回應未預期的狀態碼 %d (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:627
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:633
 msgid "CalDAV backend is not loaded yet"
 msgstr "CalDAV 後端尚未載入"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1048
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1070
 msgid "Invalid Redirect URL"
 msgstr "無效的重新導向 URL"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2525
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2917
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2562
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2927
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1205,438 +1335,461 @@ msgstr ""
 "無法連接伺服器,行事曆會以唯讀模式開啟。\n"
 "錯誤訊息:%s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2869
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "不能建立本地快取資料夾「%s」"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3957
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3967
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV 不支援大量增加"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4060
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4070
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV 不支援大量修改"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4236
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4246
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV 不支援大量移除"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4903
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4913
 msgid "Calendar doesn't support Free/Busy"
 msgstr "行事曆不支援空閒/忙碌"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4912
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4922
 msgid "Schedule outbox url not found"
 msgstr "找不到排程的寄件匣 url"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5009
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5019
 msgid "Unexpected result in schedule-response"
 msgstr "在排程-回應中未預期的結果"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:889
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:895
 msgid "Birthday"
 msgstr "生日"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:925
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:931
 #, c-format
 msgid "Birthday: %s"
 msgstr "生日:%s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:956
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:962
 #, c-format
 msgid "Anniversary: %s"
 msgstr "紀念日:%s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:245
+#: ../calendar/backends/file/e-cal-backend-file.c:244
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "無法儲存行事曆資料:URI 的格式不正確。"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:252
-#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:251
+#: ../calendar/backends/file/e-cal-backend-file.c:257
 msgid "Cannot save calendar data"
 msgstr "不能儲存行事曆資料"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:479
+#: ../calendar/backends/http/e-cal-backend-http.c:483
 #, c-format
 msgid "Malformed URI: %s"
 msgstr "格式不良的 URI:%s"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:570
+#: ../calendar/backends/http/e-cal-backend-http.c:574
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "重新指向無效的 URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:613
+#: ../calendar/backends/http/e-cal-backend-http.c:617
 #, c-format
 msgid "Bad file format."
 msgstr "錯誤的檔案格式。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:623
+#: ../calendar/backends/http/e-cal-backend-http.c:627
 #, c-format
 msgid "Not a calendar."
 msgstr "並非行事曆。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:927
-#: ../calendar/backends/weather/e-cal-backend-weather.c:514
+#: ../calendar/backends/http/e-cal-backend-http.c:914
+#: ../calendar/backends/weather/e-cal-backend-weather.c:536
 msgid "Could not create cache file"
 msgstr "無法建立快取檔案"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:173
+#: ../calendar/backends/weather/e-cal-backend-weather.c:174
 msgid "Could not retrieve weather data"
 msgstr "無法取得天氣資料"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:295
 msgid "Weather: Fog"
 msgstr "天氣:起霧"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:296
 msgid "Weather: Cloudy Night"
 msgstr "天氣:多雲的夜晚"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:297
 msgid "Weather: Cloudy"
 msgstr "天氣:多雲"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:298
 msgid "Weather: Overcast"
 msgstr "天氣:多雲"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:299
 msgid "Weather: Showers"
 msgstr "天氣:陣雨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:300
 msgid "Weather: Snow"
 msgstr "天氣:下雪"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:301
 msgid "Weather: Clear Night"
 msgstr "天氣:晴朗的夜晚"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:302
 msgid "Weather: Sunny"
 msgstr "天氣:艷陽"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:303
 msgid "Weather: Thunderstorms"
 msgstr "天氣:雷暴"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:416
+#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
+#: ../calendar/backends/weather/e-cal-backend-weather.c:329
+#, c-format
+msgid "%.1f °F"
+msgstr "%.1f °F"
+
+#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
+#: ../calendar/backends/weather/e-cal-backend-weather.c:332
+#, c-format
+msgid "%.1f °C"
+msgstr "%.1f °C"
+
+#. TRANSLATOR: This is the temperature in kelvin
+#: ../calendar/backends/weather/e-cal-backend-weather.c:335
+#, c-format
+msgid "%.1f K"
+msgstr "%.1f K"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:341
+#, c-format
+msgid "%.1f"
+msgstr "%.1f"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:452
 msgid "Forecast"
 msgstr "天氣預報"
 
-#: ../calendar/libecal/e-cal.c:2305
+#: ../calendar/libecal/e-cal.c:2304
 msgid "Repository is offline"
 msgstr "倉庫已離線"
 
-#: ../calendar/libecal/e-cal.c:2307 ../calendar/libecal/e-cal-client.c:255
+#: ../calendar/libecal/e-cal.c:2306 ../calendar/libecal/e-cal-client.c:263
 msgid "No such calendar"
 msgstr "無此行事曆"
 
-#: ../calendar/libecal/e-cal.c:2309 ../calendar/libecal/e-cal-client.c:257
-#: ../calendar/libedata-cal/e-data-cal.c:398
+#: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:265
+#: ../calendar/libedata-cal/e-data-cal.c:406
 msgid "Object not found"
 msgstr "找不到物件"
 
-#: ../calendar/libecal/e-cal.c:2311 ../calendar/libecal/e-cal-client.c:259
-#: ../calendar/libedata-cal/e-data-cal.c:399
+#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:267
+#: ../calendar/libedata-cal/e-data-cal.c:407
 msgid "Invalid object"
 msgstr "無效的物件"
 
-#: ../calendar/libecal/e-cal.c:2313
+#: ../calendar/libecal/e-cal.c:2312
 msgid "URI not loaded"
 msgstr "URI 未載入"
 
-#: ../calendar/libecal/e-cal.c:2315
+#: ../calendar/libecal/e-cal.c:2314
 msgid "URI already loaded"
 msgstr "URI 已載入"
 
-#: ../calendar/libecal/e-cal.c:2319
+#: ../calendar/libecal/e-cal.c:2318
 msgid "Unknown User"
 msgstr "不明的使用者"
 
-#: ../calendar/libecal/e-cal.c:2321 ../calendar/libecal/e-cal-client.c:263
-#: ../calendar/libedata-cal/e-data-cal.c:400
+#: ../calendar/libecal/e-cal.c:2320 ../calendar/libecal/e-cal-client.c:271
+#: ../calendar/libedata-cal/e-data-cal.c:408
 msgid "Object ID already exists"
 msgstr "物件 ID 已存在"
 
-#: ../calendar/libecal/e-cal.c:2323
+#: ../calendar/libecal/e-cal.c:2322
 msgid "Protocol not supported"
 msgstr "通訊協定不支援"
 
-#: ../calendar/libecal/e-cal.c:2325
+#: ../calendar/libecal/e-cal.c:2324
 msgid "Operation has been canceled"
 msgstr "操作已取消"
 
-#: ../calendar/libecal/e-cal.c:2327
+#: ../calendar/libecal/e-cal.c:2326
 msgid "Could not cancel operation"
 msgstr "無法取消操作"
 
-#: ../calendar/libecal/e-cal.c:2329 ../libedataserver/e-client.c:137
+#: ../calendar/libecal/e-cal.c:2328 ../libedataserver/e-client.c:145
 msgid "Authentication failed"
 msgstr "核對失敗"
 
-#: ../calendar/libecal/e-cal.c:2331
-#: ../camel/providers/smtp/camel-smtp-transport.c:911
-#: ../libedataserver/e-client.c:139
+#: ../calendar/libecal/e-cal.c:2330
+#: ../camel/providers/smtp/camel-smtp-transport.c:921
+#: ../libedataserver/e-client.c:147
 msgid "Authentication required"
 msgstr "要求核對"
 
-#: ../calendar/libecal/e-cal.c:2333
+#: ../calendar/libecal/e-cal.c:2332
 msgid "A D-Bus exception has occurred"
 msgstr "發生 D-Bus 例外"
 
-#: ../calendar/libecal/e-cal.c:2337
+#: ../calendar/libecal/e-cal.c:2336
 msgid "No error"
 msgstr "沒有錯誤"
 
-#: ../calendar/libecal/e-cal-client.c:261
-#: ../calendar/libedata-cal/e-data-cal.c:408
+#: ../calendar/libecal/e-cal-client.c:269
+#: ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Unknown user"
 msgstr "不明的使用者"
 
-#: ../calendar/libecal/e-cal-client.c:265
-#: ../calendar/libedata-cal/e-data-cal.c:397
+#: ../calendar/libecal/e-cal-client.c:273
+#: ../calendar/libedata-cal/e-data-cal.c:405
 msgid "Invalid range"
 msgstr "無效的範圍"
 
-#: ../calendar/libecal/e-cal-client.c:928
+#: ../calendar/libecal/e-cal-client.c:936
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "不明的行事曆屬性「%s」"
 
-#: ../calendar/libecal/e-cal-client.c:943
+#: ../calendar/libecal/e-cal-client.c:951
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "不能改變行事曆屬性「%s」的數值"
 
-#: ../calendar/libecal/e-cal-component.c:1340
+#: ../calendar/libecal/e-cal-component.c:1348
 msgid "Untitled appointment"
 msgstr "未命名的約會"
 
-#: ../calendar/libecal/e-cal-recur.c:4036
+#: ../calendar/libecal/e-cal-recur.c:4037
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/libecal/e-cal-recur.c:4037
+#: ../calendar/libecal/e-cal-recur.c:4038
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/libecal/e-cal-recur.c:4038
+#: ../calendar/libecal/e-cal-recur.c:4039
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/libecal/e-cal-recur.c:4039
+#: ../calendar/libecal/e-cal-recur.c:4040
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/libecal/e-cal-recur.c:4040
+#: ../calendar/libecal/e-cal-recur.c:4041
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:4042
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:4043
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:4044
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:4045
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:4046
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:4047
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:4048
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:4049
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:4050
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:4051
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:4052
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:4053
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:4054
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:4055
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4056
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4057
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4058
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4059
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4060
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4061
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4062
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4063
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4064
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4065
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4066
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4067
 msgid "31st"
 msgstr "31日"
 
-#: ../calendar/libecal/e-cal-util.c:707 ../calendar/libecal/e-cal-util.c:734
+#: ../calendar/libecal/e-cal-util.c:706 ../calendar/libecal/e-cal-util.c:733
 msgctxt "Priority"
 msgid "High"
 msgstr "高"
 
-#: ../calendar/libecal/e-cal-util.c:709 ../calendar/libecal/e-cal-util.c:736
+#: ../calendar/libecal/e-cal-util.c:708 ../calendar/libecal/e-cal-util.c:735
 msgctxt "Priority"
 msgid "Normal"
 msgstr "中"
 
-#: ../calendar/libecal/e-cal-util.c:711 ../calendar/libecal/e-cal-util.c:738
+#: ../calendar/libecal/e-cal-util.c:710 ../calendar/libecal/e-cal-util.c:737
 msgctxt "Priority"
 msgid "Low"
 msgstr "低"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:732
+#: ../calendar/libecal/e-cal-util.c:731
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "未定義"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:78
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1056
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1365
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1492
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1541
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:84
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1062
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1371
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1498
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1547
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "「%s」需要一個引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1372
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1380
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:91
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:673
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1378
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1386
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "「%s」的第一個引數必須為字串"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
 #, c-format
 msgid "\"%s\" expects two or three arguments"
 msgstr "「%s」需要二或三個引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:256
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1441
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1499
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1548
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:173
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:262
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:324
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:823
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1069
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1447
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1505
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1554
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "「%s」的第一個引數必須為 time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:264
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:328
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:826
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:270
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:334
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "「%s」的第二個引數必須為 time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:186
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:192
 #, c-format
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "「%s」的第三個引數必須為字串"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:248
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
 #, c-format
 msgid "\"%s\" expects none or two arguments"
 msgstr "「%s」需要零或二個引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:311
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:660
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:810
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1434
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:317
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:666
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:816
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1440
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "「%s」需要兩個引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:596
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:619
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:742
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:774
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:981
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1014
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1326
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:602
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:625
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:748
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:780
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1332
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "「%s」不需要引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:682
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "「%s」的第二個引數必須為字串"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:707
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:713
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1644,363 +1797,294 @@ msgid ""
 "\"classification\""
 msgstr "「%s」的第一個引數必須為「任何」、「摘要」之一,或「描述」、「位置」、「到會者」、「召集人」、「分類」其中之一"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "「%s」需要至少一個引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:893
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:899
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
 msgstr "「%s」的所有引數必須為字串,或只有一個引數為邏輯偽值 (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1389
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1395
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "「%s」的第一個引數必須為 ISO 8601 日期/時間字串"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1450
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1456
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "「%s」的第二個引數必須為整數"
 
-#: ../calendar/libedata-cal/e-data-cal.c:404
+#: ../calendar/libedata-cal/e-data-cal.c:412
 msgid "Unsupported method"
 msgstr "不支援的方法"
 
-#: ../calendar/libedata-cal/e-data-cal.c:407
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Calendar does not exist"
 msgstr "行事曆不存在"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1495
+#: ../calendar/libedata-cal/e-data-cal.c:1503
 msgid "Cannot open calendar: "
 msgstr "不能開啟行事曆:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1532
+#: ../calendar/libedata-cal/e-data-cal.c:1540
 msgid "Cannot refresh calendar: "
 msgstr "不能重新整理行事曆:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1573
+#: ../calendar/libedata-cal/e-data-cal.c:1581
 msgid "Cannot retrieve calendar object path: "
 msgstr "不能取得行事曆物件路徑:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1625
+#: ../calendar/libedata-cal/e-data-cal.c:1633
 msgid "Cannot retrieve calendar object list: "
 msgstr "不能取得行事曆物件清單:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1676
+#: ../calendar/libedata-cal/e-data-cal.c:1684
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "不能取得行事曆空閒/忙碌清單:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1719
+#: ../calendar/libedata-cal/e-data-cal.c:1727
 msgid "Cannot create calendar object: "
 msgstr "不能建立行事曆物件:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1787
+#: ../calendar/libedata-cal/e-data-cal.c:1795
 msgid "Cannot modify calendar object: "
 msgstr "不能修改行事曆物件:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1865
+#: ../calendar/libedata-cal/e-data-cal.c:1873
 msgid "Cannot remove calendar object: "
 msgstr "不能移除行事曆物件:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1951
+#: ../calendar/libedata-cal/e-data-cal.c:1959
 msgid "Cannot receive calendar objects: "
 msgstr "不能取得行事曆物件:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1994
+#: ../calendar/libedata-cal/e-data-cal.c:2002
 msgid "Cannot send calendar objects: "
 msgstr "不能傳送行事曆物件:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2046
+#: ../calendar/libedata-cal/e-data-cal.c:2054
 msgid "Could not retrieve attachment uris: "
 msgstr "無法取得附件 URI:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2091
+#: ../calendar/libedata-cal/e-data-cal.c:2099
 msgid "Could not discard reminder: "
 msgstr "無法取消提醒:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2132
+#: ../calendar/libedata-cal/e-data-cal.c:2140
 msgid "Could not retrieve calendar time zone: "
 msgstr "無法取得行事曆時區:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2172
+#: ../calendar/libedata-cal/e-data-cal.c:2180
 msgid "Could not add calendar time zone: "
 msgstr "無法加入行事曆時區:"
 
-#: ../camel/camel-cipher-context.c:208
+#: ../camel/camel-cipher-context.c:200
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "這種加密方式不支援簽署"
 
-#: ../camel/camel-cipher-context.c:221
+#: ../camel/camel-cipher-context.c:213
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "這種加密方式不支援驗證簽署"
 
-#: ../camel/camel-cipher-context.c:237
+#: ../camel/camel-cipher-context.c:229
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "這種加密方式不支援加密"
 
-#: ../camel/camel-cipher-context.c:251
+#: ../camel/camel-cipher-context.c:243
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "這種加密方式不支援解密"
 
-#: ../camel/camel-cipher-context.c:264
-#, c-format
-msgid "You may not import keys with this cipher"
-msgstr "你不能匯入這種加密方式的密碼匙"
-
-#: ../camel/camel-cipher-context.c:278
-#, c-format
-msgid "You may not export keys with this cipher"
-msgstr "你不能匯出這種加密方式的密碼匙"
-
-#: ../camel/camel-cipher-context.c:819
+#: ../camel/camel-cipher-context.c:359
 msgid "Signing message"
 msgstr "正在簽署訊息"
 
-#: ../camel/camel-cipher-context.c:1060
+#: ../camel/camel-cipher-context.c:649
 msgid "Encrypting message"
 msgstr "正在加密訊息"
 
-#: ../camel/camel-cipher-context.c:1187
+#: ../camel/camel-cipher-context.c:821
 msgid "Decrypting message"
 msgstr "正在解密訊息"
 
-#: ../camel/camel-data-cache.c:181
+#: ../camel/camel-data-cache.c:179
 #, c-format
 msgid "Unable to create cache path"
 msgstr "無法建立快取路徑"
 
-#: ../camel/camel-data-cache.c:440
+#: ../camel/camel-data-cache.c:449
 msgid "Empty cache file"
 msgstr "清空快取檔案"
 
-#: ../camel/camel-data-cache.c:509
+#: ../camel/camel-data-cache.c:522
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "無法移除快取項目: %s: %s"
 
-#: ../camel/camel-disco-diary.c:207
-#, c-format
-msgid ""
-"Could not write log entry: %s\n"
-"Further operations on this server will not be replayed when you\n"
-"reconnect to the network."
-msgstr ""
-"無法寫入紀錄: %s\n"
-"接下來在此伺服器上的操作,在你重新連線到網絡時\n"
-"將不會重播。"
-
-#: ../camel/camel-disco-diary.c:279
-#, c-format
-msgid ""
-"Could not open '%s':\n"
-"%s\n"
-"Changes made to this folder will not be resynchronized."
-msgstr ""
-"無法開啟「%s」:\n"
-"%s\n"
-"這個資料夾內所做的更改將不會重新同步。"
-
-#: ../camel/camel-disco-diary.c:326
-msgid "Resynchronizing with server"
-msgstr "與伺服器重新同步"
-
-#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93
-msgid "Downloading new messages for offline mode"
-msgstr "正在下載新訊息用於離線模式"
-
-#: ../camel/camel-disco-folder.c:422
-#, c-format
-msgid "Preparing folder '%s' for offline"
-msgstr "準備資料夾「%s」供離線使用"
-
-#: ../camel/camel-disco-folder.c:489 ../camel/camel-offline-folder.c:336
-msgid "Copy folder content locally for _offline operation"
-msgstr "複製資料夾內容至本地用於離線作業(_O)"
-
-#: ../camel/camel-disco-store.c:518 ../camel/camel-imapx-store.c:618
-#: ../camel/camel-imapx-store.c:2242
-#: ../camel/providers/pop3/camel-pop3-folder.c:596
-#: ../camel/providers/pop3/camel-pop3-folder.c:746
-#: ../camel/providers/pop3/camel-pop3-folder.c:987
-#: ../camel/providers/pop3/camel-pop3-folder.c:1216
-#: ../camel/providers/pop3/camel-pop3-store.c:291
-#: ../camel/providers/pop3/camel-pop3-store.c:519
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../camel/providers/pop3/camel-pop3-store.c:659
-#: ../camel/providers/pop3/camel-pop3-store.c:1059
-#, c-format
-msgid "You must be working online to complete this operation"
-msgstr "你必須於網上工作才能完成此操作"
-
-#: ../camel/camel-file-utils.c:732
-#, c-format
-msgid "Canceled"
-msgstr "已取消"
-
-#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:797
+#: ../camel/camel-filter-driver.c:914 ../camel/camel-filter-search.c:795
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "無法建立子代處理 '%s':%s"
 
-#: ../camel/camel-filter-driver.c:964
+#: ../camel/camel-filter-driver.c:962
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "無法讀取 %s 的歡迎辭: %s"
 
-#: ../camel/camel-filter-driver.c:1171 ../camel/camel-filter-driver.c:1180
+#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
 msgid "Syncing folders"
 msgstr "同步處理資料夾"
 
-#: ../camel/camel-filter-driver.c:1278
+#: ../camel/camel-filter-driver.c:1276
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "分析過濾器發生錯誤: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1289
+#: ../camel/camel-filter-driver.c:1287
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "執行過濾器發生錯誤: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1385
+#: ../camel/camel-filter-driver.c:1383
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "無法開啟排程器資料夾"
 
-#: ../camel/camel-filter-driver.c:1397
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "無法處理排程器資料夾"
 
-#: ../camel/camel-filter-driver.c:1420
+#: ../camel/camel-filter-driver.c:1418
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "接收郵件 %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1429 ../camel/camel-filter-driver.c:1451
+#: ../camel/camel-filter-driver.c:1427 ../camel/camel-filter-driver.c:1449
 #, c-format
 msgid "Failed on message %d"
 msgstr "在第 %d 封郵件發生錯誤"
 
-#: ../camel/camel-filter-driver.c:1470 ../camel/camel-filter-driver.c:1584
+#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1582
 msgid "Syncing folder"
 msgstr "同步處理資料夾"
 
-#: ../camel/camel-filter-driver.c:1475 ../camel/camel-filter-driver.c:1592
+#: ../camel/camel-filter-driver.c:1473 ../camel/camel-filter-driver.c:1590
 msgid "Complete"
 msgstr "完成"
 
-#: ../camel/camel-filter-driver.c:1538
+#: ../camel/camel-filter-driver.c:1536
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "正在接收第 %d / %d 封郵件"
 
-#: ../camel/camel-filter-driver.c:1556
+#: ../camel/camel-filter-driver.c:1554
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d / %d 封郵件失敗"
 
-#: ../camel/camel-filter-driver.c:1752 ../camel/camel-filter-driver.c:1779
+#: ../camel/camel-filter-driver.c:1750 ../camel/camel-filter-driver.c:1777
 #, c-format
 msgid "Execution of filter '%s' failed: "
 msgstr "過濾器「%s」的執行失敗:"
 
-#: ../camel/camel-filter-driver.c:1769
+#: ../camel/camel-filter-driver.c:1767
 #, c-format
 msgid "Error parsing filter '%s': %s: %s"
 msgstr "分析過濾器「%s」發生錯誤:%s:%s"
 
-#: ../camel/camel-filter-driver.c:1788
+#: ../camel/camel-filter-driver.c:1786
 #, c-format
 msgid "Error executing filter '%s': %s: %s"
 msgstr "執行過濾器「%s」發生錯誤:%s:%s"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "取回郵件失敗。"
 
-#: ../camel/camel-filter-search.c:537
+#: ../camel/camel-filter-search.c:535
 msgid "Invalid arguments to (system-flag)"
 msgstr "無效的參數給 (system-flag)"
 
-#: ../camel/camel-filter-search.c:555
+#: ../camel/camel-filter-search.c:553
 msgid "Invalid arguments to (user-tag)"
 msgstr "無效的參數給 (user-tag)"
 
-#: ../camel/camel-filter-search.c:1046 ../camel/camel-filter-search.c:1055
+#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "執行過濾器搜尋發生錯誤: %s: %s"
 
-#: ../camel/camel-folder.c:311
+#: ../camel/camel-folder.c:300
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "正在學習「%s」中的新垃圾郵件"
 
-#: ../camel/camel-folder.c:351
+#: ../camel/camel-folder.c:340
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "正在學習「%s」中的 ham 郵件"
 
-#: ../camel/camel-folder.c:399
+#: ../camel/camel-folder.c:388
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "正在過濾「%s」中的新郵件"
 
-#: ../camel/camel-folder.c:1009
-#: ../camel/providers/local/camel-maildir-folder.c:321
+#: ../camel/camel-folder.c:988
+#: ../camel/providers/local/camel-maildir-folder.c:319
 msgid "Moving messages"
 msgstr "正在移動郵件"
 
-#: ../camel/camel-folder.c:1012
+#: ../camel/camel-folder.c:991
 msgid "Copying messages"
 msgstr "正在複製郵件"
 
-#: ../camel/camel-folder.c:1332
+#: ../camel/camel-folder.c:1033
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "資料夾「%s」不支援限額資訊"
 
-#: ../camel/camel-folder.c:3578
+#: ../camel/camel-folder.c:2847
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "刪除資料夾「%s」"
 
-#: ../camel/camel-folder.c:3810
+#: ../camel/camel-folder.c:2975
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "接收 %2$s 中的郵件「%1$s」"
 
-#: ../camel/camel-folder.c:3965
+#: ../camel/camel-folder.c:3166
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "取得「%s」的用量限額資訊"
 
-#: ../camel/camel-folder.c:4205
+#: ../camel/camel-folder.c:3466
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "重新整理資料夾「%s」"
@@ -2035,7 +2119,7 @@ msgstr "(%s) 期望陣列結果"
 msgid "(%s) requires the folder set"
 msgstr "(%s) 需要資料夾設定"
 
-#: ../camel/camel-folder-search.c:1930 ../camel/camel-folder-search.c:2096
+#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2044,7 +2128,7 @@ msgstr ""
 "不能分析搜尋詞句:%s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1942 ../camel/camel-folder-search.c:2108
+#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2053,18 +2137,18 @@ msgstr ""
 "執行搜尋詞句時發生錯誤:%s:\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:730 ../camel/camel-gpg-context.c:735
-#: ../camel/camel-gpg-context.c:1398
+#: ../camel/camel-gpg-context.c:721 ../camel/camel-gpg-context.c:726
+#: ../camel/camel-gpg-context.c:1383
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "執行 gpg 失敗: %s"
 
-#: ../camel/camel-gpg-context.c:735
-#: ../camel/providers/smtp/camel-smtp-transport.c:914
+#: ../camel/camel-gpg-context.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:924
 msgid "Unknown"
 msgstr "不明"
 
-#: ../camel/camel-gpg-context.c:800
+#: ../camel/camel-gpg-context.c:791
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2075,17 +2159,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:836
+#: ../camel/camel-gpg-context.c:827
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "解析 gpg userid 提示時失敗。"
 
-#: ../camel/camel-gpg-context.c:861 ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:852 ../camel/camel-gpg-context.c:867
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "解析 gpg 密語要求時失敗。"
 
-#: ../camel/camel-gpg-context.c:897
+#: ../camel/camel-gpg-context.c:888
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2094,7 +2178,7 @@ msgstr ""
 "需要 PIN 才能為你的智慧卡解鎖:\n"
 "「%s」"
 
-#: ../camel/camel-gpg-context.c:901
+#: ../camel/camel-gpg-context.c:892
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2103,67 +2187,65 @@ msgstr ""
 "你需要密語才能為此使用者的密碼匙解鎖:\n"
 "「%s」"
 
-#: ../camel/camel-gpg-context.c:907
+#: ../camel/camel-gpg-context.c:898
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG 傳回對「%s」未預期的要求"
 
-#: ../camel/camel-gpg-context.c:919
+#: ../camel/camel-gpg-context.c:910
 msgid ""
 "Note the encrypted content doesn't contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
 msgstr "注意加密的內容不會包含收件者資訊,因此每個儲存的私密密碼匙都會提示輸入密碼。"
 
-#: ../camel/camel-gpg-context.c:950 ../camel/camel-net-utils.c:524
-#: ../camel/camel-tcp-stream-raw.c:268
-#: ../camel/providers/nntp/camel-nntp-summary.c:402
-#: ../libedataserver/e-client.c:150
+#: ../camel/camel-gpg-context.c:941 ../camel/camel-net-utils.c:522
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
+#: ../libedataserver/e-client.c:158
 #, c-format
 msgid "Cancelled"
 msgstr "已取消"
 
-#: ../camel/camel-gpg-context.c:971
+#: ../camel/camel-gpg-context.c:962
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "解鎖私密密碼匙時失敗:輸入了 3 次錯誤的密語 。"
 
-#: ../camel/camel-gpg-context.c:984
+#: ../camel/camel-gpg-context.c:975
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "從 GnuPG 傳回意外的回應: %s"
 
-#: ../camel/camel-gpg-context.c:1115
+#: ../camel/camel-gpg-context.c:1106
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "不能加密郵件:沒有提供有效的收件者。"
 
-#: ../camel/camel-gpg-context.c:1665 ../camel/camel-smime-context.c:846
+#: ../camel/camel-gpg-context.c:1658 ../camel/camel-smime-context.c:844
 msgid "Could not generate signing data: "
 msgstr "無法產生簽署資料:"
 
-#: ../camel/camel-gpg-context.c:1714 ../camel/camel-gpg-context.c:1918
-#: ../camel/camel-gpg-context.c:2028 ../camel/camel-gpg-context.c:2179
-#: ../camel/camel-gpg-context.c:2279 ../camel/camel-gpg-context.c:2327
+#: ../camel/camel-gpg-context.c:1708 ../camel/camel-gpg-context.c:1920
+#: ../camel/camel-gpg-context.c:2030 ../camel/camel-gpg-context.c:2179
 msgid "Failed to execute gpg."
 msgstr "執行 gpg 失敗。"
 
-#: ../camel/camel-gpg-context.c:1793 ../camel/camel-gpg-context.c:1801
-#: ../camel/camel-gpg-context.c:1809 ../camel/camel-gpg-context.c:1829
+#: ../camel/camel-gpg-context.c:1791 ../camel/camel-gpg-context.c:1799
+#: ../camel/camel-gpg-context.c:1807 ../camel/camel-gpg-context.c:1827
 #: ../camel/camel-smime-context.c:973 ../camel/camel-smime-context.c:987
 #: ../camel/camel-smime-context.c:996
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "不能驗證此郵件的簽署:錯誤的訊息格式"
 
-#: ../camel/camel-gpg-context.c:1871
+#: ../camel/camel-gpg-context.c:1873
 msgid "Cannot verify message signature: "
 msgstr "不能驗證此郵件的簽署:"
 
-#: ../camel/camel-gpg-context.c:1994
+#: ../camel/camel-gpg-context.c:1996
 msgid "Could not generate encrypting data: "
 msgstr "無法產生加密資料:"
 
-#: ../camel/camel-gpg-context.c:2047
+#: ../camel/camel-gpg-context.c:2049
 msgid "This is a digitally encrypted message part"
 msgstr "這是數碼化加密訊息部份"
 
@@ -2178,500 +2260,202 @@ msgstr "不能解密此郵件:錯誤的訊息格式"
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "解密 MIME 組件時失敗:通訊協定錯誤"
 
-#: ../camel/camel-gpg-context.c:2220 ../camel/camel-smime-context.c:1287
+#: ../camel/camel-gpg-context.c:2220 ../camel/camel-smime-context.c:1289
 msgid "Encrypted content"
 msgstr "加密內容"
 
-#: ../camel/camel-imapx-folder.c:643
-#, c-format
-msgid "No quota information available for folder '%s'"
-msgstr "資料夾「%s」不支援限額資訊"
-
-#: ../camel/camel-imapx-folder.c:727 ../camel/camel-imapx-folder.c:801
-#, c-format
-msgid "No destination folder specified"
-msgstr "沒有指定目的地資料夾"
-
-#: ../camel/camel-imapx-folder.c:747
-msgid "Unable to move junk messages"
-msgstr "無法移動垃圾郵件"
-
-#: ../camel/camel-imapx-folder.c:821
-msgid "Unable to move deleted messages"
-msgstr "無法移動刪除的郵件"
-
-#: ../camel/camel-imapx-folder.c:1008
-#: ../camel/providers/nntp/camel-nntp-folder.c:794
-msgid "Apply message _filters to this folder"
-msgstr "將郵件過濾條件套用到這個資料夾(_F)"
-
-#: ../camel/camel-imapx-folder.c:1114
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "無法建立 %s 的資料夾摘要"
-
-#: ../camel/camel-imapx-folder.c:1123
-#, c-format
-msgid "Could not create cache for %s: "
-msgstr "無法建立 %s 的快取:"
-
-#: ../camel/camel-imapx-server.c:1333
-msgid "Server disconnected"
-msgstr "伺服器斷線"
-
-#: ../camel/camel-imapx-server.c:1756
-msgid "Error writing to cache stream"
-msgstr "寫入快取串流時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:2439
-#, c-format
-msgid ""
-"Alert from IMAP server %s:\n"
-"%s"
-msgstr ""
-"來自 IMAP 伺服器 %s 的警示:\n"
-"%s"
-
-#: ../camel/camel-imapx-server.c:3035
-#, c-format
-msgid "Not authenticated"
-msgstr "尚未核對"
-
-#: ../camel/camel-imapx-server.c:3113
-msgid "Error performing IDLE"
-msgstr "進行 IDLE 時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:4005
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了: %s"
-
-#: ../camel/camel-imapx-server.c:4006
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
-msgid "STARTTLS not supported"
-msgstr "不支援 STARTTLS"
-
-#: ../camel/camel-imapx-server.c:4047
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: "
-msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了: "
-
-#: ../camel/camel-imapx-server.c:4125
-#, c-format
-msgid "IMAP server %s does not support %s authentication"
-msgstr "IMAP 伺服器 %s 不支援 %s 核對"
-
-#: ../camel/camel-imapx-server.c:4136 ../camel/camel-session.c:494
-#: ../camel/providers/pop3/camel-pop3-store.c:303
-#: ../camel/providers/pop3/camel-pop3-store.c:744
-#: ../camel/providers/smtp/camel-smtp-transport.c:505
-#, c-format
-msgid "No support for %s authentication"
-msgstr "不支援 %s 核對"
-
-#: ../camel/camel-imapx-server.c:4155
-#: ../camel/providers/nntp/camel-nntp-store.c:409
-#: ../camel/providers/nntp/camel-nntp-store.c:595
-msgid "Cannot authenticate without a username"
-msgstr "不能核對沒有使用者名稱"
-
-#: ../camel/camel-imapx-server.c:4164
-#: ../camel/providers/nntp/camel-nntp-store.c:604
-#: ../camel/providers/pop3/camel-pop3-store.c:669
-#: ../camel/providers/pop3/camel-pop3-store.c:689
-msgid "Authentication password not available"
-msgstr "沒有核對的密碼"
-
-#: ../camel/camel-imapx-server.c:4377
-msgid "Error fetching message"
-msgstr "取回郵件時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:4427 ../camel/camel-imapx-server.c:4434
-msgid "Failed to close the tmp stream"
-msgstr "無法關閉 tmp 的串流"
-
-#: ../camel/camel-imapx-server.c:4463
-msgid "Failed to copy the tmp file"
-msgstr "無法複製 tmp 檔案"
-
-#: ../camel/camel-imapx-server.c:4588
-msgid "Error moving messages"
-msgstr "移動郵件時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:4592
-msgid "Error copying messages"
-msgstr "複製郵件時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:4759
-msgid "Error appending message"
-msgstr "附加郵件時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:4956
-msgid "Error fetching message headers"
-msgstr "取回郵件檔頭時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:5119
-msgid "Error retrieving message"
-msgstr "取回郵件時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:5250 ../camel/camel-imapx-server.c:5471
-#, c-format
-msgid "Fetching summary information for new messages in '%s'"
-msgstr "正取得「%s」中新郵件的摘要資訊"
-
-#: ../camel/camel-imapx-server.c:5310
-#, c-format
-msgid "Scanning for changed messages in '%s'"
-msgstr "掃描「%s」中更改過的郵件"
-
-#: ../camel/camel-imapx-server.c:5365
-msgid "Error fetching new messages"
-msgstr "取回新郵件時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:5577
-msgid "Error while fetching messages"
-msgstr "當取回郵件時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:5585 ../camel/camel-imapx-server.c:5618
-#, c-format
-msgid "Fetching summary information for %d message in '%s'"
-msgid_plural "Fetching summary information for %d messages in '%s'"
-msgstr[0] "正取得「%2$s」中 %1$d 封郵件的摘要資訊"
-
-#: ../camel/camel-imapx-server.c:5752 ../camel/camel-imapx-server.c:5782
-msgid "Error refreshing folder"
-msgstr "重新整理資料夾時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:5904
-msgid "Error expunging message"
-msgstr "清空郵件時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:6012
-msgid "Error fetching folders"
-msgstr "取回資料夾時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:6095
-msgid "Error subscribing to folder"
-msgstr "訂閱到資料夾時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:6157
-msgid "Error creating folder"
-msgstr "建立資料夾時發生錯誤。"
-
-#: ../camel/camel-imapx-server.c:6210
-msgid "Error deleting folder"
-msgstr "刪除資料夾時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:6281
-msgid "Error renaming folder"
-msgstr "重新命名資料夾時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:6355
-msgid "Error retrieving quota information"
-msgstr "取得用量限額資訊時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:6413
-msgid "Search failed"
-msgstr "搜尋失敗"
-
-#: ../camel/camel-imapx-server.c:6475
-msgid "Error performing NOOP"
-msgstr "進行 NOOP 時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:6583
-msgid "Error syncing changes"
-msgstr "同步更改時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:6883
-msgid "Lost connection to IMAP server"
-msgstr "失去 IMAP 伺服器的連線"
-
-#: ../camel/camel-imapx-server.c:7330
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "無法取得郵件 ID 為 %s 的郵件: %s"
-
-#: ../camel/camel-imapx-server.c:7331
-msgid "No such message available."
-msgstr "沒有這個郵件。"
-
-#: ../camel/camel-imapx-server.c:7492 ../camel/camel-imapx-server.c:7507
-msgid "Cannot create spool file: "
-msgstr "不能建立排程器檔案:"
-
-#: ../camel/camel-imapx-server.c:8212
-msgid "IMAP server does not support quotas"
-msgstr "IMAP 伺服器不支援限額"
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/camel-imapx-store.c:203 ../camel/camel-imapx-store.c:1143
-#: ../camel/providers/local/camel-maildir-folder.c:473
-#: ../camel/providers/local/camel-maildir-store.c:316
-#: ../camel/providers/local/camel-maildir-store.c:752
-#: ../camel/providers/local/camel-maildir-store.c:758
-#: ../camel/providers/local/camel-maildir-store.c:842
-#: ../camel/providers/local/camel-spool-store.c:393
-msgid "Inbox"
-msgstr "收件匣"
-
-#: ../camel/camel-imapx-store.c:487
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP 伺服器 %s"
-
-#: ../camel/camel-imapx-store.c:490
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s 的 IMAP 服務於 %s"
-
-#: ../camel/camel-imapx-store.c:591
-#: ../camel/providers/nntp/camel-nntp-provider.c:95
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
-msgid "Password"
-msgstr "密碼"
-
-#: ../camel/camel-imapx-store.c:593
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
-
-#: ../camel/camel-imapx-store.c:687
-#, c-format
-msgid "No such folder %s"
-msgstr "沒有這個資料夾 %s"
-
-#: ../camel/camel-imapx-store.c:1413
-#, c-format
-msgid "Retrieving folder list for %s"
-msgstr "取得 %s 的資料夾清單"
-
-#: ../camel/camel-imapx-store.c:1783
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "資料夾名稱「%s」無效,因為它包括字符「%c」"
-
-#: ../camel/camel-imapx-store.c:1794
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "不明的母資料夾: %s"
-
-#: ../camel/camel-imapx-store.c:1804
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "母資料夾並不允許包含子資料夾"
-
-#: ../camel/camel-imapx-stream.c:98
-#, c-format
-msgid "Source stream returned no data"
-msgstr "來源串流傳回無資料"
-
-#: ../camel/camel-imapx-stream.c:107
-#, c-format
-msgid "Source stream unavailable"
-msgstr "來源串流無法使用"
-
-#: ../camel/camel-junk-filter.c:168
+#: ../camel/camel-junk-filter.c:167
 msgid "Synchronizing junk database"
 msgstr "同步垃圾郵件資料庫"
 
-#: ../camel/camel-lock.c:102
+#: ../camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "無法建立用於 %s: %s 的鎖定檔案"
 
-#: ../camel/camel-lock.c:145
+#: ../camel/camel-lock.c:153
 #, c-format
 msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr "嘗試取得 %s 上的鎖定檔案逾時。請稍後再試一次。"
 
-#: ../camel/camel-lock.c:205
+#: ../camel/camel-lock.c:215
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "使用 fcntl(2) 取得鎖失敗: %s"
 
-#: ../camel/camel-lock.c:272
+#: ../camel/camel-lock.c:282
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "使用 flock(2) 取得鎖失敗: %s"
 
-#: ../camel/camel-lock-client.c:106
+#: ../camel/camel-lock-client.c:107
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "不能建立鎖定 helper 導管:%s"
 
-#: ../camel/camel-lock-client.c:130
+#: ../camel/camel-lock-client.c:131
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "不能分叉鎖定 helper : %s"
 
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#: ../camel/camel-lock-client.c:218 ../camel/camel-lock-client.c:246
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "無法鎖定「%s」: lock-helper 協定錯誤"
 
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:234
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "無法鎖定「%s」"
 
-#: ../camel/camel-movemail.c:105
+#: ../camel/camel-movemail.c:109
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "無法檢查郵件檔案 %s:%s"
 
-#: ../camel/camel-movemail.c:119
+#: ../camel/camel-movemail.c:123
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "無法開啟郵件檔案 %s:%s"
 
-#: ../camel/camel-movemail.c:129
+#: ../camel/camel-movemail.c:133
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "無法開啟暫存郵件檔案 %s:%s"
 
-#: ../camel/camel-movemail.c:159
+#: ../camel/camel-movemail.c:163
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "儲存郵件至暫存檔案時失敗 %s:%s"
 
-#: ../camel/camel-movemail.c:193
+#: ../camel/camel-movemail.c:197
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "無法建立導管:%s"
 
-#: ../camel/camel-movemail.c:207
+#: ../camel/camel-movemail.c:211
 #, c-format
 msgid "Could not fork: %s"
 msgstr "無法另外執行一個行程:%s"
 
-#: ../camel/camel-movemail.c:245
+#: ../camel/camel-movemail.c:249
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail 程式失敗:%s"
 
-#: ../camel/camel-movemail.c:246
+#: ../camel/camel-movemail.c:250
 msgid "(Unknown error)"
 msgstr "(不明的錯誤)"
 
-#: ../camel/camel-movemail.c:273
+#: ../camel/camel-movemail.c:277
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "讀取郵件檔案時發生錯誤:%s"
 
-#: ../camel/camel-movemail.c:286
+#: ../camel/camel-movemail.c:290
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "寫入郵件暫存檔案時發生錯誤:%s"
 
-#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562
+#: ../camel/camel-movemail.c:497 ../camel/camel-movemail.c:566
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "複製郵件暫存檔案時發生錯誤:%s"
 
-#: ../camel/camel-multipart-signed.c:297
+#: ../camel/camel-multipart-signed.c:279
 #, c-format
 msgid "No content available"
 msgstr "沒有可用的內容"
 
-#: ../camel/camel-multipart-signed.c:305
+#: ../camel/camel-multipart-signed.c:287
 #, c-format
 msgid "No signature available"
 msgstr "沒有可用的簽署"
 
-#: ../camel/camel-multipart-signed.c:689
+#: ../camel/camel-multipart-signed.c:636
 #, c-format
 msgid "parse error"
 msgstr "解析錯誤"
 
-#: ../camel/camel-net-utils.c:704
+#: ../camel/camel-net-utils.c:702
 #, c-format
 msgid "Resolving: %s"
 msgstr "解析:%s"
 
-#: ../camel/camel-net-utils.c:727
+#: ../camel/camel-net-utils.c:725
 msgid "Host lookup failed"
 msgstr "搜尋主機失敗"
 
-#: ../camel/camel-net-utils.c:733
+#: ../camel/camel-net-utils.c:731
 #, c-format
 msgid "Host lookup '%s' failed. Check your host name for spelling errors."
 msgstr "主機查詢「%s」失敗。請檢查你的主機名稱是否有拼錯字。"
 
-#: ../camel/camel-net-utils.c:737
+#: ../camel/camel-net-utils.c:735
 #, c-format
 msgid "Host lookup '%s' failed: %s"
 msgstr "查詢主機「%s」失敗:%s"
 
-#: ../camel/camel-net-utils.c:858
-msgid "Resolving address"
-msgstr "解析位址"
-
-#: ../camel/camel-net-utils.c:879
-msgid "Name lookup failed"
-msgstr "查詢名稱失敗"
+#: ../camel/camel-network-service.c:1005
+msgid "No host information available"
+msgstr "沒有主機資訊可用"
 
-#: ../camel/camel-net-utils.c:886
-msgid "Name lookup failed. Check your host name for spelling errors."
-msgstr "名稱查詢失敗。請檢查你的主機名稱是否有拼錯字。"
-
-#: ../camel/camel-net-utils.c:890
-#, c-format
-msgid "Name lookup failed: %s"
-msgstr "搜尋名稱失敗: %s"
-
-#: ../camel/camel-network-service.c:350
-#, c-format
-msgid "Could not connect to '%s:%s': "
-msgstr "無法連接到「%s:%s」:"
+#: ../camel/camel-offline-folder.c:90
+msgid "Downloading new messages for offline mode"
+msgstr "正在下載新訊息用於離線模式"
 
-#: ../camel/camel-offline-folder.c:212
+#: ../camel/camel-offline-folder.c:209
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "正在將資料夾「%s」中的郵件同步到磁碟"
 
-#: ../camel/camel-provider.c:58
+#: ../camel/camel-offline-folder.c:266
+msgid "Copy folder content locally for _offline operation"
+msgstr "複製資料夾內容至本地用於離線作業(_O)"
+
+#: ../camel/camel-provider.c:56
 msgid "Virtual folder email provider"
 msgstr "虛擬資料夾電子郵件供應商"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "For reading mail as a query of another set of folders"
 msgstr "使讀取郵件如同查詢其他資料夾"
 
-#: ../camel/camel-provider.c:263
+#: ../camel/camel-provider.c:261
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "無法載入模組 %s: 此系統不支援載入模組。"
 
-#: ../camel/camel-provider.c:272
+#: ../camel/camel-provider.c:270
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "無法載入 %s:%s"
 
-#: ../camel/camel-provider.c:281
+#: ../camel/camel-provider.c:279
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "無法載入 %s:模組內沒有初始碼。"
 
-#: ../camel/camel-provider.c:429 ../camel/camel-session.c:406
+#: ../camel/camel-provider.c:427 ../camel/camel-session.c:424
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "沒有通訊協定「%s」的提供者"
 
-#: ../camel/camel-sasl-anonymous.c:35
-#: ../camel/providers/nntp/camel-nntp-provider.c:85
+#: ../camel/camel-sasl-anonymous.c:33
+#: ../camel/providers/nntp/camel-nntp-provider.c:83
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "This option will connect to the server using an anonymous login."
 msgstr "這個選項將會使用匿名登入至伺服器。"
 
-#: ../camel/camel-sasl-anonymous.c:70
+#: ../camel/camel-sasl-anonymous.c:68
 #, c-format
 msgid "Authentication failed."
 msgstr "核對失敗。"
 
-#: ../camel/camel-sasl-anonymous.c:81
+#: ../camel/camel-sasl-anonymous.c:79
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2680,7 +2464,7 @@ msgstr ""
 "無效的電子郵件地址追蹤資訊:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:95
+#: ../camel/camel-sasl-anonymous.c:93
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2689,7 +2473,7 @@ msgstr ""
 "無效的不透明追蹤資訊:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:109
+#: ../camel/camel-sasl-anonymous.c:107
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2698,61 +2482,61 @@ msgstr ""
 "無效的追蹤資訊:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:46
+#: ../camel/camel-sasl-cram-md5.c:44
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:48
+#: ../camel/camel-sasl-cram-md5.c:46
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr "這個選項將會使用 CRAM-MD5 加密的密碼連線至伺服器,若發現該伺服器支援這種服務。"
 
-#: ../camel/camel-sasl-digest-md5.c:59
+#: ../camel/camel-sasl-digest-md5.c:57
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:61
+#: ../camel/camel-sasl-digest-md5.c:59
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr "這個選項將會使用 DIGEST-MD5 加密的密碼連線至伺服器,若發現該伺服器支援這種服務。"
 
-#: ../camel/camel-sasl-digest-md5.c:855
+#: ../camel/camel-sasl-digest-md5.c:853
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "伺服器查問過長(>2048 位元 )"
 
-#: ../camel/camel-sasl-digest-md5.c:866
+#: ../camel/camel-sasl-digest-md5.c:864
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "伺服器查問無效\n"
 
-#: ../camel/camel-sasl-digest-md5.c:874
+#: ../camel/camel-sasl-digest-md5.c:872
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "伺服器查問包含無效的 「Quality of Protection」代符"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:905
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "伺服器回應並未包含授權資料"
 
-#: ../camel/camel-sasl-digest-md5.c:928
+#: ../camel/camel-sasl-digest-md5.c:926
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "伺服器回應包含不完整的授權資料"
 
-#: ../camel/camel-sasl-digest-md5.c:941
+#: ../camel/camel-sasl-digest-md5.c:939
 #, c-format
 msgid "Server response does not match"
 msgstr "伺服器回應不符"
 
-#: ../camel/camel-sasl-gssapi.c:91
+#: ../camel/camel-sasl-gssapi.c:89
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:93
+#: ../camel/camel-sasl-gssapi.c:91
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "這個選項將會使用 Kerberos 5 核對連線至伺服器。"
 
@@ -2806,474 +2590,397 @@ msgstr "在證件執行一致性檢查失敗。"
 msgid "The referenced credentials have expired."
 msgstr "參照的證件已經過期。"
 
-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340
-#: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405
-#: ../camel/providers/smtp/camel-smtp-transport.c:612
+#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:352
+#: ../camel/camel-sasl-gssapi.c:400 ../camel/camel-sasl-gssapi.c:417
+#: ../camel/providers/smtp/camel-smtp-transport.c:622
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "來自伺服器的不良許可回應。"
 
-#: ../camel/camel-sasl-gssapi.c:417
+#: ../camel/camel-sasl-gssapi.c:429
 #, c-format
 msgid "Unsupported security layer."
 msgstr "不支援的類型"
 
-#: ../camel/camel-sasl-login.c:40
+#: ../camel/camel-sasl-login.c:38
 msgid "Login"
 msgstr "登入"
 
-#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46
+#: ../camel/camel-sasl-login.c:40 ../camel/camel-sasl-plain.c:44
 msgid "This option will connect to the server using a simple password."
 msgstr "這個選項將會使用普通的密碼連線至伺服器。"
 
-#: ../camel/camel-sasl-login.c:110
+#: ../camel/camel-sasl-login.c:108
 #, c-format
 msgid "Unknown authentication state."
 msgstr "未知的驗証狀況。"
 
-#: ../camel/camel-sasl-ntlm.c:48
+#: ../camel/camel-sasl-ntlm.c:46
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:50
+#: ../camel/camel-sasl-ntlm.c:48
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr "這個選項將會使用 NTLM / 安全密碼核對連線至基於 Windows 的伺服器。"
 
-#: ../camel/camel-sasl-plain.c:44
+#: ../camel/camel-sasl-plain.c:42
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "POP before SMTP"
 msgstr "POP 先於 SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:48
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "這個選項將會在進行 SMTP 之前允許 POP連線"
 
-#: ../camel/camel-sasl-popb4smtp.c:84
+#: ../camel/camel-sasl-popb4smtp.c:82
 msgid "POP Source UID"
 msgstr "POP 來源 UID"
 
-#: ../camel/camel-sasl-popb4smtp.c:98
+#: ../camel/camel-sasl-popb4smtp.c:96
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "POP 先於 SMTP 允許使用未知的傳輸"
 
-#: ../camel/camel-sasl-popb4smtp.c:110 ../camel/camel-sasl-popb4smtp.c:119
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "以 %s 服務嘗試 POP 先於 SMTP 核對"
 
-#: ../camel/camel-search-private.c:116
+#: ../camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "正規表示式編譯失敗: %s: %s"
 
-#: ../camel/camel-session.c:415
+#: ../camel/camel-session.c:433
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "通訊協定「%s」註冊了無效的 GType"
 
-#: ../camel/camel-session.c:509
+#: ../camel/camel-session.c:502
+#: ../camel/providers/imapx/camel-imapx-server.c:4498
+#: ../camel/providers/pop3/camel-pop3-store.c:311
+#: ../camel/providers/pop3/camel-pop3-store.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:515
+#, c-format
+msgid "No support for %s authentication"
+msgstr "不支援 %s 核對"
+
+#: ../camel/camel-session.c:517
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s 核對失敗"
 
-#: ../camel/camel-session.c:645
+#: ../camel/camel-session.c:586
 msgid "Forwarding messages is not supported"
 msgstr "不支援轉寄郵件"
 
-#. Translators: The first argument is the account type
-#. * (e.g. "IMAP"), the second is the user name, and the
-#. * third is the host name.
-#: ../camel/camel-session.c:1420
-#, c-format
-msgid "Please enter the %s password for %s on host %s."
-msgstr "請輸入 %2$s 於主機 %3$s 的 %1$s 密碼。"
-
-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1074
+#: ../camel/camel-smime-context.c:349 ../camel/camel-smime-context.c:1076
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "找不到 '%s' 的證書"
 
-#: ../camel/camel-smime-context.c:379
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS message"
 msgstr "無法建立 CMS 訊息"
 
-#: ../camel/camel-smime-context.c:384
+#: ../camel/camel-smime-context.c:382
 msgid "Cannot create CMS signed data"
 msgstr "無法建立 CMS signedData"
 
-#: ../camel/camel-smime-context.c:390
+#: ../camel/camel-smime-context.c:388
 msgid "Cannot attach CMS signed data"
 msgstr "無法附加 CMS signedData"
 
-#: ../camel/camel-smime-context.c:397
+#: ../camel/camel-smime-context.c:395
 msgid "Cannot attach CMS data"
 msgstr "無法附加 CMS 資料"
 
-#: ../camel/camel-smime-context.c:403
+#: ../camel/camel-smime-context.c:401
 msgid "Cannot create CMS Signer information"
 msgstr "無法建立 CMS SignerInfo"
 
-#: ../camel/camel-smime-context.c:409
+#: ../camel/camel-smime-context.c:407
 msgid "Cannot find certificate chain"
 msgstr "找不到證書鏈"
 
-#: ../camel/camel-smime-context.c:415
+#: ../camel/camel-smime-context.c:413
 msgid "Cannot add CMS Signing time"
 msgstr "無法新增 CMS SigningTime"
 
-#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
+#: ../camel/camel-smime-context.c:437 ../camel/camel-smime-context.c:452
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' 的加密證書不存在"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "無法新增 SMIMEEncKeyPrefs 屬性"
 
-#: ../camel/camel-smime-context.c:466
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "無法新增 MS SMIMEEncKeyPrefs 屬性"
 
-#: ../camel/camel-smime-context.c:471
+#: ../camel/camel-smime-context.c:469
 msgid "Cannot add encryption certificate"
 msgstr "無法新增加密證書"
 
-#: ../camel/camel-smime-context.c:477
+#: ../camel/camel-smime-context.c:475
 msgid "Cannot add CMS Signer information"
 msgstr "無法新增 CMS SignerInfo"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:508
 msgid "Unverified"
 msgstr "未指定"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:510
 msgid "Good signature"
 msgstr "良好的簽署"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:512
 msgid "Bad signature"
 msgstr "錯誤的簽署"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:514
 msgid "Content tampered with or altered in transit"
 msgstr "內容在傳送時被竄改或更改"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not found"
 msgstr "找不到簽署證書"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:518
 msgid "Signing certificate not trusted"
 msgstr "簽署證書不受信任"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unknown"
 msgstr "未知的簽署演算法"
 
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:522
 msgid "Signature algorithm unsupported"
 msgstr "不支援這種簽署演算法"
 
-#: ../camel/camel-smime-context.c:526
+#: ../camel/camel-smime-context.c:524
 msgid "Malformed signature"
 msgstr "格式不良的簽署"
 
-#: ../camel/camel-smime-context.c:528
+#: ../camel/camel-smime-context.c:526
 msgid "Processing error"
 msgstr "解析錯誤"
 
-#: ../camel/camel-smime-context.c:573
+#: ../camel/camel-smime-context.c:571
 msgid "No signed data in signature"
 msgstr "簽署中沒有被簽署的資料"
 
-#: ../camel/camel-smime-context.c:578
+#: ../camel/camel-smime-context.c:576
 msgid "Digests missing from enveloped data"
 msgstr "包裹的資料中遺漏摘要"
 
-#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:589 ../camel/camel-smime-context.c:600
 msgid "Cannot calculate digests"
 msgstr "無法計算摘要"
 
-#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
+#: ../camel/camel-smime-context.c:607 ../camel/camel-smime-context.c:611
 msgid "Cannot set message digests"
 msgstr "無法設定郵件摘要"
 
-#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
+#: ../camel/camel-smime-context.c:621 ../camel/camel-smime-context.c:626
 msgid "Certificate import failed"
 msgstr "證書匯入失敗"
 
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:636
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "限證書訊息,無法驗證證書"
 
-#: ../camel/camel-smime-context.c:641
+#: ../camel/camel-smime-context.c:639
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "限證書訊息、匯入和驗證的證書"
 
-#: ../camel/camel-smime-context.c:645
+#: ../camel/camel-smime-context.c:643
 msgid "Cannot find signature digests"
 msgstr "找不到簽署摘要"
 
-#: ../camel/camel-smime-context.c:662
+#: ../camel/camel-smime-context.c:660
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "簽署者: %s<%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:858 ../camel/camel-smime-context.c:1148
+#: ../camel/camel-smime-context.c:856 ../camel/camel-smime-context.c:1150
 msgid "Cannot create encoder context"
 msgstr "無法建立編碼器網絡位置"
 
-#: ../camel/camel-smime-context.c:864
+#: ../camel/camel-smime-context.c:862
 msgid "Failed to add data to CMS encoder"
 msgstr "無法新增資料至 CMS 編碼器"
 
-#: ../camel/camel-smime-context.c:869 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:867 ../camel/camel-smime-context.c:1167
 msgid "Failed to encode data"
 msgstr "無法編碼資料"
 
-#: ../camel/camel-smime-context.c:1013 ../camel/camel-smime-context.c:1262
+#: ../camel/camel-smime-context.c:1015 ../camel/camel-smime-context.c:1264
 msgid "Decoder failed"
 msgstr "解碼器失敗"
 
-#: ../camel/camel-smime-context.c:1082
+#: ../camel/camel-smime-context.c:1084
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "找不到一般大量加密演算法"
 
-#: ../camel/camel-smime-context.c:1090
+#: ../camel/camel-smime-context.c:1092
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "無法配置插槽給加密大量密碼匙"
 
-#: ../camel/camel-smime-context.c:1101
+#: ../camel/camel-smime-context.c:1103
 msgid "Cannot create CMS Message"
 msgstr "無法建立 CMS 訊息"
 
-#: ../camel/camel-smime-context.c:1107
+#: ../camel/camel-smime-context.c:1109
 msgid "Cannot create CMS Enveloped data"
 msgstr "無法建立 CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1113
+#: ../camel/camel-smime-context.c:1115
 msgid "Cannot attach CMS Enveloped data"
 msgstr "無法附加 CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1119
+#: ../camel/camel-smime-context.c:1121
 msgid "Cannot attach CMS data object"
 msgstr "無法附加 CMS 資料物件"
 
-#: ../camel/camel-smime-context.c:1128
+#: ../camel/camel-smime-context.c:1130
 msgid "Cannot create CMS Recipient information"
 msgstr "無法建立 CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1133
+#: ../camel/camel-smime-context.c:1135
 msgid "Cannot add CMS Recipient information"
 msgstr "無法新增 CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1159
+#: ../camel/camel-smime-context.c:1161
 msgid "Failed to add data to encoder"
 msgstr "無法新增資料至編碼器"
 
-#: ../camel/camel-smime-context.c:1269
+#: ../camel/camel-smime-context.c:1271
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME 解密:找不到加密內容"
 
-#: ../camel/camel-store.c:1999
+#: ../camel/camel-store.c:1210
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "不能建立資料夾「%s」:資料夾已存在"
 
-#: ../camel/camel-store.c:2042
+#: ../camel/camel-store.c:1253
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "開啟資料夾「%s」"
 
-#: ../camel/camel-store.c:2231
+#: ../camel/camel-store.c:1480
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "掃描「%s」內的資料夾"
 
-#: ../camel/camel-store.c:2259 ../camel/camel-store.c:2304
-#: ../camel/camel-vtrash-folder.c:48
+#: ../camel/camel-store.c:1508 ../camel/camel-store.c:1553
+#: ../camel/camel-vtrash-folder.c:46
 msgid "Trash"
 msgstr "回收筒"
 
-#: ../camel/camel-store.c:2273 ../camel/camel-store.c:2321
-#: ../camel/camel-vtrash-folder.c:50
+#: ../camel/camel-store.c:1522 ../camel/camel-store.c:1570
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: ../camel/camel-store.c:2774
+#: ../camel/camel-store.c:2171
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "無法建立資料夾:%s:資料夾已存在"
 
-#: ../camel/camel-store.c:2788
+#: ../camel/camel-store.c:2178
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "正在建立資料夾「%s」"
 
-#: ../camel/camel-store.c:2906 ../camel/camel-vee-store.c:416
-#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/camel-store.c:2355 ../camel/camel-vee-store.c:416
+#: ../camel/providers/local/camel-maildir-store.c:320
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "不能刪除資料夾: %s :無效的操作"
 
-#: ../camel/camel-store.c:3049 ../camel/camel-vee-store.c:466
-#: ../camel/providers/local/camel-maildir-store.c:841
+#: ../camel/camel-store.c:2545 ../camel/camel-vee-store.c:467
+#: ../camel/providers/local/camel-maildir-store.c:851
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "不能重新命名資料夾: %s :無效的操作"
 
-#: ../camel/camel-stream-filter.c:334
+#: ../camel/camel-stream.c:285 ../camel/camel-stream.c:336
+#, c-format
+msgid "Stream type '%s' is not seekable"
+msgstr "串流類型「%s」不是可尋找的"
+
+#: ../camel/camel-stream-filter.c:344
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "CamelStreamFilter 只支援重設到開頭"
 
-#: ../camel/camel-stream-null.c:78
+#: ../camel/camel-stream-null.c:76
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "CamelHttpStream 只支援重設到開頭"
 
-#: ../camel/camel-stream-process.c:275
+#: ../camel/camel-stream-process.c:280
 #, c-format
 msgid "Connection cancelled"
 msgstr "連線已取消"
 
-#: ../camel/camel-stream-process.c:280
+#: ../camel/camel-stream-process.c:285
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "無法以指令「%s」連線: %s"
 
-#: ../camel/camel-subscribable.c:395
+#: ../camel/camel-subscribable.c:273
 #, c-format
 msgid "Subscribing to folder '%s'"
 msgstr "訂閱到資料夾「%s」"
 
-#: ../camel/camel-subscribable.c:527
+#: ../camel/camel-subscribable.c:442
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "取消訂閱資料夾「%s」"
 
-#: ../camel/camel-tcp-stream-raw.c:310
-#, c-format
-msgid "NSPR error code %d"
-msgstr "NSPR 錯誤代碼 %d"
-
-#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662
-#, c-format
-msgid "The proxy host does not support SOCKS4"
-msgstr "代理伺服器主機不支援 SOCKS4"
-
-#: ../camel/camel-tcp-stream-raw.c:675
-#, c-format
-msgid "The proxy host denied our request: code %d"
-msgstr "代理伺服器主機拒絕我們的要求:代碼 %d"
-
-#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781
-#, c-format
-msgid "The proxy host does not support SOCKS5"
-msgstr "代理伺服器主機不支援 SOCKS5"
-
-#: ../camel/camel-tcp-stream-raw.c:789
-#, c-format
-msgid "Could not find a suitable authentication type: code 0x%x"
-msgstr "找不到合適的核對類型:代碼 0x%x"
-
-#: ../camel/camel-tcp-stream-raw.c:801
-msgid "General SOCKS server failure"
-msgstr "一般性 SOCKS 伺服器失敗"
-
-#: ../camel/camel-tcp-stream-raw.c:802
-msgid "SOCKS server's rules do not allow connection"
-msgstr "SOCKS 伺服器的規則不允許連線"
-
-#: ../camel/camel-tcp-stream-raw.c:803
-msgid "Network is unreachable from SOCKS server"
-msgstr "網絡無法透過 SOCKS 伺服器到達"
-
-#: ../camel/camel-tcp-stream-raw.c:804
-msgid "Host is unreachable from SOCKS server"
-msgstr "主機無法透過 SOCKS 伺服器到達"
-
-#: ../camel/camel-tcp-stream-raw.c:805
-msgid "Connection refused"
-msgstr "連線被拒絕"
-
-#: ../camel/camel-tcp-stream-raw.c:806
-msgid "Time-to-live expired"
-msgstr "超過 Time-to-live 時間"
-
-#: ../camel/camel-tcp-stream-raw.c:807
-msgid "Command not supported by SOCKS server"
-msgstr "SOCKS 伺服器不支援指令"
-
-#: ../camel/camel-tcp-stream-raw.c:808
-msgid "Address type not supported by SOCKS server"
-msgstr "SOCKS 伺服器不支援位址類型"
-
-#: ../camel/camel-tcp-stream-raw.c:809
-msgid "Unknown error from SOCKS server"
-msgstr "來自 SOCKS 伺服器的不明錯誤"
-
-#: ../camel/camel-tcp-stream-raw.c:842
-#, c-format
-msgid "Got unknown address type from SOCKS server"
-msgstr "從 SOCKS 伺服器取得不明的位址類型"
-
-#: ../camel/camel-tcp-stream-raw.c:860
-#, c-format
-msgid "Incomplete reply from SOCKS server"
-msgstr "來自 SOCKS 伺服器的不完整回覆"
-
-#: ../camel/camel-tcp-stream-raw.c:880
-#, c-format
-msgid "Hostname is too long (maximum is 255 characters)"
-msgstr "主機名稱太長(最多 255 字符)"
-
-#. SOCKS5
-#. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922
-#, c-format
-msgid "Invalid reply from proxy server"
-msgstr "從代理伺服器傳回無效的回覆"
-
-#: ../camel/camel-url.c:331
+#: ../camel/camel-url.c:329
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "無法解析 URL「%s」"
 
-#: ../camel/camel-vee-folder.c:494
+#: ../camel/camel-vee-folder.c:491
 #, c-format
 msgid "Updating folder '%s'"
 msgstr "更新資料夾「%s」"
 
-#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965
+#: ../camel/camel-vee-folder.c:851 ../camel/camel-vee-folder.c:961
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "不能複製或移動郵件到虛擬資料夾中"
 
-#: ../camel/camel-vee-folder.c:888
+#: ../camel/camel-vee-folder.c:884
 #, c-format
 msgid "No such message %s in %s"
 msgstr "沒有 %s 這類郵件在 %s 中"
 
-#: ../camel/camel-vee-folder.c:941
+#: ../camel/camel-vee-folder.c:937
 #, c-format
 msgid "Error storing '%s': "
 msgstr "儲存「%s」發生錯誤:"
 
-#: ../camel/camel-vee-folder.c:1171
+#: ../camel/camel-vee-folder.c:1167
 msgid "Automatically _update on change in source folders"
 msgstr "來源資料夾中更改時自動更新(_U)"
 
 #. Translators: 'Unmatched' is a folder name under Search folders where are shown
 #. * all messages not belonging into any other configured search folder
-#: ../camel/camel-vee-store.c:42
+#: ../camel/camel-vee-store.c:40
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
@@ -3282,23 +2989,62 @@ msgstr "沒有相符資料"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "不能刪除資料夾: %s :沒有這個資料夾"
 
-#: ../camel/camel-vee-store.c:476
+#: ../camel/camel-vee-store.c:477
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "不能重新命名資料夾: %s :沒有這個資料夾"
 
-#: ../camel/camel-vee-store.c:538
+#: ../camel/camel-vee-store.c:539
 msgid "Enable _Unmatched folder"
 msgstr "啟用未符合資料夾(_U)"
 
-#: ../camel/camel-vtrash-folder.c:49
+#: ../camel/camel-vtrash-folder.c:47
 msgid "Cannot copy messages to the Trash folder"
 msgstr "無法複製訊息到「回收筒」資料夾"
 
-#: ../camel/camel-vtrash-folder.c:51
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Junk folder"
 msgstr "無法複製訊息到「垃圾郵件」資料夾"
 
+#: ../camel/providers/imapx/camel-imapx-folder.c:654
+#, c-format
+msgid "No quota information available for folder '%s'"
+msgstr "資料夾「%s」不支援限額資訊"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:768
+#: ../camel/providers/imapx/camel-imapx-folder.c:861
+#, c-format
+msgid "No destination folder specified"
+msgstr "沒有指定目的地資料夾"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:796
+msgid "Unable to move junk messages"
+msgstr "無法移動垃圾郵件"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:889
+msgid "Unable to move deleted messages"
+msgstr "無法移動刪除的郵件"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1115
+#: ../camel/providers/nntp/camel-nntp-folder.c:758
+msgid "Apply message _filters to this folder"
+msgstr "將郵件過濾條件套用到這個資料夾(_F)"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1221
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "無法建立 %s 的資料夾摘要"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1230
+#, c-format
+msgid "Could not create cache for %s: "
+msgstr "無法建立 %s 的快取:"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1415
+#, c-format
+msgid "No IMAP mailbox available for folder '%s'"
+msgstr "資料夾「%s」沒有 IMAP 郵箱可用"
+
 #: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "檢查新郵件"
@@ -3320,7 +3066,7 @@ msgid "_Listen for server change notifications"
 msgstr "聽取伺服器更改通知(_L)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:49
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid "Folders"
 msgstr "資料夾"
 
@@ -3337,15 +3083,15 @@ msgid "Namespace:"
 msgstr "命名空間"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:59
-#: ../camel/providers/local/camel-local-provider.c:41
-#: ../camel/providers/local/camel-local-provider.c:81
-#: ../camel/providers/local/camel-local-provider.c:101
-#: ../camel/providers/nntp/camel-nntp-provider.c:41
+#: ../camel/providers/local/camel-local-provider.c:39
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:99
+#: ../camel/providers/nntp/camel-nntp-provider.c:39
 msgid "Options"
 msgstr "選項"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:61
-#: ../camel/providers/nntp/camel-nntp-provider.c:43
+#: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Apply _filters to new messages in all folders"
 msgstr "將過濾條件套用到所有資料夾的新郵件(_F)"
 
@@ -3381,27 +3127,274 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
 
-#: ../camel/providers/local/camel-local-folder.c:194
+#: ../camel/providers/imapx/camel-imapx-server.c:1577
+msgid "Server disconnected"
+msgstr "伺服器斷線"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2040
+msgid "Error writing to cache stream"
+msgstr "寫入快取串流時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3379
+#, c-format
+msgid "Not authenticated"
+msgstr "尚未核對"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3456
+msgid "Error performing IDLE"
+msgstr "進行 IDLE 時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4359
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了: %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4360
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
+msgid "STARTTLS not supported"
+msgstr "不支援 STARTTLS"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4407
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4487
+#, c-format
+msgid "IMAP server %s does not support %s authentication"
+msgstr "IMAP 伺服器 %s 不支援 %s 核對"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4517
+#: ../camel/providers/nntp/camel-nntp-store.c:394
+#: ../camel/providers/nntp/camel-nntp-store.c:531
+msgid "Cannot authenticate without a username"
+msgstr "不能核對沒有使用者名稱"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4526
+#: ../camel/providers/nntp/camel-nntp-store.c:540
+#: ../camel/providers/pop3/camel-pop3-store.c:678
+#: ../camel/providers/pop3/camel-pop3-store.c:699
+msgid "Authentication password not available"
+msgstr "沒有核對的密碼"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4743
+msgid "Error fetching message"
+msgstr "取回郵件時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4789
+#: ../camel/providers/imapx/camel-imapx-server.c:4796
+msgid "Failed to close the tmp stream"
+msgstr "無法關閉 tmp 的串流"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4831
+msgid "Failed to copy the tmp file"
+msgstr "無法複製 tmp 檔案"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4957
+msgid "Error moving messages"
+msgstr "移動郵件時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4961
+msgid "Error copying messages"
+msgstr "複製郵件時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5120
+msgid "Error appending message"
+msgstr "附加郵件時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5314
+msgid "Error fetching message headers"
+msgstr "取回郵件檔頭時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5479
+msgid "Error retrieving message"
+msgstr "取回郵件時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5609
+#: ../camel/providers/imapx/camel-imapx-server.c:5832
+#, c-format
+msgid "Fetching summary information for new messages in '%s'"
+msgstr "正取得「%s」中新郵件的摘要資訊"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5661
+#, c-format
+msgid "Scanning for changed messages in '%s'"
+msgstr "掃描「%s」中更改過的郵件"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5713
+msgid "Error fetching new messages"
+msgstr "取回新郵件時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5981
+msgid "Error refreshing folder"
+msgstr "重新整理資料夾時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6131
+msgid "Error expunging message"
+msgstr "清空郵件時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6240
+#: ../camel/providers/imapx/camel-imapx-server.c:6265
+msgid "Error fetching folders"
+msgstr "取回資料夾時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6345
+msgid "Error creating folder"
+msgstr "建立資料夾時發生錯誤。"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6397
+msgid "Error deleting folder"
+msgstr "刪除資料夾時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6464
+msgid "Error renaming folder"
+msgstr "重新命名資料夾時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6551
+msgid "Error subscribing to folder"
+msgstr "訂閱到資料夾時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6611
+msgid "Error unsubscribing from folder"
+msgstr "取消訂閱資料夾發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6667
+msgid "Error retrieving quota information"
+msgstr "取得用量限額資訊時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6719
+msgid "Search failed"
+msgstr "搜尋失敗"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6781
+msgid "Error performing NOOP"
+msgstr "進行 NOOP 時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6888
+msgid "Error syncing changes"
+msgstr "同步更改時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:7194
+msgid "Lost connection to IMAP server"
+msgstr "失去 IMAP 伺服器的連線"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:7959
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "無法取得郵件 ID 為 %s 的郵件: %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:7960
+msgid "No such message available."
+msgstr "沒有這個郵件。"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:8159
+#: ../camel/providers/imapx/camel-imapx-server.c:8174
+msgid "Cannot create spool file: "
+msgstr "不能建立排程器檔案:"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:8879
+msgid "IMAP server does not support quotas"
+msgstr "IMAP 伺服器不支援限額"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imapx/camel-imapx-store.c:207
+#: ../camel/providers/local/camel-maildir-folder.c:471
+#: ../camel/providers/local/camel-maildir-store.c:321
+#: ../camel/providers/local/camel-maildir-store.c:763
+#: ../camel/providers/local/camel-maildir-store.c:769
+#: ../camel/providers/local/camel-maildir-store.c:852
+#: ../camel/providers/local/camel-spool-store.c:393
+msgid "Inbox"
+msgstr "收件匣"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:823
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP 伺服器 %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:826
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s 的 IMAP 服務於 %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1029
+#: ../camel/providers/nntp/camel-nntp-provider.c:93
+#: ../camel/providers/pop3/camel-pop3-provider.c:81
+msgid "Password"
+msgstr "密碼"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1031
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1056
+#: ../camel/providers/imapx/camel-imapx-store.c:2619
+#: ../camel/providers/nntp/camel-nntp-store.c:1250
+#: ../camel/providers/pop3/camel-pop3-folder.c:450
+#: ../camel/providers/pop3/camel-pop3-folder.c:593
+#: ../camel/providers/pop3/camel-pop3-folder.c:789
+#: ../camel/providers/pop3/camel-pop3-folder.c:987
+#: ../camel/providers/pop3/camel-pop3-store.c:299
+#: ../camel/providers/pop3/camel-pop3-store.c:528
+#: ../camel/providers/pop3/camel-pop3-store.c:576
+#: ../camel/providers/pop3/camel-pop3-store.c:668
+#: ../camel/providers/pop3/camel-pop3-store.c:1072
+#, c-format
+msgid "You must be working online to complete this operation"
+msgstr "你必須於網上工作才能完成此操作"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1123
+#, c-format
+msgid "No such folder %s"
+msgstr "沒有這個資料夾 %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1518
+#, c-format
+msgid "No IMAP namespace for folder path '%s'"
+msgstr "資料夾路徑「%s」沒有 IMAP 命名空間可用"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1667
+#, c-format
+msgid "Retrieving folder list for %s"
+msgstr "取得 %s 的資料夾清單"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2073
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "資料夾名稱「%s」無效,因為它包括字符「%c」"
+
+#: ../camel/providers/imapx/camel-imapx-stream.c:96
+#, c-format
+msgid "Source stream returned no data"
+msgstr "來源串流傳回無資料"
+
+#: ../camel/providers/imapx/camel-imapx-stream.c:105
+#, c-format
+msgid "Source stream unavailable"
+msgstr "來源串流無法使用"
+
+#: ../camel/providers/local/camel-local-folder.c:192
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:204
-#: ../camel/providers/local/camel-local-folder.c:213
+#: ../camel/providers/local/camel-local-folder.c:202
+#: ../camel/providers/local/camel-local-folder.c:211
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "信箱:%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:222
+#: ../camel/providers/local/camel-local-folder.c:220
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:499
+#: ../camel/providers/local/camel-local-folder.c:497
 msgid "_Index message body data"
 msgstr "索引郵件內文資料(_I)"
 
-#: ../camel/providers/local/camel-local-folder.c:727
+#: ../camel/providers/local/camel-local-folder.c:725
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3410,51 +3403,51 @@ msgstr ""
 "不能從資料夾 %2$s 取得郵件 %1$s \n"
 "%3$s"
 
-#: ../camel/providers/local/camel-local-provider.c:43
+#: ../camel/providers/local/camel-local-provider.c:41
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "使用「.folders」資料夾摘要檔案[exmh](_U)"
 
-#: ../camel/providers/local/camel-local-provider.c:50
+#: ../camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "MH-format 郵件目錄"
 
-#: ../camel/providers/local/camel-local-provider.c:51
+#: ../camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr "用於儲存本地端郵件至 MH-like 郵件目錄。"
 
-#: ../camel/providers/local/camel-local-provider.c:68
+#: ../camel/providers/local/camel-local-provider.c:66
 msgid "Local delivery"
 msgstr "本地端寄送"
 
-#: ../camel/providers/local/camel-local-provider.c:69
+#: ../camel/providers/local/camel-local-provider.c:67
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 msgstr "用於自標準 mbox 格式排程器接收(移動)本地端郵件至 Evolution 管理的資料夾。"
 
-#: ../camel/providers/local/camel-local-provider.c:83
-#: ../camel/providers/local/camel-local-provider.c:103
+#: ../camel/providers/local/camel-local-provider.c:81
+#: ../camel/providers/local/camel-local-provider.c:101
 msgid "_Apply filters to new messages in Inbox"
 msgstr "將過濾條件套用於收件匣裏的新郵件(_A)"
 
-#: ../camel/providers/local/camel-local-provider.c:90
+#: ../camel/providers/local/camel-local-provider.c:88
 msgid "Maildir-format mail directories"
 msgstr "Maildir-format 郵件目錄"
 
-#: ../camel/providers/local/camel-local-provider.c:91
+#: ../camel/providers/local/camel-local-provider.c:89
 msgid "For storing local mail in maildir directories."
 msgstr "用於儲存本地端郵件至 maildir 目錄。"
 
-#: ../camel/providers/local/camel-local-provider.c:104
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "儲存在 Elm/_Pine/Mutt 格式中的狀態檔頭"
 
-#: ../camel/providers/local/camel-local-provider.c:111
+#: ../camel/providers/local/camel-local-provider.c:109
 msgid "Standard Unix mbox spool file"
 msgstr "標準 Unix mbox 排程器檔案"
 
-#: ../camel/providers/local/camel-local-provider.c:112
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:110
+#: ../camel/providers/local/camel-local-provider.c:124
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3462,225 +3455,220 @@ msgstr ""
 "用於讀取及儲存外部標準 mbox 排程器檔案中的本地端郵件。\n"
 "也可以用來讀 Elm 、 Pine 或 Mutt 形式資料夾的樹狀結構。"
 
-#: ../camel/providers/local/camel-local-provider.c:125
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid "Standard Unix mbox spool directory"
 msgstr "標準 Unix mbox 排程器目錄"
 
-#: ../camel/providers/local/camel-local-store.c:98
+#: ../camel/providers/local/camel-local-store.c:96
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "無法將資料夾 %s 重新命名為 %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:180
+#: ../camel/providers/local/camel-local-store.c:178
 #, c-format
 msgid "Local mail file %s"
 msgstr "本地端郵件檔案 %s"
 
-#: ../camel/providers/local/camel-local-store.c:223
-#: ../camel/providers/local/camel-local-store.c:383
-#: ../camel/providers/local/camel-maildir-store.c:117
-#: ../camel/providers/local/camel-mbox-store.c:581
-#: ../camel/providers/local/camel-spool-store.c:89
+#: ../camel/providers/local/camel-local-store.c:221
+#: ../camel/providers/local/camel-local-store.c:381
+#: ../camel/providers/local/camel-maildir-store.c:122
+#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-spool-store.c:87
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "儲存根目錄 %s 不是絕對路徑"
 
-#: ../camel/providers/local/camel-local-store.c:232
+#: ../camel/providers/local/camel-local-store.c:230
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "儲存根目錄 %s 不是合法的目錄"
 
-#: ../camel/providers/local/camel-local-store.c:244
-#: ../camel/providers/local/camel-local-store.c:254
-#: ../camel/providers/local/camel-local-store.c:396
-#: ../camel/providers/local/camel-maildir-store.c:145
+#: ../camel/providers/local/camel-local-store.c:242
+#: ../camel/providers/local/camel-local-store.c:252
+#: ../camel/providers/local/camel-local-store.c:394
+#: ../camel/providers/local/camel-maildir-store.c:150
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "不能取得資料夾:%s:%s"
 
-#: ../camel/providers/local/camel-local-store.c:291
+#: ../camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "本地端的存儲沒有收件匣"
 
-#: ../camel/providers/local/camel-local-store.c:456
-#: ../camel/providers/local/camel-mbox-store.c:748
+#: ../camel/providers/local/camel-local-store.c:454
+#: ../camel/providers/local/camel-mbox-store.c:746
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "不能刪除資料夾索引檔案「%s」: %s"
 
-#: ../camel/providers/local/camel-local-store.c:484
-#: ../camel/providers/local/camel-mbox-store.c:778
+#: ../camel/providers/local/camel-local-store.c:482
+#: ../camel/providers/local/camel-mbox-store.c:776
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "不能刪除資料夾中繼檔案「%s」:%s"
 
-#: ../camel/providers/local/camel-local-store.c:596
+#: ../camel/providers/local/camel-local-store.c:594
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "無法重新命名「%s」:%s "
 
-#: ../camel/providers/local/camel-local-summary.c:567
-#, c-format
-msgid "Unable to add message to summary: unknown reason"
-msgstr "無法新增郵件到摘要資訊:不明的原因"
-
-#: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:335
-#: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:329
-#: ../camel/providers/local/camel-mh-folder.c:159
+#: ../camel/providers/local/camel-maildir-folder.c:98
+#: ../camel/providers/local/camel-maildir-folder.c:333
+#: ../camel/providers/local/camel-mbox-folder.c:115
+#: ../camel/providers/local/camel-mbox-folder.c:328
+#: ../camel/providers/local/camel-mh-folder.c:157
 msgid "No such message"
 msgstr "無此郵件"
 
-#: ../camel/providers/local/camel-maildir-folder.c:225
+#: ../camel/providers/local/camel-maildir-folder.c:223
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "不能將郵件儲存到 maildir 資料夾: %s:"
 
-#: ../camel/providers/local/camel-maildir-folder.c:273
-#: ../camel/providers/local/camel-maildir-folder.c:283
-#: ../camel/providers/local/camel-mbox-folder.c:390
-#: ../camel/providers/local/camel-mh-folder.c:171
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-maildir-folder.c:271
+#: ../camel/providers/local/camel-maildir-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:389
+#: ../camel/providers/local/camel-mh-folder.c:169
+#: ../camel/providers/local/camel-mh-folder.c:179
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "不能從資料夾 %2$s 取得郵件 %1$s:"
 
-#: ../camel/providers/local/camel-maildir-folder.c:353
+#: ../camel/providers/local/camel-maildir-folder.c:351
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "不能將郵件傳輸到目的端資料夾:%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:125
-#: ../camel/providers/local/camel-maildir-store.c:850
+#: ../camel/providers/local/camel-maildir-store.c:130
+#: ../camel/providers/local/camel-maildir-store.c:860
 #, c-format
 msgid "Folder %s already exists"
 msgstr "資料夾 %s 已存在"
 
-#: ../camel/providers/local/camel-maildir-store.c:230
-#: ../camel/providers/local/camel-maildir-store.c:261
-#: ../camel/providers/local/camel-mbox-store.c:403
-#: ../camel/providers/local/camel-mbox-store.c:424
+#: ../camel/providers/local/camel-maildir-store.c:235
+#: ../camel/providers/local/camel-maildir-store.c:266
+#: ../camel/providers/local/camel-mbox-store.c:401
+#: ../camel/providers/local/camel-mbox-store.c:422
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "不能建立資料夾「%s」:%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:245
-#: ../camel/providers/local/camel-mbox-store.c:369
-#: ../camel/providers/local/camel-mh-store.c:514
+#: ../camel/providers/local/camel-maildir-store.c:250
+#: ../camel/providers/local/camel-mbox-store.c:367
+#: ../camel/providers/local/camel-mh-store.c:523
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "不能建立資料夾「%s」:%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:251
-#: ../camel/providers/local/camel-mbox-store.c:379
-#: ../camel/providers/local/camel-mh-store.c:523
+#: ../camel/providers/local/camel-maildir-store.c:256
+#: ../camel/providers/local/camel-mbox-store.c:377
+#: ../camel/providers/local/camel-mh-store.c:532
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "不能取得資料夾「%s」:資料夾不存在。"
 
-#: ../camel/providers/local/camel-maildir-store.c:278
+#: ../camel/providers/local/camel-maildir-store.c:283
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "不能取得資料夾「%s」:不是 maildir 目錄。"
 
-#: ../camel/providers/local/camel-maildir-store.c:283
-#: ../camel/providers/local/camel-mbox-store.c:442
-#: ../camel/providers/local/camel-mh-store.c:556
+#: ../camel/providers/local/camel-maildir-store.c:288
+#: ../camel/providers/local/camel-mbox-store.c:440
+#: ../camel/providers/local/camel-mh-store.c:565
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "不能建立資料夾「%s」:資料夾已存在。"
 
-#: ../camel/providers/local/camel-maildir-store.c:347
-#: ../camel/providers/local/camel-maildir-store.c:387
-#: ../camel/providers/local/camel-mh-store.c:674
+#: ../camel/providers/local/camel-maildir-store.c:352
+#: ../camel/providers/local/camel-maildir-store.c:392
+#: ../camel/providers/local/camel-mh-store.c:683
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "無法刪除資料夾「%s」:%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:349
+#: ../camel/providers/local/camel-maildir-store.c:354
 msgid "not a maildir directory"
 msgstr "不是一個 maildir 目錄"
 
-#: ../camel/providers/local/camel-maildir-store.c:630
-#: ../camel/providers/local/camel-maildir-store.c:1065
+#: ../camel/providers/local/camel-maildir-store.c:635
+#: ../camel/providers/local/camel-maildir-store.c:1074
 #: ../camel/providers/local/camel-spool-store.c:212
 #: ../camel/providers/local/camel-spool-store.c:231
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "無法掃描資料夾「%s」:%s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:458
-#: ../camel/providers/local/camel-maildir-summary.c:591
+#: ../camel/providers/local/camel-maildir-summary.c:465
+#: ../camel/providers/local/camel-maildir-summary.c:605
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "不能開啟 maildir 目錄路徑:%s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:582
+#: ../camel/providers/local/camel-maildir-summary.c:596
 msgid "Checking folder consistency"
 msgstr "檢查資料夾的一致性"
 
-#: ../camel/providers/local/camel-maildir-summary.c:675
+#: ../camel/providers/local/camel-maildir-summary.c:689
 msgid "Checking for new messages"
 msgstr "檢查新郵件"
 
-#: ../camel/providers/local/camel-maildir-summary.c:770
-#: ../camel/providers/local/camel-mbox-summary.c:450
+#: ../camel/providers/local/camel-maildir-summary.c:784
+#: ../camel/providers/local/camel-mbox-summary.c:466
 #: ../camel/providers/local/camel-mbox-summary.c:682
-#: ../camel/providers/local/camel-mbox-summary.c:830
-#: ../camel/providers/local/camel-spool-summary.c:141
+#: ../camel/providers/local/camel-mbox-summary.c:831
+#: ../camel/providers/local/camel-spool-summary.c:139
 msgid "Storing folder"
 msgstr "儲存資料夾"
 
-#: ../camel/providers/local/camel-mbox-folder.c:187
+#: ../camel/providers/local/camel-mbox-folder.c:185
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "不能開啟 mailbox:%s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:253
+#: ../camel/providers/local/camel-mbox-folder.c:251
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "不能將郵件儲存到 mbox 檔案:%s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:382
+#: ../camel/providers/local/camel-mbox-folder.c:381
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "資料夾好像已經損毀並且不能復原。"
 
-#: ../camel/providers/local/camel-mbox-folder.c:439
-#: ../camel/providers/local/camel-spool-folder.c:69
+#: ../camel/providers/local/camel-mbox-folder.c:438
+#: ../camel/providers/local/camel-spool-folder.c:67
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "不能建立資料夾鎖定 %s : %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:391
-#: ../camel/providers/local/camel-mbox-store.c:589
+#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:587
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "無法建立以此為名的資料夾"
 
-#: ../camel/providers/local/camel-mbox-store.c:435
+#: ../camel/providers/local/camel-mbox-store.c:433
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "不能取得資料夾「%s」:不是一般檔案。"
 
-#: ../camel/providers/local/camel-mbox-store.c:605
+#: ../camel/providers/local/camel-mbox-store.c:603
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "不能建立目錄「%s」: %s。"
 
-#: ../camel/providers/local/camel-mbox-store.c:617
+#: ../camel/providers/local/camel-mbox-store.c:615
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "不能取得資料夾:%s:%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:619
+#: ../camel/providers/local/camel-mbox-store.c:617
 msgid "Folder already exists"
 msgstr "資料夾已存在"
 
-#: ../camel/providers/local/camel-mbox-store.c:659
-#: ../camel/providers/local/camel-mbox-store.c:672
-#: ../camel/providers/local/camel-mbox-store.c:701
+#: ../camel/providers/local/camel-mbox-store.c:657
+#: ../camel/providers/local/camel-mbox-store.c:670
+#: ../camel/providers/local/camel-mbox-store.c:699
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3689,144 +3677,139 @@ msgstr ""
 "無法刪除資料夾「%s」:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:682
+#: ../camel/providers/local/camel-mbox-store.c:680
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "「%s」不是普通的檔案。"
 
-#: ../camel/providers/local/camel-mbox-store.c:691
+#: ../camel/providers/local/camel-mbox-store.c:689
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "資料夾「%s」內仍有檔案。所以不刪除。"
 
-#: ../camel/providers/local/camel-mbox-store.c:718
-#: ../camel/providers/local/camel-mbox-store.c:733
+#: ../camel/providers/local/camel-mbox-store.c:716
+#: ../camel/providers/local/camel-mbox-store.c:731
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "無法刪除資料夾摘要檔案「%s」: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:815
+#: ../camel/providers/local/camel-mbox-store.c:813
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "新的資料夾名稱不合法。"
 
-#: ../camel/providers/local/camel-mbox-store.c:831
+#: ../camel/providers/local/camel-mbox-store.c:829
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "無法重新命名「%s」:「%s」:%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:915
+#: ../camel/providers/local/camel-mbox-store.c:913
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "無法將 '%s' 重新命名成 %s:%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:460
+#: ../camel/providers/local/camel-mbox-summary.c:476
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "無法開啟資料夾: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:522
-#, c-format
-msgid "Fatal mail parser error near position %s in folder %s"
-msgstr "靠近 %s (於資料夾 %s)的位置發生嚴重的郵件分析錯誤"
-
-#: ../camel/providers/local/camel-mbox-summary.c:607
+#: ../camel/providers/local/camel-mbox-summary.c:606
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "不能檢查資料夾:%s: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:695
-#: ../camel/providers/local/camel-mbox-summary.c:839
-#: ../camel/providers/local/camel-spool-summary.c:148
+#: ../camel/providers/local/camel-mbox-summary.c:840
+#: ../camel/providers/local/camel-spool-summary.c:146
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "無法開啟檔案: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:709
-#: ../camel/providers/local/camel-spool-summary.c:163
+#: ../camel/providers/local/camel-mbox-summary.c:710
+#: ../camel/providers/local/camel-spool-summary.c:161
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "不能開啟暫存 mailbox:%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:726
-#: ../camel/providers/local/camel-mbox-summary.c:956
+#: ../camel/providers/local/camel-mbox-summary.c:727
+#: ../camel/providers/local/camel-mbox-summary.c:962
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "無法關閉來源資料夾 %s : %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-mbox-summary.c:740
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "無法關閉暫存資料夾: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:758
+#: ../camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "無法重新命名資料夾:%s "
 
-#: ../camel/providers/local/camel-mbox-summary.c:853
-#: ../camel/providers/local/camel-mbox-summary.c:1122
+#: ../camel/providers/local/camel-mbox-summary.c:854
+#: ../camel/providers/local/camel-mbox-summary.c:1127
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "無法儲存資料夾:%s "
 
-#: ../camel/providers/local/camel-mbox-summary.c:892
-#: ../camel/providers/local/camel-mbox-summary.c:1162
+#: ../camel/providers/local/camel-mbox-summary.c:893
+#: ../camel/providers/local/camel-mbox-summary.c:1167
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
 "it.)"
 msgstr "MBOX 檔案已損壞,請修正它。(預期有 From 這一列,卻找不到它。)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:902
-#: ../camel/providers/local/camel-mbox-summary.c:1174
+#: ../camel/providers/local/camel-mbox-summary.c:903
+#: ../camel/providers/local/camel-mbox-summary.c:1179
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "摘要與資料夾不協調,即使經過同步"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1067
+#: ../camel/providers/local/camel-mbox-summary.c:1072
 #: ../camel/providers/local/camel-spool-summary.c:356
 #, c-format
 msgid "Unknown error: %s"
 msgstr "不明的錯誤: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1232
-#: ../camel/providers/local/camel-mbox-summary.c:1262
+#: ../camel/providers/local/camel-mbox-summary.c:1237
+#: ../camel/providers/local/camel-mbox-summary.c:1267
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "寫入暫存郵箱失敗:  %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1251
+#: ../camel/providers/local/camel-mbox-summary.c:1256
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "寫入暫存郵箱失敗: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:118
+#: ../camel/providers/local/camel-mh-folder.c:116
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "不能將郵件儲存到 mh 資料夾: %s:"
 
-#: ../camel/providers/local/camel-mh-store.c:533
+#: ../camel/providers/local/camel-mh-store.c:542
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "無法建立資料夾「%s」:%s"
 
-#: ../camel/providers/local/camel-mh-store.c:549
+#: ../camel/providers/local/camel-mh-store.c:558
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "不能取得資料夾「%s」:不是目錄。"
 
-#: ../camel/providers/local/camel-mh-summary.c:227
+#: ../camel/providers/local/camel-mh-summary.c:236
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "不能開啟 MH 目錄路徑: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:97
+#: ../camel/providers/local/camel-spool-store.c:95
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "排程器「%s」不能被開啟:%s"
 
-#: ../camel/providers/local/camel-spool-store.c:111
+#: ../camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "排程器「%s」不是一般檔案或目錄。"
@@ -3845,12 +3828,12 @@ msgstr "排程資料夾樹狀結構 %s"
 msgid "Invalid spool"
 msgstr "無效的排程器"
 
-#: ../camel/providers/local/camel-spool-store.c:492
+#: ../camel/providers/local/camel-spool-store.c:481
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "資料夾「%s/%s」不存在。"
 
-#: ../camel/providers/local/camel-spool-store.c:505
+#: ../camel/providers/local/camel-spool-store.c:494
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3859,12 +3842,12 @@ msgstr ""
 "無法開啟資料夾「%s」:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:511
+#: ../camel/providers/local/camel-spool-store.c:500
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "資料夾「%s」不存在。"
 
-#: ../camel/providers/local/camel-spool-store.c:519
+#: ../camel/providers/local/camel-spool-store.c:508
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3873,34 +3856,34 @@ msgstr ""
 "無法建立資料夾「%s」:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:532
+#: ../camel/providers/local/camel-spool-store.c:521
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "「%s」不是 mailbox 檔案。"
 
-#: ../camel/providers/local/camel-spool-store.c:596
+#: ../camel/providers/local/camel-spool-store.c:585
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "儲存並不支援 INBOX"
 
-#: ../camel/providers/local/camel-spool-store.c:615
+#: ../camel/providers/local/camel-spool-store.c:604
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "排程資料夾不能刪除"
 
-#: ../camel/providers/local/camel-spool-store.c:630
+#: ../camel/providers/local/camel-spool-store.c:619
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "排程資料夾不能重新命名"
 
-#: ../camel/providers/local/camel-spool-summary.c:179
-#: ../camel/providers/local/camel-spool-summary.c:191
-#: ../camel/providers/local/camel-spool-summary.c:203
+#: ../camel/providers/local/camel-spool-summary.c:177
+#: ../camel/providers/local/camel-spool-summary.c:189
+#: ../camel/providers/local/camel-spool-summary.c:201
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "無法同步暫存資料夾 %s:%s"
 
-#: ../camel/providers/local/camel-spool-summary.c:221
+#: ../camel/providers/local/camel-spool-summary.c:219
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "無法同步排程資料夾%s:%s"
@@ -3916,108 +3899,102 @@ msgstr ""
 "無法同步排程資料夾 %s:%s\n"
 "資料夾可能損毀,複本儲存於「%s」"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:285
-#: ../camel/providers/nntp/camel-nntp-folder.c:388
-#: ../camel/providers/nntp/camel-nntp-folder.c:510
+#: ../camel/providers/nntp/camel-nntp-folder.c:222
+#: ../camel/providers/nntp/camel-nntp-folder.c:588
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "內部錯誤:UID 格式無效:%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:349
-#: ../camel/providers/nntp/camel-nntp-folder.c:354
-#: ../camel/providers/pop3/camel-pop3-folder.c:698
-#: ../camel/providers/pop3/camel-pop3-folder.c:1173
+#: ../camel/providers/nntp/camel-nntp-folder.c:291
+#: ../camel/providers/nntp/camel-nntp-folder.c:296
+#: ../camel/providers/pop3/camel-pop3-folder.c:546
+#: ../camel/providers/pop3/camel-pop3-folder.c:945
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "無法取得郵件 %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:361
-#: ../camel/providers/nntp/camel-nntp-folder.c:536
-#: ../camel/providers/pop3/camel-pop3-folder.c:623
-#: ../camel/providers/pop3/camel-pop3-folder.c:688
-#: ../camel/providers/pop3/camel-pop3-folder.c:707
+#: ../camel/providers/nntp/camel-nntp-folder.c:303
+#: ../camel/providers/nntp/camel-nntp-folder.c:622
+#: ../camel/providers/pop3/camel-pop3-folder.c:476
+#: ../camel/providers/pop3/camel-pop3-folder.c:536
+#: ../camel/providers/pop3/camel-pop3-folder.c:555
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "無法取得郵件 %s:"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:525
-#, c-format
-msgid "This message is not currently available"
-msgstr "這封郵件目前仍未可用"
-
-#: ../camel/providers/nntp/camel-nntp-folder.c:593
-#: ../camel/providers/nntp/camel-nntp-folder.c:599
+#: ../camel/providers/nntp/camel-nntp-folder.c:430
+#: ../camel/providers/nntp/camel-nntp-folder.c:436
 #, c-format
 msgid "Posting failed: %s"
 msgstr "張貼失敗:%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:664
+#: ../camel/providers/nntp/camel-nntp-folder.c:501
 msgid "Posting failed: "
 msgstr "張貼失敗:"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:689
+#: ../camel/providers/nntp/camel-nntp-folder.c:611
 #, c-format
-msgid "You cannot post NNTP messages while working offline!"
-msgstr "離線工作時無法張貼 NNTP 訊息!"
+msgid "This message is not currently available"
+msgstr "這封郵件目前仍未可用"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:709
+#: ../camel/providers/nntp/camel-nntp-folder.c:720
 #, c-format
-msgid "You cannot copy messages from a NNTP folder!"
-msgstr "你無法從 NNTP 資料夾複製訊息!"
+msgid "You cannot copy messages from a NNTP folder"
+msgstr "你不能從 NNTP 資料夾複製郵件"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "以簡短表示法顯示資料夾(例如,c.o.linux 而不是 comp.o_s.linux)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:51
+#: ../camel/providers/nntp/camel-nntp-provider.c:49
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "在訂閱對話方塊,顯示相關資料夾名稱(_D)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "Default NNTP port"
 msgstr "預設的 NNTP 連接埠"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:58
+#: ../camel/providers/nntp/camel-nntp-provider.c:56
 msgid "NNTP over SSL"
 msgstr "NNTP 透過 SSL"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:64
+#: ../camel/providers/nntp/camel-nntp-provider.c:62
 msgid "USENET news"
 msgstr "USENET 新聞"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:66
+#: ../camel/providers/nntp/camel-nntp-provider.c:64
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "這是讀取與發信至 USENET 新聞羣組的供應者。"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:87
+#: ../camel/providers/nntp/camel-nntp-provider.c:85
 msgid ""
 "This option will connect to the NNTP server anonymously, without "
 "authentication."
 msgstr "這個選項將會匿名連線至 NNTP 伺服器,不使用任何核對。"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:97
+#: ../camel/providers/nntp/camel-nntp-provider.c:95
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "這個選項將會使用純文字的密碼核對 NNTP 伺服器。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:386
+#: ../camel/providers/nntp/camel-nntp-store.c:371
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "無法讀取 %s 的歡迎辭:"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:394
+#: ../camel/providers/nntp/camel-nntp-store.c:379
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP 伺服器 %s 傳回錯誤代碼 %d : %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:555
+#: ../camel/providers/nntp/camel-nntp-store.c:449
 #, c-format
 msgid "USENET News via %s"
 msgstr "經由 %s 的 USENET 新聞"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1225
+#: ../camel/providers/nntp/camel-nntp-store.c:1151
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4028,22 +4005,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1337
+#: ../camel/providers/nntp/camel-nntp-store.c:1267
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "你無法在「新聞」儲存區建立資料夾:改以訂閱。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1353
+#: ../camel/providers/nntp/camel-nntp-store.c:1283
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "你無法在「新聞」儲存區重新命名資料夾。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1376
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "你無法在「新聞」儲存區移除資料夾:改以取消訂閱。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1595
+#: ../camel/providers/nntp/camel-nntp-store.c:1516
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4054,7 +4031,7 @@ msgstr ""
 "\n"
 "沒有類似的新聞羣組。選取的項目可能是父代資料夾。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1662
+#: ../camel/providers/nntp/camel-nntp-store.c:1583
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4065,122 +4042,122 @@ msgstr ""
 "\n"
 "新聞羣組不存在!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2099
+#: ../camel/providers/nntp/camel-nntp-store.c:2009
 msgid "NNTP Command failed: "
 msgstr "NNTP 指令失敗:"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2196
+#: ../camel/providers/nntp/camel-nntp-store.c:2106
 #, c-format
 msgid "Not connected."
 msgstr "未連線。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2290
+#: ../camel/providers/nntp/camel-nntp-store.c:2200
 #, c-format
 msgid "No such folder: %s"
 msgstr "沒有這個資料夾: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:200
-#: ../camel/providers/nntp/camel-nntp-summary.c:339
+#: ../camel/providers/nntp/camel-nntp-summary.c:197
+#: ../camel/providers/nntp/camel-nntp-summary.c:337
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s:掃描新郵件"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:222
+#: ../camel/providers/nntp/camel-nntp-summary.c:219
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover 傳來意外的伺服器回應:%s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:360
+#: ../camel/providers/nntp/camel-nntp-summary.c:358
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "標題傳來意外的伺服器回應:%s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:407
+#: ../camel/providers/nntp/camel-nntp-summary.c:406
 #, c-format
 msgid "Operation failed: %s"
 msgstr "作業失敗: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:509
-#: ../camel/providers/pop3/camel-pop3-folder.c:588
+#: ../camel/providers/pop3/camel-pop3-folder.c:359
+#: ../camel/providers/pop3/camel-pop3-folder.c:442
 #, c-format
 msgid "No message with UID %s"
 msgstr "沒有郵件具有這個 UID %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:604
+#: ../camel/providers/pop3/camel-pop3-folder.c:458
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "接收 POP 郵件 %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:699
+#: ../camel/providers/pop3/camel-pop3-folder.c:547
 msgid "Unknown reason"
 msgstr "不明的原因"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:751
+#: ../camel/providers/pop3/camel-pop3-folder.c:598
 msgid "Retrieving POP summary"
 msgstr "取回 POP 的摘要"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:812
-#: ../camel/providers/pop3/camel-pop3-folder.c:815
-#: ../camel/providers/pop3/camel-pop3-folder.c:828
-#: ../camel/providers/pop3/camel-pop3-folder.c:841
-#: ../camel/providers/pop3/camel-pop3-folder.c:855
+#: ../camel/providers/pop3/camel-pop3-folder.c:659
+#: ../camel/providers/pop3/camel-pop3-folder.c:662
+#: ../camel/providers/pop3/camel-pop3-folder.c:675
+#: ../camel/providers/pop3/camel-pop3-folder.c:688
+#: ../camel/providers/pop3/camel-pop3-folder.c:702
 msgid "Cannot get POP summary: "
 msgstr "不能取得 POP 摘要:"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:966
+#: ../camel/providers/pop3/camel-pop3-folder.c:766
 msgid "Expunging old messages"
 msgstr "清空舊的郵件"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:992
+#: ../camel/providers/pop3/camel-pop3-folder.c:794
 msgid "Expunging deleted messages"
 msgstr "清空刪除的郵件"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:39
+#: ../camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message Storage"
 msgstr "郵件儲存空間"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
 msgid "_Leave messages on server"
 msgstr "在伺服器保留郵件備份(_L)"
 
 #. Translators: '%s' is replaced with a widget, where user can
 #. * select how many days can be message left on the server.
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "刪除 %s 天後的郵件(_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "Delete _expunged from local Inbox"
 msgstr "刪除在本地端收件匣清除的(_E)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 msgid "Disable _support for all POP3 extensions"
 msgstr "停止所有 P_OP3 延伸功能的支援"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "Default POP3 port"
 msgstr "預設 POP3 連接埠"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:56
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
 msgid "POP3 over SSL"
 msgstr "POP3 透過 SSL"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:63
+#: ../camel/providers/pop3/camel-pop3-provider.c:61
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:65
+#: ../camel/providers/pop3/camel-pop3-provider.c:63
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "用於連線到 POP 伺服器並下載郵件。"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:85
+#: ../camel/providers/pop3/camel-pop3-provider.c:83
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr "這個選項將會使用純文字的密碼連線到 POP 伺服器。一般的 POP 伺服器只會支援這種方式。"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:95
+#: ../camel/providers/pop3/camel-pop3-provider.c:93
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4188,64 +4165,64 @@ msgid ""
 msgstr "這個選項將會使用加密的密碼經由 APOP 通訊協定連線到 POP 伺服器。不過就算伺服器聲稱能夠支援,但對於所有使用者來講都未必一定可行。"
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:99
+#: ../camel/providers/pop3/camel-pop3-store.c:97
 msgid ": "
 msgstr ":"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:161
+#: ../camel/providers/pop3/camel-pop3-store.c:164
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "無法從 POP 伺服器 %s 讀取有效的問候語"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:176
+#: ../camel/providers/pop3/camel-pop3-store.c:179
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "無法以安全模式連線到 POP 伺服器 %s: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:177
+#: ../camel/providers/pop3/camel-pop3-store.c:180
 msgid "STLS not supported by server"
 msgstr "伺服器不支援 STLS"
 
 #. Translators: Last %s is an optional
 #. * explanation beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:198
+#: ../camel/providers/pop3/camel-pop3-store.c:201
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "無法以安全模式連線到 POP 伺服器 %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:211
+#: ../camel/providers/pop3/camel-pop3-store.c:219
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "無法以安全模式連線到 POP 伺服器 %s:"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:351
+#: ../camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "不能登入 POP 伺服器 %s: SASL 通訊協定錯誤"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:373
+#: ../camel/providers/pop3/camel-pop3-store.c:382
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "無法核對 POP 伺服器 %s:"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:481
+#: ../camel/providers/pop3/camel-pop3-store.c:490
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 伺服器 %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:484
+#: ../camel/providers/pop3/camel-pop3-store.c:493
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "%s 在 %s 的 POP3 伺服器"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:703
+#: ../camel/providers/pop3/camel-pop3-store.c:713
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 msgstr "無法連線至 POP 伺服器 %s:\t收到無效的 APOP ID。推測可能是使用者假冒攻擊。請聯絡你的系統管理者。"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:755
+#: ../camel/providers/pop3/camel-pop3-store.c:768
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4256,7 +4233,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:770
+#: ../camel/providers/pop3/camel-pop3-store.c:783
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4265,316 +4242,316 @@ msgstr ""
 "無法連線 POP 伺服器 %s。\n"
 "傳送使用者名稱發生錯誤%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:852
+#: ../camel/providers/pop3/camel-pop3-store.c:865
 #, c-format
 msgid "No such folder '%s'."
 msgstr "沒有這個資料夾「%s」。"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:869
+#: ../camel/providers/pop3/camel-pop3-store.c:882
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 儲存區沒有資料夾階層"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:34
 #: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr "將遞送的郵件交給本地端系統上的「sendmail」程式處理。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:52
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
 msgid "Mail delivery via the sendmail program"
 msgstr "經由 sendmail 程式傳送郵件"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:140
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:138
 #, c-format
 msgid "Failed to read From address"
 msgstr "讀取寄件者位址失敗"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:157
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:155
 #, c-format
 msgid "Message send in offline mode is disabled"
 msgstr "離線模式下傳送郵件已停用"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:185
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:183
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "無法分析收件人清單"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:202
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:200
 #, c-format
 msgid "Could not parse arguments"
 msgstr "無法解析引數"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:233
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:231
 #, c-format
 msgid "Could not create pipe to '%s': %s: mail not sent"
 msgstr "無法建立導管到「%s」: %s:郵件無法傳送"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:258
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:256
 #, c-format
 msgid "Could not fork '%s': %s: mail not sent"
 msgstr "無法另外再啟動一個「%s」: %s:郵件無法傳送"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:307
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:305
 msgid "Could not send message: "
 msgstr "無法傳送郵件:"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:337
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:335
 #, c-format
 msgid "'%s' exited with signal %s: mail not sent."
 msgstr "「%s」已結束,訊息為 %s:郵件無法傳送。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:347
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:345
 #, c-format
 msgid "Could not execute '%s': mail not sent."
 msgstr "無法執行「%s」: 郵件無法傳送。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:352
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:350
 #, c-format
 msgid "'%s' exited with status %d: mail not sent."
 msgstr "「%s」由於狀況 %d 關閉: 郵件無法傳送。"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:42
+#: ../camel/providers/smtp/camel-smtp-provider.c:40
 msgid "Default SMTP port"
 msgstr "預設 SMTP 連接埠"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
 msgid "SMTP over SSL"
 msgstr "SMTP 透過 SSL"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:44
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
 msgid "Message submission port"
 msgstr "郵件提交連接埠"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:50
+#: ../camel/providers/smtp/camel-smtp-provider.c:48
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:52
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "使用 SMTP 連線到遠端 mailhub 來傳送郵件。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Welcome response error: "
 msgstr "迎接的回應錯誤:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:214
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "無法以安全模式連線到 SMTP 伺服器 %s: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
-#: ../camel/providers/smtp/camel-smtp-transport.c:226
-#: ../camel/providers/smtp/camel-smtp-transport.c:234
+#: ../camel/providers/smtp/camel-smtp-transport.c:224
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS 指令失敗:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:265
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "無法以安全模式連線到 SMTP 伺服器 %s:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:338
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP 伺服器 %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:341
+#: ../camel/providers/smtp/camel-smtp-transport.c:360
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "經由 %s 傳送 SMTP 郵件"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:415
+#: ../camel/providers/smtp/camel-smtp-transport.c:434
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP 伺服器 %s 不支援 %s 核對"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
+#: ../camel/providers/smtp/camel-smtp-transport.c:506
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr "沒有指定 SASL 機制"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:526
-#: ../camel/providers/smtp/camel-smtp-transport.c:537
-#: ../camel/providers/smtp/camel-smtp-transport.c:550
+#: ../camel/providers/smtp/camel-smtp-transport.c:536
+#: ../camel/providers/smtp/camel-smtp-transport.c:547
+#: ../camel/providers/smtp/camel-smtp-transport.c:560
 msgid "AUTH command failed: "
 msgstr "AUTH 指令失敗:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:691
+#: ../camel/providers/smtp/camel-smtp-transport.c:701
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "無法傳送訊息:服務未連線。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:698
+#: ../camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "不能傳送郵件:寄件者的地址無效。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
+#: ../camel/providers/smtp/camel-smtp-transport.c:712
 msgid "Sending message"
 msgstr "傳送郵件"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "不能傳送郵件:沒有定義收件者。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:740
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "不能傳送郵件:一或多個無效的收件者"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:861
+#: ../camel/providers/smtp/camel-smtp-transport.c:871
 msgid "Syntax error, command unrecognized"
 msgstr "語法錯誤,不認識的指令"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:863
+#: ../camel/providers/smtp/camel-smtp-transport.c:873
 msgid "Syntax error in parameters or arguments"
 msgstr "參數內的語法錯誤"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:865
+#: ../camel/providers/smtp/camel-smtp-transport.c:875
 msgid "Command not implemented"
 msgstr "指令沒有實作"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:867
+#: ../camel/providers/smtp/camel-smtp-transport.c:877
 msgid "Command parameter not implemented"
 msgstr "指令的參數沒有實作"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:869
+#: ../camel/providers/smtp/camel-smtp-transport.c:879
 msgid "System status, or system help reply"
 msgstr "系統狀況,或者是系統的求助說明回應"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:871
+#: ../camel/providers/smtp/camel-smtp-transport.c:881
 msgid "Help message"
 msgstr "求助說明訊息"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:873
+#: ../camel/providers/smtp/camel-smtp-transport.c:883
 msgid "Service ready"
 msgstr "服務已就緒"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:875
+#: ../camel/providers/smtp/camel-smtp-transport.c:885
 msgid "Service closing transmission channel"
 msgstr "此服務將傳輸通道關閉"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:877
+#: ../camel/providers/smtp/camel-smtp-transport.c:887
 msgid "Service not available, closing transmission channel"
 msgstr "此服務仍未可用,傳輸通道關閉"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:879
+#: ../camel/providers/smtp/camel-smtp-transport.c:889
 msgid "Requested mail action okay, completed"
 msgstr " 所要求的郵件動作已成功完成"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:881
+#: ../camel/providers/smtp/camel-smtp-transport.c:891
 msgid "User not local; will forward to <forward-path>"
 msgstr "不是本地端的使用者;將會轉寄至 <轉寄路徑>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:883
+#: ../camel/providers/smtp/camel-smtp-transport.c:893
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "所要求的郵件動作無法執行:郵箱仍未可用"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:885
+#: ../camel/providers/smtp/camel-smtp-transport.c:895
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "所要求的動作無法執行:郵箱仍未可用"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:887
+#: ../camel/providers/smtp/camel-smtp-transport.c:897
 msgid "Requested action aborted: error in processing"
 msgstr "所要求的動作已放棄:正在處理時發生錯誤"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:889
+#: ../camel/providers/smtp/camel-smtp-transport.c:899
 msgid "User not local; please try <forward-path>"
 msgstr "不是本地端的使用者;請嘗試使用 <轉寄路徑>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:891
+#: ../camel/providers/smtp/camel-smtp-transport.c:901
 msgid "Requested action not taken: insufficient system storage"
 msgstr "所要求的動作無法執行:系統的儲存空間不足"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:893
+#: ../camel/providers/smtp/camel-smtp-transport.c:903
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "所要求的郵件動作已放棄:超出可供儲存空間的限制"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:895
+#: ../camel/providers/smtp/camel-smtp-transport.c:905
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "所要求的動作已放棄:不允許的郵箱名稱"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:897
+#: ../camel/providers/smtp/camel-smtp-transport.c:907
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "請開始輸入郵件的資料;<CRLF>.<CRLF> 結束撰寫郵件"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:899
+#: ../camel/providers/smtp/camel-smtp-transport.c:909
 msgid "Transaction failed"
 msgstr "執行失敗"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:903
+#: ../camel/providers/smtp/camel-smtp-transport.c:913
 msgid "A password transition is needed"
 msgstr "需要密碼傳送"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:905
+#: ../camel/providers/smtp/camel-smtp-transport.c:915
 msgid "Authentication mechanism is too weak"
 msgstr "核對機制太弱了"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:907
+#: ../camel/providers/smtp/camel-smtp-transport.c:917
 msgid "Encryption required for requested authentication mechanism"
 msgstr "所要求的核對機制必須加密處理"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:909
+#: ../camel/providers/smtp/camel-smtp-transport.c:919
 msgid "Temporary authentication failure"
 msgstr "臨時核對失敗"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1166
+#: ../camel/providers/smtp/camel-smtp-transport.c:1207
 msgid "SMTP Greeting"
 msgstr "SMTP 迎接"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1193
-#: ../camel/providers/smtp/camel-smtp-transport.c:1207
-#: ../camel/providers/smtp/camel-smtp-transport.c:1215
+#: ../camel/providers/smtp/camel-smtp-transport.c:1217
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#: ../camel/providers/smtp/camel-smtp-transport.c:1239
 msgid "HELO command failed: "
 msgstr "HELO 指令失敗:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#: ../camel/providers/smtp/camel-smtp-transport.c:1305
-#: ../camel/providers/smtp/camel-smtp-transport.c:1315
+#: ../camel/providers/smtp/camel-smtp-transport.c:1314
+#: ../camel/providers/smtp/camel-smtp-transport.c:1329
+#: ../camel/providers/smtp/camel-smtp-transport.c:1339
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM 指令失敗:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1342
+#: ../camel/providers/smtp/camel-smtp-transport.c:1366
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO 指令失敗:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1359
-#: ../camel/providers/smtp/camel-smtp-transport.c:1369
+#: ../camel/providers/smtp/camel-smtp-transport.c:1383
+#: ../camel/providers/smtp/camel-smtp-transport.c:1393
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> 失敗:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1412
-#: ../camel/providers/smtp/camel-smtp-transport.c:1423
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
-#: ../camel/providers/smtp/camel-smtp-transport.c:1493
-#: ../camel/providers/smtp/camel-smtp-transport.c:1513
-#: ../camel/providers/smtp/camel-smtp-transport.c:1527
-#: ../camel/providers/smtp/camel-smtp-transport.c:1536
+#: ../camel/providers/smtp/camel-smtp-transport.c:1436
+#: ../camel/providers/smtp/camel-smtp-transport.c:1447
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1517
+#: ../camel/providers/smtp/camel-smtp-transport.c:1537
+#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1560
 msgid "DATA command failed: "
 msgstr "DATA 指令失敗:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1561
-#: ../camel/providers/smtp/camel-smtp-transport.c:1576
 #: ../camel/providers/smtp/camel-smtp-transport.c:1585
+#: ../camel/providers/smtp/camel-smtp-transport.c:1600
+#: ../camel/providers/smtp/camel-smtp-transport.c:1609
 msgid "RSET command failed: "
 msgstr "RSET 指令失敗:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1610
-#: ../camel/providers/smtp/camel-smtp-transport.c:1624
-#: ../camel/providers/smtp/camel-smtp-transport.c:1631
+#: ../camel/providers/smtp/camel-smtp-transport.c:1634
+#: ../camel/providers/smtp/camel-smtp-transport.c:1648
+#: ../camel/providers/smtp/camel-smtp-transport.c:1655
 msgid "QUIT command failed: "
 msgstr "QUIT 指令失敗:"
 
@@ -4608,341 +4585,405 @@ msgid ""
 "\"days\""
 msgstr "生日和週年紀念日提醒的單位,「minutes」(分鐘)、「hours」(小時)或「days」(日)"
 
-#: ../libebackend/e-authentication-mediator.c:205
-#: ../libebackend/e-authentication-mediator.c:216
-#: ../libebackend/e-authentication-mediator.c:862
-#: ../libebackend/e-authentication-mediator.c:1193
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
+msgid "(Deprecated) Proxy type to use"
+msgstr "(已廢棄) 要使用的代理伺服器類型"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
+msgid ""
+"This key was deprecated in version 3.12 and should no longer be used. Proxy "
+"settings are now integrated into Evolution-Data-Server's account system. See "
+"the ESourceProxy API documentation for details."
+msgstr "這個設定鍵在 3.12 版中已廢棄不再使用。代理伺服器設定值現在已整合到 Evolution-Data-Server 帳號系統。請查看 ESourceProxy API 文件以了解詳細資訊。"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
+msgid "(Deprecated) Whether to use http-proxy"
+msgstr "(已廢棄) 是否使用 http-proxy"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+msgid "(Deprecated) Whether proxy server requires authentication"
+msgstr "(已廢棄) 代理伺服器是否要求核對"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
+msgid "(Deprecated) Host name for HTTP requests"
+msgstr "(已廢棄) HTTP 要求的主機名稱"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
+msgid "(Deprecated) Port number for HTTP requests"
+msgstr "(已廢棄) HTTP 要求的連接埠"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
+msgid "(Deprecated) Proxy authentication user name"
+msgstr "(已廢棄) 代理伺服器核對使用者名稱"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+msgid "(Deprecated) Proxy authentication password"
+msgstr "(已廢棄) 代理伺服器核對密碼"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+msgid "(Deprecated) List of hosts to connect to without proxy"
+msgstr "(已廢棄) 不使用代理伺服器的主機清單"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+msgid "(Deprecated) Host name for HTTPS requests"
+msgstr "(已廢棄) HTTPS 要求的主機名稱"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+msgid "(Deprecated) Port number for HTTPS requests"
+msgstr "(已廢棄) HTTPS 要求的連接埠"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
+msgid "(Deprecated) Host name for SOCKS requests"
+msgstr "(已廢棄) SOCKS 要求的主機名稱"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+msgid "(Deprecated) Port number for SOCKS requests"
+msgstr "(已廢棄) SOCKS 要求的連接埠"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+msgid "(Deprecated) Automatic proxy configuration URL"
+msgstr "(已廢棄) 自動代理伺服器組態網址"
+
+#: ../libebackend/e-authentication-mediator.c:204
+#: ../libebackend/e-authentication-mediator.c:215
+#: ../libebackend/e-authentication-mediator.c:861
+#: ../libebackend/e-authentication-mediator.c:1198
 msgid "Bus name vanished (client terminated?)"
 msgstr "匯流排名稱消失了 (客戶端終止?)"
 
-#: ../libebackend/e-authentication-mediator.c:264
+#: ../libebackend/e-authentication-mediator.c:263
 msgid "No response from client"
 msgstr "客戶端沒有回應"
 
-#: ../libebackend/e-authentication-mediator.c:334
-#: ../libebackend/e-authentication-mediator.c:345
-#: ../libebackend/e-authentication-mediator.c:856
-#: ../libebackend/e-authentication-mediator.c:1187
+#: ../libebackend/e-authentication-mediator.c:333
+#: ../libebackend/e-authentication-mediator.c:344
+#: ../libebackend/e-authentication-mediator.c:855
+#: ../libebackend/e-authentication-mediator.c:1192
 msgid "Client cancelled the operation"
 msgstr "客戶端已取消操作"
 
-#: ../libebackend/e-authentication-mediator.c:416
+#: ../libebackend/e-authentication-mediator.c:415
 msgid "Client reports password was rejected"
 msgstr "客戶端回報密碼被拒絕"
 
-#: ../libebackend/e-authentication-session.c:569
+#: ../libebackend/e-authentication-session.c:568
 msgid "Add this password to your keyring"
 msgstr "將密碼加入你的密碼匙圈"
 
-#: ../libebackend/e-authentication-session.c:674
+#: ../libebackend/e-authentication-session.c:673
 msgid "Password was incorrect"
 msgstr "密碼是不正確的"
 
-#: ../libebackend/e-backend.c:428
+#: ../libebackend/e-backend.c:408
 #, c-format
 msgid "%s does not support authentication"
 msgstr "%s 不支援核對"
 
-#: ../libebackend/e-collection-backend.c:800
+#: ../libebackend/e-collection-backend.c:900
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr "%s 不支援建立遠端資源"
 
-#: ../libebackend/e-collection-backend.c:859
+#: ../libebackend/e-collection-backend.c:959
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr "%s 不支援刪除遠端資源"
 
-#: ../libebackend/e-data-factory.c:304
+#: ../libebackend/e-data-factory.c:303
 #, c-format
 msgid "No backend factory for hash key '%s'"
 msgstr "雜湊鍵「%s」中沒有後端工廠"
 
-#: ../libebackend/e-server-side-source.c:134
+#: ../libebackend/e-server-side-source.c:133
 #, c-format
 msgid "Data source is missing a [%s] group"
 msgstr "資料來源缺少 [%s] 羣組"
 
-#: ../libebackend/e-server-side-source.c:1008
-#: ../libedataserver/e-source.c:1138
+#: ../libebackend/e-server-side-source.c:1007
+#: ../libedataserver/e-source.c:1252
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
 msgstr "資料來源「%s」不支援建立遠端資源"
 
-#: ../libebackend/e-server-side-source.c:1022
+#: ../libebackend/e-server-side-source.c:1021
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to create the remote resource"
 msgstr "資料來源「%s」沒有用來建立遠端資料的收集後端"
 
-#: ../libebackend/e-server-side-source.c:1050
-#: ../libedataserver/e-source.c:1251
+#: ../libebackend/e-server-side-source.c:1049
+#: ../libedataserver/e-source.c:1365
 #, c-format
 msgid "Data source '%s' does not support deleting remote resources"
 msgstr "資料來源「%s」不支援刪除遠端資源"
 
-#: ../libebackend/e-server-side-source.c:1064
+#: ../libebackend/e-server-side-source.c:1063
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to delete the remote resource"
 msgstr "資料來源「%s」沒有用來刪除遠端資料的收集後端"
 
-#: ../libebackend/e-server-side-source.c:1095
-#: ../libedataserver/e-source.c:1347
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990
+#: ../libebackend/e-server-side-source.c:1094
+#: ../libedataserver/e-source.c:1461
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027
 #, c-format
 msgid "Data source '%s' does not support OAuth 2.0 authentication"
 msgstr "資料來源「%s」不支援 OAuth 2.0 核對"
 
-#: ../libebackend/e-server-side-source.c:1438
+#: ../libebackend/e-server-side-source.c:1439
 #, c-format
 msgid "File must have a '.source' extension"
 msgstr "檔案必須以「.source」做為延伸檔名"
 
-#: ../libebackend/e-source-registry-server.c:521
-#: ../libedataserver/e-source-registry.c:1876
+#: ../libebackend/e-source-registry-server.c:531
+#: ../libedataserver/e-source-registry.c:1878
 msgid "The user declined to authenticate"
 msgstr "使用者拒絕核對"
 
-#: ../libebackend/e-source-registry-server.c:790
+#: ../libebackend/e-source-registry-server.c:800
 #, c-format
 msgid "UID '%s' is already in use"
 msgstr "UID 「%s」已經在使用中"
 
-#: ../libebackend/e-user-prompter-server.c:301
+#: ../libebackend/e-user-prompter-server.c:305
 #, c-format
 msgid "Extension dialog '%s' not found."
 msgstr "找不到延伸功能對話盒「%s」。"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "週年紀念日"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "生日"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "商務"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "競爭者"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "喜愛的"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "禮物"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "終點/目標"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "假日"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "假日邀請卡"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "熱門聯絡人"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "創意"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "International"
 msgstr "國際的"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "關鍵客戶"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "雜項"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:63
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "個人"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:64
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "電話"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "狀態"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "策略"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "供應商"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "時間與開銷"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:70
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:69
+#: ../libedataserver/e-categories.c:71
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "正在等待"
 
-#: ../libedataserver/e-client.c:133
+#: ../libedataserver/e-client.c:141
 msgid "Source not loaded"
 msgstr "來源未載入"
 
-#: ../libedataserver/e-client.c:135
+#: ../libedataserver/e-client.c:143
 msgid "Source already loaded"
 msgstr "來源已載入"
 
 #. Translators: This means that the EClient does not
 #. * support offline mode, or it's not set to by a user,
 #. * thus it is unavailable while user is not connected.
-#: ../libedataserver/e-client.c:146
+#: ../libedataserver/e-client.c:154
 msgid "Offline unavailable"
 msgstr "離線無法使用"
 
-#: ../libedataserver/e-client.c:168
+#: ../libedataserver/e-client.c:176
 msgid "D-Bus error"
 msgstr "D-Bus 錯誤"
 
-#: ../libedataserver/e-source-authenticator.c:166
+#: ../libedataserver/e-source-authenticator.c:162
 msgid "Address book authentication request"
 msgstr "通訊錄核對要求"
 
-#: ../libedataserver/e-source-authenticator.c:171
+#: ../libedataserver/e-source-authenticator.c:167
 msgid "Calendar authentication request"
 msgstr "行事曆核對要求"
 
-#: ../libedataserver/e-source-authenticator.c:175
+#: ../libedataserver/e-source-authenticator.c:171
 msgid "Mail authentication request"
 msgstr "郵件核對要求"
 
 #. generic account prompt
-#: ../libedataserver/e-source-authenticator.c:178
+#: ../libedataserver/e-source-authenticator.c:174
 msgid "Authentication request"
 msgstr "核對要求"
 
-#: ../libedataserver/e-source-authenticator.c:188
+#: ../libedataserver/e-source-authenticator.c:184
 #, c-format
 msgid "Please enter the password for address book \"%s\"."
 msgstr "請輸入通訊錄「%s」的密碼 。"
 
-#: ../libedataserver/e-source-authenticator.c:194
+#: ../libedataserver/e-source-authenticator.c:190
 #, c-format
 msgid "Please enter the password for calendar \"%s\"."
 msgstr "請輸入行事曆「%s」的密碼 。"
 
-#: ../libedataserver/e-source-authenticator.c:200
+#: ../libedataserver/e-source-authenticator.c:196
 #, c-format
 msgid "Please enter the password for mail account \"%s\"."
 msgstr "請輸入郵件帳號「%s」的密碼 。"
 
-#: ../libedataserver/e-source-authenticator.c:206
+#: ../libedataserver/e-source-authenticator.c:202
 #, c-format
 msgid "Please enter the password for mail transport \"%s\"."
 msgstr "請輸入郵件傳輸「%s」的密碼 。"
 
-#: ../libedataserver/e-source-authenticator.c:212
+#: ../libedataserver/e-source-authenticator.c:208
 #, c-format
 msgid "Please enter the password for memo list \"%s\"."
 msgstr "請輸入備忘錄清單「%s」的密碼 。"
 
-#: ../libedataserver/e-source-authenticator.c:218
+#: ../libedataserver/e-source-authenticator.c:214
 #, c-format
 msgid "Please enter the password for task list \"%s\"."
 msgstr "請輸入工作清單「%s」的密碼 。"
 
-#: ../libedataserver/e-source-authenticator.c:224
+#: ../libedataserver/e-source-authenticator.c:220
 #, c-format
 msgid "Please enter the password for account \"%s\"."
 msgstr "請輸入帳號「%s」的密碼 。"
 
-#: ../libedataserver/e-source.c:627
+#: ../libedataserver/e-source.c:669
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "來源檔案缺少 [%s] 羣組"
 
-#: ../libedataserver/e-source.c:949
+#: ../libedataserver/e-source.c:1032
 #, c-format
 msgid "Data source '%s' is not removable"
 msgstr "資料來源「%s」無法移除"
 
-#: ../libedataserver/e-source.c:1041
+#: ../libedataserver/e-source.c:1155
 #, c-format
 msgid "Data source '%s' is not writable"
 msgstr "資料來源「%s」無法寫入"
 
-#: ../libedataserver/e-source.c:1559
+#: ../libedataserver/e-source.c:1768
 msgid "Unnamed"
 msgstr "未命名的"
 
-#: ../libedataserver/e-source-mail-signature.c:487
+#: ../libedataserver/e-source-mail-signature.c:486
 #, c-format
 msgid "Signature script must be a local file"
 msgstr "簽署必須是本地端檔案"
 
-#: ../libedataserver/e-source-webdav.c:1553
+#: ../libedataserver/e-source-proxy.c:1646
+#, c-format
+msgid "Source '%s' does not support proxy lookups"
+msgstr "來源「%s」不支援代理伺服器查詢"
+
+#: ../libedataserver/e-source-webdav.c:1551
 #, c-format
 msgid ""
 "SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
 "you wish to accept it?"
 msgstr "主機「%s」用於通訊錄「%s」的 SSL 證書未受信任。你想要接受它嗎?"
 
-#: ../libedataserver/e-source-webdav.c:1562
+#: ../libedataserver/e-source-webdav.c:1560
 #, c-format
 msgid ""
 "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
 "wish to accept it?"
 msgstr "主機「%s」用於行事曆「%s」的 SSL 證書未受信任。你想要接受它嗎?"
 
-#: ../libedataserver/e-source-webdav.c:1571
+#: ../libedataserver/e-source-webdav.c:1569
 #, c-format
 msgid ""
 "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
 "you wish to accept it?"
 msgstr "主機「%s」用於備忘錄清單「%s」的 SSL 證書未受信任。你想要接受它嗎?"
 
-#: ../libedataserver/e-source-webdav.c:1580
+#: ../libedataserver/e-source-webdav.c:1578
 #, c-format
 msgid ""
 "SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
@@ -4953,7 +4994,7 @@ msgstr "主機「%s」用於工作清單「%s」的 SSL 證書未受信任。你
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1962
+#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1961
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
@@ -4961,7 +5002,7 @@ msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1668 ../libedataserver/e-time-utils.c:1953
+#: ../libedataserver/e-time-utils.c:1667 ../libedataserver/e-time-utils.c:1952
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
@@ -4969,7 +5010,7 @@ msgstr "%Y/%m/%d (%a) %H:%M:%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1673 ../libedataserver/e-time-utils.c:1958
+#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1957
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -4977,78 +5018,78 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1949
+#: ../libedataserver/e-time-utils.c:1677 ../libedataserver/e-time-utils.c:1948
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1683
+#: ../libedataserver/e-time-utils.c:1682
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1688
+#: ../libedataserver/e-time-utils.c:1687
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1691 ../libedataserver/e-time-utils.c:1811
-#: ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1690 ../libedataserver/e-time-utils.c:1810
+#: ../libedataserver/e-time-utils.c:1943
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1698
+#: ../libedataserver/e-time-utils.c:1697
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1702
+#: ../libedataserver/e-time-utils.c:1701
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1707
+#: ../libedataserver/e-time-utils.c:1706
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1712
+#: ../libedataserver/e-time-utils.c:1711
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1717
+#: ../libedataserver/e-time-utils.c:1716
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1722
+#: ../libedataserver/e-time-utils.c:1721
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1725 ../libedataserver/e-time-utils.c:1814
+#: ../libedataserver/e-time-utils.c:1724 ../libedataserver/e-time-utils.c:1813
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:2006
+#: ../libedataserver/e-time-utils.c:1884 ../libedataserver/e-time-utils.c:2005
 msgid "%I:%M:%S %p"
 msgstr "%p %I:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1889 ../libedataserver/e-time-utils.c:1998
+#: ../libedataserver/e-time-utils.c:1888 ../libedataserver/e-time-utils.c:1997
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5056,570 +5097,156 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1894 ../libedataserver/e-time-utils.c:2003
+#: ../libedataserver/e-time-utils.c:1893 ../libedataserver/e-time-utils.c:2002
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1898 ../libedataserver/e-time-utils.c:1995
+#: ../libedataserver/e-time-utils.c:1897 ../libedataserver/e-time-utils.c:1994
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format,
 #. * and no colon.
-#: ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1901
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1906
+#: ../libedataserver/e-time-utils.c:1905
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
-msgid "Proxy type to use"
-msgstr "要使用的代理伺服器類型"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
-msgid ""
-"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
-"means manual proxy."
-msgstr "要使用哪種類型的代理伺服器。「0」表示使用系統值,「1」表示不使用代理伺服器,「2」表示手動設定代理伺服器。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
-msgid "Whether to use http-proxy"
-msgstr "是否使用 http-proxy"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
-msgid "Whether to use proxy for HTTP requests."
-msgstr "對 HTTP 要求是否使用代理伺服器。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
-msgid "Whether proxy server requires authentication"
-msgstr "代理伺服器是否要求核對"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
-msgid "Whether authentication is required to access proxy server."
-msgstr "存取代理伺服器是否要求核對。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
-msgid "Host name for HTTP requests"
-msgstr "HTTP 要求的主機名稱"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
-msgid "Host name to use for HTTP requests."
-msgstr "對 HTTP 要求使用的主機名稱。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
-msgid "Port number for HTTP requests"
-msgstr "HTTP 要求使用的連接埠號"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
-msgid "Port number to use for HTTP requests."
-msgstr "對 HTTP 要求使用的連接埠號。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
-msgid "Proxy authentication user name"
-msgstr "代理伺服器核對使用者名稱"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
-msgid "User name to use to authenticate against proxy server."
-msgstr "用來核對代理伺服器的使用者名稱。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
-msgid "Proxy authentication password"
-msgstr "代理伺服器核對密碼"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
-msgid "Password to use to authenticate against proxy server."
-msgstr "用來核對代理伺服器的密碼。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:15
-msgid "List of hosts to connect to without proxy"
-msgstr "不使用代理伺服器連接的主機清單"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:16
-msgid "List of hosts for which do not use proxy."
-msgstr "不使用代理伺服器連接的主機清單。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:17
-msgid "Host name for HTTPS requests"
-msgstr "HTTPS 要求的主機名稱"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:18
-msgid "Host name to use for HTTPS requests."
-msgstr "對 HTTPS 要求使用的主機名稱。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:19
-msgid "Port number for HTTPS requests"
-msgstr "HTTPS 要求使用的連接埠號"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:20
-msgid "Port number to use for HTTPS requests."
-msgstr "對 HTTPS 要求使用的連接埠號。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:21
-msgid "Host name for SOCKS requests"
-msgstr "SOCKS 要求的主機名稱"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:22
-msgid "Host name to use for SOCKS requests."
-msgstr "對 SOCKS 要求使用的主機名稱。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:23
-msgid "Port number for SOCKS requests"
-msgstr "SOCKS 要求使用的連接埠號"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:24
-msgid "Port number to use for SOCKS requests."
-msgstr "對 SOCKS 要求使用的連接埠號。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:25
-msgid "Automatic proxy configuration URL"
-msgstr "自動代理伺服器組態網址"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:26
-msgid "Where to read automatic proxy configuration from."
-msgstr "要從何處讀取自動代理伺服器組態。"
-
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:129
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:365
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:130
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:364
 #, c-format
 msgid "No such data source for UID '%s'"
 msgstr "沒有 UID「%s」的資料來源"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:141
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:142
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain a password for '%s'"
 msgstr "找不到在 org.gnome 中對應的帳號。這是 OnlineAccounts 服務用來獲得「%s」的密碼的地方"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:213
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:218
 #, c-format
 msgid "Invalid password for '%s'"
 msgstr "「%s」的密碼無效"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:222
+#: ../modules/gnome-online-accounts/goaewsclient.c:219
 #, c-format
 msgid "Code: %u - Unexpected response from server"
 msgstr "代碼:%u - 從伺服器傳回未預期的回應"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:243
+#: ../modules/gnome-online-accounts/goaewsclient.c:240
 #, c-format
 msgid "Failed to parse autodiscover response XML"
 msgstr "無法解析自動偵測回應的 XML"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:252
+#: ../modules/gnome-online-accounts/goaewsclient.c:249
 #, c-format
 msgid "Failed to find Autodiscover element"
 msgstr "找不到自動偵測元素"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:264
+#: ../modules/gnome-online-accounts/goaewsclient.c:261
 #, c-format
 msgid "Failed to find Response element"
 msgstr "找不到回應元素"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:276
+#: ../modules/gnome-online-accounts/goaewsclient.c:273
 #, c-format
 msgid "Failed to find Account element"
 msgstr "找不到帳號元素"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:290
+#: ../modules/gnome-online-accounts/goaewsclient.c:287
 #, c-format
 msgid "Failed to find ASUrl and OABUrl in autodiscover response"
 msgstr "在自動探索回應中找不到 ASUrl 與 OABUrl"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1238
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1240
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an access token for '%s'"
 msgstr "找不到在 org.gnome 中對應的帳號。這是 OnlineAccounts 服務用來獲得「%s」的存取記號的地方"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1265
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1267
 #, c-format
 msgid "Failed to obtain an access token for '%s': "
 msgstr "無法獲得「%s」的存取記號:"
 
-#: ../modules/google-backend/module-google-backend.c:192
+#: ../modules/google-backend/module-google-backend.c:191
 #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
-#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+#: ../modules/yahoo-backend/module-yahoo-backend.c:199
 msgid "Calendar"
 msgstr "行事曆"
 
-#: ../modules/google-backend/module-google-backend.c:261
+#: ../modules/google-backend/module-google-backend.c:260
 #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
 #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
 msgid "Contacts"
 msgstr "聯絡人"
 
-#: ../modules/trust-prompt/certificate-viewer.c:292
-msgid "Not part of certificate"
-msgstr "不是證書的部分"
-
-#: ../modules/trust-prompt/certificate-viewer.c:575
-msgid "_Close"
-msgstr "關閉(_C)"
-
-#: ../modules/trust-prompt/certificate-viewer.c:600
-msgid "This certificate has been verified for the following uses:"
-msgstr "此證書已經檢驗用於下列用途:"
-
-#: ../modules/trust-prompt/certificate-viewer.c:604
-#: ../modules/trust-prompt/e-asn1-object.c:387
-msgid "SSL Client Certificate"
-msgstr "SSL 用戶端證書"
-
-#: ../modules/trust-prompt/certificate-viewer.c:609
-#: ../modules/trust-prompt/e-asn1-object.c:391
-msgid "SSL Server Certificate"
-msgstr "SSL 伺服器證書"
-
-#: ../modules/trust-prompt/certificate-viewer.c:614
-msgid "Email Signer Certificate"
-msgstr "電子郵件簽署者證書"
-
-#: ../modules/trust-prompt/certificate-viewer.c:619
-msgid "Email Recipient Certificate"
-msgstr "電子郵件收件者證書"
-
-#: ../modules/trust-prompt/certificate-viewer.c:634
-msgid "Issued To"
-msgstr "簽發給"
-
-#: ../modules/trust-prompt/certificate-viewer.c:635
-#: ../modules/trust-prompt/certificate-viewer.c:641
-msgid "Common Name (CN)"
-msgstr "一般名稱 (CN)"
-
-#: ../modules/trust-prompt/certificate-viewer.c:636
-#: ../modules/trust-prompt/certificate-viewer.c:642
-msgid "Organization (O)"
-msgstr "組織 (O)"
-
-#: ../modules/trust-prompt/certificate-viewer.c:637
-#: ../modules/trust-prompt/certificate-viewer.c:643
-msgid "Organizational Unit (OU)"
-msgstr "組織單位 (OU)"
-
-#: ../modules/trust-prompt/certificate-viewer.c:638
-#: ../modules/trust-prompt/e-asn1-object.c:134
-msgid "Serial Number"
-msgstr "序號"
-
-#: ../modules/trust-prompt/certificate-viewer.c:640
-msgid "Issued By"
-msgstr "簽發者"
-
-#: ../modules/trust-prompt/certificate-viewer.c:645
-msgid "Validity"
-msgstr "有效性"
-
-#: ../modules/trust-prompt/certificate-viewer.c:646
-msgid "Issued On"
-msgstr "簽發日"
-
-#: ../modules/trust-prompt/certificate-viewer.c:647
-msgid "Expires On"
-msgstr "到期日"
-
-#: ../modules/trust-prompt/certificate-viewer.c:649
-msgid "Fingerprints"
-msgstr "數碼指紋"
-
-#: ../modules/trust-prompt/certificate-viewer.c:650
-msgid "SHA1 Fingerprint"
-msgstr "SHA1 指紋"
-
-#: ../modules/trust-prompt/certificate-viewer.c:651
-msgid "MD5 Fingerprint"
-msgstr "MD5 指紋"
-
-#: ../modules/trust-prompt/certificate-viewer.c:653
-msgid "General"
-msgstr "一般"
-
-#: ../modules/trust-prompt/certificate-viewer.c:672
-msgid "Certificate Hierarchy"
-msgstr "證書階層"
-
-#: ../modules/trust-prompt/certificate-viewer.c:676
-msgid "Certificate Fields"
-msgstr "證書欄位"
-
-#: ../modules/trust-prompt/certificate-viewer.c:680
-msgid "Field Value"
-msgstr "欄位數值"
-
-#: ../modules/trust-prompt/certificate-viewer.c:682
-msgid "Details"
-msgstr "詳細資料"
-
-#: ../modules/trust-prompt/e-asn1-object.c:95
-msgid "Version"
-msgstr "版本"
-
-#: ../modules/trust-prompt/e-asn1-object.c:110
-msgid "Version 1"
-msgstr "版本 1"
-
-#: ../modules/trust-prompt/e-asn1-object.c:113
-msgid "Version 2"
-msgstr "版本 2"
-
-#: ../modules/trust-prompt/e-asn1-object.c:116
-msgid "Version 3"
-msgstr "版本 3"
-
-#: ../modules/trust-prompt/e-asn1-object.c:192
-msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr "PKCS #1 MD2 附 RSA 加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:195
-msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr "PKCS #1 MD5 附 RSA 加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:198
-msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr "PKCS #1 SHA-1 附 RSA 加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:201
-msgid "PKCS #1 SHA-256 With RSA Encryption"
-msgstr "PKCS #1 SHA-256 附 RSA 加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:204
-msgid "PKCS #1 SHA-384 With RSA Encryption"
-msgstr "PKCS #1 SHA-384 附 RSA 加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:207
-msgid "PKCS #1 SHA-512 With RSA Encryption"
-msgstr "PKCS #1 SHA-512 附 RSA 加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:234
-msgid "PKCS #1 RSA Encryption"
-msgstr "PKCS #1 RSA 加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:237
-msgid "Certificate Key Usage"
-msgstr "證書密碼匙用途"
-
-#: ../modules/trust-prompt/e-asn1-object.c:240
-msgid "Netscape Certificate Type"
-msgstr "Netscape 證書類型"
-
-#: ../modules/trust-prompt/e-asn1-object.c:243
-msgid "Certificate Authority Key Identifier"
-msgstr "核證機關密碼匙識別碼"
-
-#: ../modules/trust-prompt/e-asn1-object.c:255
-#, c-format
-msgid "Object Identifier (%s)"
-msgstr "物件識別碼 (%s)"
-
-#: ../modules/trust-prompt/e-asn1-object.c:306
-msgid "Algorithm Identifier"
-msgstr "演算法識別碼"
-
-#: ../modules/trust-prompt/e-asn1-object.c:314
-msgid "Algorithm Parameters"
-msgstr "演算法參數"
-
-#: ../modules/trust-prompt/e-asn1-object.c:336
-msgid "Subject Public Key Info"
-msgstr "主旨公開密碼匙資訊"
-
-#: ../modules/trust-prompt/e-asn1-object.c:341
-msgid "Subject Public Key Algorithm"
-msgstr "主旨公開密碼匙演算法"
-
-#: ../modules/trust-prompt/e-asn1-object.c:356
-msgid "Subject's Public Key"
-msgstr "主旨的公開密碼匙"
-
-#: ../modules/trust-prompt/e-asn1-object.c:378
-#: ../modules/trust-prompt/e-asn1-object.c:428
-msgid "Error: Unable to process extension"
-msgstr "錯誤:無法處理延伸資訊"
-
-#: ../modules/trust-prompt/e-asn1-object.c:395
-msgid "Email"
-msgstr "電子郵件"
-
-#: ../modules/trust-prompt/e-asn1-object.c:399
-#: ../modules/trust-prompt/e-asn1-object.c:411
-msgid "Object Signer"
-msgstr "物件簽署者"
-
-#: ../modules/trust-prompt/e-asn1-object.c:403
-msgid "SSL Certificate Authority"
-msgstr "SSL 證書檢核"
-
-#: ../modules/trust-prompt/e-asn1-object.c:407
-msgid "Email Certificate Authority"
-msgstr "電子郵件證書檢核"
-
-#: ../modules/trust-prompt/e-asn1-object.c:436
-msgid "Signing"
-msgstr "簽署"
-
-#: ../modules/trust-prompt/e-asn1-object.c:440
-msgid "Non-repudiation"
-msgstr "不可否認"
-
-#: ../modules/trust-prompt/e-asn1-object.c:444
-msgid "Key Encipherment"
-msgstr "密碼匙加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:448
-msgid "Data Encipherment"
-msgstr "資料加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:452
-msgid "Key Agreement"
-msgstr "密碼匙合同"
-
-#: ../modules/trust-prompt/e-asn1-object.c:456
-msgid "Certificate Signer"
-msgstr "證書簽署者"
-
-#: ../modules/trust-prompt/e-asn1-object.c:460
-msgid "CRL Signer"
-msgstr "CRL 簽署者"
-
-#: ../modules/trust-prompt/e-asn1-object.c:509
-msgid "Critical"
-msgstr "重要"
-
-#: ../modules/trust-prompt/e-asn1-object.c:511
-#: ../modules/trust-prompt/e-asn1-object.c:514
-msgid "Not Critical"
-msgstr "不重要"
-
-#: ../modules/trust-prompt/e-asn1-object.c:535
-msgid "Extensions"
-msgstr "延伸資訊"
-
-#. Translators: This string is used in Certificate
-#. * details for fields like Issuer or Subject, which
-#. * shows the field name on the left and its respective
-#. * value on the right, both as stored in the
-#. * certificate itself.  You probably do not need to
-#. * change this string, unless changing the order of
-#. * name and value.  As a result example:
-#. * "OU = VeriSign Trust Network"
-#: ../modules/trust-prompt/e-asn1-object.c:615
-#, c-format
-msgid "%s = %s"
-msgstr "%s = %s"
-
-#: ../modules/trust-prompt/e-asn1-object.c:658
-msgid "Certificate"
-msgstr "證書"
-
-#: ../modules/trust-prompt/e-asn1-object.c:674
-#: ../modules/trust-prompt/e-asn1-object.c:812
-msgid "Certificate Signature Algorithm"
-msgstr "證書簽署演算法"
-
-#: ../modules/trust-prompt/e-asn1-object.c:683
-msgid "Issuer"
-msgstr "簽發者"
-
-#: ../modules/trust-prompt/e-asn1-object.c:714
-msgid "Subject"
-msgstr "主旨"
-
-#: ../modules/trust-prompt/e-asn1-object.c:738
-msgid "Issuer Unique ID"
-msgstr "簽發者獨有 ID"
-
-#: ../modules/trust-prompt/e-asn1-object.c:757
-msgid "Subject Unique ID"
-msgstr "主旨獨有 ID"
-
-#: ../modules/trust-prompt/e-asn1-object.c:818
-msgid "Certificate Signature Value"
-msgstr "證書簽署值"
-
-#: ../modules/trust-prompt/module-trust-prompt.c:201
+#: ../modules/trust-prompt/module-trust-prompt.c:82
 msgid "The signing certificate authority is not known."
 msgstr "簽署的證書授權中心不明。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:203
+#: ../modules/trust-prompt/module-trust-prompt.c:84
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 msgstr "證書與取回證書的網站身分比對不符。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:205
+#: ../modules/trust-prompt/module-trust-prompt.c:86
 msgid "The certificate's activation time is still in the future."
 msgstr "證書的啟用時刻在未來。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:207
+#: ../modules/trust-prompt/module-trust-prompt.c:88
 msgid "The certificate has expired."
 msgstr "證書已逾期。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:209
+#: ../modules/trust-prompt/module-trust-prompt.c:90
 msgid ""
 "The certificate has been revoked according to the connection's certificate "
 "revocation list."
 msgstr "根據連線的證書註銷清單,這個證書已被註銷。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:211
+#: ../modules/trust-prompt/module-trust-prompt.c:92
 msgid "The certificate's algorithm is considered insecure."
 msgstr "證書的演算法被認為是不安全的。"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:162
+#: ../modules/trust-prompt/trust-prompt-gtk.c:119
 msgid "Certificate trust..."
 msgstr "證書信任度…"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:163
-msgid "_View Certificate"
-msgstr "檢視證書(_V)"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:164
+#: ../modules/trust-prompt/trust-prompt-gtk.c:120
 msgid "_Reject"
 msgstr "拒絕(_R)"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:165
+#: ../modules/trust-prompt/trust-prompt-gtk.c:121
 msgid "Accept _Temporarily"
 msgstr "暫時接受(_T)"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:166
+#: ../modules/trust-prompt/trust-prompt-gtk.c:122
 msgid "_Accept Permanently"
 msgstr "永久接受(_A)"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:203
+#: ../modules/trust-prompt/trust-prompt-gtk.c:160
 #, c-format
 msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
 msgstr "「%s」的 SSL 證書未受信任。你想要接受它嗎?"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:209
-msgid "Detailed information about the certificate:"
-msgstr "證書的相關詳細資訊:"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:223
-msgid "Issuer:"
-msgstr "簽發者:"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:224
-msgid "Subject:"
-msgstr "主旨:"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:225
-msgid "Fingerprint:"
-msgstr "數碼指紋:"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:226
+#: ../modules/trust-prompt/trust-prompt-gtk.c:175
 msgid "Reason:"
 msgstr "原因:"
 
@@ -5631,7 +5258,7 @@ msgstr "整合你的行事曆"
 msgid "Integrate your contacts"
 msgstr "整合你的聯絡人"
 
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:257
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:256
 msgid "Signon service did not return a secret"
 msgstr "Signon 服務尚未傳回機密"
 
@@ -5663,25 +5290,40 @@ msgstr "郵件"
 msgid "Integrate your mailboxes"
 msgstr "整合你的信箱"
 
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:971
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008
 #, c-format
 msgid ""
 "Cannot find a corresponding account service in the accounts database from "
 "which to obtain an access token for '%s'"
 msgstr "在帳號資料庫中找不到對應的帳號服務以獲得「%s」的存取記號"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:79
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:84
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:281
 #, c-format
-msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
-msgstr "請求 guid 時預期的狀態為 200,但卻取得狀態 %d (%s)"
+msgid ""
+"Expected status 200 when requesting your identity, instead got status %d (%s)"
+msgstr "請求你的身分識別時預期的狀態為 200,但卻取得狀態 %d (%s)"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:96
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:101
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:298
 msgid "Error parsing response as JSON: "
 msgstr "以 JSON 解析回應時發生錯誤:"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:112
-msgid "Didn't find email member in JSON data"
-msgstr "JSON 資料中找不到電子郵件成員"
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:119
+msgid "Didn't find 'email' in JSON data"
+msgstr "在 JSON 資料中找不到「email」"
+
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:316
+msgid "Didn't find 'id' in JSON data"
+msgstr "在 JSON 資料中找不到「id」"
+
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:321
+msgid "Didn't find 'emails.account' in JSON data"
+msgstr "在 JSON 資料中找不到「email.account」"
+
+#: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1
+msgid "Windows Live Mail"
+msgstr "Windows Live Mail"
 
 #: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
 msgid "Yahoo! Calendar"
@@ -5691,18 +5333,18 @@ msgstr "Yahoo! 行事曆"
 msgid "Yahoo! Mail"
 msgstr "Yahoo! 電子信箱"
 
-#: ../modules/yahoo-backend/module-yahoo-backend.c:227
+#: ../modules/yahoo-backend/module-yahoo-backend.c:226
 msgid "Tasks"
 msgstr "工作"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51
-#: ../services/evolution-user-prompter/evolution-user-prompter.c:31
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50
+#: ../services/evolution-user-prompter/evolution-user-prompter.c:30
 msgid "Keep running after the last client is closed"
 msgstr "在上次關閉客戶端之後保持執行"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52
 msgid "Wait running until at least one client is connected"
 msgstr "直到至少有一個客戶端連線前等候執行"
 
@@ -5743,10 +5385,407 @@ msgstr "於網站"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../services/evolution-user-prompter/prompt-user-gtk.c:122
+#: ../services/evolution-source-registry/evolution-source-registry.c:38
+msgid "Don't migrate user data from previous versions of Evolution"
+msgstr "不要從前一版的 Evolution 轉換使用者資料"
+
+#: ../services/evolution-user-prompter/prompt-user-gtk.c:121
 msgid "_Dismiss"
 msgstr "解除(_D)"
 
+#~ msgid "You may not import keys with this cipher"
+#~ msgstr "您不能匯入這種加密方式的金鑰"
+
+#~ msgid "You may not export keys with this cipher"
+#~ msgstr "您不能匯出這種加密方式的金鑰"
+
+#~ msgid ""
+#~ "Could not write log entry: %s\n"
+#~ "Further operations on this server will not be replayed when you\n"
+#~ "reconnect to the network."
+#~ msgstr ""
+#~ "無法寫入紀錄: %s\n"
+#~ "接下來在此伺服器上的操作,在您重新連線到網路時\n"
+#~ "將不會重播。"
+
+#~ msgid ""
+#~ "Could not open '%s':\n"
+#~ "%s\n"
+#~ "Changes made to this folder will not be resynchronized."
+#~ msgstr ""
+#~ "無法開啟「%s」:\n"
+#~ "%s\n"
+#~ "這個資料夾內所做的變更將不會重新同步。"
+
+#~ msgid "Resynchronizing with server"
+#~ msgstr "與伺服器重新同步"
+
+#~ msgid "Preparing folder '%s' for offline"
+#~ msgstr "準備資料夾「%s」供離線使用"
+
+#~ msgid "Canceled"
+#~ msgstr "已取消"
+
+#~ msgid ""
+#~ "Alert from IMAP server %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "來自 IMAP 伺服器 %s 的警示:\n"
+#~ "%s"
+
+#~ msgid "Error while fetching messages"
+#~ msgstr "當取回郵件時發生錯誤"
+
+#~ msgid "Fetching summary information for %d message in '%s'"
+#~ msgid_plural "Fetching summary information for %d messages in '%s'"
+#~ msgstr[0] "正取得「%2$s」中 %1$d 封郵件的摘要資訊"
+
+#~ msgid "Unknown parent folder: %s"
+#~ msgstr "不明的母資料夾: %s"
+
+#~ msgid "The parent folder is not allowed to contain subfolders"
+#~ msgstr "母資料夾並不允許包含子資料夾"
+
+#~ msgid "Resolving address"
+#~ msgstr "解析位址"
+
+#~ msgid "Name lookup failed"
+#~ msgstr "查詢名稱失敗"
+
+#~ msgid "Name lookup failed. Check your host name for spelling errors."
+#~ msgstr "名稱查詢失敗。請檢查您的主機名稱是否有拼錯字。"
+
+#~ msgid "Name lookup failed: %s"
+#~ msgstr "搜尋名稱失敗: %s"
+
+#~ msgid "Could not connect to '%s:%s': "
+#~ msgstr "無法連接到「%s:%s」:"
+
+#~ msgid "Please enter the %s password for %s on host %s."
+#~ msgstr "請輸入 %2$s 於主機 %3$s 的 %1$s 密碼。"
+
+#~ msgid "NSPR error code %d"
+#~ msgstr "NSPR 錯誤代碼 %d"
+
+#~ msgid "The proxy host does not support SOCKS4"
+#~ msgstr "代理伺服器主機不支援 SOCKS4"
+
+#~ msgid "The proxy host denied our request: code %d"
+#~ msgstr "代理伺服器主機拒絕我們的要求:代碼 %d"
+
+#~ msgid "The proxy host does not support SOCKS5"
+#~ msgstr "代理伺服器主機不支援 SOCKS5"
+
+#~ msgid "Could not find a suitable authentication type: code 0x%x"
+#~ msgstr "找不到合適的核對類型:代碼 0x%x"
+
+#~ msgid "General SOCKS server failure"
+#~ msgstr "一般性 SOCKS 伺服器失敗"
+
+#~ msgid "SOCKS server's rules do not allow connection"
+#~ msgstr "SOCKS 伺服器的規則不允許連線"
+
+#~ msgid "Network is unreachable from SOCKS server"
+#~ msgstr "網路無法透過 SOCKS 伺服器到達"
+
+#~ msgid "Host is unreachable from SOCKS server"
+#~ msgstr "主機無法透過 SOCKS 伺服器到達"
+
+#~ msgid "Connection refused"
+#~ msgstr "連線被拒絕"
+
+#~ msgid "Time-to-live expired"
+#~ msgstr "超過 Time-to-live 時間"
+
+#~ msgid "Command not supported by SOCKS server"
+#~ msgstr "SOCKS 伺服器不支援指令"
+
+#~ msgid "Address type not supported by SOCKS server"
+#~ msgstr "SOCKS 伺服器不支援位址類型"
+
+#~ msgid "Unknown error from SOCKS server"
+#~ msgstr "來自 SOCKS 伺服器的不明錯誤"
+
+#~ msgid "Got unknown address type from SOCKS server"
+#~ msgstr "從 SOCKS 伺服器取得不明的位址類型"
+
+#~ msgid "Incomplete reply from SOCKS server"
+#~ msgstr "來自 SOCKS 伺服器的不完整回覆"
+
+#~ msgid "Hostname is too long (maximum is 255 characters)"
+#~ msgstr "主機名稱太長(最多 255 字元)"
+
+#~ msgid "Invalid reply from proxy server"
+#~ msgstr "從代理伺服器傳回無效的回覆"
+
+#~ msgid "Unable to add message to summary: unknown reason"
+#~ msgstr "無法新增郵件到摘要資訊:不明的原因"
+
+#~ msgid "Fatal mail parser error near position %s in folder %s"
+#~ msgstr "靠近 %s (於資料夾 %s)的位置發生嚴重的郵件分析錯誤"
+
+#~ msgid "You cannot post NNTP messages while working offline!"
+#~ msgstr "離線工作時無法張貼 NNTP 訊息!"
+
+#~ msgid ""
+#~ "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
+#~ "means manual proxy."
+#~ msgstr ""
+#~ "要使用哪種類型的代理伺服器。「0」表示使用系統值,「1」表示不使用代理伺服"
+#~ "器,「2」表示手動設定代理伺服器。"
+
+#~ msgid "Whether to use proxy for HTTP requests."
+#~ msgstr "對 HTTP 要求是否使用代理伺服器。"
+
+#~ msgid "Whether authentication is required to access proxy server."
+#~ msgstr "存取代理伺服器是否要求核對。"
+
+#~ msgid "Host name to use for HTTP requests."
+#~ msgstr "對 HTTP 要求使用的主機名稱。"
+
+#~ msgid "Port number to use for HTTP requests."
+#~ msgstr "對 HTTP 要求使用的連接埠號。"
+
+#~ msgid "User name to use to authenticate against proxy server."
+#~ msgstr "用來核對代理伺服器的使用者名稱。"
+
+#~ msgid "Password to use to authenticate against proxy server."
+#~ msgstr "用來核對代理伺服器的密碼。"
+
+#~ msgid "List of hosts for which do not use proxy."
+#~ msgstr "不使用代理伺服器連接的主機清單。"
+
+#~ msgid "Host name to use for HTTPS requests."
+#~ msgstr "對 HTTPS 要求使用的主機名稱。"
+
+#~ msgid "Port number to use for HTTPS requests."
+#~ msgstr "對 HTTPS 要求使用的連接埠號。"
+
+#~ msgid "Host name to use for SOCKS requests."
+#~ msgstr "對 SOCKS 要求使用的主機名稱。"
+
+#~ msgid "Port number to use for SOCKS requests."
+#~ msgstr "對 SOCKS 要求使用的連接埠號。"
+
+#~ msgid "Where to read automatic proxy configuration from."
+#~ msgstr "要從何處讀取自動代理伺服器組態。"
+
+#~ msgid "Not part of certificate"
+#~ msgstr "不是憑證的部分"
+
+#~ msgid "_Close"
+#~ msgstr "關閉(_C)"
+
+#~ msgid "This certificate has been verified for the following uses:"
+#~ msgstr "此憑證已經檢驗用於下列用途:"
+
+#~ msgid "SSL Client Certificate"
+#~ msgstr "SSL 用戶端憑證"
+
+#~ msgid "SSL Server Certificate"
+#~ msgstr "SSL 伺服器憑證"
+
+#~ msgid "Email Signer Certificate"
+#~ msgstr "電子郵件簽署者憑證"
+
+#~ msgid "Email Recipient Certificate"
+#~ msgstr "電子郵件收件者憑證"
+
+#~ msgid "Issued To"
+#~ msgstr "簽發給"
+
+#~ msgid "Common Name (CN)"
+#~ msgstr "一般名稱 (CN)"
+
+#~ msgid "Organization (O)"
+#~ msgstr "組織 (O)"
+
+#~ msgid "Organizational Unit (OU)"
+#~ msgstr "組織單位 (OU)"
+
+#~ msgid "Serial Number"
+#~ msgstr "序號"
+
+#~ msgid "Issued By"
+#~ msgstr "簽發者"
+
+#~ msgid "Validity"
+#~ msgstr "有效性"
+
+#~ msgid "Issued On"
+#~ msgstr "簽發日"
+
+#~ msgid "Expires On"
+#~ msgstr "到期日"
+
+#~ msgid "Fingerprints"
+#~ msgstr "數位指紋"
+
+#~ msgid "SHA1 Fingerprint"
+#~ msgstr "SHA1 指紋"
+
+#~ msgid "MD5 Fingerprint"
+#~ msgstr "MD5 指紋"
+
+#~ msgid "General"
+#~ msgstr "一般"
+
+#~ msgid "Certificate Hierarchy"
+#~ msgstr "憑證階層"
+
+#~ msgid "Certificate Fields"
+#~ msgstr "憑證欄位"
+
+#~ msgid "Field Value"
+#~ msgstr "欄位數值"
+
+#~ msgid "Details"
+#~ msgstr "詳細資料"
+
+#~ msgid "Version"
+#~ msgstr "版本"
+
+#~ msgid "Version 1"
+#~ msgstr "版本 1"
+
+#~ msgid "Version 2"
+#~ msgstr "版本 2"
+
+#~ msgid "Version 3"
+#~ msgstr "版本 3"
+
+#~ msgid "PKCS #1 MD2 With RSA Encryption"
+#~ msgstr "PKCS #1 MD2 附 RSA 加密"
+
+#~ msgid "PKCS #1 MD5 With RSA Encryption"
+#~ msgstr "PKCS #1 MD5 附 RSA 加密"
+
+#~ msgid "PKCS #1 SHA-1 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-1 附 RSA 加密"
+
+#~ msgid "PKCS #1 SHA-256 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-256 附 RSA 加密"
+
+#~ msgid "PKCS #1 SHA-384 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-384 附 RSA 加密"
+
+#~ msgid "PKCS #1 SHA-512 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-512 附 RSA 加密"
+
+#~ msgid "PKCS #1 RSA Encryption"
+#~ msgstr "PKCS #1 RSA 加密"
+
+#~ msgid "Certificate Key Usage"
+#~ msgstr "憑證金鑰用途"
+
+#~ msgid "Netscape Certificate Type"
+#~ msgstr "Netscape 憑證類型"
+
+#~ msgid "Certificate Authority Key Identifier"
+#~ msgstr "憑證管理中心金鑰識別碼"
+
+#~ msgid "Object Identifier (%s)"
+#~ msgstr "物件識別碼 (%s)"
+
+#~ msgid "Algorithm Identifier"
+#~ msgstr "演算法識別碼"
+
+#~ msgid "Algorithm Parameters"
+#~ msgstr "演算法參數"
+
+#~ msgid "Subject Public Key Info"
+#~ msgstr "主旨公鑰資訊"
+
+#~ msgid "Subject Public Key Algorithm"
+#~ msgstr "主旨公鑰演算法"
+
+#~ msgid "Subject's Public Key"
+#~ msgstr "主旨的公鑰"
+
+#~ msgid "Error: Unable to process extension"
+#~ msgstr "錯誤:無法處理延伸資訊"
+
+#~ msgid "Email"
+#~ msgstr "電子郵件"
+
+#~ msgid "Object Signer"
+#~ msgstr "物件簽署者"
+
+#~ msgid "SSL Certificate Authority"
+#~ msgstr "SSL 憑證檢核"
+
+#~ msgid "Email Certificate Authority"
+#~ msgstr "電子郵件憑證檢核"
+
+#~ msgid "Signing"
+#~ msgstr "簽署"
+
+#~ msgid "Non-repudiation"
+#~ msgstr "不可否認"
+
+#~ msgid "Key Encipherment"
+#~ msgstr "金鑰加密"
+
+#~ msgid "Data Encipherment"
+#~ msgstr "資料加密"
+
+#~ msgid "Key Agreement"
+#~ msgstr "金鑰合同"
+
+#~ msgid "Certificate Signer"
+#~ msgstr "憑證簽署者"
+
+#~ msgid "CRL Signer"
+#~ msgstr "CRL 簽署者"
+
+#~ msgid "Critical"
+#~ msgstr "重要"
+
+#~ msgid "Not Critical"
+#~ msgstr "不重要"
+
+#~ msgid "Extensions"
+#~ msgstr "延伸資訊"
+
+#~ msgid "%s = %s"
+#~ msgstr "%s = %s"
+
+#~ msgid "Certificate"
+#~ msgstr "憑證"
+
+#~ msgid "Certificate Signature Algorithm"
+#~ msgstr "憑證簽章演算法"
+
+#~ msgid "Issuer"
+#~ msgstr "簽發者"
+
+#~ msgid "Subject"
+#~ msgstr "主旨"
+
+#~ msgid "Issuer Unique ID"
+#~ msgstr "簽發者獨有 ID"
+
+#~ msgid "Subject Unique ID"
+#~ msgstr "主旨獨有 ID"
+
+#~ msgid "Certificate Signature Value"
+#~ msgstr "憑證簽章值"
+
+#~ msgid "_View Certificate"
+#~ msgstr "檢視憑證(_V)"
+
+#~ msgid "Detailed information about the certificate:"
+#~ msgstr "憑證的相關詳細資訊:"
+
+#~ msgid "Issuer:"
+#~ msgstr "簽發者:"
+
+#~ msgid "Subject:"
+#~ msgstr "主旨:"
+
+#~ msgid "Fingerprint:"
+#~ msgstr "數位指紋:"
+
 #~ msgid "Cannot write offline journal for folder '%s': %s"
 #~ msgstr "不能寫入資料夾「%s」的離線日誌:%s"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b934029..d73cf00 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,10 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server 3.3.91\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2013-09-21 16:50+0000\n"
-"PO-Revision-Date: 2013-08-16 11:31+0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-16 19:35+0800\n"
+"PO-Revision-Date: 2014-01-15 10:04+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional)\n"
 "Language: zh_TW\n"
@@ -19,121 +18,157 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.3\n"
 "X-Project-Style: gnome\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:115
+#: ../addressbook/backends/file/e-book-backend-file.c:117
 #, c-format
 msgid "Failed to remove file '%s': %s"
 msgstr "移除鎖定檔「%s」失敗:%s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:143
+#: ../addressbook/backends/file/e-book-backend-file.c:145
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "無法建立目錄「%s」:%s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:394
+#: ../addressbook/backends/file/e-book-backend-file.c:396
 #, c-format
 msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "無法建立資源「%s」的硬連結:%s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:499
-#: ../addressbook/backends/file/e-book-backend-file.c:1135
+#: ../addressbook/backends/file/e-book-backend-file.c:501
+#: ../addressbook/backends/file/e-book-backend-file.c:1230
 msgid "No UID in the contact"
 msgstr "在連絡人中沒有 UID"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:773
+#: ../addressbook/backends/file/e-book-backend-file.c:828
 #, c-format
 msgid "Conflicting UIDs found in added contacts"
 msgstr "在加入的連絡人中發現衝突的 UID"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:881
+#: ../addressbook/backends/file/e-book-backend-file.c:967
 msgid "Loading..."
 msgstr "載入中…"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:883
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4419
+#: ../addressbook/backends/file/e-book-backend-file.c:969
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4425
 msgid "Searching..."
 msgstr "搜尋中…"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1164
+#: ../addressbook/backends/file/e-book-backend-file.c:1258
 #, c-format
 msgid "Tried to modify contact '%s' with out of sync revision"
 msgstr "嘗試不使用同步修訂來修改連絡人「%s」"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1300
-#: ../addressbook/backends/file/e-book-backend-file.c:1369
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2707
+#: ../addressbook/backends/file/e-book-backend-file.c:1449
+#: ../addressbook/backends/file/e-book-backend-file.c:1532
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077
+#: ../addressbook/libedata-book/e-book-sqlite.c:6706
 #, c-format
 msgid "Contact '%s' not found"
 msgstr "找不到連絡人「%s」"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1411
-#: ../addressbook/backends/file/e-book-backend-file.c:1478
+#: ../addressbook/backends/file/e-book-backend-file.c:1592
+#: ../addressbook/backends/file/e-book-backend-file.c:1673
 #, c-format
 msgid "Query '%s' not supported"
 msgstr "查詢「%s」不支援"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1420
-#: ../addressbook/backends/file/e-book-backend-file.c:1487
+#: ../addressbook/backends/file/e-book-backend-file.c:1601
+#: ../addressbook/backends/file/e-book-backend-file.c:1682
 #, c-format
 msgid "Invalid Query '%s'"
 msgstr "無效的查詢「%s」"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1671
+#: ../addressbook/backends/file/e-book-backend-file.c:1947
+msgid "Requested to delete an unrelated cursor"
+msgstr "已要求刪除無關的游標"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:2014
 #, c-format
 msgid "Failed to rename old database from '%s' to '%s': %s"
 msgstr "無法將舊資料庫「%s」重新命名為「%s」: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1240
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4314
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:383
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:826
+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1244
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4320
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:378
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:820
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
-#: ../addressbook/libebook-contacts/e-phone-number.c:58
-#: ../addressbook/libedata-book/e-book-backend-sexp.c:874
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:568
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:599
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:611
-#: ../calendar/libecal/e-cal.c:2335 ../calendar/libecal/e-cal-client.c:268
-#: ../camel/camel-imapx-command.c:650 ../libedataserver/e-client.c:177
+#: ../addressbook/libebook-contacts/e-phone-number.c:56
+#: ../addressbook/libebook/e-book.c:1078
+#: ../addressbook/libebook/e-book-client.c:1882
+#: ../addressbook/libebook/e-book-client.c:2054
+#: ../addressbook/libebook/e-book-client.c:2267
+#: ../addressbook/libebook/e-book-client.c:2398
+#: ../addressbook/libebook/e-book-client.c:2557
+#: ../addressbook/libebook/e-book-client.c:2691
+#: ../addressbook/libebook/e-book-client.c:2822
+#: ../addressbook/libebook/e-book-client.c:2980
+#: ../addressbook/libebook/e-book-client.c:3175
+#: ../addressbook/libebook/e-book-client.c:3393
+#: ../addressbook/libedata-book/e-book-backend-sexp.c:878
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:605
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:617
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:270
+#: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276
+#: ../calendar/libecal/e-cal-client.c:3237
+#: ../calendar/libecal/e-cal-client.c:3410
+#: ../calendar/libecal/e-cal-client.c:3674
+#: ../calendar/libecal/e-cal-client.c:3915
+#: ../calendar/libecal/e-cal-client.c:4103
+#: ../calendar/libecal/e-cal-client.c:4295
+#: ../calendar/libecal/e-cal-client.c:4465
+#: ../calendar/libecal/e-cal-client.c:4634
+#: ../calendar/libecal/e-cal-client.c:4837
+#: ../calendar/libecal/e-cal-client.c:4987
+#: ../calendar/libecal/e-cal-client.c:5181
+#: ../calendar/libecal/e-cal-client.c:5334
+#: ../calendar/libecal/e-cal-client.c:5551
+#: ../calendar/libecal/e-cal-client.c:5705
+#: ../calendar/libecal/e-cal-client.c:5931
+#: ../calendar/libecal/e-cal-client.c:6127
+#: ../calendar/libecal/e-cal-client.c:6490
+#: ../calendar/libecal/e-cal-client.c:6704
+#: ../camel/providers/imapx/camel-imapx-command.c:654
+#: ../libedataserver/e-client.c:185
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:833
+#: ../addressbook/backends/google/e-book-backend-google.c:836
 msgid "Querying for updated contacts…"
 msgstr "查詢更新的連絡人…"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:985
+#: ../addressbook/backends/google/e-book-backend-google.c:988
 msgid "Querying for updated groups…"
 msgstr "查詢更新的群組…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1673
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5050
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1293
+#: ../addressbook/backends/google/e-book-backend-google.c:1705
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5056
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1268
 msgid "The backend does not support bulk additions"
 msgstr "後端不支援大量增加"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1822
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5186
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1395
+#: ../addressbook/backends/google/e-book-backend-google.c:1854
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5192
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1370
 msgid "The backend does not support bulk modifications"
 msgstr "後端不支援大量修改"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2022
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1487
+#: ../addressbook/backends/google/e-book-backend-google.c:2054
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1462
 msgid "The backend does not support bulk removals"
 msgstr "後端不支援大量移除"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2148
+#: ../addressbook/backends/google/e-book-backend-google.c:2180
 msgid "Loading…"
 msgstr "載入中…"
 
 #. System Group: My Contacts
-#: ../addressbook/backends/google/e-book-google-utils.c:1620
+#: ../addressbook/backends/google/e-book-google-utils.c:1618
 #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1
 #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1
 #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
@@ -142,129 +177,129 @@ msgid "Personal"
 msgstr "個人"
 
 #. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1622
+#: ../addressbook/backends/google/e-book-google-utils.c:1620
 msgid "Friends"
 msgstr "朋友"
 
 #. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1624
+#: ../addressbook/backends/google/e-book-google-utils.c:1622
 msgid "Family"
 msgstr "家人"
 
 #. System Group: Coworkers
-#: ../addressbook/backends/google/e-book-google-utils.c:1626
+#: ../addressbook/backends/google/e-book-google-utils.c:1624
 msgid "Coworkers"
 msgstr "同事"
 
 #. Translators: An error message shown to a user when trying to do an
 #. * operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:174
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
 msgid "Not connected"
 msgstr "未連線"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:968
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:971
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr "無法使用 v3 或 v2 的 binds 來綁定"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1091
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1094
 msgid "Reconnecting to LDAP server..."
 msgstr "正在重新連接 LDAP 伺服器…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1221
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1225
 msgid "Invalid DN syntax"
 msgstr "無效的 DN 語法"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1237
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4313
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1241
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4319
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "LDAP 錯誤 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1849
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2172
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1853
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2176
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s:從 ldap_first_entry 傳回 NULL"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2102
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2230
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2106
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2234
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s:傳回未處理的類型 %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2363
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2490
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2367
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2494
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr "%s:傳回未處理的搜尋結果類型 %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4262
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4268
 msgid "Receiving LDAP search results..."
 msgstr "正在接收 LDAP 搜尋結果…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4441
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4447
 msgid "Error performing search"
 msgstr "進行搜尋時發生錯誤"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4569
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
 #, c-format
 msgid "Downloading contacts (%d)..."
 msgstr "下載連絡人 (%d)…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5133
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5139
 msgid "Adding contact to LDAP server..."
 msgstr "正在新增連絡人至 LDAP 伺服器…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5214
 msgid "Modifying contact from LDAP server..."
 msgstr "正在修改 LDAP 伺服器中的連絡人…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5274
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5280
 msgid "Removing contact from LDAP server..."
 msgstr "正在移除 LDAP 伺服器中的連絡人…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5663
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5669
 #, c-format
 msgid "Failed to get the DN for user '%s'"
 msgstr "無法擷取 DN 給使用者「%s」"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:805
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:799
 msgid "Loading Addressbook summary..."
 msgstr "載入通訊錄摘要…"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:823
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:817
 #, c-format
 msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
 msgstr "webdav PROPFIND 失敗,HTTP 狀態:%d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:842
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836
 msgid "No response body in webdav PROPFIND result"
 msgstr "在 webdav PROPFIND 結果沒有回應本體"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:878
 #, c-format
 msgid "Loading Contacts (%d%%)"
 msgstr "載入聯絡人 (%d%%)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1215
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1191
 msgid "Cannot transform SoupURI to string"
 msgstr "不能將 SoupURI 轉換為字串"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1326
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1301
 #, c-format
 msgid "Create resource '%s' failed with HTTP status %d (%s)"
 msgstr "建立資源「%s」失敗,HTTP 狀態:%d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1424
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1399
 msgid "Contact on server changed -> not modifying"
 msgstr "伺服器上的連絡人已變更 -> 尚未修改"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1432
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1407
 #, c-format
 msgid "Modify contact failed with HTTP status %d (%s)"
 msgstr "修改連絡人失敗,HTTP 狀態:%d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1508
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1483
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "DELETE 失敗,HTTP 狀態:%d"
@@ -274,12 +309,12 @@ msgid "No such book"
 msgstr "沒有這個通訊錄"
 
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:26
-#: ../addressbook/libedata-book/e-data-book.c:346
+#: ../addressbook/libedata-book/e-data-book.c:371
 msgid "Contact not found"
 msgstr "找不到連絡人"
 
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:28
-#: ../addressbook/libedata-book/e-data-book.c:347
+#: ../addressbook/libedata-book/e-data-book.c:372
 msgid "Contact ID already exists"
 msgstr "連絡人 ID 已經存在"
 
@@ -288,12 +323,12 @@ msgid "No such source"
 msgstr "沒有這個來源"
 
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:32
-#: ../addressbook/libedata-book/e-data-book.c:363
+#: ../addressbook/libedata-book/e-data-book.c:388
 msgid "No space"
 msgstr "沒有空間"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook-contacts/e-contact.c:123
+#: ../addressbook/libebook-contacts/e-contact.c:131
 msgid "Unique ID"
 msgstr "獨特的 ID"
 
@@ -301,12 +336,12 @@ msgstr "獨特的 ID"
 #. * so we can generate its value if necessary in the getter
 #. Translators: This is an EContact field description, in this case it's a
 #. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
-#: ../addressbook/libebook-contacts/e-contact.c:128
+#: ../addressbook/libebook-contacts/e-contact.c:136
 msgid "File Under"
 msgstr "歸檔為"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook-contacts/e-contact.c:130
+#: ../addressbook/libebook-contacts/e-contact.c:138
 msgid "Book UID"
 msgstr "通訊錄 UID"
 
@@ -314,434 +349,434 @@ msgstr "通訊錄 UID"
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook-contacts/e-contact.c:136
+#: ../addressbook/libebook-contacts/e-contact.c:144
 msgid "Full Name"
 msgstr "全名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:137
+#: ../addressbook/libebook-contacts/e-contact.c:145
 msgid "Given Name"
 msgstr "名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:138
+#: ../addressbook/libebook-contacts/e-contact.c:146
 msgid "Family Name"
 msgstr "姓"
 
-#: ../addressbook/libebook-contacts/e-contact.c:139
+#: ../addressbook/libebook-contacts/e-contact.c:147
 msgid "Nickname"
 msgstr "暱稱"
 
 #. Email fields
-#: ../addressbook/libebook-contacts/e-contact.c:142
+#: ../addressbook/libebook-contacts/e-contact.c:150
 msgid "Email 1"
 msgstr "電子郵件 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:143
+#: ../addressbook/libebook-contacts/e-contact.c:151
 msgid "Email 2"
 msgstr "電子郵件 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:144
+#: ../addressbook/libebook-contacts/e-contact.c:152
 msgid "Email 3"
 msgstr "電子郵件 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:145
+#: ../addressbook/libebook-contacts/e-contact.c:153
 msgid "Email 4"
 msgstr "電子郵件 4"
 
-#: ../addressbook/libebook-contacts/e-contact.c:147
+#: ../addressbook/libebook-contacts/e-contact.c:155
 msgid "Mailer"
 msgstr "寄件者"
 
 #. Address Labels
-#: ../addressbook/libebook-contacts/e-contact.c:150
+#: ../addressbook/libebook-contacts/e-contact.c:158
 msgid "Home Address Label"
 msgstr "住家地址標籤"
 
-#: ../addressbook/libebook-contacts/e-contact.c:151
+#: ../addressbook/libebook-contacts/e-contact.c:159
 msgid "Work Address Label"
 msgstr "工作地址標籤"
 
-#: ../addressbook/libebook-contacts/e-contact.c:152
+#: ../addressbook/libebook-contacts/e-contact.c:160
 msgid "Other Address Label"
 msgstr "其他地址標籤"
 
 #. Phone fields
-#: ../addressbook/libebook-contacts/e-contact.c:155
+#: ../addressbook/libebook-contacts/e-contact.c:163
 msgid "Assistant Phone"
 msgstr "助理電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:156
+#: ../addressbook/libebook-contacts/e-contact.c:164
 msgid "Business Phone"
 msgstr "商務電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:157
+#: ../addressbook/libebook-contacts/e-contact.c:165
 msgid "Business Phone 2"
 msgstr "商務電話 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:158
+#: ../addressbook/libebook-contacts/e-contact.c:166
 msgid "Business Fax"
 msgstr "商務傅真"
 
-#: ../addressbook/libebook-contacts/e-contact.c:159
+#: ../addressbook/libebook-contacts/e-contact.c:167
 msgid "Callback Phone"
 msgstr "回撥電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:160
+#: ../addressbook/libebook-contacts/e-contact.c:168
 msgid "Car Phone"
 msgstr "汽車電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:161
+#: ../addressbook/libebook-contacts/e-contact.c:169
 msgid "Company Phone"
 msgstr "公司電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:162
+#: ../addressbook/libebook-contacts/e-contact.c:170
 msgid "Home Phone"
 msgstr "住家電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:163
+#: ../addressbook/libebook-contacts/e-contact.c:171
 msgid "Home Phone 2"
 msgstr "住家電話 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:164
+#: ../addressbook/libebook-contacts/e-contact.c:172
 msgid "Home Fax"
 msgstr "住家傳真"
 
-#: ../addressbook/libebook-contacts/e-contact.c:165
+#: ../addressbook/libebook-contacts/e-contact.c:173
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook-contacts/e-contact.c:166
+#: ../addressbook/libebook-contacts/e-contact.c:174
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:167
+#: ../addressbook/libebook-contacts/e-contact.c:175
 msgid "Other Phone"
 msgstr "其它電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:168
+#: ../addressbook/libebook-contacts/e-contact.c:176
 msgid "Other Fax"
 msgstr "其它傳真"
 
-#: ../addressbook/libebook-contacts/e-contact.c:169
+#: ../addressbook/libebook-contacts/e-contact.c:177
 msgid "Pager"
 msgstr "呼叫器"
 
-#: ../addressbook/libebook-contacts/e-contact.c:170
+#: ../addressbook/libebook-contacts/e-contact.c:178
 msgid "Primary Phone"
 msgstr "主要電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:171
+#: ../addressbook/libebook-contacts/e-contact.c:179
 msgid "Radio"
 msgstr "無線電電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:172
+#: ../addressbook/libebook-contacts/e-contact.c:180
 msgid "Telex"
 msgstr "電報"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook-contacts/e-contact.c:174
+#: ../addressbook/libebook-contacts/e-contact.c:182
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook-contacts/e-contact.c:177
+#: ../addressbook/libebook-contacts/e-contact.c:185
 msgid "Organization"
 msgstr "團體"
 
-#: ../addressbook/libebook-contacts/e-contact.c:178
+#: ../addressbook/libebook-contacts/e-contact.c:186
 msgid "Organizational Unit"
 msgstr "團體單位"
 
-#: ../addressbook/libebook-contacts/e-contact.c:179
+#: ../addressbook/libebook-contacts/e-contact.c:187
 msgid "Office"
 msgstr "辦公室"
 
-#: ../addressbook/libebook-contacts/e-contact.c:180
+#: ../addressbook/libebook-contacts/e-contact.c:188
 msgid "Title"
 msgstr "頭銜"
 
-#: ../addressbook/libebook-contacts/e-contact.c:181
+#: ../addressbook/libebook-contacts/e-contact.c:189
 msgid "Role"
 msgstr "角色"
 
-#: ../addressbook/libebook-contacts/e-contact.c:182
+#: ../addressbook/libebook-contacts/e-contact.c:190
 msgid "Manager"
 msgstr "主管"
 
-#: ../addressbook/libebook-contacts/e-contact.c:183
+#: ../addressbook/libebook-contacts/e-contact.c:191
 msgid "Assistant"
 msgstr "助理"
 
 #. Web fields
-#: ../addressbook/libebook-contacts/e-contact.c:186
+#: ../addressbook/libebook-contacts/e-contact.c:194
 msgid "Homepage URL"
 msgstr "首頁 URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:187
+#: ../addressbook/libebook-contacts/e-contact.c:195
 msgid "Weblog URL"
 msgstr "網誌 URL"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:190
+#: ../addressbook/libebook-contacts/e-contact.c:198
 msgid "Categories"
 msgstr "分類"
 
 #. Collaboration fields
-#: ../addressbook/libebook-contacts/e-contact.c:193
+#: ../addressbook/libebook-contacts/e-contact.c:201
 msgid "Calendar URI"
 msgstr "行事曆 URI"
 
-#: ../addressbook/libebook-contacts/e-contact.c:194
+#: ../addressbook/libebook-contacts/e-contact.c:202
 msgid "Free/Busy URL"
 msgstr "空閒/忙碌 URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:195
+#: ../addressbook/libebook-contacts/e-contact.c:203
 msgid "ICS Calendar"
 msgstr "ICS 行事曆"
 
-#: ../addressbook/libebook-contacts/e-contact.c:196
+#: ../addressbook/libebook-contacts/e-contact.c:204
 msgid "Video Conferencing URL"
 msgstr "視訊會議 URL"
 
 #. Misc fields
-#: ../addressbook/libebook-contacts/e-contact.c:199
+#: ../addressbook/libebook-contacts/e-contact.c:207
 msgid "Spouse's Name"
 msgstr "配偶姓名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:200
+#: ../addressbook/libebook-contacts/e-contact.c:208
 msgid "Note"
 msgstr "備註"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:203
+#: ../addressbook/libebook-contacts/e-contact.c:211
 msgid "AIM Home Screen Name 1"
 msgstr "AIM 家用螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:204
+#: ../addressbook/libebook-contacts/e-contact.c:212
 msgid "AIM Home Screen Name 2"
 msgstr "AIM 家用螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:205
+#: ../addressbook/libebook-contacts/e-contact.c:213
 msgid "AIM Home Screen Name 3"
 msgstr "AIM 家用螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:206
+#: ../addressbook/libebook-contacts/e-contact.c:214
 msgid "AIM Work Screen Name 1"
 msgstr "AIM 工作螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:207
+#: ../addressbook/libebook-contacts/e-contact.c:215
 msgid "AIM Work Screen Name 2"
 msgstr "AIM 工作螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:208
+#: ../addressbook/libebook-contacts/e-contact.c:216
 msgid "AIM Work Screen Name 3"
 msgstr "AIM 工作螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:209
+#: ../addressbook/libebook-contacts/e-contact.c:217
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise 家用螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:210
+#: ../addressbook/libebook-contacts/e-contact.c:218
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise 家用螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:211
+#: ../addressbook/libebook-contacts/e-contact.c:219
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise 家用螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:212
+#: ../addressbook/libebook-contacts/e-contact.c:220
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise 工作螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:213
+#: ../addressbook/libebook-contacts/e-contact.c:221
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise 工作螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:214
+#: ../addressbook/libebook-contacts/e-contact.c:222
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise 工作螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:215
+#: ../addressbook/libebook-contacts/e-contact.c:223
 msgid "Jabber Home ID 1"
 msgstr "Jabber 家用 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:216
+#: ../addressbook/libebook-contacts/e-contact.c:224
 msgid "Jabber Home ID 2"
 msgstr "Jabber 家用 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:217
+#: ../addressbook/libebook-contacts/e-contact.c:225
 msgid "Jabber Home ID 3"
 msgstr "Jabber 家用 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:218
+#: ../addressbook/libebook-contacts/e-contact.c:226
 msgid "Jabber Work ID 1"
 msgstr "Jabber 工作 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:219
+#: ../addressbook/libebook-contacts/e-contact.c:227
 msgid "Jabber Work ID 2"
 msgstr "Jabber 工作 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:220
+#: ../addressbook/libebook-contacts/e-contact.c:228
 msgid "Jabber Work ID 3"
 msgstr "Jabber 工作 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:221
+#: ../addressbook/libebook-contacts/e-contact.c:229
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo!家用螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:222
+#: ../addressbook/libebook-contacts/e-contact.c:230
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo!家用螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:223
+#: ../addressbook/libebook-contacts/e-contact.c:231
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo!家用螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:224
+#: ../addressbook/libebook-contacts/e-contact.c:232
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo!工作螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:225
+#: ../addressbook/libebook-contacts/e-contact.c:233
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo!工作螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:226
+#: ../addressbook/libebook-contacts/e-contact.c:234
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo!工作螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:227
+#: ../addressbook/libebook-contacts/e-contact.c:235
 msgid "MSN Home Screen Name 1"
 msgstr "MSN 家用螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:228
+#: ../addressbook/libebook-contacts/e-contact.c:236
 msgid "MSN Home Screen Name 2"
 msgstr "MSN 家用螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:229
+#: ../addressbook/libebook-contacts/e-contact.c:237
 msgid "MSN Home Screen Name 3"
 msgstr "MSN 家用螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:230
+#: ../addressbook/libebook-contacts/e-contact.c:238
 msgid "MSN Work Screen Name 1"
 msgstr "MSN 工作螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:231
+#: ../addressbook/libebook-contacts/e-contact.c:239
 msgid "MSN Work Screen Name 2"
 msgstr "MSN 工作螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:232
+#: ../addressbook/libebook-contacts/e-contact.c:240
 msgid "MSN Work Screen Name 3"
 msgstr "MSN 工作螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:233
+#: ../addressbook/libebook-contacts/e-contact.c:241
 msgid "ICQ Home ID 1"
 msgstr "ICQ 家用 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:234
+#: ../addressbook/libebook-contacts/e-contact.c:242
 msgid "ICQ Home ID 2"
 msgstr "ICQ 家用 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:235
+#: ../addressbook/libebook-contacts/e-contact.c:243
 msgid "ICQ Home ID 3"
 msgstr "ICQ 家用 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:236
+#: ../addressbook/libebook-contacts/e-contact.c:244
 msgid "ICQ Work ID 1"
 msgstr "ICQ 工作 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:237
+#: ../addressbook/libebook-contacts/e-contact.c:245
 msgid "ICQ Work ID 2"
 msgstr "ICQ 工作 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:238
+#: ../addressbook/libebook-contacts/e-contact.c:246
 msgid "ICQ Work ID 3"
 msgstr "ICQ 工作 ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook-contacts/e-contact.c:241
+#: ../addressbook/libebook-contacts/e-contact.c:249
 msgid "Last Revision"
 msgstr "上次改版"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * virtual field, which returns either name of the contact or the organization
 #. * name, recognized by multiple other fields, where the first filled is used.
-#: ../addressbook/libebook-contacts/e-contact.c:245
+#: ../addressbook/libebook-contacts/e-contact.c:253
 msgid "Name or Org"
 msgstr "姓名或組織"
 
 #. Address fields
-#: ../addressbook/libebook-contacts/e-contact.c:248
+#: ../addressbook/libebook-contacts/e-contact.c:256
 msgid "Address List"
 msgstr "地址清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:249
+#: ../addressbook/libebook-contacts/e-contact.c:257
 msgid "Home Address"
 msgstr "住家地址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:250
+#: ../addressbook/libebook-contacts/e-contact.c:258
 msgid "Work Address"
 msgstr "工作地址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:251
+#: ../addressbook/libebook-contacts/e-contact.c:259
 msgid "Other Address"
 msgstr "其它地址"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:254
+#: ../addressbook/libebook-contacts/e-contact.c:262
 msgid "Category List"
 msgstr "分類清單"
 
 #. Photo/Logo
-#: ../addressbook/libebook-contacts/e-contact.c:257
+#: ../addressbook/libebook-contacts/e-contact.c:265
 msgid "Photo"
 msgstr "相片"
 
-#: ../addressbook/libebook-contacts/e-contact.c:258
+#: ../addressbook/libebook-contacts/e-contact.c:266
 msgid "Logo"
 msgstr "標誌"
 
 #. Translators: This is an EContact field description, in this case it's a name
 #. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
-#: ../addressbook/libebook-contacts/e-contact.c:262
+#: ../addressbook/libebook-contacts/e-contact.c:270
 msgid "Name"
 msgstr "名稱"
 
-#: ../addressbook/libebook-contacts/e-contact.c:263
+#: ../addressbook/libebook-contacts/e-contact.c:271
 msgid "Email List"
 msgstr "電子郵件清單"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:266
+#: ../addressbook/libebook-contacts/e-contact.c:274
 msgid "AIM Screen Name List"
 msgstr "AIM 螢幕名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:267
+#: ../addressbook/libebook-contacts/e-contact.c:275
 msgid "GroupWise ID List"
 msgstr "GroupWise ID 清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:268
+#: ../addressbook/libebook-contacts/e-contact.c:276
 msgid "Jabber ID List"
 msgstr "Jabber ID 清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:269
+#: ../addressbook/libebook-contacts/e-contact.c:277
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo!螢幕名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:270
+#: ../addressbook/libebook-contacts/e-contact.c:278
 msgid "MSN Screen Name List"
 msgstr "MSN 螢幕名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:271
+#: ../addressbook/libebook-contacts/e-contact.c:279
 msgid "ICQ ID List"
 msgstr "ICQ ID 清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:273
+#: ../addressbook/libebook-contacts/e-contact.c:281
 msgid "Wants HTML Mail"
 msgstr "需要 HTML 郵件"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * field describing whether it's a Contact list (list of email addresses) or a
 #. * regular contact for one person/organization/...
-#: ../addressbook/libebook-contacts/e-contact.c:278
+#: ../addressbook/libebook-contacts/e-contact.c:286
 msgid "List"
 msgstr "清單"
 
@@ -749,198 +784,202 @@ msgstr "清單"
 #. * used to determine whether when sending to Contact lists the addresses should be
 #. * shown or not to other recipients - basically whether to use BCC field or CC
 #. * message header when sending messages to this Contact list.
-#: ../addressbook/libebook-contacts/e-contact.c:283
+#: ../addressbook/libebook-contacts/e-contact.c:291
 msgid "List Shows Addresses"
 msgstr "清單顯示位址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:285
+#: ../addressbook/libebook-contacts/e-contact.c:293
 msgid "Birth Date"
 msgstr "出生日期"
 
-#: ../addressbook/libebook-contacts/e-contact.c:286
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:887
+#: ../addressbook/libebook-contacts/e-contact.c:294
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:893
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #. Security fields
-#: ../addressbook/libebook-contacts/e-contact.c:289
+#: ../addressbook/libebook-contacts/e-contact.c:297
 msgid "X.509 Certificate"
 msgstr "X.509 憑證"
 
-#: ../addressbook/libebook-contacts/e-contact.c:291
+#: ../addressbook/libebook-contacts/e-contact.c:299
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu 家用 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:292
+#: ../addressbook/libebook-contacts/e-contact.c:300
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu 家用 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:293
+#: ../addressbook/libebook-contacts/e-contact.c:301
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu 家用 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:294
+#: ../addressbook/libebook-contacts/e-contact.c:302
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu 工作 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:295
+#: ../addressbook/libebook-contacts/e-contact.c:303
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu 工作 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:296
+#: ../addressbook/libebook-contacts/e-contact.c:304
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu 工作 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:297
+#: ../addressbook/libebook-contacts/e-contact.c:305
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID 清單"
 
 #. Geo information
-#: ../addressbook/libebook-contacts/e-contact.c:300
+#: ../addressbook/libebook-contacts/e-contact.c:308
 msgid "Geographic Information"
 msgstr "地理資訊"
 
-#: ../addressbook/libebook-contacts/e-contact.c:302
+#: ../addressbook/libebook-contacts/e-contact.c:310
 msgid "Telephone"
 msgstr "電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:304
+#: ../addressbook/libebook-contacts/e-contact.c:312
 msgid "Skype Home Name 1"
 msgstr "Skype 住家名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:305
+#: ../addressbook/libebook-contacts/e-contact.c:313
 msgid "Skype Home Name 2"
 msgstr "Skype 住家名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:306
+#: ../addressbook/libebook-contacts/e-contact.c:314
 msgid "Skype Home Name 3"
 msgstr "Skype 住家名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:307
+#: ../addressbook/libebook-contacts/e-contact.c:315
 msgid "Skype Work Name 1"
 msgstr "Skype 工作名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:308
+#: ../addressbook/libebook-contacts/e-contact.c:316
 msgid "Skype Work Name 2"
 msgstr "Skype 工作名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:309
+#: ../addressbook/libebook-contacts/e-contact.c:317
 msgid "Skype Work Name 3"
 msgstr "Skype 工作名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:310
+#: ../addressbook/libebook-contacts/e-contact.c:318
 msgid "Skype Name List"
 msgstr "Skype 名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:312
+#: ../addressbook/libebook-contacts/e-contact.c:320
 msgid "SIP address"
 msgstr "SIP 位址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:314
+#: ../addressbook/libebook-contacts/e-contact.c:322
 msgid "Google Talk Home Name 1"
 msgstr "Google Talk 住家名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:315
+#: ../addressbook/libebook-contacts/e-contact.c:323
 msgid "Google Talk Home Name 2"
 msgstr "Google Talk 住家名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:316
+#: ../addressbook/libebook-contacts/e-contact.c:324
 msgid "Google Talk Home Name 3"
 msgstr "Google Talk 住家名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:317
+#: ../addressbook/libebook-contacts/e-contact.c:325
 msgid "Google Talk Work Name 1"
 msgstr "Google Talk 工作名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:318
+#: ../addressbook/libebook-contacts/e-contact.c:326
 msgid "Google Talk Work Name 2"
 msgstr "Google Talk 工作名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:319
+#: ../addressbook/libebook-contacts/e-contact.c:327
 msgid "Google Talk Work Name 3"
 msgstr "Google Talk 工作名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:320
+#: ../addressbook/libebook-contacts/e-contact.c:328
 msgid "Google Talk Name List"
 msgstr "Google Talk 名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:322
+#: ../addressbook/libebook-contacts/e-contact.c:330
 msgid "Twitter Name List"
 msgstr "Twitter 名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:1627
-#: ../addressbook/libebook/e-destination.c:883
+#: ../addressbook/libebook-contacts/e-contact.c:1635
+#: ../addressbook/libebook/e-destination.c:881
 msgid "Unnamed List"
 msgstr "未命名的清單"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:43
+#: ../addressbook/libebook-contacts/e-phone-number.c:41
 msgid "The library was built without phone number support."
 msgstr "程式庫組建時未加入電話號碼支援。"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:45
+#: ../addressbook/libebook-contacts/e-phone-number.c:43
 msgid "The phone number parser reported an yet unkown error code."
 msgstr "電話號碼分析器回報了不明的錯誤代碼。"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:47
+#: ../addressbook/libebook-contacts/e-phone-number.c:45
 msgid "Not a phone number"
 msgstr "不是電話號碼"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:49
+#: ../addressbook/libebook-contacts/e-phone-number.c:47
 msgid "Invalid country calling code"
 msgstr "無效的國家呼叫代碼"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:51
+#: ../addressbook/libebook-contacts/e-phone-number.c:49
 msgid ""
 "Remaining text after the country calling code is too short for a phone number"
 msgstr "國碼後的文字太短,不足電話號碼的長度"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:53
+#: ../addressbook/libebook-contacts/e-phone-number.c:51
 msgid "Text is too short for a phone number"
 msgstr "文字太短,不符合電話號碼格式"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:55
+#: ../addressbook/libebook-contacts/e-phone-number.c:53
 msgid "Text is too long for a phone number"
 msgstr "文字太長,不符合電話號碼格式"
 
-#: ../addressbook/libebook/e-book-client.c:749
+#: ../addressbook/libebook/e-book-client.c:807
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "不明的通訊錄屬性「%s」"
 
-#: ../addressbook/libebook/e-book-client.c:764
+#: ../addressbook/libebook/e-book-client.c:822
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "不能改變通訊錄屬性「%s」的數值"
 
-#: ../addressbook/libebook/e-book-client.c:1099
-#: ../addressbook/libebook/e-book-client.c:1274
-#: ../calendar/libecal/e-cal-client.c:1522
-#: ../calendar/libecal/e-cal-client.c:1704
+#: ../addressbook/libebook/e-book-client.c:1207
+#: ../addressbook/libebook/e-book-client.c:1382
+#: ../addressbook/libebook/e-book-client.c:1649
+#: ../calendar/libecal/e-cal-client.c:1530
+#: ../calendar/libecal/e-cal-client.c:1712
 #, c-format
 msgid "Unable to connect to '%s': "
 msgstr "無法連線至「%s」:"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:796
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:899
+#: ../addressbook/libedata-book/e-book-sqlite.c:2163
 #, c-format
 msgid "Error introspecting unknown summary field '%s'"
 msgstr "插補不明的摘要欄位「%s」時發生錯誤"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1295
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1509
+#: ../addressbook/libedata-book/e-book-sqlite.c:1319
 msgid "Error parsing regular expression"
 msgstr "解析正規表示式時發生錯誤"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1340
-#: ../camel/camel-db.c:544
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1554
+#: ../addressbook/libedata-book/e-book-sqlite.c:1803 ../camel/camel-db.c:545
 #, c-format
 msgid "Insufficient memory"
 msgstr "記憶體不足"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1473
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1691
 #, c-format
 msgid "Invalid contact field '%d' specified in summary"
 msgstr "在摘要中指定了無效的連絡人欄位「%d」"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1507
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1725
+#: ../addressbook/libedata-book/e-book-sqlite.c:557
 #, c-format
 msgid ""
 "Contact field '%s' of type '%s' specified in summary, but only boolean, "
@@ -949,256 +988,349 @@ msgstr ""
 "在摘要中指定了類型「%2$s」的連絡人欄位「%1$s」,但是只支援布林值、字串及字串"
 "清單欄位類型"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2695
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3772
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3065
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4161
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. vcards cannot be returned."
 msgstr "完整搜尋連絡人未儲存於快取。不能傳回 vcard。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3898
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3979
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385
+#: ../addressbook/libedata-book/e-book-sqlite.c:5364
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr "查詢包含了不支援的元素"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3902
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4296
 #, c-format
 msgid "Invalid Query"
 msgstr "無效的查詢"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3926
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4320
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
 "supported."
 msgstr "完整搜尋連絡人未儲存於快取。因此只支援摘要查詢。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3983
-#: ../addressbook/libedata-book/e-data-book.c:358
-#: ../addressbook/libedata-book/e-data-book.c:992
-#: ../calendar/libedata-cal/e-data-cal.c:412
-#: ../calendar/libedata-cal/e-data-cal.c:1299 ../libedataserver/e-client.c:164
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4389
+#: ../addressbook/libedata-book/e-data-book.c:383
+#: ../addressbook/libedata-book/e-data-book.c:1028
+#: ../calendar/libedata-cal/e-data-cal.c:420
+#: ../calendar/libedata-cal/e-data-cal.c:1307 ../libedataserver/e-client.c:172
 #, c-format
 msgid "Invalid query"
 msgstr "無效的查詢"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4026
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4432
 #, c-format
 msgid ""
 "Full vcards are not stored in cache. Hence only summary query is supported."
 msgstr "完整 vcard 未儲存於快取。因此只支援摘要查詢。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4729
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5255
 #, c-format
 msgid "Unable to remove the db file: errno %d"
 msgstr "無法移除 db 檔案:錯誤 %d"
 
-#: ../addressbook/libedata-book/e-data-book.c:342
-#: ../calendar/libedata-cal/e-data-cal.c:393
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6042
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6442
+#, c-format
+msgid "Only summary queries are supported by EbSdbCursor"
+msgstr "EbSdbCursor 只支援摘要查詢。"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6049
+#, c-format
+msgid "At least one sort field must be specified to use an EbSdbCursor"
+msgstr "必須選擇至少一項排序欄位使用 EbSdbCursor"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6063
+#, c-format
+msgid "Cannot sort by a field that is not in the summary"
+msgstr "不能排序不在摘要中的欄位"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6070
+#, c-format
+msgid "Cannot sort by a field which may have multiple values"
+msgstr "不能排序可能含有多重數值的欄位"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203
+#: ../addressbook/libedata-book/e-book-sqlite.c:7376
+#, c-format
+msgid ""
+"Tried to step a cursor in reverse, but cursor is already at the beginning of "
+"the contact list"
+msgstr "嘗試反向推進游標,但是游標已在連絡人清單的開頭"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
+#: ../addressbook/libedata-book/e-book-sqlite.c:7384
+#, c-format
+msgid ""
+"Tried to step a cursor forwards, but cursor is already at the end of the "
+"contact list"
+msgstr "嘗試推進游標,但是游標已在連絡人清單的結尾"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:524
+#, c-format
+msgid "Unsupported contact field '%d' specified in summary"
+msgstr "在摘要中指定了不支援的連絡人欄位「%d」"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:1876
+msgid ""
+"Cannot upgrade contacts database from a legacy database with more than one "
+"addressbook. Delete one of the entries in the 'folders' table first."
+msgstr ""
+"有一個以上通訊錄時不能從傳統資料庫升級連絡人資料庫。請先在「folders」表格中刪"
+"除其中一個項目。"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:5357
+#, c-format
+msgid "Invalid query: %s"
+msgstr "無效的查詢:%s"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:5532
+msgid "Invalid query for EbSqlCursor"
+msgstr "EbSqlCursor 的無效查詢"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:7198
+msgid "At least one sort field must be specified to use an EbSqlCursor"
+msgstr "要使用 EbSqlCursor 您必須指定至少一個排序欄位"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:7216
+msgid "Cannot sort by a field that is not a string type"
+msgstr "不能排序不是字串類型的欄位"
+
+#: ../addressbook/libedata-book/e-data-book.c:367
+#: ../calendar/libedata-cal/e-data-cal.c:401
 msgid "Success"
 msgstr "成功"
 
-#: ../addressbook/libedata-book/e-data-book.c:343
-#: ../calendar/libecal/e-cal.c:2303 ../calendar/libedata-cal/e-data-cal.c:394
-#: ../libedataserver/e-client.c:131
+#: ../addressbook/libedata-book/e-data-book.c:368
+#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:402
+#: ../libedataserver/e-client.c:139
 msgid "Backend is busy"
 msgstr "後端忙碌中"
 
-#: ../addressbook/libedata-book/e-data-book.c:344
-#: ../calendar/libedata-cal/e-data-cal.c:395 ../libedataserver/e-client.c:141
+#: ../addressbook/libedata-book/e-data-book.c:369
+#: ../calendar/libedata-cal/e-data-cal.c:403 ../libedataserver/e-client.c:149
 msgid "Repository offline"
 msgstr "資料庫離線"
 
-#: ../addressbook/libedata-book/e-data-book.c:345
-#: ../calendar/libecal/e-cal.c:2317 ../calendar/libedata-cal/e-data-cal.c:396
-#: ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:370
+#: ../calendar/libecal/e-cal.c:2316 ../calendar/libedata-cal/e-data-cal.c:404
+#: ../libedataserver/e-client.c:156
 msgid "Permission denied"
 msgstr "權限不足"
 
-#: ../addressbook/libedata-book/e-data-book.c:348
-#: ../calendar/libedata-cal/e-data-cal.c:401
+#: ../addressbook/libedata-book/e-data-book.c:373
+#: ../calendar/libedata-cal/e-data-cal.c:409
 msgid "Authentication Failed"
 msgstr "核對失敗"
 
-#: ../addressbook/libedata-book/e-data-book.c:349
-#: ../calendar/libedata-cal/e-data-cal.c:402
+#: ../addressbook/libedata-book/e-data-book.c:374
+#: ../calendar/libedata-cal/e-data-cal.c:410
 msgid "Authentication Required"
 msgstr "要求核對"
 
-#: ../addressbook/libedata-book/e-data-book.c:350
-#: ../calendar/libedata-cal/e-data-cal.c:403
+#: ../addressbook/libedata-book/e-data-book.c:375
+#: ../calendar/libedata-cal/e-data-cal.c:411
 msgid "Unsupported field"
 msgstr "不支援的欄位"
 
-#: ../addressbook/libedata-book/e-data-book.c:351
-#: ../calendar/libedata-cal/e-data-cal.c:405 ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:376
+#: ../calendar/libedata-cal/e-data-cal.c:413 ../libedataserver/e-client.c:164
 msgid "Unsupported authentication method"
 msgstr "不支援的核對方法"
 
-#: ../addressbook/libedata-book/e-data-book.c:352
-#: ../calendar/libedata-cal/e-data-cal.c:406 ../libedataserver/e-client.c:158
+#: ../addressbook/libedata-book/e-data-book.c:377
+#: ../calendar/libedata-cal/e-data-cal.c:414 ../libedataserver/e-client.c:166
 msgid "TLS not available"
 msgstr "無法使用 TLS"
 
-#: ../addressbook/libedata-book/e-data-book.c:353
+#: ../addressbook/libedata-book/e-data-book.c:378
 msgid "Address book does not exist"
 msgstr "通訊錄不存在"
 
-#: ../addressbook/libedata-book/e-data-book.c:354
+#: ../addressbook/libedata-book/e-data-book.c:379
 msgid "Book removed"
 msgstr "通訊錄已經移除"
 
-#: ../addressbook/libedata-book/e-data-book.c:355
-#: ../calendar/libedata-cal/e-data-cal.c:409
+#: ../addressbook/libedata-book/e-data-book.c:380
+#: ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Not available in offline mode"
 msgstr "無法在離線模式下使用"
 
-#: ../addressbook/libedata-book/e-data-book.c:356
-#: ../calendar/libedata-cal/e-data-cal.c:410 ../libedataserver/e-client.c:160
+#: ../addressbook/libedata-book/e-data-book.c:381
+#: ../calendar/libedata-cal/e-data-cal.c:418 ../libedataserver/e-client.c:168
 msgid "Search size limit exceeded"
 msgstr "超過搜尋大小限制"
 
-#: ../addressbook/libedata-book/e-data-book.c:357
-#: ../calendar/libedata-cal/e-data-cal.c:411 ../libedataserver/e-client.c:162
+#: ../addressbook/libedata-book/e-data-book.c:382
+#: ../calendar/libedata-cal/e-data-cal.c:419 ../libedataserver/e-client.c:170
 msgid "Search time limit exceeded"
 msgstr "超過搜尋時間限制"
 
-#: ../addressbook/libedata-book/e-data-book.c:359
-#: ../calendar/libedata-cal/e-data-cal.c:413 ../libedataserver/e-client.c:166
+#: ../addressbook/libedata-book/e-data-book.c:384
+#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:174
 msgid "Query refused"
 msgstr "查詢被拒絕"
 
-#: ../addressbook/libedata-book/e-data-book.c:360
-#: ../calendar/libedata-cal/e-data-cal.c:414 ../libedataserver/e-client.c:152
+#: ../addressbook/libedata-book/e-data-book.c:385
+#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:160
 msgid "Could not cancel"
 msgstr "無法取消"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,                   N_("Other error") },
 #. { OtherError,                       N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:362
-#: ../calendar/libedata-cal/e-data-cal.c:416
+#: ../addressbook/libedata-book/e-data-book.c:387
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Invalid server version"
 msgstr "無效的伺服器版本"
 
-#: ../addressbook/libedata-book/e-data-book.c:364
-#: ../calendar/libecal/e-cal.c:2301 ../calendar/libedata-cal/e-data-cal.c:417
-#: ../libedataserver/e-client.c:129
+#: ../addressbook/libedata-book/e-data-book.c:389
+#: ../calendar/libecal/e-cal.c:2300 ../calendar/libedata-cal/e-data-cal.c:425
+#: ../libedataserver/e-client.c:137
 msgid "Invalid argument"
 msgstr "無效的參數"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:366
-#: ../calendar/libecal/e-cal.c:1060 ../calendar/libecal/e-cal.c:1428
-#: ../calendar/libecal/e-cal.c:1908 ../calendar/libecal/e-cal.c:2340
-#: ../calendar/libedata-cal/e-data-cal.c:419 ../libedataserver/e-client.c:154
+#: ../addressbook/libedata-book/e-data-book.c:391
+#: ../calendar/libecal/e-cal.c:1059 ../calendar/libecal/e-cal.c:1427
+#: ../calendar/libecal/e-cal.c:1907 ../calendar/libecal/e-cal.c:2339
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:162
 #, c-format
 msgid "Not supported"
 msgstr "不支援"
 
-#: ../addressbook/libedata-book/e-data-book.c:367
-#: ../calendar/libedata-cal/e-data-cal.c:420 ../libedataserver/e-client.c:172
+#: ../addressbook/libedata-book/e-data-book.c:392
+#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:180
 msgid "Backend is not opened yet"
 msgstr "後端尚未開啟"
 
-#: ../addressbook/libedata-book/e-data-book.c:368
-#: ../libedataserver/e-client.c:174
+#: ../addressbook/libedata-book/e-data-book.c:393
+#: ../libedataserver/e-client.c:182
 msgid "Object is out of sync"
 msgstr "物件沒有同步"
 
-#: ../addressbook/libedata-book/e-data-book.c:376
-#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:170
+#: ../addressbook/libedata-book/e-data-book.c:401
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:178
 msgid "Other error"
 msgstr "其他錯誤"
 
-#: ../addressbook/libedata-book/e-data-book.c:1017
-#: ../calendar/libedata-cal/e-data-cal.c:1324
+#: ../addressbook/libedata-book/e-data-book.c:1053
+#: ../calendar/libedata-cal/e-data-cal.c:1332
 msgid "Invalid query: "
 msgstr "無效的查詢:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1069
+#: ../addressbook/libedata-book/e-data-book.c:1272
 msgid "Cannot open book: "
 msgstr "不能開啟通訊錄:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1106
+#: ../addressbook/libedata-book/e-data-book.c:1309
 msgid "Cannot refresh address book: "
 msgstr "不能重新整理通訊錄:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1137
+#: ../addressbook/libedata-book/e-data-book.c:1340
 msgid "Cannot get contact: "
 msgstr "不能取得連絡人:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1175
+#: ../addressbook/libedata-book/e-data-book.c:1378
 msgid "Cannot get contact list: "
 msgstr "不能取得連絡人清單:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1227
+#: ../addressbook/libedata-book/e-data-book.c:1430
 msgid "Cannot get contact list uids: "
 msgstr "不能取得連絡人清單 uid:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1274
+#: ../addressbook/libedata-book/e-data-book.c:1477
 msgid "Cannot add contact: "
 msgstr "不能加入連絡人:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1323
+#: ../addressbook/libedata-book/e-data-book.c:1526
 msgid "Cannot modify contacts: "
 msgstr "不能修改連絡人"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1365
+#: ../addressbook/libedata-book/e-data-book.c:1568
 msgid "Cannot remove contacts: "
 msgstr "不能移除連絡人:"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:273
-#: ../calendar/libedata-cal/e-data-cal-factory.c:276
+#: ../addressbook/libedata-book/e-data-book-cursor.c:772
+msgid "Cursor does not support setting the search expression"
+msgstr "游標不支援設定搜尋正規表示式"
+
+#: ../addressbook/libedata-book/e-data-book-cursor.c:855
+msgid "Cursor does not support step"
+msgstr "游標並不支援步進"
+
+#: ../addressbook/libedata-book/e-data-book-cursor.c:938
+msgid "Cursor does not support alphabetic indexes"
+msgstr "游標不支援字母排列索引"
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:268
+msgid "Unrecognized cursor origin"
+msgstr "無法辨識的游標原始"
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:336
+#, fuzzy
+msgid "Out of sync revision while moving cursor"
+msgstr "嘗試不使用同步修訂來修改連絡人「%s」"
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:430
+msgid "Alphabetic index was set for incorrect locale"
+msgstr "字母排序索引設定了不正確地區"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:289
+#: ../calendar/libedata-cal/e-data-cal-factory.c:285
 #, c-format
 msgid "No backend name in source '%s'"
 msgstr "來源「%s」中沒有後端名稱"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:324
-#: ../calendar/libedata-cal/e-data-cal-factory.c:330
+#: ../addressbook/libedata-book/e-data-book-factory.c:377
+#: ../calendar/libedata-cal/e-data-cal-factory.c:339
 #, c-format
 msgid "Missing source UID"
 msgstr "缺少來源 UID"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:335
-#: ../calendar/libedata-cal/e-data-cal-factory.c:340
+#: ../addressbook/libedata-book/e-data-book-factory.c:388
+#: ../calendar/libedata-cal/e-data-cal-factory.c:349
 #, c-format
 msgid "No such source for UID '%s'"
 msgstr "沒有 UID「%s」的這類來源"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:566
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:572
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "無法連接伺服器 (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:597
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:603
 #, c-format
 msgid "Failed to connect to a server using SSL: %s"
 msgstr "無法使用 SSL 連線至伺服器:%s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:608
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:614
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "HTTP 回應未預期的狀態碼 %d (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:627
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:633
 msgid "CalDAV backend is not loaded yet"
 msgstr "CalDAV 後端尚未載入"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1048
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1070
 msgid "Invalid Redirect URL"
 msgstr "無效的重新導向 URL"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2525
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2917
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2562
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2927
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1207,438 +1339,461 @@ msgstr ""
 "無法連接伺服器,行事曆會以唯讀模式開啟。\n"
 "錯誤訊息:%s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2869
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "不能建立本地快取資料夾「%s」"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3957
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3967
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV 不支援大量增加"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4060
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4070
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV 不支援大量修改"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4236
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4246
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV 不支援大量移除"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4903
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4913
 msgid "Calendar doesn't support Free/Busy"
 msgstr "行事曆不支援空閒/忙碌"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4912
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4922
 msgid "Schedule outbox url not found"
 msgstr "找不到排程的寄件匣 url"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5009
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5019
 msgid "Unexpected result in schedule-response"
 msgstr "在排程-回應中未預期的結果"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:889
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:895
 msgid "Birthday"
 msgstr "生日"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:925
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:931
 #, c-format
 msgid "Birthday: %s"
 msgstr "生日:%s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:956
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:962
 #, c-format
 msgid "Anniversary: %s"
 msgstr "紀念日:%s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:245
+#: ../calendar/backends/file/e-cal-backend-file.c:244
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "無法儲存行事曆資料:URI 的格式不正確。"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:252
-#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:251
+#: ../calendar/backends/file/e-cal-backend-file.c:257
 msgid "Cannot save calendar data"
 msgstr "不能儲存行事曆資料"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:479
+#: ../calendar/backends/http/e-cal-backend-http.c:483
 #, c-format
 msgid "Malformed URI: %s"
 msgstr "格式不良的 URI:%s"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:570
+#: ../calendar/backends/http/e-cal-backend-http.c:574
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "重新指向無效的 URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:613
+#: ../calendar/backends/http/e-cal-backend-http.c:617
 #, c-format
 msgid "Bad file format."
 msgstr "錯誤的檔案格式。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:623
+#: ../calendar/backends/http/e-cal-backend-http.c:627
 #, c-format
 msgid "Not a calendar."
 msgstr "並非行事曆。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:927
-#: ../calendar/backends/weather/e-cal-backend-weather.c:514
+#: ../calendar/backends/http/e-cal-backend-http.c:914
+#: ../calendar/backends/weather/e-cal-backend-weather.c:536
 msgid "Could not create cache file"
 msgstr "無法建構快取檔案"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:173
+#: ../calendar/backends/weather/e-cal-backend-weather.c:174
 msgid "Could not retrieve weather data"
 msgstr "無法取得天氣資料"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:295
 msgid "Weather: Fog"
 msgstr "天氣:起霧"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:296
 msgid "Weather: Cloudy Night"
 msgstr "天氣:多雲的夜晚"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:297
 msgid "Weather: Cloudy"
 msgstr "天氣:多雲"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:298
 msgid "Weather: Overcast"
 msgstr "天氣:多雲"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:299
 msgid "Weather: Showers"
 msgstr "天氣:陣雨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:300
 msgid "Weather: Snow"
 msgstr "天氣:下雪"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:301
 msgid "Weather: Clear Night"
 msgstr "天氣:晴朗的夜晚"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:302
 msgid "Weather: Sunny"
 msgstr "天氣:艷陽"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:303
 msgid "Weather: Thunderstorms"
 msgstr "天氣:雷暴"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:416
+#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
+#: ../calendar/backends/weather/e-cal-backend-weather.c:329
+#, c-format
+msgid "%.1f °F"
+msgstr "%.1f °F"
+
+#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
+#: ../calendar/backends/weather/e-cal-backend-weather.c:332
+#, c-format
+msgid "%.1f °C"
+msgstr "%.1f °C"
+
+#. TRANSLATOR: This is the temperature in kelvin
+#: ../calendar/backends/weather/e-cal-backend-weather.c:335
+#, c-format
+msgid "%.1f K"
+msgstr "%.1f K"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:341
+#, c-format
+msgid "%.1f"
+msgstr "%.1f"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:452
 msgid "Forecast"
 msgstr "天氣預報"
 
-#: ../calendar/libecal/e-cal.c:2305
+#: ../calendar/libecal/e-cal.c:2304
 msgid "Repository is offline"
 msgstr "倉庫已離線"
 
-#: ../calendar/libecal/e-cal.c:2307 ../calendar/libecal/e-cal-client.c:255
+#: ../calendar/libecal/e-cal.c:2306 ../calendar/libecal/e-cal-client.c:263
 msgid "No such calendar"
 msgstr "無此行事曆"
 
-#: ../calendar/libecal/e-cal.c:2309 ../calendar/libecal/e-cal-client.c:257
-#: ../calendar/libedata-cal/e-data-cal.c:398
+#: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:265
+#: ../calendar/libedata-cal/e-data-cal.c:406
 msgid "Object not found"
 msgstr "找不到物件"
 
-#: ../calendar/libecal/e-cal.c:2311 ../calendar/libecal/e-cal-client.c:259
-#: ../calendar/libedata-cal/e-data-cal.c:399
+#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:267
+#: ../calendar/libedata-cal/e-data-cal.c:407
 msgid "Invalid object"
 msgstr "無效的物件"
 
-#: ../calendar/libecal/e-cal.c:2313
+#: ../calendar/libecal/e-cal.c:2312
 msgid "URI not loaded"
 msgstr "URI 未載入"
 
-#: ../calendar/libecal/e-cal.c:2315
+#: ../calendar/libecal/e-cal.c:2314
 msgid "URI already loaded"
 msgstr "URI 已載入"
 
-#: ../calendar/libecal/e-cal.c:2319
+#: ../calendar/libecal/e-cal.c:2318
 msgid "Unknown User"
 msgstr "不明的使用者"
 
-#: ../calendar/libecal/e-cal.c:2321 ../calendar/libecal/e-cal-client.c:263
-#: ../calendar/libedata-cal/e-data-cal.c:400
+#: ../calendar/libecal/e-cal.c:2320 ../calendar/libecal/e-cal-client.c:271
+#: ../calendar/libedata-cal/e-data-cal.c:408
 msgid "Object ID already exists"
 msgstr "物件 ID 已存在"
 
-#: ../calendar/libecal/e-cal.c:2323
+#: ../calendar/libecal/e-cal.c:2322
 msgid "Protocol not supported"
 msgstr "通訊協定不支援"
 
-#: ../calendar/libecal/e-cal.c:2325
+#: ../calendar/libecal/e-cal.c:2324
 msgid "Operation has been canceled"
 msgstr "操作已取消"
 
-#: ../calendar/libecal/e-cal.c:2327
+#: ../calendar/libecal/e-cal.c:2326
 msgid "Could not cancel operation"
 msgstr "無法取消操作"
 
-#: ../calendar/libecal/e-cal.c:2329 ../libedataserver/e-client.c:137
+#: ../calendar/libecal/e-cal.c:2328 ../libedataserver/e-client.c:145
 msgid "Authentication failed"
 msgstr "核對失敗"
 
-#: ../calendar/libecal/e-cal.c:2331
-#: ../camel/providers/smtp/camel-smtp-transport.c:911
-#: ../libedataserver/e-client.c:139
+#: ../calendar/libecal/e-cal.c:2330
+#: ../camel/providers/smtp/camel-smtp-transport.c:921
+#: ../libedataserver/e-client.c:147
 msgid "Authentication required"
 msgstr "要求核對"
 
-#: ../calendar/libecal/e-cal.c:2333
+#: ../calendar/libecal/e-cal.c:2332
 msgid "A D-Bus exception has occurred"
 msgstr "發生 D-Bus 例外"
 
-#: ../calendar/libecal/e-cal.c:2337
+#: ../calendar/libecal/e-cal.c:2336
 msgid "No error"
 msgstr "沒有錯誤"
 
-#: ../calendar/libecal/e-cal-client.c:261
-#: ../calendar/libedata-cal/e-data-cal.c:408
+#: ../calendar/libecal/e-cal-client.c:269
+#: ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Unknown user"
 msgstr "不明的使用者"
 
-#: ../calendar/libecal/e-cal-client.c:265
-#: ../calendar/libedata-cal/e-data-cal.c:397
+#: ../calendar/libecal/e-cal-client.c:273
+#: ../calendar/libedata-cal/e-data-cal.c:405
 msgid "Invalid range"
 msgstr "無效的範圍"
 
-#: ../calendar/libecal/e-cal-client.c:928
+#: ../calendar/libecal/e-cal-client.c:936
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "不明的行事曆屬性「%s」"
 
-#: ../calendar/libecal/e-cal-client.c:943
+#: ../calendar/libecal/e-cal-client.c:951
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "不能改變行事曆屬性「%s」的數值"
 
-#: ../calendar/libecal/e-cal-component.c:1340
+#: ../calendar/libecal/e-cal-component.c:1348
 msgid "Untitled appointment"
 msgstr "未命名的約會"
 
-#: ../calendar/libecal/e-cal-recur.c:4036
+#: ../calendar/libecal/e-cal-recur.c:4037
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/libecal/e-cal-recur.c:4037
+#: ../calendar/libecal/e-cal-recur.c:4038
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/libecal/e-cal-recur.c:4038
+#: ../calendar/libecal/e-cal-recur.c:4039
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/libecal/e-cal-recur.c:4039
+#: ../calendar/libecal/e-cal-recur.c:4040
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/libecal/e-cal-recur.c:4040
+#: ../calendar/libecal/e-cal-recur.c:4041
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:4042
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:4043
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:4044
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:4045
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:4046
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:4047
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:4048
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:4049
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:4050
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:4051
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:4052
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:4053
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:4054
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:4055
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4056
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4057
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4058
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4059
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4060
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4061
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4062
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4063
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4064
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4065
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4066
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4067
 msgid "31st"
 msgstr "31日"
 
-#: ../calendar/libecal/e-cal-util.c:707 ../calendar/libecal/e-cal-util.c:734
+#: ../calendar/libecal/e-cal-util.c:706 ../calendar/libecal/e-cal-util.c:733
 msgctxt "Priority"
 msgid "High"
 msgstr "高"
 
-#: ../calendar/libecal/e-cal-util.c:709 ../calendar/libecal/e-cal-util.c:736
+#: ../calendar/libecal/e-cal-util.c:708 ../calendar/libecal/e-cal-util.c:735
 msgctxt "Priority"
 msgid "Normal"
 msgstr "中"
 
-#: ../calendar/libecal/e-cal-util.c:711 ../calendar/libecal/e-cal-util.c:738
+#: ../calendar/libecal/e-cal-util.c:710 ../calendar/libecal/e-cal-util.c:737
 msgctxt "Priority"
 msgid "Low"
 msgstr "低"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:732
+#: ../calendar/libecal/e-cal-util.c:731
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "未定義"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:78
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1056
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1365
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1492
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1541
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:84
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1062
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1371
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1498
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1547
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "「%s」需要一個引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1372
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1380
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:91
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:673
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1378
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1386
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "「%s」的第一個引數必須為字串"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
 #, c-format
 msgid "\"%s\" expects two or three arguments"
 msgstr "「%s」需要二或三個引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:256
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1441
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1499
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1548
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:173
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:262
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:324
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:823
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1069
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1447
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1505
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1554
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "「%s」的第一個引數必須為 time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:264
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:328
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:826
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:270
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:334
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "「%s」的第二個引數必須為 time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:186
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:192
 #, c-format
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "「%s」的第三個引數必須為字串"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:248
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
 #, c-format
 msgid "\"%s\" expects none or two arguments"
 msgstr "「%s」需要零或二個引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:311
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:660
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:810
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1434
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:317
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:666
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:816
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1440
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "「%s」需要兩個引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:596
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:619
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:742
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:774
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:981
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1014
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1326
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:602
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:625
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:748
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:780
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1332
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "「%s」不需要引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:682
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "「%s」的第二個引數必須為字串"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:707
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:713
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1648,363 +1803,294 @@ msgstr ""
 "「%s」的第一個引數必須為「任何」、「摘要」之一,或「描述」、「位置」、「到會"
 "者」、「召集人」、「分類」其中之一"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "「%s」需要至少一個引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:893
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:899
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
 msgstr "「%s」的所有引數必須為字串,或只有一個引數為布林偽值 (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1389
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1395
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "「%s」的第一個引數必須為 ISO 8601 日期/時間字串"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1450
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1456
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "「%s」的第二個引數必須為整數"
 
-#: ../calendar/libedata-cal/e-data-cal.c:404
+#: ../calendar/libedata-cal/e-data-cal.c:412
 msgid "Unsupported method"
 msgstr "不支援的方法"
 
-#: ../calendar/libedata-cal/e-data-cal.c:407
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Calendar does not exist"
 msgstr "行事曆不存在"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1495
+#: ../calendar/libedata-cal/e-data-cal.c:1503
 msgid "Cannot open calendar: "
 msgstr "不能開啟行事曆:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1532
+#: ../calendar/libedata-cal/e-data-cal.c:1540
 msgid "Cannot refresh calendar: "
 msgstr "不能重新整理行事曆:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1573
+#: ../calendar/libedata-cal/e-data-cal.c:1581
 msgid "Cannot retrieve calendar object path: "
 msgstr "不能取得行事曆物件路徑:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1625
+#: ../calendar/libedata-cal/e-data-cal.c:1633
 msgid "Cannot retrieve calendar object list: "
 msgstr "不能取得行事曆物件清單:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1676
+#: ../calendar/libedata-cal/e-data-cal.c:1684
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "不能取得行事曆空閒/忙碌清單:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1719
+#: ../calendar/libedata-cal/e-data-cal.c:1727
 msgid "Cannot create calendar object: "
 msgstr "不能建立行事曆物件:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1787
+#: ../calendar/libedata-cal/e-data-cal.c:1795
 msgid "Cannot modify calendar object: "
 msgstr "不能修改行事曆物件:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1865
+#: ../calendar/libedata-cal/e-data-cal.c:1873
 msgid "Cannot remove calendar object: "
 msgstr "不能移除行事曆物件:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1951
+#: ../calendar/libedata-cal/e-data-cal.c:1959
 msgid "Cannot receive calendar objects: "
 msgstr "不能取得行事曆物件:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1994
+#: ../calendar/libedata-cal/e-data-cal.c:2002
 msgid "Cannot send calendar objects: "
 msgstr "不能傳送行事曆物件:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2046
+#: ../calendar/libedata-cal/e-data-cal.c:2054
 msgid "Could not retrieve attachment uris: "
 msgstr "無法取得附件 URI:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2091
+#: ../calendar/libedata-cal/e-data-cal.c:2099
 msgid "Could not discard reminder: "
 msgstr "無法取消提醒:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2132
+#: ../calendar/libedata-cal/e-data-cal.c:2140
 msgid "Could not retrieve calendar time zone: "
 msgstr "無法取得行事曆時區:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2172
+#: ../calendar/libedata-cal/e-data-cal.c:2180
 msgid "Could not add calendar time zone: "
 msgstr "無法加入行事曆時區:"
 
-#: ../camel/camel-cipher-context.c:208
+#: ../camel/camel-cipher-context.c:200
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "這種加密方式不支援簽署"
 
-#: ../camel/camel-cipher-context.c:221
+#: ../camel/camel-cipher-context.c:213
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "這種加密方式不支援驗證簽署"
 
-#: ../camel/camel-cipher-context.c:237
+#: ../camel/camel-cipher-context.c:229
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "這種加密方式不支援加密"
 
-#: ../camel/camel-cipher-context.c:251
+#: ../camel/camel-cipher-context.c:243
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "這種加密方式不支援解密"
 
-#: ../camel/camel-cipher-context.c:264
-#, c-format
-msgid "You may not import keys with this cipher"
-msgstr "您不能匯入這種加密方式的金鑰"
-
-#: ../camel/camel-cipher-context.c:278
-#, c-format
-msgid "You may not export keys with this cipher"
-msgstr "您不能匯出這種加密方式的金鑰"
-
-#: ../camel/camel-cipher-context.c:819
+#: ../camel/camel-cipher-context.c:359
 msgid "Signing message"
 msgstr "正在簽署訊息"
 
-#: ../camel/camel-cipher-context.c:1060
+#: ../camel/camel-cipher-context.c:649
 msgid "Encrypting message"
 msgstr "正在加密訊息"
 
-#: ../camel/camel-cipher-context.c:1187
+#: ../camel/camel-cipher-context.c:821
 msgid "Decrypting message"
 msgstr "正在解密訊息"
 
-#: ../camel/camel-data-cache.c:181
+#: ../camel/camel-data-cache.c:179
 #, c-format
 msgid "Unable to create cache path"
 msgstr "無法建構快取路徑"
 
-#: ../camel/camel-data-cache.c:440
+#: ../camel/camel-data-cache.c:449
 msgid "Empty cache file"
 msgstr "清空快取檔案"
 
-#: ../camel/camel-data-cache.c:509
+#: ../camel/camel-data-cache.c:522
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "無法移除快取項目: %s: %s"
 
-#: ../camel/camel-disco-diary.c:207
-#, c-format
-msgid ""
-"Could not write log entry: %s\n"
-"Further operations on this server will not be replayed when you\n"
-"reconnect to the network."
-msgstr ""
-"無法寫入紀錄: %s\n"
-"接下來在此伺服器上的操作,在您重新連線到網路時\n"
-"將不會重播。"
-
-#: ../camel/camel-disco-diary.c:279
-#, c-format
-msgid ""
-"Could not open '%s':\n"
-"%s\n"
-"Changes made to this folder will not be resynchronized."
-msgstr ""
-"無法開啟「%s」:\n"
-"%s\n"
-"這個資料夾內所做的變更將不會重新同步。"
-
-#: ../camel/camel-disco-diary.c:326
-msgid "Resynchronizing with server"
-msgstr "與伺服器重新同步"
-
-#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93
-msgid "Downloading new messages for offline mode"
-msgstr "正在下載新訊息用於離線模式"
-
-#: ../camel/camel-disco-folder.c:422
-#, c-format
-msgid "Preparing folder '%s' for offline"
-msgstr "準備資料夾「%s」供離線使用"
-
-#: ../camel/camel-disco-folder.c:489 ../camel/camel-offline-folder.c:336
-msgid "Copy folder content locally for _offline operation"
-msgstr "複製資料夾內容至本地用於離線作業(_O)"
-
-#: ../camel/camel-disco-store.c:518 ../camel/camel-imapx-store.c:618
-#: ../camel/camel-imapx-store.c:2242
-#: ../camel/providers/pop3/camel-pop3-folder.c:596
-#: ../camel/providers/pop3/camel-pop3-folder.c:746
-#: ../camel/providers/pop3/camel-pop3-folder.c:987
-#: ../camel/providers/pop3/camel-pop3-folder.c:1216
-#: ../camel/providers/pop3/camel-pop3-store.c:291
-#: ../camel/providers/pop3/camel-pop3-store.c:519
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../camel/providers/pop3/camel-pop3-store.c:659
-#: ../camel/providers/pop3/camel-pop3-store.c:1059
-#, c-format
-msgid "You must be working online to complete this operation"
-msgstr "您必須於線上工作才能完成此操作"
-
-#: ../camel/camel-file-utils.c:732
-#, c-format
-msgid "Canceled"
-msgstr "已取消"
-
-#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:797
+#: ../camel/camel-filter-driver.c:914 ../camel/camel-filter-search.c:795
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "無法建構子代處理 '%s':%s"
 
-#: ../camel/camel-filter-driver.c:964
+#: ../camel/camel-filter-driver.c:962
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "無法讀取 %s 的歡迎辭: %s"
 
-#: ../camel/camel-filter-driver.c:1171 ../camel/camel-filter-driver.c:1180
+#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
 msgid "Syncing folders"
 msgstr "同步處理資料夾"
 
-#: ../camel/camel-filter-driver.c:1278
+#: ../camel/camel-filter-driver.c:1276
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "分析過濾器發生錯誤: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1289
+#: ../camel/camel-filter-driver.c:1287
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "執行過濾器發生錯誤: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1385
+#: ../camel/camel-filter-driver.c:1383
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "無法開啟排程器資料夾"
 
-#: ../camel/camel-filter-driver.c:1397
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "無法處理排程器資料夾"
 
-#: ../camel/camel-filter-driver.c:1420
+#: ../camel/camel-filter-driver.c:1418
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "接收郵件 %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1429 ../camel/camel-filter-driver.c:1451
+#: ../camel/camel-filter-driver.c:1427 ../camel/camel-filter-driver.c:1449
 #, c-format
 msgid "Failed on message %d"
 msgstr "在第 %d 封郵件發生錯誤"
 
-#: ../camel/camel-filter-driver.c:1470 ../camel/camel-filter-driver.c:1584
+#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1582
 msgid "Syncing folder"
 msgstr "同步處理資料夾"
 
-#: ../camel/camel-filter-driver.c:1475 ../camel/camel-filter-driver.c:1592
+#: ../camel/camel-filter-driver.c:1473 ../camel/camel-filter-driver.c:1590
 msgid "Complete"
 msgstr "完成"
 
-#: ../camel/camel-filter-driver.c:1538
+#: ../camel/camel-filter-driver.c:1536
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "正在接收第 %d / %d 封郵件"
 
-#: ../camel/camel-filter-driver.c:1556
+#: ../camel/camel-filter-driver.c:1554
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d / %d 封郵件失敗"
 
-#: ../camel/camel-filter-driver.c:1752 ../camel/camel-filter-driver.c:1779
+#: ../camel/camel-filter-driver.c:1750 ../camel/camel-filter-driver.c:1777
 #, c-format
 msgid "Execution of filter '%s' failed: "
 msgstr "過濾器「%s」的執行失敗:"
 
-#: ../camel/camel-filter-driver.c:1769
+#: ../camel/camel-filter-driver.c:1767
 #, c-format
 msgid "Error parsing filter '%s': %s: %s"
 msgstr "分析過濾器「%s」發生錯誤:%s:%s"
 
-#: ../camel/camel-filter-driver.c:1788
+#: ../camel/camel-filter-driver.c:1786
 #, c-format
 msgid "Error executing filter '%s': %s: %s"
 msgstr "執行過濾器「%s」發生錯誤:%s:%s"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "取回郵件失敗。"
 
-#: ../camel/camel-filter-search.c:537
+#: ../camel/camel-filter-search.c:535
 msgid "Invalid arguments to (system-flag)"
 msgstr "無效的參數給 (system-flag)"
 
-#: ../camel/camel-filter-search.c:555
+#: ../camel/camel-filter-search.c:553
 msgid "Invalid arguments to (user-tag)"
 msgstr "無效的參數給 (user-tag)"
 
-#: ../camel/camel-filter-search.c:1046 ../camel/camel-filter-search.c:1055
+#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "執行過濾器搜尋發生錯誤: %s: %s"
 
-#: ../camel/camel-folder.c:311
+#: ../camel/camel-folder.c:300
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "正在學習「%s」中的新垃圾郵件"
 
-#: ../camel/camel-folder.c:351
+#: ../camel/camel-folder.c:340
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "正在學習「%s」中的 ham 郵件"
 
-#: ../camel/camel-folder.c:399
+#: ../camel/camel-folder.c:388
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "正在過濾「%s」中的新郵件"
 
-#: ../camel/camel-folder.c:1009
-#: ../camel/providers/local/camel-maildir-folder.c:321
+#: ../camel/camel-folder.c:988
+#: ../camel/providers/local/camel-maildir-folder.c:319
 msgid "Moving messages"
 msgstr "正在移動郵件"
 
-#: ../camel/camel-folder.c:1012
+#: ../camel/camel-folder.c:991
 msgid "Copying messages"
 msgstr "正在複製郵件"
 
-#: ../camel/camel-folder.c:1332
+#: ../camel/camel-folder.c:1033
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "資料夾「%s」不支援限額資訊"
 
-#: ../camel/camel-folder.c:3578
+#: ../camel/camel-folder.c:2847
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "刪除資料夾「%s」"
 
-#: ../camel/camel-folder.c:3810
+#: ../camel/camel-folder.c:2975
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "接收 %2$s 中的郵件「%1$s」"
 
-#: ../camel/camel-folder.c:3965
+#: ../camel/camel-folder.c:3166
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "取得「%s」的用量限額資訊"
 
-#: ../camel/camel-folder.c:4205
+#: ../camel/camel-folder.c:3466
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "重新整理資料夾「%s」"
@@ -2039,7 +2125,7 @@ msgstr "(%s) 期望陣列結果"
 msgid "(%s) requires the folder set"
 msgstr "(%s) 需要資料夾設定"
 
-#: ../camel/camel-folder-search.c:1930 ../camel/camel-folder-search.c:2096
+#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2048,7 +2134,7 @@ msgstr ""
 "不能分析搜尋詞句:%s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1942 ../camel/camel-folder-search.c:2108
+#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2057,18 +2143,18 @@ msgstr ""
 "執行搜尋詞句時發生錯誤:%s:\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:730 ../camel/camel-gpg-context.c:735
-#: ../camel/camel-gpg-context.c:1398
+#: ../camel/camel-gpg-context.c:721 ../camel/camel-gpg-context.c:726
+#: ../camel/camel-gpg-context.c:1383
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "執行 gpg 失敗: %s"
 
-#: ../camel/camel-gpg-context.c:735
-#: ../camel/providers/smtp/camel-smtp-transport.c:914
+#: ../camel/camel-gpg-context.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:924
 msgid "Unknown"
 msgstr "不明"
 
-#: ../camel/camel-gpg-context.c:800
+#: ../camel/camel-gpg-context.c:791
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2079,17 +2165,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:836
+#: ../camel/camel-gpg-context.c:827
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "解析 gpg userid 提示時失敗。"
 
-#: ../camel/camel-gpg-context.c:861 ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:852 ../camel/camel-gpg-context.c:867
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "解析 gpg 密語要求時失敗。"
 
-#: ../camel/camel-gpg-context.c:897
+#: ../camel/camel-gpg-context.c:888
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2098,7 +2184,7 @@ msgstr ""
 "需要 PIN 才能為您的智慧卡解鎖:\n"
 "「%s」"
 
-#: ../camel/camel-gpg-context.c:901
+#: ../camel/camel-gpg-context.c:892
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2107,68 +2193,66 @@ msgstr ""
 "您需要密語才能為此使用者的金鑰解鎖:\n"
 "「%s」"
 
-#: ../camel/camel-gpg-context.c:907
+#: ../camel/camel-gpg-context.c:898
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG 傳回對「%s」未預期的要求"
 
-#: ../camel/camel-gpg-context.c:919
+#: ../camel/camel-gpg-context.c:910
 msgid ""
 "Note the encrypted content doesn't contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
 msgstr ""
 "注意加密的內容不會包含收件者資訊,因此每個儲存的私密金鑰都會提示輸入密碼。"
 
-#: ../camel/camel-gpg-context.c:950 ../camel/camel-net-utils.c:524
-#: ../camel/camel-tcp-stream-raw.c:268
-#: ../camel/providers/nntp/camel-nntp-summary.c:402
-#: ../libedataserver/e-client.c:150
+#: ../camel/camel-gpg-context.c:941 ../camel/camel-net-utils.c:522
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
+#: ../libedataserver/e-client.c:158
 #, c-format
 msgid "Cancelled"
 msgstr "已取消"
 
-#: ../camel/camel-gpg-context.c:971
+#: ../camel/camel-gpg-context.c:962
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "解鎖私密金鑰時失敗:輸入了 3 次錯誤的密語 。"
 
-#: ../camel/camel-gpg-context.c:984
+#: ../camel/camel-gpg-context.c:975
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "從 GnuPG 傳回意外的回應: %s"
 
-#: ../camel/camel-gpg-context.c:1115
+#: ../camel/camel-gpg-context.c:1106
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "不能加密郵件:沒有提供有效的收件者。"
 
-#: ../camel/camel-gpg-context.c:1665 ../camel/camel-smime-context.c:846
+#: ../camel/camel-gpg-context.c:1658 ../camel/camel-smime-context.c:844
 msgid "Could not generate signing data: "
 msgstr "無法產生簽章資料:"
 
-#: ../camel/camel-gpg-context.c:1714 ../camel/camel-gpg-context.c:1918
-#: ../camel/camel-gpg-context.c:2028 ../camel/camel-gpg-context.c:2179
-#: ../camel/camel-gpg-context.c:2279 ../camel/camel-gpg-context.c:2327
+#: ../camel/camel-gpg-context.c:1708 ../camel/camel-gpg-context.c:1920
+#: ../camel/camel-gpg-context.c:2030 ../camel/camel-gpg-context.c:2179
 msgid "Failed to execute gpg."
 msgstr "執行 gpg 失敗。"
 
-#: ../camel/camel-gpg-context.c:1793 ../camel/camel-gpg-context.c:1801
-#: ../camel/camel-gpg-context.c:1809 ../camel/camel-gpg-context.c:1829
+#: ../camel/camel-gpg-context.c:1791 ../camel/camel-gpg-context.c:1799
+#: ../camel/camel-gpg-context.c:1807 ../camel/camel-gpg-context.c:1827
 #: ../camel/camel-smime-context.c:973 ../camel/camel-smime-context.c:987
 #: ../camel/camel-smime-context.c:996
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "不能驗證此郵件的簽章:錯誤的訊息格式"
 
-#: ../camel/camel-gpg-context.c:1871
+#: ../camel/camel-gpg-context.c:1873
 msgid "Cannot verify message signature: "
 msgstr "不能驗證此郵件的簽章:"
 
-#: ../camel/camel-gpg-context.c:1994
+#: ../camel/camel-gpg-context.c:1996
 msgid "Could not generate encrypting data: "
 msgstr "無法產生加密資料:"
 
-#: ../camel/camel-gpg-context.c:2047
+#: ../camel/camel-gpg-context.c:2049
 msgid "This is a digitally encrypted message part"
 msgstr "這是數位化加密訊息部份"
 
@@ -2183,500 +2267,202 @@ msgstr "不能解密此郵件:錯誤的訊息格式"
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "解密 MIME 組件時失敗:通訊協定錯誤"
 
-#: ../camel/camel-gpg-context.c:2220 ../camel/camel-smime-context.c:1287
+#: ../camel/camel-gpg-context.c:2220 ../camel/camel-smime-context.c:1289
 msgid "Encrypted content"
 msgstr "加密內容"
 
-#: ../camel/camel-imapx-folder.c:643
-#, c-format
-msgid "No quota information available for folder '%s'"
-msgstr "資料夾「%s」不支援限額資訊"
-
-#: ../camel/camel-imapx-folder.c:727 ../camel/camel-imapx-folder.c:801
-#, c-format
-msgid "No destination folder specified"
-msgstr "沒有指定目的地資料夾"
-
-#: ../camel/camel-imapx-folder.c:747
-msgid "Unable to move junk messages"
-msgstr "無法移動垃圾郵件"
-
-#: ../camel/camel-imapx-folder.c:821
-msgid "Unable to move deleted messages"
-msgstr "無法移動刪除的郵件"
-
-#: ../camel/camel-imapx-folder.c:1008
-#: ../camel/providers/nntp/camel-nntp-folder.c:794
-msgid "Apply message _filters to this folder"
-msgstr "將郵件過濾條件套用到這個資料夾(_F)"
-
-#: ../camel/camel-imapx-folder.c:1114
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "無法建立 %s 的資料夾摘要"
-
-#: ../camel/camel-imapx-folder.c:1123
-#, c-format
-msgid "Could not create cache for %s: "
-msgstr "無法建立 %s 的快取:"
-
-#: ../camel/camel-imapx-server.c:1333
-msgid "Server disconnected"
-msgstr "伺服器斷線"
-
-#: ../camel/camel-imapx-server.c:1756
-msgid "Error writing to cache stream"
-msgstr "寫入快取串流時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:2439
-#, c-format
-msgid ""
-"Alert from IMAP server %s:\n"
-"%s"
-msgstr ""
-"來自 IMAP 伺服器 %s 的警示:\n"
-"%s"
-
-#: ../camel/camel-imapx-server.c:3035
-#, c-format
-msgid "Not authenticated"
-msgstr "尚未核對"
-
-#: ../camel/camel-imapx-server.c:3113
-msgid "Error performing IDLE"
-msgstr "進行 IDLE 時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:4005
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了: %s"
-
-#: ../camel/camel-imapx-server.c:4006
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
-msgid "STARTTLS not supported"
-msgstr "不支援 STARTTLS"
-
-#: ../camel/camel-imapx-server.c:4047
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: "
-msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了: "
-
-#: ../camel/camel-imapx-server.c:4125
-#, c-format
-msgid "IMAP server %s does not support %s authentication"
-msgstr "IMAP 伺服器 %s 不支援 %s 核對"
-
-#: ../camel/camel-imapx-server.c:4136 ../camel/camel-session.c:494
-#: ../camel/providers/pop3/camel-pop3-store.c:303
-#: ../camel/providers/pop3/camel-pop3-store.c:744
-#: ../camel/providers/smtp/camel-smtp-transport.c:505
-#, c-format
-msgid "No support for %s authentication"
-msgstr "不支援 %s 核對"
-
-#: ../camel/camel-imapx-server.c:4155
-#: ../camel/providers/nntp/camel-nntp-store.c:409
-#: ../camel/providers/nntp/camel-nntp-store.c:595
-msgid "Cannot authenticate without a username"
-msgstr "不能核對沒有使用者名稱"
-
-#: ../camel/camel-imapx-server.c:4164
-#: ../camel/providers/nntp/camel-nntp-store.c:604
-#: ../camel/providers/pop3/camel-pop3-store.c:669
-#: ../camel/providers/pop3/camel-pop3-store.c:689
-msgid "Authentication password not available"
-msgstr "沒有核對的密碼"
-
-#: ../camel/camel-imapx-server.c:4377
-msgid "Error fetching message"
-msgstr "取回郵件時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:4427 ../camel/camel-imapx-server.c:4434
-msgid "Failed to close the tmp stream"
-msgstr "無法關閉 tmp 的串流"
-
-#: ../camel/camel-imapx-server.c:4463
-msgid "Failed to copy the tmp file"
-msgstr "無法複製 tmp 檔案"
-
-#: ../camel/camel-imapx-server.c:4588
-msgid "Error moving messages"
-msgstr "移動郵件時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:4592
-msgid "Error copying messages"
-msgstr "複製郵件時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:4759
-msgid "Error appending message"
-msgstr "附加郵件時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:4956
-msgid "Error fetching message headers"
-msgstr "取回郵件檔頭時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:5119
-msgid "Error retrieving message"
-msgstr "取回郵件時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:5250 ../camel/camel-imapx-server.c:5471
-#, c-format
-msgid "Fetching summary information for new messages in '%s'"
-msgstr "正取得「%s」中新郵件的摘要資訊"
-
-#: ../camel/camel-imapx-server.c:5310
-#, c-format
-msgid "Scanning for changed messages in '%s'"
-msgstr "掃描「%s」中變更過的郵件"
-
-#: ../camel/camel-imapx-server.c:5365
-msgid "Error fetching new messages"
-msgstr "取回新郵件時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:5577
-msgid "Error while fetching messages"
-msgstr "當取回郵件時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:5585 ../camel/camel-imapx-server.c:5618
-#, c-format
-msgid "Fetching summary information for %d message in '%s'"
-msgid_plural "Fetching summary information for %d messages in '%s'"
-msgstr[0] "正取得「%2$s」中 %1$d 封郵件的摘要資訊"
-
-#: ../camel/camel-imapx-server.c:5752 ../camel/camel-imapx-server.c:5782
-msgid "Error refreshing folder"
-msgstr "重新整理資料夾時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:5904
-msgid "Error expunging message"
-msgstr "清空郵件時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:6012
-msgid "Error fetching folders"
-msgstr "取回資料夾時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:6095
-msgid "Error subscribing to folder"
-msgstr "訂閱到資料夾時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:6157
-msgid "Error creating folder"
-msgstr "建立資料夾時發生錯誤。"
-
-#: ../camel/camel-imapx-server.c:6210
-msgid "Error deleting folder"
-msgstr "刪除資料夾時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:6281
-msgid "Error renaming folder"
-msgstr "重新命名資料夾時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:6355
-msgid "Error retrieving quota information"
-msgstr "取得用量限額資訊時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:6413
-msgid "Search failed"
-msgstr "搜尋失敗"
-
-#: ../camel/camel-imapx-server.c:6475
-msgid "Error performing NOOP"
-msgstr "進行 NOOP 時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:6583
-msgid "Error syncing changes"
-msgstr "同步變更時發生錯誤"
-
-#: ../camel/camel-imapx-server.c:6883
-msgid "Lost connection to IMAP server"
-msgstr "失去 IMAP 伺服器的連線"
-
-#: ../camel/camel-imapx-server.c:7330
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "無法取得郵件 ID 為 %s 的郵件: %s"
-
-#: ../camel/camel-imapx-server.c:7331
-msgid "No such message available."
-msgstr "沒有這個郵件。"
-
-#: ../camel/camel-imapx-server.c:7492 ../camel/camel-imapx-server.c:7507
-msgid "Cannot create spool file: "
-msgstr "不能建立排程器檔案:"
-
-#: ../camel/camel-imapx-server.c:8212
-msgid "IMAP server does not support quotas"
-msgstr "IMAP 伺服器不支援限額"
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/camel-imapx-store.c:203 ../camel/camel-imapx-store.c:1143
-#: ../camel/providers/local/camel-maildir-folder.c:473
-#: ../camel/providers/local/camel-maildir-store.c:316
-#: ../camel/providers/local/camel-maildir-store.c:752
-#: ../camel/providers/local/camel-maildir-store.c:758
-#: ../camel/providers/local/camel-maildir-store.c:842
-#: ../camel/providers/local/camel-spool-store.c:393
-msgid "Inbox"
-msgstr "收件匣"
-
-#: ../camel/camel-imapx-store.c:487
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP 伺服器 %s"
-
-#: ../camel/camel-imapx-store.c:490
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s 的 IMAP 服務於 %s"
-
-#: ../camel/camel-imapx-store.c:591
-#: ../camel/providers/nntp/camel-nntp-provider.c:95
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
-msgid "Password"
-msgstr "密碼"
-
-#: ../camel/camel-imapx-store.c:593
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
-
-#: ../camel/camel-imapx-store.c:687
-#, c-format
-msgid "No such folder %s"
-msgstr "沒有這個資料夾 %s"
-
-#: ../camel/camel-imapx-store.c:1413
-#, c-format
-msgid "Retrieving folder list for %s"
-msgstr "取得 %s 的資料夾清單"
-
-#: ../camel/camel-imapx-store.c:1783
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "資料夾名稱「%s」無效,因為它包括字元「%c」"
-
-#: ../camel/camel-imapx-store.c:1794
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "不明的母資料夾: %s"
-
-#: ../camel/camel-imapx-store.c:1804
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "母資料夾並不允許包含子資料夾"
-
-#: ../camel/camel-imapx-stream.c:98
-#, c-format
-msgid "Source stream returned no data"
-msgstr "來源串流傳回無資料"
-
-#: ../camel/camel-imapx-stream.c:107
-#, c-format
-msgid "Source stream unavailable"
-msgstr "來源串流無法使用"
-
-#: ../camel/camel-junk-filter.c:168
+#: ../camel/camel-junk-filter.c:167
 msgid "Synchronizing junk database"
 msgstr "同步垃圾郵件資料庫"
 
-#: ../camel/camel-lock.c:102
+#: ../camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "無法建構用於 %s: %s 的鎖定檔案"
 
-#: ../camel/camel-lock.c:145
+#: ../camel/camel-lock.c:153
 #, c-format
 msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr "嘗試取得 %s 上的鎖定檔案逾時。請稍後再試一次。"
 
-#: ../camel/camel-lock.c:205
+#: ../camel/camel-lock.c:215
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "使用 fcntl(2) 取得鎖失敗: %s"
 
-#: ../camel/camel-lock.c:272
+#: ../camel/camel-lock.c:282
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "使用 flock(2) 取得鎖失敗: %s"
 
-#: ../camel/camel-lock-client.c:106
+#: ../camel/camel-lock-client.c:107
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "不能建構鎖定 helper 導管:%s"
 
-#: ../camel/camel-lock-client.c:130
+#: ../camel/camel-lock-client.c:131
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "不能分叉鎖定 helper : %s"
 
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#: ../camel/camel-lock-client.c:218 ../camel/camel-lock-client.c:246
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "無法鎖定「%s」: lock-helper 協定錯誤"
 
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:234
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "無法鎖定「%s」"
 
-#: ../camel/camel-movemail.c:105
+#: ../camel/camel-movemail.c:109
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "無法檢查郵件檔案 %s:%s"
 
-#: ../camel/camel-movemail.c:119
+#: ../camel/camel-movemail.c:123
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "無法開啟郵件檔案 %s:%s"
 
-#: ../camel/camel-movemail.c:129
+#: ../camel/camel-movemail.c:133
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "無法開啟暫存郵件檔案 %s:%s"
 
-#: ../camel/camel-movemail.c:159
+#: ../camel/camel-movemail.c:163
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "儲存郵件至暫存檔案時失敗 %s:%s"
 
-#: ../camel/camel-movemail.c:193
+#: ../camel/camel-movemail.c:197
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "無法建構導管:%s"
 
-#: ../camel/camel-movemail.c:207
+#: ../camel/camel-movemail.c:211
 #, c-format
 msgid "Could not fork: %s"
 msgstr "無法另外執行一個行程:%s"
 
-#: ../camel/camel-movemail.c:245
+#: ../camel/camel-movemail.c:249
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail 程式失敗:%s"
 
-#: ../camel/camel-movemail.c:246
+#: ../camel/camel-movemail.c:250
 msgid "(Unknown error)"
 msgstr "(不明的錯誤)"
 
-#: ../camel/camel-movemail.c:273
+#: ../camel/camel-movemail.c:277
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "讀取郵件檔案時發生錯誤:%s"
 
-#: ../camel/camel-movemail.c:286
+#: ../camel/camel-movemail.c:290
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "寫入郵件暫存檔案時發生錯誤:%s"
 
-#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562
+#: ../camel/camel-movemail.c:497 ../camel/camel-movemail.c:566
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "複製郵件暫存檔案時發生錯誤:%s"
 
-#: ../camel/camel-multipart-signed.c:297
+#: ../camel/camel-multipart-signed.c:279
 #, c-format
 msgid "No content available"
 msgstr "沒有可用的內容"
 
-#: ../camel/camel-multipart-signed.c:305
+#: ../camel/camel-multipart-signed.c:287
 #, c-format
 msgid "No signature available"
 msgstr "沒有可用的簽章"
 
-#: ../camel/camel-multipart-signed.c:689
+#: ../camel/camel-multipart-signed.c:636
 #, c-format
 msgid "parse error"
 msgstr "解析錯誤"
 
-#: ../camel/camel-net-utils.c:704
+#: ../camel/camel-net-utils.c:702
 #, c-format
 msgid "Resolving: %s"
 msgstr "解析:%s"
 
-#: ../camel/camel-net-utils.c:727
+#: ../camel/camel-net-utils.c:725
 msgid "Host lookup failed"
 msgstr "搜尋主機失敗"
 
-#: ../camel/camel-net-utils.c:733
+#: ../camel/camel-net-utils.c:731
 #, c-format
 msgid "Host lookup '%s' failed. Check your host name for spelling errors."
 msgstr "主機查詢「%s」失敗。請檢查您的主機名稱是否有拼錯字。"
 
-#: ../camel/camel-net-utils.c:737
+#: ../camel/camel-net-utils.c:735
 #, c-format
 msgid "Host lookup '%s' failed: %s"
 msgstr "查詢主機「%s」失敗:%s"
 
-#: ../camel/camel-net-utils.c:858
-msgid "Resolving address"
-msgstr "解析位址"
-
-#: ../camel/camel-net-utils.c:879
-msgid "Name lookup failed"
-msgstr "查詢名稱失敗"
+#: ../camel/camel-network-service.c:1005
+msgid "No host information available"
+msgstr "沒有主機資訊可用"
 
-#: ../camel/camel-net-utils.c:886
-msgid "Name lookup failed. Check your host name for spelling errors."
-msgstr "名稱查詢失敗。請檢查您的主機名稱是否有拼錯字。"
-
-#: ../camel/camel-net-utils.c:890
-#, c-format
-msgid "Name lookup failed: %s"
-msgstr "搜尋名稱失敗: %s"
-
-#: ../camel/camel-network-service.c:350
-#, c-format
-msgid "Could not connect to '%s:%s': "
-msgstr "無法連接到「%s:%s」:"
+#: ../camel/camel-offline-folder.c:90
+msgid "Downloading new messages for offline mode"
+msgstr "正在下載新訊息用於離線模式"
 
-#: ../camel/camel-offline-folder.c:212
+#: ../camel/camel-offline-folder.c:209
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "正在將資料夾「%s」中的郵件同步到磁碟"
 
-#: ../camel/camel-provider.c:58
+#: ../camel/camel-offline-folder.c:266
+msgid "Copy folder content locally for _offline operation"
+msgstr "複製資料夾內容至本地用於離線作業(_O)"
+
+#: ../camel/camel-provider.c:56
 msgid "Virtual folder email provider"
 msgstr "虛擬資料夾電子郵件供應商"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "For reading mail as a query of another set of folders"
 msgstr "使讀取郵件如同查詢其他資料夾"
 
-#: ../camel/camel-provider.c:263
+#: ../camel/camel-provider.c:261
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "無法載入模組 %s: 此系統不支援載入模組。"
 
-#: ../camel/camel-provider.c:272
+#: ../camel/camel-provider.c:270
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "無法載入 %s:%s"
 
-#: ../camel/camel-provider.c:281
+#: ../camel/camel-provider.c:279
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "無法載入 %s:模組內沒有初始碼。"
 
-#: ../camel/camel-provider.c:429 ../camel/camel-session.c:406
+#: ../camel/camel-provider.c:427 ../camel/camel-session.c:424
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "沒有通訊協定「%s」的提供者"
 
-#: ../camel/camel-sasl-anonymous.c:35
-#: ../camel/providers/nntp/camel-nntp-provider.c:85
+#: ../camel/camel-sasl-anonymous.c:33
+#: ../camel/providers/nntp/camel-nntp-provider.c:83
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "This option will connect to the server using an anonymous login."
 msgstr "這個選項將會使用匿名登入至伺服器。"
 
-#: ../camel/camel-sasl-anonymous.c:70
+#: ../camel/camel-sasl-anonymous.c:68
 #, c-format
 msgid "Authentication failed."
 msgstr "核對失敗。"
 
-#: ../camel/camel-sasl-anonymous.c:81
+#: ../camel/camel-sasl-anonymous.c:79
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2685,7 +2471,7 @@ msgstr ""
 "無效的電子郵件地址追蹤資訊:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:95
+#: ../camel/camel-sasl-anonymous.c:93
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2694,7 +2480,7 @@ msgstr ""
 "無效的不透明追蹤資訊:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:109
+#: ../camel/camel-sasl-anonymous.c:107
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2703,11 +2489,11 @@ msgstr ""
 "無效的追蹤資訊:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:46
+#: ../camel/camel-sasl-cram-md5.c:44
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:48
+#: ../camel/camel-sasl-cram-md5.c:46
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2715,11 +2501,11 @@ msgstr ""
 "這個選項將會使用 CRAM-MD5 加密的密碼連線至伺服器,若發現該伺服器支援這種服"
 "務。"
 
-#: ../camel/camel-sasl-digest-md5.c:59
+#: ../camel/camel-sasl-digest-md5.c:57
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:61
+#: ../camel/camel-sasl-digest-md5.c:59
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2727,41 +2513,41 @@ msgstr ""
 "這個選項將會使用 DIGEST-MD5 加密的密碼連線至伺服器,若發現該伺服器支援這種服"
 "務。"
 
-#: ../camel/camel-sasl-digest-md5.c:855
+#: ../camel/camel-sasl-digest-md5.c:853
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "伺服器查問過長(>2048 位元 )"
 
-#: ../camel/camel-sasl-digest-md5.c:866
+#: ../camel/camel-sasl-digest-md5.c:864
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "伺服器查問無效\n"
 
-#: ../camel/camel-sasl-digest-md5.c:874
+#: ../camel/camel-sasl-digest-md5.c:872
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "伺服器查問包含無效的 「Quality of Protection」代符"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:905
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "伺服器回應並未包含授權資料"
 
-#: ../camel/camel-sasl-digest-md5.c:928
+#: ../camel/camel-sasl-digest-md5.c:926
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "伺服器回應包含不完整的授權資料"
 
-#: ../camel/camel-sasl-digest-md5.c:941
+#: ../camel/camel-sasl-digest-md5.c:939
 #, c-format
 msgid "Server response does not match"
 msgstr "伺服器回應不符"
 
-#: ../camel/camel-sasl-gssapi.c:91
+#: ../camel/camel-sasl-gssapi.c:89
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:93
+#: ../camel/camel-sasl-gssapi.c:91
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "這個選項將會使用 Kerberos 5 核對連線至伺服器。"
 
@@ -2816,474 +2602,397 @@ msgstr "在證件執行一致性檢查失敗。"
 msgid "The referenced credentials have expired."
 msgstr "參照的證件已經過期。"
 
-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340
-#: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405
-#: ../camel/providers/smtp/camel-smtp-transport.c:612
+#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:352
+#: ../camel/camel-sasl-gssapi.c:400 ../camel/camel-sasl-gssapi.c:417
+#: ../camel/providers/smtp/camel-smtp-transport.c:622
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "來自伺服器的不良許可回應。"
 
-#: ../camel/camel-sasl-gssapi.c:417
+#: ../camel/camel-sasl-gssapi.c:429
 #, c-format
 msgid "Unsupported security layer."
 msgstr "不支援的類型"
 
-#: ../camel/camel-sasl-login.c:40
+#: ../camel/camel-sasl-login.c:38
 msgid "Login"
 msgstr "登入"
 
-#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46
+#: ../camel/camel-sasl-login.c:40 ../camel/camel-sasl-plain.c:44
 msgid "This option will connect to the server using a simple password."
 msgstr "這個選項將會使用普通的密碼連線至伺服器。"
 
-#: ../camel/camel-sasl-login.c:110
+#: ../camel/camel-sasl-login.c:108
 #, c-format
 msgid "Unknown authentication state."
 msgstr "未知的驗証狀況。"
 
-#: ../camel/camel-sasl-ntlm.c:48
+#: ../camel/camel-sasl-ntlm.c:46
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:50
+#: ../camel/camel-sasl-ntlm.c:48
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr "這個選項將會使用 NTLM / 安全密碼核對連線至基於 Windows 的伺服器。"
 
-#: ../camel/camel-sasl-plain.c:44
+#: ../camel/camel-sasl-plain.c:42
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "POP before SMTP"
 msgstr "POP 先於 SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:48
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "這個選項將會在進行 SMTP 之前允許 POP連線"
 
-#: ../camel/camel-sasl-popb4smtp.c:84
+#: ../camel/camel-sasl-popb4smtp.c:82
 msgid "POP Source UID"
 msgstr "POP 來源 UID"
 
-#: ../camel/camel-sasl-popb4smtp.c:98
+#: ../camel/camel-sasl-popb4smtp.c:96
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "POP 先於 SMTP 允許使用未知的傳輸"
 
-#: ../camel/camel-sasl-popb4smtp.c:110 ../camel/camel-sasl-popb4smtp.c:119
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "以 %s 服務嘗試 POP 先於 SMTP 核對"
 
-#: ../camel/camel-search-private.c:116
+#: ../camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "正規表示式編譯失敗: %s: %s"
 
-#: ../camel/camel-session.c:415
+#: ../camel/camel-session.c:433
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "通訊協定「%s」註冊了無效的 GType"
 
-#: ../camel/camel-session.c:509
+#: ../camel/camel-session.c:502
+#: ../camel/providers/imapx/camel-imapx-server.c:4498
+#: ../camel/providers/pop3/camel-pop3-store.c:311
+#: ../camel/providers/pop3/camel-pop3-store.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:515
+#, c-format
+msgid "No support for %s authentication"
+msgstr "不支援 %s 核對"
+
+#: ../camel/camel-session.c:517
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s 核對失敗"
 
-#: ../camel/camel-session.c:645
+#: ../camel/camel-session.c:586
 msgid "Forwarding messages is not supported"
 msgstr "不支援轉寄郵件"
 
-#. Translators: The first argument is the account type
-#. * (e.g. "IMAP"), the second is the user name, and the
-#. * third is the host name.
-#: ../camel/camel-session.c:1420
-#, c-format
-msgid "Please enter the %s password for %s on host %s."
-msgstr "請輸入 %2$s 於主機 %3$s 的 %1$s 密碼。"
-
-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1074
+#: ../camel/camel-smime-context.c:349 ../camel/camel-smime-context.c:1076
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "找不到 '%s' 的憑證"
 
-#: ../camel/camel-smime-context.c:379
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS message"
 msgstr "無法建構 CMS 訊息"
 
-#: ../camel/camel-smime-context.c:384
+#: ../camel/camel-smime-context.c:382
 msgid "Cannot create CMS signed data"
 msgstr "無法建構 CMS signedData"
 
-#: ../camel/camel-smime-context.c:390
+#: ../camel/camel-smime-context.c:388
 msgid "Cannot attach CMS signed data"
 msgstr "無法附加 CMS signedData"
 
-#: ../camel/camel-smime-context.c:397
+#: ../camel/camel-smime-context.c:395
 msgid "Cannot attach CMS data"
 msgstr "無法附加 CMS 資料"
 
-#: ../camel/camel-smime-context.c:403
+#: ../camel/camel-smime-context.c:401
 msgid "Cannot create CMS Signer information"
 msgstr "無法建構 CMS SignerInfo"
 
-#: ../camel/camel-smime-context.c:409
+#: ../camel/camel-smime-context.c:407
 msgid "Cannot find certificate chain"
 msgstr "找不到憑證鏈"
 
-#: ../camel/camel-smime-context.c:415
+#: ../camel/camel-smime-context.c:413
 msgid "Cannot add CMS Signing time"
 msgstr "無法新增 CMS SigningTime"
 
-#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
+#: ../camel/camel-smime-context.c:437 ../camel/camel-smime-context.c:452
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' 的加密憑證不存在"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "無法新增 SMIMEEncKeyPrefs 屬性"
 
-#: ../camel/camel-smime-context.c:466
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "無法新增 MS SMIMEEncKeyPrefs 屬性"
 
-#: ../camel/camel-smime-context.c:471
+#: ../camel/camel-smime-context.c:469
 msgid "Cannot add encryption certificate"
 msgstr "無法新增加密憑證"
 
-#: ../camel/camel-smime-context.c:477
+#: ../camel/camel-smime-context.c:475
 msgid "Cannot add CMS Signer information"
 msgstr "無法新增 CMS SignerInfo"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:508
 msgid "Unverified"
 msgstr "未指定"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:510
 msgid "Good signature"
 msgstr "良好的簽章"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:512
 msgid "Bad signature"
 msgstr "錯誤的簽章"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:514
 msgid "Content tampered with or altered in transit"
 msgstr "內容在傳送時被竄改或變更"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not found"
 msgstr "找不到簽署憑證"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:518
 msgid "Signing certificate not trusted"
 msgstr "簽署憑證不受信任"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unknown"
 msgstr "未知的簽章演算法"
 
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:522
 msgid "Signature algorithm unsupported"
 msgstr "不支援這種簽章演算法"
 
-#: ../camel/camel-smime-context.c:526
+#: ../camel/camel-smime-context.c:524
 msgid "Malformed signature"
 msgstr "格式不良的簽章"
 
-#: ../camel/camel-smime-context.c:528
+#: ../camel/camel-smime-context.c:526
 msgid "Processing error"
 msgstr "解析錯誤"
 
-#: ../camel/camel-smime-context.c:573
+#: ../camel/camel-smime-context.c:571
 msgid "No signed data in signature"
 msgstr "簽章中沒有被簽署的資料"
 
-#: ../camel/camel-smime-context.c:578
+#: ../camel/camel-smime-context.c:576
 msgid "Digests missing from enveloped data"
 msgstr "包裹的資料中遺漏摘要"
 
-#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:589 ../camel/camel-smime-context.c:600
 msgid "Cannot calculate digests"
 msgstr "無法計算摘要"
 
-#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
+#: ../camel/camel-smime-context.c:607 ../camel/camel-smime-context.c:611
 msgid "Cannot set message digests"
 msgstr "無法設定郵件摘要"
 
-#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
+#: ../camel/camel-smime-context.c:621 ../camel/camel-smime-context.c:626
 msgid "Certificate import failed"
 msgstr "憑證匯入失敗"
 
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:636
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "限憑證訊息,無法驗證憑證"
 
-#: ../camel/camel-smime-context.c:641
+#: ../camel/camel-smime-context.c:639
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "限憑證訊息、匯入和驗證的憑證"
 
-#: ../camel/camel-smime-context.c:645
+#: ../camel/camel-smime-context.c:643
 msgid "Cannot find signature digests"
 msgstr "找不到簽章摘要"
 
-#: ../camel/camel-smime-context.c:662
+#: ../camel/camel-smime-context.c:660
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "簽署者: %s<%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:858 ../camel/camel-smime-context.c:1148
+#: ../camel/camel-smime-context.c:856 ../camel/camel-smime-context.c:1150
 msgid "Cannot create encoder context"
 msgstr "無法建構編碼器網路位置"
 
-#: ../camel/camel-smime-context.c:864
+#: ../camel/camel-smime-context.c:862
 msgid "Failed to add data to CMS encoder"
 msgstr "無法新增資料至 CMS 編碼器"
 
-#: ../camel/camel-smime-context.c:869 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:867 ../camel/camel-smime-context.c:1167
 msgid "Failed to encode data"
 msgstr "無法編碼資料"
 
-#: ../camel/camel-smime-context.c:1013 ../camel/camel-smime-context.c:1262
+#: ../camel/camel-smime-context.c:1015 ../camel/camel-smime-context.c:1264
 msgid "Decoder failed"
 msgstr "解碼器失敗"
 
-#: ../camel/camel-smime-context.c:1082
+#: ../camel/camel-smime-context.c:1084
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "找不到一般大量加密演算法"
 
-#: ../camel/camel-smime-context.c:1090
+#: ../camel/camel-smime-context.c:1092
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "無法配置插槽給加密大量鑰匙"
 
-#: ../camel/camel-smime-context.c:1101
+#: ../camel/camel-smime-context.c:1103
 msgid "Cannot create CMS Message"
 msgstr "無法建構 CMS 訊息"
 
-#: ../camel/camel-smime-context.c:1107
+#: ../camel/camel-smime-context.c:1109
 msgid "Cannot create CMS Enveloped data"
 msgstr "無法建構 CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1113
+#: ../camel/camel-smime-context.c:1115
 msgid "Cannot attach CMS Enveloped data"
 msgstr "無法附加 CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1119
+#: ../camel/camel-smime-context.c:1121
 msgid "Cannot attach CMS data object"
 msgstr "無法附加 CMS 資料物件"
 
-#: ../camel/camel-smime-context.c:1128
+#: ../camel/camel-smime-context.c:1130
 msgid "Cannot create CMS Recipient information"
 msgstr "無法建構 CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1133
+#: ../camel/camel-smime-context.c:1135
 msgid "Cannot add CMS Recipient information"
 msgstr "無法新增 CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1159
+#: ../camel/camel-smime-context.c:1161
 msgid "Failed to add data to encoder"
 msgstr "無法新增資料至編碼器"
 
-#: ../camel/camel-smime-context.c:1269
+#: ../camel/camel-smime-context.c:1271
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME 解密:找不到加密內容"
 
-#: ../camel/camel-store.c:1999
+#: ../camel/camel-store.c:1210
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "不能建立資料夾「%s」:資料夾已存在"
 
-#: ../camel/camel-store.c:2042
+#: ../camel/camel-store.c:1253
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "開啟資料夾「%s」"
 
-#: ../camel/camel-store.c:2231
+#: ../camel/camel-store.c:1480
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "掃描「%s」內的資料夾"
 
-#: ../camel/camel-store.c:2259 ../camel/camel-store.c:2304
-#: ../camel/camel-vtrash-folder.c:48
+#: ../camel/camel-store.c:1508 ../camel/camel-store.c:1553
+#: ../camel/camel-vtrash-folder.c:46
 msgid "Trash"
 msgstr "回收筒"
 
-#: ../camel/camel-store.c:2273 ../camel/camel-store.c:2321
-#: ../camel/camel-vtrash-folder.c:50
+#: ../camel/camel-store.c:1522 ../camel/camel-store.c:1570
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: ../camel/camel-store.c:2774
+#: ../camel/camel-store.c:2171
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "無法建構資料夾:%s:資料夾已存在"
 
-#: ../camel/camel-store.c:2788
+#: ../camel/camel-store.c:2178
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "正在建立資料夾「%s」"
 
-#: ../camel/camel-store.c:2906 ../camel/camel-vee-store.c:416
-#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/camel-store.c:2355 ../camel/camel-vee-store.c:416
+#: ../camel/providers/local/camel-maildir-store.c:320
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "不能刪除資料夾: %s :無效的操作"
 
-#: ../camel/camel-store.c:3049 ../camel/camel-vee-store.c:466
-#: ../camel/providers/local/camel-maildir-store.c:841
+#: ../camel/camel-store.c:2545 ../camel/camel-vee-store.c:467
+#: ../camel/providers/local/camel-maildir-store.c:851
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "不能重新命名資料夾: %s :無效的操作"
 
-#: ../camel/camel-stream-filter.c:334
+#: ../camel/camel-stream.c:285 ../camel/camel-stream.c:336
+#, c-format
+msgid "Stream type '%s' is not seekable"
+msgstr "串流類型「%s」不是可尋找的"
+
+#: ../camel/camel-stream-filter.c:344
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "CamelStreamFilter 只支援重設到開頭"
 
-#: ../camel/camel-stream-null.c:78
+#: ../camel/camel-stream-null.c:76
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "CamelHttpStream 只支援重設到開頭"
 
-#: ../camel/camel-stream-process.c:275
+#: ../camel/camel-stream-process.c:280
 #, c-format
 msgid "Connection cancelled"
 msgstr "連線已取消"
 
-#: ../camel/camel-stream-process.c:280
+#: ../camel/camel-stream-process.c:285
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "無法以指令「%s」連線: %s"
 
-#: ../camel/camel-subscribable.c:395
+#: ../camel/camel-subscribable.c:273
 #, c-format
 msgid "Subscribing to folder '%s'"
 msgstr "訂閱到資料夾「%s」"
 
-#: ../camel/camel-subscribable.c:527
+#: ../camel/camel-subscribable.c:442
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "取消訂閱資料夾「%s」"
 
-#: ../camel/camel-tcp-stream-raw.c:310
-#, c-format
-msgid "NSPR error code %d"
-msgstr "NSPR 錯誤代碼 %d"
-
-#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662
-#, c-format
-msgid "The proxy host does not support SOCKS4"
-msgstr "代理伺服器主機不支援 SOCKS4"
-
-#: ../camel/camel-tcp-stream-raw.c:675
-#, c-format
-msgid "The proxy host denied our request: code %d"
-msgstr "代理伺服器主機拒絕我們的要求:代碼 %d"
-
-#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781
-#, c-format
-msgid "The proxy host does not support SOCKS5"
-msgstr "代理伺服器主機不支援 SOCKS5"
-
-#: ../camel/camel-tcp-stream-raw.c:789
-#, c-format
-msgid "Could not find a suitable authentication type: code 0x%x"
-msgstr "找不到合適的核對類型:代碼 0x%x"
-
-#: ../camel/camel-tcp-stream-raw.c:801
-msgid "General SOCKS server failure"
-msgstr "一般性 SOCKS 伺服器失敗"
-
-#: ../camel/camel-tcp-stream-raw.c:802
-msgid "SOCKS server's rules do not allow connection"
-msgstr "SOCKS 伺服器的規則不允許連線"
-
-#: ../camel/camel-tcp-stream-raw.c:803
-msgid "Network is unreachable from SOCKS server"
-msgstr "網路無法透過 SOCKS 伺服器到達"
-
-#: ../camel/camel-tcp-stream-raw.c:804
-msgid "Host is unreachable from SOCKS server"
-msgstr "主機無法透過 SOCKS 伺服器到達"
-
-#: ../camel/camel-tcp-stream-raw.c:805
-msgid "Connection refused"
-msgstr "連線被拒絕"
-
-#: ../camel/camel-tcp-stream-raw.c:806
-msgid "Time-to-live expired"
-msgstr "超過 Time-to-live 時間"
-
-#: ../camel/camel-tcp-stream-raw.c:807
-msgid "Command not supported by SOCKS server"
-msgstr "SOCKS 伺服器不支援指令"
-
-#: ../camel/camel-tcp-stream-raw.c:808
-msgid "Address type not supported by SOCKS server"
-msgstr "SOCKS 伺服器不支援位址類型"
-
-#: ../camel/camel-tcp-stream-raw.c:809
-msgid "Unknown error from SOCKS server"
-msgstr "來自 SOCKS 伺服器的不明錯誤"
-
-#: ../camel/camel-tcp-stream-raw.c:842
-#, c-format
-msgid "Got unknown address type from SOCKS server"
-msgstr "從 SOCKS 伺服器取得不明的位址類型"
-
-#: ../camel/camel-tcp-stream-raw.c:860
-#, c-format
-msgid "Incomplete reply from SOCKS server"
-msgstr "來自 SOCKS 伺服器的不完整回覆"
-
-#: ../camel/camel-tcp-stream-raw.c:880
-#, c-format
-msgid "Hostname is too long (maximum is 255 characters)"
-msgstr "主機名稱太長(最多 255 字元)"
-
-#. SOCKS5
-#. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922
-#, c-format
-msgid "Invalid reply from proxy server"
-msgstr "從代理伺服器傳回無效的回覆"
-
-#: ../camel/camel-url.c:331
+#: ../camel/camel-url.c:329
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "無法解析 URL「%s」"
 
-#: ../camel/camel-vee-folder.c:494
+#: ../camel/camel-vee-folder.c:491
 #, c-format
 msgid "Updating folder '%s'"
 msgstr "更新資料夾「%s」"
 
-#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965
+#: ../camel/camel-vee-folder.c:851 ../camel/camel-vee-folder.c:961
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "不能複製或移動郵件到虛擬資料夾中"
 
-#: ../camel/camel-vee-folder.c:888
+#: ../camel/camel-vee-folder.c:884
 #, c-format
 msgid "No such message %s in %s"
 msgstr "沒有 %s 這類郵件在 %s 中"
 
-#: ../camel/camel-vee-folder.c:941
+#: ../camel/camel-vee-folder.c:937
 #, c-format
 msgid "Error storing '%s': "
 msgstr "儲存「%s」發生錯誤:"
 
-#: ../camel/camel-vee-folder.c:1171
+#: ../camel/camel-vee-folder.c:1167
 msgid "Automatically _update on change in source folders"
 msgstr "來源資料夾中變更時自動更新(_U)"
 
 #. Translators: 'Unmatched' is a folder name under Search folders where are shown
 #. * all messages not belonging into any other configured search folder
-#: ../camel/camel-vee-store.c:42
+#: ../camel/camel-vee-store.c:40
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
@@ -3292,23 +3001,62 @@ msgstr "沒有相符資料"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "不能刪除資料夾: %s :沒有這個資料夾"
 
-#: ../camel/camel-vee-store.c:476
+#: ../camel/camel-vee-store.c:477
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "不能重新命名資料夾: %s :沒有這個資料夾"
 
-#: ../camel/camel-vee-store.c:538
+#: ../camel/camel-vee-store.c:539
 msgid "Enable _Unmatched folder"
 msgstr "啟用未符合資料夾(_U)"
 
-#: ../camel/camel-vtrash-folder.c:49
+#: ../camel/camel-vtrash-folder.c:47
 msgid "Cannot copy messages to the Trash folder"
 msgstr "無法複製訊息到「回收筒」資料夾"
 
-#: ../camel/camel-vtrash-folder.c:51
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Junk folder"
 msgstr "無法複製訊息到「垃圾郵件」資料夾"
 
+#: ../camel/providers/imapx/camel-imapx-folder.c:654
+#, c-format
+msgid "No quota information available for folder '%s'"
+msgstr "資料夾「%s」不支援限額資訊"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:768
+#: ../camel/providers/imapx/camel-imapx-folder.c:861
+#, c-format
+msgid "No destination folder specified"
+msgstr "沒有指定目的地資料夾"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:796
+msgid "Unable to move junk messages"
+msgstr "無法移動垃圾郵件"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:889
+msgid "Unable to move deleted messages"
+msgstr "無法移動刪除的郵件"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1115
+#: ../camel/providers/nntp/camel-nntp-folder.c:758
+msgid "Apply message _filters to this folder"
+msgstr "將郵件過濾條件套用到這個資料夾(_F)"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1221
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "無法建立 %s 的資料夾摘要"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1230
+#, c-format
+msgid "Could not create cache for %s: "
+msgstr "無法建立 %s 的快取:"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1415
+#, c-format
+msgid "No IMAP mailbox available for folder '%s'"
+msgstr "資料夾「%s」沒有 IMAP 郵箱可用"
+
 #: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "檢查新郵件"
@@ -3330,7 +3078,7 @@ msgid "_Listen for server change notifications"
 msgstr "聽取伺服器變更通知(_L)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:49
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid "Folders"
 msgstr "資料夾"
 
@@ -3347,15 +3095,15 @@ msgid "Namespace:"
 msgstr "命名空間"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:59
-#: ../camel/providers/local/camel-local-provider.c:41
-#: ../camel/providers/local/camel-local-provider.c:81
-#: ../camel/providers/local/camel-local-provider.c:101
-#: ../camel/providers/nntp/camel-nntp-provider.c:41
+#: ../camel/providers/local/camel-local-provider.c:39
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:99
+#: ../camel/providers/nntp/camel-nntp-provider.c:39
 msgid "Options"
 msgstr "選項"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:61
-#: ../camel/providers/nntp/camel-nntp-provider.c:43
+#: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Apply _filters to new messages in all folders"
 msgstr "將過濾條件套用到所有資料夾的新郵件(_F)"
 
@@ -3391,27 +3139,274 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
 
-#: ../camel/providers/local/camel-local-folder.c:194
+#: ../camel/providers/imapx/camel-imapx-server.c:1577
+msgid "Server disconnected"
+msgstr "伺服器斷線"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2040
+msgid "Error writing to cache stream"
+msgstr "寫入快取串流時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3379
+#, c-format
+msgid "Not authenticated"
+msgstr "尚未核對"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3456
+msgid "Error performing IDLE"
+msgstr "進行 IDLE 時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4359
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了: %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4360
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
+msgid "STARTTLS not supported"
+msgstr "不支援 STARTTLS"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4407
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4487
+#, c-format
+msgid "IMAP server %s does not support %s authentication"
+msgstr "IMAP 伺服器 %s 不支援 %s 核對"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4517
+#: ../camel/providers/nntp/camel-nntp-store.c:394
+#: ../camel/providers/nntp/camel-nntp-store.c:531
+msgid "Cannot authenticate without a username"
+msgstr "不能核對沒有使用者名稱"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4526
+#: ../camel/providers/nntp/camel-nntp-store.c:540
+#: ../camel/providers/pop3/camel-pop3-store.c:678
+#: ../camel/providers/pop3/camel-pop3-store.c:699
+msgid "Authentication password not available"
+msgstr "沒有核對的密碼"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4743
+msgid "Error fetching message"
+msgstr "取回郵件時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4789
+#: ../camel/providers/imapx/camel-imapx-server.c:4796
+msgid "Failed to close the tmp stream"
+msgstr "無法關閉 tmp 的串流"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4831
+msgid "Failed to copy the tmp file"
+msgstr "無法複製 tmp 檔案"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4957
+msgid "Error moving messages"
+msgstr "移動郵件時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4961
+msgid "Error copying messages"
+msgstr "複製郵件時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5120
+msgid "Error appending message"
+msgstr "附加郵件時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5314
+msgid "Error fetching message headers"
+msgstr "取回郵件檔頭時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5479
+msgid "Error retrieving message"
+msgstr "取回郵件時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5609
+#: ../camel/providers/imapx/camel-imapx-server.c:5832
+#, c-format
+msgid "Fetching summary information for new messages in '%s'"
+msgstr "正取得「%s」中新郵件的摘要資訊"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5661
+#, c-format
+msgid "Scanning for changed messages in '%s'"
+msgstr "掃描「%s」中變更過的郵件"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5713
+msgid "Error fetching new messages"
+msgstr "取回新郵件時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5981
+msgid "Error refreshing folder"
+msgstr "重新整理資料夾時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6131
+msgid "Error expunging message"
+msgstr "清空郵件時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6240
+#: ../camel/providers/imapx/camel-imapx-server.c:6265
+msgid "Error fetching folders"
+msgstr "取回資料夾時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6345
+msgid "Error creating folder"
+msgstr "建立資料夾時發生錯誤。"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6397
+msgid "Error deleting folder"
+msgstr "刪除資料夾時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6464
+msgid "Error renaming folder"
+msgstr "重新命名資料夾時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6551
+msgid "Error subscribing to folder"
+msgstr "訂閱到資料夾時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6611
+msgid "Error unsubscribing from folder"
+msgstr "取消訂閱資料夾發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6667
+msgid "Error retrieving quota information"
+msgstr "取得用量限額資訊時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6719
+msgid "Search failed"
+msgstr "搜尋失敗"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6781
+msgid "Error performing NOOP"
+msgstr "進行 NOOP 時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6888
+msgid "Error syncing changes"
+msgstr "同步變更時發生錯誤"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:7194
+msgid "Lost connection to IMAP server"
+msgstr "失去 IMAP 伺服器的連線"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:7959
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "無法取得郵件 ID 為 %s 的郵件: %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:7960
+msgid "No such message available."
+msgstr "沒有這個郵件。"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:8159
+#: ../camel/providers/imapx/camel-imapx-server.c:8174
+msgid "Cannot create spool file: "
+msgstr "不能建立排程器檔案:"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:8879
+msgid "IMAP server does not support quotas"
+msgstr "IMAP 伺服器不支援限額"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imapx/camel-imapx-store.c:207
+#: ../camel/providers/local/camel-maildir-folder.c:471
+#: ../camel/providers/local/camel-maildir-store.c:321
+#: ../camel/providers/local/camel-maildir-store.c:763
+#: ../camel/providers/local/camel-maildir-store.c:769
+#: ../camel/providers/local/camel-maildir-store.c:852
+#: ../camel/providers/local/camel-spool-store.c:393
+msgid "Inbox"
+msgstr "收件匣"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:823
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP 伺服器 %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:826
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s 的 IMAP 服務於 %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1029
+#: ../camel/providers/nntp/camel-nntp-provider.c:93
+#: ../camel/providers/pop3/camel-pop3-provider.c:81
+msgid "Password"
+msgstr "密碼"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1031
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1056
+#: ../camel/providers/imapx/camel-imapx-store.c:2619
+#: ../camel/providers/nntp/camel-nntp-store.c:1250
+#: ../camel/providers/pop3/camel-pop3-folder.c:450
+#: ../camel/providers/pop3/camel-pop3-folder.c:593
+#: ../camel/providers/pop3/camel-pop3-folder.c:789
+#: ../camel/providers/pop3/camel-pop3-folder.c:987
+#: ../camel/providers/pop3/camel-pop3-store.c:299
+#: ../camel/providers/pop3/camel-pop3-store.c:528
+#: ../camel/providers/pop3/camel-pop3-store.c:576
+#: ../camel/providers/pop3/camel-pop3-store.c:668
+#: ../camel/providers/pop3/camel-pop3-store.c:1072
+#, c-format
+msgid "You must be working online to complete this operation"
+msgstr "您必須於線上工作才能完成此操作"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1123
+#, c-format
+msgid "No such folder %s"
+msgstr "沒有這個資料夾 %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1518
+#, c-format
+msgid "No IMAP namespace for folder path '%s'"
+msgstr "資料夾路徑「%s」沒有 IMAP 命名空間可用"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1667
+#, c-format
+msgid "Retrieving folder list for %s"
+msgstr "取得 %s 的資料夾清單"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2073
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "資料夾名稱「%s」無效,因為它包括字元「%c」"
+
+#: ../camel/providers/imapx/camel-imapx-stream.c:96
+#, c-format
+msgid "Source stream returned no data"
+msgstr "來源串流傳回無資料"
+
+#: ../camel/providers/imapx/camel-imapx-stream.c:105
+#, c-format
+msgid "Source stream unavailable"
+msgstr "來源串流無法使用"
+
+#: ../camel/providers/local/camel-local-folder.c:192
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:204
-#: ../camel/providers/local/camel-local-folder.c:213
+#: ../camel/providers/local/camel-local-folder.c:202
+#: ../camel/providers/local/camel-local-folder.c:211
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "信箱:%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:222
+#: ../camel/providers/local/camel-local-folder.c:220
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:499
+#: ../camel/providers/local/camel-local-folder.c:497
 msgid "_Index message body data"
 msgstr "索引郵件內文資料(_I)"
 
-#: ../camel/providers/local/camel-local-folder.c:727
+#: ../camel/providers/local/camel-local-folder.c:725
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3420,52 +3415,52 @@ msgstr ""
 "不能從資料夾 %2$s 取得郵件 %1$s \n"
 "%3$s"
 
-#: ../camel/providers/local/camel-local-provider.c:43
+#: ../camel/providers/local/camel-local-provider.c:41
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "使用「.folders」資料夾摘要檔案[exmh](_U)"
 
-#: ../camel/providers/local/camel-local-provider.c:50
+#: ../camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "MH-format 郵件目錄"
 
-#: ../camel/providers/local/camel-local-provider.c:51
+#: ../camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr "用於儲存本地端郵件至 MH-like 郵件目錄。"
 
-#: ../camel/providers/local/camel-local-provider.c:68
+#: ../camel/providers/local/camel-local-provider.c:66
 msgid "Local delivery"
 msgstr "本地端寄送"
 
-#: ../camel/providers/local/camel-local-provider.c:69
+#: ../camel/providers/local/camel-local-provider.c:67
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 msgstr ""
 "用於自標準 mbox 格式排程器接收(移動)本地端郵件至 Evolution 管理的資料夾。"
 
-#: ../camel/providers/local/camel-local-provider.c:83
-#: ../camel/providers/local/camel-local-provider.c:103
+#: ../camel/providers/local/camel-local-provider.c:81
+#: ../camel/providers/local/camel-local-provider.c:101
 msgid "_Apply filters to new messages in Inbox"
 msgstr "將過濾條件套用於收件匣裡的新郵件(_A)"
 
-#: ../camel/providers/local/camel-local-provider.c:90
+#: ../camel/providers/local/camel-local-provider.c:88
 msgid "Maildir-format mail directories"
 msgstr "Maildir-format 郵件目錄"
 
-#: ../camel/providers/local/camel-local-provider.c:91
+#: ../camel/providers/local/camel-local-provider.c:89
 msgid "For storing local mail in maildir directories."
 msgstr "用於儲存本地端郵件至 maildir 目錄。"
 
-#: ../camel/providers/local/camel-local-provider.c:104
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "儲存在 Elm/_Pine/Mutt 格式中的狀態檔頭"
 
-#: ../camel/providers/local/camel-local-provider.c:111
+#: ../camel/providers/local/camel-local-provider.c:109
 msgid "Standard Unix mbox spool file"
 msgstr "標準 Unix mbox 排程器檔案"
 
-#: ../camel/providers/local/camel-local-provider.c:112
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:110
+#: ../camel/providers/local/camel-local-provider.c:124
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3473,225 +3468,220 @@ msgstr ""
 "用於讀取及儲存外部標準 mbox 排程器檔案中的本地端郵件。\n"
 "也可以用來讀 Elm 、 Pine 或 Mutt 形式資料夾的樹狀結構。"
 
-#: ../camel/providers/local/camel-local-provider.c:125
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid "Standard Unix mbox spool directory"
 msgstr "標準 Unix mbox 排程器目錄"
 
-#: ../camel/providers/local/camel-local-store.c:98
+#: ../camel/providers/local/camel-local-store.c:96
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "無法將資料夾 %s 重新命名為 %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:180
+#: ../camel/providers/local/camel-local-store.c:178
 #, c-format
 msgid "Local mail file %s"
 msgstr "本地端郵件檔案 %s"
 
-#: ../camel/providers/local/camel-local-store.c:223
-#: ../camel/providers/local/camel-local-store.c:383
-#: ../camel/providers/local/camel-maildir-store.c:117
-#: ../camel/providers/local/camel-mbox-store.c:581
-#: ../camel/providers/local/camel-spool-store.c:89
+#: ../camel/providers/local/camel-local-store.c:221
+#: ../camel/providers/local/camel-local-store.c:381
+#: ../camel/providers/local/camel-maildir-store.c:122
+#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-spool-store.c:87
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "儲存根目錄 %s 不是絕對路徑"
 
-#: ../camel/providers/local/camel-local-store.c:232
+#: ../camel/providers/local/camel-local-store.c:230
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "儲存根目錄 %s 不是合法的目錄"
 
-#: ../camel/providers/local/camel-local-store.c:244
-#: ../camel/providers/local/camel-local-store.c:254
-#: ../camel/providers/local/camel-local-store.c:396
-#: ../camel/providers/local/camel-maildir-store.c:145
+#: ../camel/providers/local/camel-local-store.c:242
+#: ../camel/providers/local/camel-local-store.c:252
+#: ../camel/providers/local/camel-local-store.c:394
+#: ../camel/providers/local/camel-maildir-store.c:150
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "不能取得資料夾:%s:%s"
 
-#: ../camel/providers/local/camel-local-store.c:291
+#: ../camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "本地端的存儲沒有收件匣"
 
-#: ../camel/providers/local/camel-local-store.c:456
-#: ../camel/providers/local/camel-mbox-store.c:748
+#: ../camel/providers/local/camel-local-store.c:454
+#: ../camel/providers/local/camel-mbox-store.c:746
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "不能刪除資料夾索引檔案「%s」: %s"
 
-#: ../camel/providers/local/camel-local-store.c:484
-#: ../camel/providers/local/camel-mbox-store.c:778
+#: ../camel/providers/local/camel-local-store.c:482
+#: ../camel/providers/local/camel-mbox-store.c:776
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "不能刪除資料夾中繼檔案「%s」:%s"
 
-#: ../camel/providers/local/camel-local-store.c:596
+#: ../camel/providers/local/camel-local-store.c:594
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "無法重新命名「%s」:%s "
 
-#: ../camel/providers/local/camel-local-summary.c:567
-#, c-format
-msgid "Unable to add message to summary: unknown reason"
-msgstr "無法新增郵件到摘要資訊:不明的原因"
-
-#: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:335
-#: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:329
-#: ../camel/providers/local/camel-mh-folder.c:159
+#: ../camel/providers/local/camel-maildir-folder.c:98
+#: ../camel/providers/local/camel-maildir-folder.c:333
+#: ../camel/providers/local/camel-mbox-folder.c:115
+#: ../camel/providers/local/camel-mbox-folder.c:328
+#: ../camel/providers/local/camel-mh-folder.c:157
 msgid "No such message"
 msgstr "無此郵件"
 
-#: ../camel/providers/local/camel-maildir-folder.c:225
+#: ../camel/providers/local/camel-maildir-folder.c:223
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "不能將郵件儲存到 maildir 資料夾: %s:"
 
-#: ../camel/providers/local/camel-maildir-folder.c:273
-#: ../camel/providers/local/camel-maildir-folder.c:283
-#: ../camel/providers/local/camel-mbox-folder.c:390
-#: ../camel/providers/local/camel-mh-folder.c:171
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-maildir-folder.c:271
+#: ../camel/providers/local/camel-maildir-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:389
+#: ../camel/providers/local/camel-mh-folder.c:169
+#: ../camel/providers/local/camel-mh-folder.c:179
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "不能從資料夾 %2$s 取得郵件 %1$s:"
 
-#: ../camel/providers/local/camel-maildir-folder.c:353
+#: ../camel/providers/local/camel-maildir-folder.c:351
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "不能將郵件傳輸到目的端資料夾:%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:125
-#: ../camel/providers/local/camel-maildir-store.c:850
+#: ../camel/providers/local/camel-maildir-store.c:130
+#: ../camel/providers/local/camel-maildir-store.c:860
 #, c-format
 msgid "Folder %s already exists"
 msgstr "資料夾 %s 已存在"
 
-#: ../camel/providers/local/camel-maildir-store.c:230
-#: ../camel/providers/local/camel-maildir-store.c:261
-#: ../camel/providers/local/camel-mbox-store.c:403
-#: ../camel/providers/local/camel-mbox-store.c:424
+#: ../camel/providers/local/camel-maildir-store.c:235
+#: ../camel/providers/local/camel-maildir-store.c:266
+#: ../camel/providers/local/camel-mbox-store.c:401
+#: ../camel/providers/local/camel-mbox-store.c:422
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "不能建立資料夾「%s」:%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:245
-#: ../camel/providers/local/camel-mbox-store.c:369
-#: ../camel/providers/local/camel-mh-store.c:514
+#: ../camel/providers/local/camel-maildir-store.c:250
+#: ../camel/providers/local/camel-mbox-store.c:367
+#: ../camel/providers/local/camel-mh-store.c:523
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "不能建立資料夾「%s」:%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:251
-#: ../camel/providers/local/camel-mbox-store.c:379
-#: ../camel/providers/local/camel-mh-store.c:523
+#: ../camel/providers/local/camel-maildir-store.c:256
+#: ../camel/providers/local/camel-mbox-store.c:377
+#: ../camel/providers/local/camel-mh-store.c:532
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "不能取得資料夾「%s」:資料夾不存在。"
 
-#: ../camel/providers/local/camel-maildir-store.c:278
+#: ../camel/providers/local/camel-maildir-store.c:283
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "不能取得資料夾「%s」:不是 maildir 目錄。"
 
-#: ../camel/providers/local/camel-maildir-store.c:283
-#: ../camel/providers/local/camel-mbox-store.c:442
-#: ../camel/providers/local/camel-mh-store.c:556
+#: ../camel/providers/local/camel-maildir-store.c:288
+#: ../camel/providers/local/camel-mbox-store.c:440
+#: ../camel/providers/local/camel-mh-store.c:565
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "不能建立資料夾「%s」:資料夾已存在。"
 
-#: ../camel/providers/local/camel-maildir-store.c:347
-#: ../camel/providers/local/camel-maildir-store.c:387
-#: ../camel/providers/local/camel-mh-store.c:674
+#: ../camel/providers/local/camel-maildir-store.c:352
+#: ../camel/providers/local/camel-maildir-store.c:392
+#: ../camel/providers/local/camel-mh-store.c:683
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "無法刪除資料夾「%s」:%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:349
+#: ../camel/providers/local/camel-maildir-store.c:354
 msgid "not a maildir directory"
 msgstr "不是一個 maildir 目錄"
 
-#: ../camel/providers/local/camel-maildir-store.c:630
-#: ../camel/providers/local/camel-maildir-store.c:1065
+#: ../camel/providers/local/camel-maildir-store.c:635
+#: ../camel/providers/local/camel-maildir-store.c:1074
 #: ../camel/providers/local/camel-spool-store.c:212
 #: ../camel/providers/local/camel-spool-store.c:231
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "無法掃描資料夾「%s」:%s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:458
-#: ../camel/providers/local/camel-maildir-summary.c:591
+#: ../camel/providers/local/camel-maildir-summary.c:465
+#: ../camel/providers/local/camel-maildir-summary.c:605
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "不能開啟 maildir 目錄路徑:%s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:582
+#: ../camel/providers/local/camel-maildir-summary.c:596
 msgid "Checking folder consistency"
 msgstr "檢查資料夾的一致性"
 
-#: ../camel/providers/local/camel-maildir-summary.c:675
+#: ../camel/providers/local/camel-maildir-summary.c:689
 msgid "Checking for new messages"
 msgstr "檢查新郵件"
 
-#: ../camel/providers/local/camel-maildir-summary.c:770
-#: ../camel/providers/local/camel-mbox-summary.c:450
+#: ../camel/providers/local/camel-maildir-summary.c:784
+#: ../camel/providers/local/camel-mbox-summary.c:466
 #: ../camel/providers/local/camel-mbox-summary.c:682
-#: ../camel/providers/local/camel-mbox-summary.c:830
-#: ../camel/providers/local/camel-spool-summary.c:141
+#: ../camel/providers/local/camel-mbox-summary.c:831
+#: ../camel/providers/local/camel-spool-summary.c:139
 msgid "Storing folder"
 msgstr "儲存資料夾"
 
-#: ../camel/providers/local/camel-mbox-folder.c:187
+#: ../camel/providers/local/camel-mbox-folder.c:185
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "不能開啟 mailbox:%s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:253
+#: ../camel/providers/local/camel-mbox-folder.c:251
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "不能將郵件儲存到 mbox 檔案:%s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:382
+#: ../camel/providers/local/camel-mbox-folder.c:381
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "資料夾好像已經損毀並且不能復原。"
 
-#: ../camel/providers/local/camel-mbox-folder.c:439
-#: ../camel/providers/local/camel-spool-folder.c:69
+#: ../camel/providers/local/camel-mbox-folder.c:438
+#: ../camel/providers/local/camel-spool-folder.c:67
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "不能建構資料夾鎖定 %s : %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:391
-#: ../camel/providers/local/camel-mbox-store.c:589
+#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:587
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "無法建構以此為名的資料夾"
 
-#: ../camel/providers/local/camel-mbox-store.c:435
+#: ../camel/providers/local/camel-mbox-store.c:433
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "不能取得資料夾「%s」:不是一般檔案。"
 
-#: ../camel/providers/local/camel-mbox-store.c:605
+#: ../camel/providers/local/camel-mbox-store.c:603
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "不能建立目錄「%s」: %s。"
 
-#: ../camel/providers/local/camel-mbox-store.c:617
+#: ../camel/providers/local/camel-mbox-store.c:615
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "不能取得資料夾:%s:%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:619
+#: ../camel/providers/local/camel-mbox-store.c:617
 msgid "Folder already exists"
 msgstr "資料夾已存在"
 
-#: ../camel/providers/local/camel-mbox-store.c:659
-#: ../camel/providers/local/camel-mbox-store.c:672
-#: ../camel/providers/local/camel-mbox-store.c:701
+#: ../camel/providers/local/camel-mbox-store.c:657
+#: ../camel/providers/local/camel-mbox-store.c:670
+#: ../camel/providers/local/camel-mbox-store.c:699
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3700,144 +3690,139 @@ msgstr ""
 "無法刪除資料夾「%s」:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:682
+#: ../camel/providers/local/camel-mbox-store.c:680
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "「%s」不是普通的檔案。"
 
-#: ../camel/providers/local/camel-mbox-store.c:691
+#: ../camel/providers/local/camel-mbox-store.c:689
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "資料夾「%s」內仍有檔案。所以不刪除。"
 
-#: ../camel/providers/local/camel-mbox-store.c:718
-#: ../camel/providers/local/camel-mbox-store.c:733
+#: ../camel/providers/local/camel-mbox-store.c:716
+#: ../camel/providers/local/camel-mbox-store.c:731
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "無法刪除資料夾摘要檔案「%s」: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:815
+#: ../camel/providers/local/camel-mbox-store.c:813
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "新的資料夾名稱不合法。"
 
-#: ../camel/providers/local/camel-mbox-store.c:831
+#: ../camel/providers/local/camel-mbox-store.c:829
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "無法重新命名「%s」:「%s」:%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:915
+#: ../camel/providers/local/camel-mbox-store.c:913
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "無法將 '%s' 重新命名成 %s:%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:460
+#: ../camel/providers/local/camel-mbox-summary.c:476
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "無法開啟資料夾: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:522
-#, c-format
-msgid "Fatal mail parser error near position %s in folder %s"
-msgstr "靠近 %s (於資料夾 %s)的位置發生嚴重的郵件分析錯誤"
-
-#: ../camel/providers/local/camel-mbox-summary.c:607
+#: ../camel/providers/local/camel-mbox-summary.c:606
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "不能檢查資料夾:%s: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:695
-#: ../camel/providers/local/camel-mbox-summary.c:839
-#: ../camel/providers/local/camel-spool-summary.c:148
+#: ../camel/providers/local/camel-mbox-summary.c:840
+#: ../camel/providers/local/camel-spool-summary.c:146
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "無法開啟檔案: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:709
-#: ../camel/providers/local/camel-spool-summary.c:163
+#: ../camel/providers/local/camel-mbox-summary.c:710
+#: ../camel/providers/local/camel-spool-summary.c:161
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "不能開啟暫存 mailbox:%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:726
-#: ../camel/providers/local/camel-mbox-summary.c:956
+#: ../camel/providers/local/camel-mbox-summary.c:727
+#: ../camel/providers/local/camel-mbox-summary.c:962
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "無法關閉來源資料夾 %s : %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-mbox-summary.c:740
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "無法關閉暫存資料夾: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:758
+#: ../camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "無法重新命名資料夾:%s "
 
-#: ../camel/providers/local/camel-mbox-summary.c:853
-#: ../camel/providers/local/camel-mbox-summary.c:1122
+#: ../camel/providers/local/camel-mbox-summary.c:854
+#: ../camel/providers/local/camel-mbox-summary.c:1127
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "無法儲存資料夾:%s "
 
-#: ../camel/providers/local/camel-mbox-summary.c:892
-#: ../camel/providers/local/camel-mbox-summary.c:1162
+#: ../camel/providers/local/camel-mbox-summary.c:893
+#: ../camel/providers/local/camel-mbox-summary.c:1167
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
 "it.)"
 msgstr "MBOX 檔案已損壞,請修正它。(預期有 From 這一列,卻找不到它。)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:902
-#: ../camel/providers/local/camel-mbox-summary.c:1174
+#: ../camel/providers/local/camel-mbox-summary.c:903
+#: ../camel/providers/local/camel-mbox-summary.c:1179
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "摘要與資料夾不協調,即使經過同步"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1067
+#: ../camel/providers/local/camel-mbox-summary.c:1072
 #: ../camel/providers/local/camel-spool-summary.c:356
 #, c-format
 msgid "Unknown error: %s"
 msgstr "不明的錯誤: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1232
-#: ../camel/providers/local/camel-mbox-summary.c:1262
+#: ../camel/providers/local/camel-mbox-summary.c:1237
+#: ../camel/providers/local/camel-mbox-summary.c:1267
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "寫入暫存郵箱失敗:  %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1251
+#: ../camel/providers/local/camel-mbox-summary.c:1256
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "寫入暫存郵箱失敗: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:118
+#: ../camel/providers/local/camel-mh-folder.c:116
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "不能將郵件儲存到 mh 資料夾: %s:"
 
-#: ../camel/providers/local/camel-mh-store.c:533
+#: ../camel/providers/local/camel-mh-store.c:542
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "無法建立資料夾「%s」:%s"
 
-#: ../camel/providers/local/camel-mh-store.c:549
+#: ../camel/providers/local/camel-mh-store.c:558
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "不能取得資料夾「%s」:不是目錄。"
 
-#: ../camel/providers/local/camel-mh-summary.c:227
+#: ../camel/providers/local/camel-mh-summary.c:236
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "不能開啟 MH 目錄路徑: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:97
+#: ../camel/providers/local/camel-spool-store.c:95
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "排程器「%s」不能被開啟:%s"
 
-#: ../camel/providers/local/camel-spool-store.c:111
+#: ../camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "排程器「%s」不是一般檔案或目錄。"
@@ -3856,12 +3841,12 @@ msgstr "排程資料夾樹狀結構 %s"
 msgid "Invalid spool"
 msgstr "無效的排程器"
 
-#: ../camel/providers/local/camel-spool-store.c:492
+#: ../camel/providers/local/camel-spool-store.c:481
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "資料夾「%s/%s」不存在。"
 
-#: ../camel/providers/local/camel-spool-store.c:505
+#: ../camel/providers/local/camel-spool-store.c:494
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3870,12 +3855,12 @@ msgstr ""
 "無法開啟資料夾「%s」:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:511
+#: ../camel/providers/local/camel-spool-store.c:500
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "資料夾「%s」不存在。"
 
-#: ../camel/providers/local/camel-spool-store.c:519
+#: ../camel/providers/local/camel-spool-store.c:508
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3884,34 +3869,34 @@ msgstr ""
 "無法建立資料夾「%s」:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:532
+#: ../camel/providers/local/camel-spool-store.c:521
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "「%s」不是 mailbox 檔案。"
 
-#: ../camel/providers/local/camel-spool-store.c:596
+#: ../camel/providers/local/camel-spool-store.c:585
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "儲存並不支援 INBOX"
 
-#: ../camel/providers/local/camel-spool-store.c:615
+#: ../camel/providers/local/camel-spool-store.c:604
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "排程資料夾不能刪除"
 
-#: ../camel/providers/local/camel-spool-store.c:630
+#: ../camel/providers/local/camel-spool-store.c:619
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "排程資料夾不能重新命名"
 
-#: ../camel/providers/local/camel-spool-summary.c:179
-#: ../camel/providers/local/camel-spool-summary.c:191
-#: ../camel/providers/local/camel-spool-summary.c:203
+#: ../camel/providers/local/camel-spool-summary.c:177
+#: ../camel/providers/local/camel-spool-summary.c:189
+#: ../camel/providers/local/camel-spool-summary.c:201
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "無法同步暫存資料夾 %s:%s"
 
-#: ../camel/providers/local/camel-spool-summary.c:221
+#: ../camel/providers/local/camel-spool-summary.c:219
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "無法同步排程資料夾%s:%s"
@@ -3927,108 +3912,102 @@ msgstr ""
 "無法同步排程資料夾 %s:%s\n"
 "資料夾可能損毀,複本儲存於「%s」"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:285
-#: ../camel/providers/nntp/camel-nntp-folder.c:388
-#: ../camel/providers/nntp/camel-nntp-folder.c:510
+#: ../camel/providers/nntp/camel-nntp-folder.c:222
+#: ../camel/providers/nntp/camel-nntp-folder.c:588
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "內部錯誤:UID 格式無效:%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:349
-#: ../camel/providers/nntp/camel-nntp-folder.c:354
-#: ../camel/providers/pop3/camel-pop3-folder.c:698
-#: ../camel/providers/pop3/camel-pop3-folder.c:1173
+#: ../camel/providers/nntp/camel-nntp-folder.c:291
+#: ../camel/providers/nntp/camel-nntp-folder.c:296
+#: ../camel/providers/pop3/camel-pop3-folder.c:546
+#: ../camel/providers/pop3/camel-pop3-folder.c:945
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "無法取得郵件 %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:361
-#: ../camel/providers/nntp/camel-nntp-folder.c:536
-#: ../camel/providers/pop3/camel-pop3-folder.c:623
-#: ../camel/providers/pop3/camel-pop3-folder.c:688
-#: ../camel/providers/pop3/camel-pop3-folder.c:707
+#: ../camel/providers/nntp/camel-nntp-folder.c:303
+#: ../camel/providers/nntp/camel-nntp-folder.c:622
+#: ../camel/providers/pop3/camel-pop3-folder.c:476
+#: ../camel/providers/pop3/camel-pop3-folder.c:536
+#: ../camel/providers/pop3/camel-pop3-folder.c:555
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "無法取得郵件 %s:"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:525
-#, c-format
-msgid "This message is not currently available"
-msgstr "這封郵件目前仍未可用"
-
-#: ../camel/providers/nntp/camel-nntp-folder.c:593
-#: ../camel/providers/nntp/camel-nntp-folder.c:599
+#: ../camel/providers/nntp/camel-nntp-folder.c:430
+#: ../camel/providers/nntp/camel-nntp-folder.c:436
 #, c-format
 msgid "Posting failed: %s"
 msgstr "張貼失敗:%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:664
+#: ../camel/providers/nntp/camel-nntp-folder.c:501
 msgid "Posting failed: "
 msgstr "張貼失敗:"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:689
+#: ../camel/providers/nntp/camel-nntp-folder.c:611
 #, c-format
-msgid "You cannot post NNTP messages while working offline!"
-msgstr "離線工作時無法張貼 NNTP 訊息!"
+msgid "This message is not currently available"
+msgstr "這封郵件目前仍未可用"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:709
+#: ../camel/providers/nntp/camel-nntp-folder.c:720
 #, c-format
-msgid "You cannot copy messages from a NNTP folder!"
-msgstr "您無法從 NNTP 資料夾複製訊息!"
+msgid "You cannot copy messages from a NNTP folder"
+msgstr "您不能從 NNTP 資料夾複製郵件"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "以簡短表示法顯示資料夾(例如,c.o.linux 而不是 comp.o_s.linux)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:51
+#: ../camel/providers/nntp/camel-nntp-provider.c:49
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "在訂閱對話方塊,顯示相關資料夾名稱(_D)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "Default NNTP port"
 msgstr "預設的 NNTP 連接埠"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:58
+#: ../camel/providers/nntp/camel-nntp-provider.c:56
 msgid "NNTP over SSL"
 msgstr "NNTP 透過 SSL"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:64
+#: ../camel/providers/nntp/camel-nntp-provider.c:62
 msgid "USENET news"
 msgstr "USENET 新聞"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:66
+#: ../camel/providers/nntp/camel-nntp-provider.c:64
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "這是讀取與發信至 USENET 新聞群組的供應者。"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:87
+#: ../camel/providers/nntp/camel-nntp-provider.c:85
 msgid ""
 "This option will connect to the NNTP server anonymously, without "
 "authentication."
 msgstr "這個選項將會匿名連線至 NNTP 伺服器,不使用任何核對。"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:97
+#: ../camel/providers/nntp/camel-nntp-provider.c:95
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "這個選項將會使用純文字的密碼核對 NNTP 伺服器。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:386
+#: ../camel/providers/nntp/camel-nntp-store.c:371
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "無法讀取 %s 的歡迎辭:"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:394
+#: ../camel/providers/nntp/camel-nntp-store.c:379
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP 伺服器 %s 傳回錯誤代碼 %d : %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:555
+#: ../camel/providers/nntp/camel-nntp-store.c:449
 #, c-format
 msgid "USENET News via %s"
 msgstr "經由 %s 的 USENET 新聞"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1225
+#: ../camel/providers/nntp/camel-nntp-store.c:1151
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4039,22 +4018,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1337
+#: ../camel/providers/nntp/camel-nntp-store.c:1267
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "您無法在「新聞」儲存區建構資料夾:改以訂閱。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1353
+#: ../camel/providers/nntp/camel-nntp-store.c:1283
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "您無法在「新聞」儲存區重新命名資料夾。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1376
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "您無法在「新聞」儲存區移除資料夾:改以取消訂閱。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1595
+#: ../camel/providers/nntp/camel-nntp-store.c:1516
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4065,7 +4044,7 @@ msgstr ""
 "\n"
 "沒有類似的新聞群組。選取的項目可能是父代資料夾。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1662
+#: ../camel/providers/nntp/camel-nntp-store.c:1583
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4076,116 +4055,116 @@ msgstr ""
 "\n"
 "新聞群組不存在!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2099
+#: ../camel/providers/nntp/camel-nntp-store.c:2009
 msgid "NNTP Command failed: "
 msgstr "NNTP 指令失敗:"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2196
+#: ../camel/providers/nntp/camel-nntp-store.c:2106
 #, c-format
 msgid "Not connected."
 msgstr "未連線。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2290
+#: ../camel/providers/nntp/camel-nntp-store.c:2200
 #, c-format
 msgid "No such folder: %s"
 msgstr "沒有這個資料夾: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:200
-#: ../camel/providers/nntp/camel-nntp-summary.c:339
+#: ../camel/providers/nntp/camel-nntp-summary.c:197
+#: ../camel/providers/nntp/camel-nntp-summary.c:337
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s:掃描新郵件"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:222
+#: ../camel/providers/nntp/camel-nntp-summary.c:219
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover 傳來意外的伺服器回應:%s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:360
+#: ../camel/providers/nntp/camel-nntp-summary.c:358
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "標題傳來意外的伺服器回應:%s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:407
+#: ../camel/providers/nntp/camel-nntp-summary.c:406
 #, c-format
 msgid "Operation failed: %s"
 msgstr "作業失敗: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:509
-#: ../camel/providers/pop3/camel-pop3-folder.c:588
+#: ../camel/providers/pop3/camel-pop3-folder.c:359
+#: ../camel/providers/pop3/camel-pop3-folder.c:442
 #, c-format
 msgid "No message with UID %s"
 msgstr "沒有郵件具有這個 UID %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:604
+#: ../camel/providers/pop3/camel-pop3-folder.c:458
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "接收 POP 郵件 %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:699
+#: ../camel/providers/pop3/camel-pop3-folder.c:547
 msgid "Unknown reason"
 msgstr "不明的原因"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:751
+#: ../camel/providers/pop3/camel-pop3-folder.c:598
 msgid "Retrieving POP summary"
 msgstr "取回 POP 的摘要"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:812
-#: ../camel/providers/pop3/camel-pop3-folder.c:815
-#: ../camel/providers/pop3/camel-pop3-folder.c:828
-#: ../camel/providers/pop3/camel-pop3-folder.c:841
-#: ../camel/providers/pop3/camel-pop3-folder.c:855
+#: ../camel/providers/pop3/camel-pop3-folder.c:659
+#: ../camel/providers/pop3/camel-pop3-folder.c:662
+#: ../camel/providers/pop3/camel-pop3-folder.c:675
+#: ../camel/providers/pop3/camel-pop3-folder.c:688
+#: ../camel/providers/pop3/camel-pop3-folder.c:702
 msgid "Cannot get POP summary: "
 msgstr "不能取得 POP 摘要:"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:966
+#: ../camel/providers/pop3/camel-pop3-folder.c:766
 msgid "Expunging old messages"
 msgstr "清空舊的郵件"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:992
+#: ../camel/providers/pop3/camel-pop3-folder.c:794
 msgid "Expunging deleted messages"
 msgstr "清空刪除的郵件"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:39
+#: ../camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message Storage"
 msgstr "郵件儲存空間"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
 msgid "_Leave messages on server"
 msgstr "在伺服器保留郵件備份(_L)"
 
 #. Translators: '%s' is replaced with a widget, where user can
 #. * select how many days can be message left on the server.
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "刪除 %s 天後的郵件(_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "Delete _expunged from local Inbox"
 msgstr "刪除在本地端收件匣清除的(_E)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 msgid "Disable _support for all POP3 extensions"
 msgstr "停止所有 P_OP3 延伸功能的支援"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "Default POP3 port"
 msgstr "預設 POP3 連接埠"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:56
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
 msgid "POP3 over SSL"
 msgstr "POP3 透過 SSL"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:63
+#: ../camel/providers/pop3/camel-pop3-provider.c:61
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:65
+#: ../camel/providers/pop3/camel-pop3-provider.c:63
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "用於連線到 POP 伺服器並下載郵件。"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:85
+#: ../camel/providers/pop3/camel-pop3-provider.c:83
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4193,7 +4172,7 @@ msgstr ""
 "這個選項將會使用純文字的密碼連線到 POP 伺服器。一般的 POP 伺服器只會支援這種"
 "方式。"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:95
+#: ../camel/providers/pop3/camel-pop3-provider.c:93
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4203,57 +4182,57 @@ msgstr ""
 "聲稱能夠支援,但對於所有使用者來講都未必一定可行。"
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:99
+#: ../camel/providers/pop3/camel-pop3-store.c:97
 msgid ": "
 msgstr ":"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:161
+#: ../camel/providers/pop3/camel-pop3-store.c:164
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "無法從 POP 伺服器 %s 讀取有效的問候語"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:176
+#: ../camel/providers/pop3/camel-pop3-store.c:179
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "無法以安全模式連線到 POP 伺服器 %s: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:177
+#: ../camel/providers/pop3/camel-pop3-store.c:180
 msgid "STLS not supported by server"
 msgstr "伺服器不支援 STLS"
 
 #. Translators: Last %s is an optional
 #. * explanation beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:198
+#: ../camel/providers/pop3/camel-pop3-store.c:201
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "無法以安全模式連線到 POP 伺服器 %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:211
+#: ../camel/providers/pop3/camel-pop3-store.c:219
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "無法以安全模式連線到 POP 伺服器 %s:"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:351
+#: ../camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "不能登入 POP 伺服器 %s: SASL 通訊協定錯誤"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:373
+#: ../camel/providers/pop3/camel-pop3-store.c:382
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "無法核對 POP 伺服器 %s:"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:481
+#: ../camel/providers/pop3/camel-pop3-store.c:490
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 伺服器 %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:484
+#: ../camel/providers/pop3/camel-pop3-store.c:493
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "%s 在 %s 的 POP3 伺服器"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:703
+#: ../camel/providers/pop3/camel-pop3-store.c:713
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4262,7 +4241,7 @@ msgstr ""
 "無法連線至 POP 伺服器 %s:\t收到無效的 APOP ID。推測可能是使用者假冒攻擊。請"
 "聯絡您的系統管理者。"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:755
+#: ../camel/providers/pop3/camel-pop3-store.c:768
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4273,7 +4252,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:770
+#: ../camel/providers/pop3/camel-pop3-store.c:783
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4282,316 +4261,316 @@ msgstr ""
 "無法連線 POP 伺服器 %s。\n"
 "傳送使用者名稱發生錯誤%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:852
+#: ../camel/providers/pop3/camel-pop3-store.c:865
 #, c-format
 msgid "No such folder '%s'."
 msgstr "沒有這個資料夾「%s」。"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:869
+#: ../camel/providers/pop3/camel-pop3-store.c:882
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 儲存區沒有資料夾階層"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:34
 #: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr "將遞送的郵件交給本地端系統上的「sendmail」程式處理。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:52
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
 msgid "Mail delivery via the sendmail program"
 msgstr "經由 sendmail 程式傳送郵件"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:140
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:138
 #, c-format
 msgid "Failed to read From address"
 msgstr "讀取寄件者位址失敗"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:157
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:155
 #, c-format
 msgid "Message send in offline mode is disabled"
 msgstr "離線模式下傳送郵件已停用"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:185
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:183
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "無法分析收件人清單"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:202
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:200
 #, c-format
 msgid "Could not parse arguments"
 msgstr "無法解析引數"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:233
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:231
 #, c-format
 msgid "Could not create pipe to '%s': %s: mail not sent"
 msgstr "無法建構導管到「%s」: %s:郵件無法傳送"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:258
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:256
 #, c-format
 msgid "Could not fork '%s': %s: mail not sent"
 msgstr "無法另外再啟動一個「%s」: %s:郵件無法傳送"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:307
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:305
 msgid "Could not send message: "
 msgstr "無法傳送郵件:"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:337
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:335
 #, c-format
 msgid "'%s' exited with signal %s: mail not sent."
 msgstr "「%s」已結束,訊息為 %s:郵件無法傳送。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:347
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:345
 #, c-format
 msgid "Could not execute '%s': mail not sent."
 msgstr "無法執行「%s」: 郵件無法傳送。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:352
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:350
 #, c-format
 msgid "'%s' exited with status %d: mail not sent."
 msgstr "「%s」由於狀況 %d 關閉: 郵件無法傳送。"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:42
+#: ../camel/providers/smtp/camel-smtp-provider.c:40
 msgid "Default SMTP port"
 msgstr "預設 SMTP 連接埠"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
 msgid "SMTP over SSL"
 msgstr "SMTP 透過 SSL"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:44
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
 msgid "Message submission port"
 msgstr "郵件提交連接埠"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:50
+#: ../camel/providers/smtp/camel-smtp-provider.c:48
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:52
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "使用 SMTP 連線到遠端 mailhub 來傳送郵件。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Welcome response error: "
 msgstr "迎接的回應錯誤:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:214
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "無法以安全模式連線到 SMTP 伺服器 %s: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
-#: ../camel/providers/smtp/camel-smtp-transport.c:226
-#: ../camel/providers/smtp/camel-smtp-transport.c:234
+#: ../camel/providers/smtp/camel-smtp-transport.c:224
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS 指令失敗:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:265
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "無法以安全模式連線到 SMTP 伺服器 %s:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:338
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP 伺服器 %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:341
+#: ../camel/providers/smtp/camel-smtp-transport.c:360
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "經由 %s 傳送 SMTP 郵件"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:415
+#: ../camel/providers/smtp/camel-smtp-transport.c:434
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP 伺服器 %s 不支援 %s 核對"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
+#: ../camel/providers/smtp/camel-smtp-transport.c:506
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr "沒有指定 SASL 機制"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:526
-#: ../camel/providers/smtp/camel-smtp-transport.c:537
-#: ../camel/providers/smtp/camel-smtp-transport.c:550
+#: ../camel/providers/smtp/camel-smtp-transport.c:536
+#: ../camel/providers/smtp/camel-smtp-transport.c:547
+#: ../camel/providers/smtp/camel-smtp-transport.c:560
 msgid "AUTH command failed: "
 msgstr "AUTH 指令失敗:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:691
+#: ../camel/providers/smtp/camel-smtp-transport.c:701
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "無法傳送訊息:服務未連線。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:698
+#: ../camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "不能傳送郵件:寄件者的地址無效。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
+#: ../camel/providers/smtp/camel-smtp-transport.c:712
 msgid "Sending message"
 msgstr "傳送郵件"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "不能傳送郵件:沒有定義收件者。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:740
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "不能傳送郵件:一或多個無效的收件者"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:861
+#: ../camel/providers/smtp/camel-smtp-transport.c:871
 msgid "Syntax error, command unrecognized"
 msgstr "語法錯誤,不認識的指令"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:863
+#: ../camel/providers/smtp/camel-smtp-transport.c:873
 msgid "Syntax error in parameters or arguments"
 msgstr "參數內的語法錯誤"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:865
+#: ../camel/providers/smtp/camel-smtp-transport.c:875
 msgid "Command not implemented"
 msgstr "指令沒有實作"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:867
+#: ../camel/providers/smtp/camel-smtp-transport.c:877
 msgid "Command parameter not implemented"
 msgstr "指令的參數沒有實作"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:869
+#: ../camel/providers/smtp/camel-smtp-transport.c:879
 msgid "System status, or system help reply"
 msgstr "系統狀況,或者是系統的求助說明回應"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:871
+#: ../camel/providers/smtp/camel-smtp-transport.c:881
 msgid "Help message"
 msgstr "求助說明訊息"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:873
+#: ../camel/providers/smtp/camel-smtp-transport.c:883
 msgid "Service ready"
 msgstr "服務已就緒"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:875
+#: ../camel/providers/smtp/camel-smtp-transport.c:885
 msgid "Service closing transmission channel"
 msgstr "此服務將傳輸通道關閉"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:877
+#: ../camel/providers/smtp/camel-smtp-transport.c:887
 msgid "Service not available, closing transmission channel"
 msgstr "此服務仍未可用,傳輸通道關閉"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:879
+#: ../camel/providers/smtp/camel-smtp-transport.c:889
 msgid "Requested mail action okay, completed"
 msgstr " 所要求的郵件動作已成功完成"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:881
+#: ../camel/providers/smtp/camel-smtp-transport.c:891
 msgid "User not local; will forward to <forward-path>"
 msgstr "不是本地端的使用者;將會轉寄至 <轉寄路徑>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:883
+#: ../camel/providers/smtp/camel-smtp-transport.c:893
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "所要求的郵件動作無法執行:郵箱仍未可用"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:885
+#: ../camel/providers/smtp/camel-smtp-transport.c:895
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "所要求的動作無法執行:郵箱仍未可用"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:887
+#: ../camel/providers/smtp/camel-smtp-transport.c:897
 msgid "Requested action aborted: error in processing"
 msgstr "所要求的動作已放棄:正在處理時發生錯誤"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:889
+#: ../camel/providers/smtp/camel-smtp-transport.c:899
 msgid "User not local; please try <forward-path>"
 msgstr "不是本地端的使用者;請嘗試使用 <轉寄路徑>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:891
+#: ../camel/providers/smtp/camel-smtp-transport.c:901
 msgid "Requested action not taken: insufficient system storage"
 msgstr "所要求的動作無法執行:系統的儲存空間不足"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:893
+#: ../camel/providers/smtp/camel-smtp-transport.c:903
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "所要求的郵件動作已放棄:超出可供儲存空間的限制"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:895
+#: ../camel/providers/smtp/camel-smtp-transport.c:905
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "所要求的動作已放棄:不允許的郵箱名稱"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:897
+#: ../camel/providers/smtp/camel-smtp-transport.c:907
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "請開始輸入郵件的資料;<CRLF>.<CRLF> 結束撰寫郵件"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:899
+#: ../camel/providers/smtp/camel-smtp-transport.c:909
 msgid "Transaction failed"
 msgstr "執行失敗"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:903
+#: ../camel/providers/smtp/camel-smtp-transport.c:913
 msgid "A password transition is needed"
 msgstr "需要密碼傳送"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:905
+#: ../camel/providers/smtp/camel-smtp-transport.c:915
 msgid "Authentication mechanism is too weak"
 msgstr "核對機制太弱了"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:907
+#: ../camel/providers/smtp/camel-smtp-transport.c:917
 msgid "Encryption required for requested authentication mechanism"
 msgstr "所要求的核對機制必須加密處理"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:909
+#: ../camel/providers/smtp/camel-smtp-transport.c:919
 msgid "Temporary authentication failure"
 msgstr "臨時核對失敗"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1166
+#: ../camel/providers/smtp/camel-smtp-transport.c:1207
 msgid "SMTP Greeting"
 msgstr "SMTP 迎接"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1193
-#: ../camel/providers/smtp/camel-smtp-transport.c:1207
-#: ../camel/providers/smtp/camel-smtp-transport.c:1215
+#: ../camel/providers/smtp/camel-smtp-transport.c:1217
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#: ../camel/providers/smtp/camel-smtp-transport.c:1239
 msgid "HELO command failed: "
 msgstr "HELO 指令失敗:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#: ../camel/providers/smtp/camel-smtp-transport.c:1305
-#: ../camel/providers/smtp/camel-smtp-transport.c:1315
+#: ../camel/providers/smtp/camel-smtp-transport.c:1314
+#: ../camel/providers/smtp/camel-smtp-transport.c:1329
+#: ../camel/providers/smtp/camel-smtp-transport.c:1339
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM 指令失敗:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1342
+#: ../camel/providers/smtp/camel-smtp-transport.c:1366
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO 指令失敗:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1359
-#: ../camel/providers/smtp/camel-smtp-transport.c:1369
+#: ../camel/providers/smtp/camel-smtp-transport.c:1383
+#: ../camel/providers/smtp/camel-smtp-transport.c:1393
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> 失敗:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1412
-#: ../camel/providers/smtp/camel-smtp-transport.c:1423
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
-#: ../camel/providers/smtp/camel-smtp-transport.c:1493
-#: ../camel/providers/smtp/camel-smtp-transport.c:1513
-#: ../camel/providers/smtp/camel-smtp-transport.c:1527
-#: ../camel/providers/smtp/camel-smtp-transport.c:1536
+#: ../camel/providers/smtp/camel-smtp-transport.c:1436
+#: ../camel/providers/smtp/camel-smtp-transport.c:1447
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1517
+#: ../camel/providers/smtp/camel-smtp-transport.c:1537
+#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1560
 msgid "DATA command failed: "
 msgstr "DATA 指令失敗:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1561
-#: ../camel/providers/smtp/camel-smtp-transport.c:1576
 #: ../camel/providers/smtp/camel-smtp-transport.c:1585
+#: ../camel/providers/smtp/camel-smtp-transport.c:1600
+#: ../camel/providers/smtp/camel-smtp-transport.c:1609
 msgid "RSET command failed: "
 msgstr "RSET 指令失敗:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1610
-#: ../camel/providers/smtp/camel-smtp-transport.c:1624
-#: ../camel/providers/smtp/camel-smtp-transport.c:1631
+#: ../camel/providers/smtp/camel-smtp-transport.c:1634
+#: ../camel/providers/smtp/camel-smtp-transport.c:1648
+#: ../camel/providers/smtp/camel-smtp-transport.c:1655
 msgid "QUIT command failed: "
 msgstr "QUIT 指令失敗:"
 
@@ -4626,341 +4605,407 @@ msgid ""
 msgstr ""
 "生日和週年紀念日提醒的單位,「minutes」(分鐘)、「hours」(小時)或「days」(日)"
 
-#: ../libebackend/e-authentication-mediator.c:205
-#: ../libebackend/e-authentication-mediator.c:216
-#: ../libebackend/e-authentication-mediator.c:862
-#: ../libebackend/e-authentication-mediator.c:1193
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
+msgid "(Deprecated) Proxy type to use"
+msgstr "(已廢棄) 要使用的代理伺服器類型"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
+msgid ""
+"This key was deprecated in version 3.12 and should no longer be used. Proxy "
+"settings are now integrated into Evolution-Data-Server's account system. See "
+"the ESourceProxy API documentation for details."
+msgstr ""
+"這個設定鍵在 3.12 版中已廢棄不再使用。代理伺服器設定值現在已整合到 Evolution-"
+"Data-Server 帳號系統。請查看 ESourceProxy API 文件以了解詳細資訊。"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
+msgid "(Deprecated) Whether to use http-proxy"
+msgstr "(已廢棄) 是否使用 http-proxy"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+msgid "(Deprecated) Whether proxy server requires authentication"
+msgstr "(已廢棄) 代理伺服器是否要求核對"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
+msgid "(Deprecated) Host name for HTTP requests"
+msgstr "(已廢棄) HTTP 要求的主機名稱"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
+msgid "(Deprecated) Port number for HTTP requests"
+msgstr "(已廢棄) HTTP 要求的連接埠"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
+msgid "(Deprecated) Proxy authentication user name"
+msgstr "(已廢棄) 代理伺服器核對使用者名稱"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+msgid "(Deprecated) Proxy authentication password"
+msgstr "(已廢棄) 代理伺服器核對密碼"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+msgid "(Deprecated) List of hosts to connect to without proxy"
+msgstr "(已廢棄) 不使用代理伺服器的主機清單"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+msgid "(Deprecated) Host name for HTTPS requests"
+msgstr "(已廢棄) HTTPS 要求的主機名稱"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+msgid "(Deprecated) Port number for HTTPS requests"
+msgstr "(已廢棄) HTTPS 要求的連接埠"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
+msgid "(Deprecated) Host name for SOCKS requests"
+msgstr "(已廢棄) SOCKS 要求的主機名稱"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+msgid "(Deprecated) Port number for SOCKS requests"
+msgstr "(已廢棄) SOCKS 要求的連接埠"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+msgid "(Deprecated) Automatic proxy configuration URL"
+msgstr "(已廢棄) 自動代理伺服器組態網址"
+
+#: ../libebackend/e-authentication-mediator.c:204
+#: ../libebackend/e-authentication-mediator.c:215
+#: ../libebackend/e-authentication-mediator.c:861
+#: ../libebackend/e-authentication-mediator.c:1198
 msgid "Bus name vanished (client terminated?)"
 msgstr "匯流排名稱消失了 (客戶端終止?)"
 
-#: ../libebackend/e-authentication-mediator.c:264
+#: ../libebackend/e-authentication-mediator.c:263
 msgid "No response from client"
 msgstr "客戶端沒有回應"
 
-#: ../libebackend/e-authentication-mediator.c:334
-#: ../libebackend/e-authentication-mediator.c:345
-#: ../libebackend/e-authentication-mediator.c:856
-#: ../libebackend/e-authentication-mediator.c:1187
+#: ../libebackend/e-authentication-mediator.c:333
+#: ../libebackend/e-authentication-mediator.c:344
+#: ../libebackend/e-authentication-mediator.c:855
+#: ../libebackend/e-authentication-mediator.c:1192
 msgid "Client cancelled the operation"
 msgstr "客戶端已取消操作"
 
-#: ../libebackend/e-authentication-mediator.c:416
+#: ../libebackend/e-authentication-mediator.c:415
 msgid "Client reports password was rejected"
 msgstr "客戶端回報密碼被拒絕"
 
-#: ../libebackend/e-authentication-session.c:569
+#: ../libebackend/e-authentication-session.c:568
 msgid "Add this password to your keyring"
 msgstr "將密碼加入您的鑰匙圈"
 
-#: ../libebackend/e-authentication-session.c:674
+#: ../libebackend/e-authentication-session.c:673
 msgid "Password was incorrect"
 msgstr "密碼是不正確的"
 
-#: ../libebackend/e-backend.c:428
+#: ../libebackend/e-backend.c:408
 #, c-format
 msgid "%s does not support authentication"
 msgstr "%s 不支援核對"
 
-#: ../libebackend/e-collection-backend.c:800
+#: ../libebackend/e-collection-backend.c:900
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr "%s 不支援建立遠端資源"
 
-#: ../libebackend/e-collection-backend.c:859
+#: ../libebackend/e-collection-backend.c:959
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr "%s 不支援刪除遠端資源"
 
-#: ../libebackend/e-data-factory.c:304
+#: ../libebackend/e-data-factory.c:303
 #, c-format
 msgid "No backend factory for hash key '%s'"
 msgstr "雜湊鍵「%s」中沒有後端工廠"
 
-#: ../libebackend/e-server-side-source.c:134
+#: ../libebackend/e-server-side-source.c:133
 #, c-format
 msgid "Data source is missing a [%s] group"
 msgstr "資料來源缺少 [%s] 群組"
 
-#: ../libebackend/e-server-side-source.c:1008
-#: ../libedataserver/e-source.c:1138
+#: ../libebackend/e-server-side-source.c:1007
+#: ../libedataserver/e-source.c:1252
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
 msgstr "資料來源「%s」不支援建立遠端資源"
 
-#: ../libebackend/e-server-side-source.c:1022
+#: ../libebackend/e-server-side-source.c:1021
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to create the remote resource"
 msgstr "資料來源「%s」沒有用來建立遠端資料的收集後端"
 
-#: ../libebackend/e-server-side-source.c:1050
-#: ../libedataserver/e-source.c:1251
+#: ../libebackend/e-server-side-source.c:1049
+#: ../libedataserver/e-source.c:1365
 #, c-format
 msgid "Data source '%s' does not support deleting remote resources"
 msgstr "資料來源「%s」不支援刪除遠端資源"
 
-#: ../libebackend/e-server-side-source.c:1064
+#: ../libebackend/e-server-side-source.c:1063
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to delete the remote resource"
 msgstr "資料來源「%s」沒有用來刪除遠端資料的收集後端"
 
-#: ../libebackend/e-server-side-source.c:1095
-#: ../libedataserver/e-source.c:1347
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990
+#: ../libebackend/e-server-side-source.c:1094
+#: ../libedataserver/e-source.c:1461
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027
 #, c-format
 msgid "Data source '%s' does not support OAuth 2.0 authentication"
 msgstr "資料來源「%s」不支援 OAuth 2.0 核對"
 
-#: ../libebackend/e-server-side-source.c:1438
+#: ../libebackend/e-server-side-source.c:1439
 #, c-format
 msgid "File must have a '.source' extension"
 msgstr "檔案必須以「.source」做為延伸檔名"
 
-#: ../libebackend/e-source-registry-server.c:521
-#: ../libedataserver/e-source-registry.c:1876
+#: ../libebackend/e-source-registry-server.c:531
+#: ../libedataserver/e-source-registry.c:1878
 msgid "The user declined to authenticate"
 msgstr "使用者拒絕核對"
 
-#: ../libebackend/e-source-registry-server.c:790
+#: ../libebackend/e-source-registry-server.c:800
 #, c-format
 msgid "UID '%s' is already in use"
 msgstr "UID 「%s」已經在使用中"
 
-#: ../libebackend/e-user-prompter-server.c:301
+#: ../libebackend/e-user-prompter-server.c:305
 #, c-format
 msgid "Extension dialog '%s' not found."
 msgstr "找不到延伸功能對話盒「%s」。"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "週年紀念日"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "生日"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "商務"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "競爭者"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "喜愛的"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "禮物"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "終點/目標"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "假日"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "假日邀請卡"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "熱門連絡人"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "創意"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "International"
 msgstr "國際的"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "關鍵客戶"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "雜項"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:63
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "個人"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:64
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "電話"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "狀態"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "策略"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "供應商"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "時間與開銷"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:70
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:69
+#: ../libedataserver/e-categories.c:71
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "正在等待"
 
-#: ../libedataserver/e-client.c:133
+#: ../libedataserver/e-client.c:141
 msgid "Source not loaded"
 msgstr "來源未載入"
 
-#: ../libedataserver/e-client.c:135
+#: ../libedataserver/e-client.c:143
 msgid "Source already loaded"
 msgstr "來源已載入"
 
 #. Translators: This means that the EClient does not
 #. * support offline mode, or it's not set to by a user,
 #. * thus it is unavailable while user is not connected.
-#: ../libedataserver/e-client.c:146
+#: ../libedataserver/e-client.c:154
 msgid "Offline unavailable"
 msgstr "離線無法使用"
 
-#: ../libedataserver/e-client.c:168
+#: ../libedataserver/e-client.c:176
 msgid "D-Bus error"
 msgstr "D-Bus 錯誤"
 
-#: ../libedataserver/e-source-authenticator.c:166
+#: ../libedataserver/e-source-authenticator.c:162
 msgid "Address book authentication request"
 msgstr "通訊錄核對要求"
 
-#: ../libedataserver/e-source-authenticator.c:171
+#: ../libedataserver/e-source-authenticator.c:167
 msgid "Calendar authentication request"
 msgstr "行事曆核對要求"
 
-#: ../libedataserver/e-source-authenticator.c:175
+#: ../libedataserver/e-source-authenticator.c:171
 msgid "Mail authentication request"
 msgstr "郵件核對要求"
 
 #. generic account prompt
-#: ../libedataserver/e-source-authenticator.c:178
+#: ../libedataserver/e-source-authenticator.c:174
 msgid "Authentication request"
 msgstr "核對要求"
 
-#: ../libedataserver/e-source-authenticator.c:188
+#: ../libedataserver/e-source-authenticator.c:184
 #, c-format
 msgid "Please enter the password for address book \"%s\"."
 msgstr "請輸入通訊錄「%s」的密碼 。"
 
-#: ../libedataserver/e-source-authenticator.c:194
+#: ../libedataserver/e-source-authenticator.c:190
 #, c-format
 msgid "Please enter the password for calendar \"%s\"."
 msgstr "請輸入行事曆「%s」的密碼 。"
 
-#: ../libedataserver/e-source-authenticator.c:200
+#: ../libedataserver/e-source-authenticator.c:196
 #, c-format
 msgid "Please enter the password for mail account \"%s\"."
 msgstr "請輸入郵件帳號「%s」的密碼 。"
 
-#: ../libedataserver/e-source-authenticator.c:206
+#: ../libedataserver/e-source-authenticator.c:202
 #, c-format
 msgid "Please enter the password for mail transport \"%s\"."
 msgstr "請輸入郵件傳輸「%s」的密碼 。"
 
-#: ../libedataserver/e-source-authenticator.c:212
+#: ../libedataserver/e-source-authenticator.c:208
 #, c-format
 msgid "Please enter the password for memo list \"%s\"."
 msgstr "請輸入備忘錄清單「%s」的密碼 。"
 
-#: ../libedataserver/e-source-authenticator.c:218
+#: ../libedataserver/e-source-authenticator.c:214
 #, c-format
 msgid "Please enter the password for task list \"%s\"."
 msgstr "請輸入工作清單「%s」的密碼 。"
 
-#: ../libedataserver/e-source-authenticator.c:224
+#: ../libedataserver/e-source-authenticator.c:220
 #, c-format
 msgid "Please enter the password for account \"%s\"."
 msgstr "請輸入帳號「%s」的密碼 。"
 
-#: ../libedataserver/e-source.c:627
+#: ../libedataserver/e-source.c:669
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "來源檔案缺少 [%s] 群組"
 
-#: ../libedataserver/e-source.c:949
+#: ../libedataserver/e-source.c:1032
 #, c-format
 msgid "Data source '%s' is not removable"
 msgstr "資料來源「%s」無法移除"
 
-#: ../libedataserver/e-source.c:1041
+#: ../libedataserver/e-source.c:1155
 #, c-format
 msgid "Data source '%s' is not writable"
 msgstr "資料來源「%s」無法寫入"
 
-#: ../libedataserver/e-source.c:1559
+#: ../libedataserver/e-source.c:1768
 msgid "Unnamed"
 msgstr "未命名的"
 
-#: ../libedataserver/e-source-mail-signature.c:487
+#: ../libedataserver/e-source-mail-signature.c:486
 #, c-format
 msgid "Signature script must be a local file"
 msgstr "簽章必須是本地端檔案"
 
-#: ../libedataserver/e-source-webdav.c:1553
+#: ../libedataserver/e-source-proxy.c:1646
+#, c-format
+msgid "Source '%s' does not support proxy lookups"
+msgstr "來源「%s」不支援代理伺服器查詢"
+
+#: ../libedataserver/e-source-webdav.c:1551
 #, c-format
 msgid ""
 "SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
 "you wish to accept it?"
 msgstr "主機「%s」用於通訊錄「%s」的 SSL 憑證未受信任。您想要接受它嗎?"
 
-#: ../libedataserver/e-source-webdav.c:1562
+#: ../libedataserver/e-source-webdav.c:1560
 #, c-format
 msgid ""
 "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
 "wish to accept it?"
 msgstr "主機「%s」用於行事曆「%s」的 SSL 憑證未受信任。您想要接受它嗎?"
 
-#: ../libedataserver/e-source-webdav.c:1571
+#: ../libedataserver/e-source-webdav.c:1569
 #, c-format
 msgid ""
 "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
 "you wish to accept it?"
 msgstr "主機「%s」用於備忘錄清單「%s」的 SSL 憑證未受信任。您想要接受它嗎?"
 
-#: ../libedataserver/e-source-webdav.c:1580
+#: ../libedataserver/e-source-webdav.c:1578
 #, c-format
 msgid ""
 "SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
@@ -4971,7 +5016,7 @@ msgstr "主機「%s」用於工作清單「%s」的 SSL 憑證未受信任。您
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1962
+#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1961
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
@@ -4979,7 +5024,7 @@ msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1668 ../libedataserver/e-time-utils.c:1953
+#: ../libedataserver/e-time-utils.c:1667 ../libedataserver/e-time-utils.c:1952
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
@@ -4987,7 +5032,7 @@ msgstr "%Y/%m/%d (%a) %H:%M:%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1673 ../libedataserver/e-time-utils.c:1958
+#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1957
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -4995,78 +5040,78 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1949
+#: ../libedataserver/e-time-utils.c:1677 ../libedataserver/e-time-utils.c:1948
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1683
+#: ../libedataserver/e-time-utils.c:1682
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1688
+#: ../libedataserver/e-time-utils.c:1687
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1691 ../libedataserver/e-time-utils.c:1811
-#: ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1690 ../libedataserver/e-time-utils.c:1810
+#: ../libedataserver/e-time-utils.c:1943
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1698
+#: ../libedataserver/e-time-utils.c:1697
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1702
+#: ../libedataserver/e-time-utils.c:1701
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1707
+#: ../libedataserver/e-time-utils.c:1706
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1712
+#: ../libedataserver/e-time-utils.c:1711
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1717
+#: ../libedataserver/e-time-utils.c:1716
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1722
+#: ../libedataserver/e-time-utils.c:1721
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1725 ../libedataserver/e-time-utils.c:1814
+#: ../libedataserver/e-time-utils.c:1724 ../libedataserver/e-time-utils.c:1813
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:2006
+#: ../libedataserver/e-time-utils.c:1884 ../libedataserver/e-time-utils.c:2005
 msgid "%I:%M:%S %p"
 msgstr "%p %I:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1889 ../libedataserver/e-time-utils.c:1998
+#: ../libedataserver/e-time-utils.c:1888 ../libedataserver/e-time-utils.c:1997
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5074,143 +5119,35 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1894 ../libedataserver/e-time-utils.c:2003
+#: ../libedataserver/e-time-utils.c:1893 ../libedataserver/e-time-utils.c:2002
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1898 ../libedataserver/e-time-utils.c:1995
+#: ../libedataserver/e-time-utils.c:1897 ../libedataserver/e-time-utils.c:1994
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format,
 #. * and no colon.
-#: ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1901
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1906
+#: ../libedataserver/e-time-utils.c:1905
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
-msgid "Proxy type to use"
-msgstr "要使用的代理伺服器類型"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
-msgid ""
-"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
-"means manual proxy."
-msgstr ""
-"要使用哪種類型的代理伺服器。「0」表示使用系統值,「1」表示不使用代理伺服器,"
-"「2」表示手動設定代理伺服器。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
-msgid "Whether to use http-proxy"
-msgstr "是否使用 http-proxy"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
-msgid "Whether to use proxy for HTTP requests."
-msgstr "對 HTTP 要求是否使用代理伺服器。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
-msgid "Whether proxy server requires authentication"
-msgstr "代理伺服器是否要求核對"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
-msgid "Whether authentication is required to access proxy server."
-msgstr "存取代理伺服器是否要求核對。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
-msgid "Host name for HTTP requests"
-msgstr "HTTP 要求的主機名稱"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
-msgid "Host name to use for HTTP requests."
-msgstr "對 HTTP 要求使用的主機名稱。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
-msgid "Port number for HTTP requests"
-msgstr "HTTP 要求使用的連接埠號"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
-msgid "Port number to use for HTTP requests."
-msgstr "對 HTTP 要求使用的連接埠號。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
-msgid "Proxy authentication user name"
-msgstr "代理伺服器核對使用者名稱"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
-msgid "User name to use to authenticate against proxy server."
-msgstr "用來核對代理伺服器的使用者名稱。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
-msgid "Proxy authentication password"
-msgstr "代理伺服器核對密碼"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
-msgid "Password to use to authenticate against proxy server."
-msgstr "用來核對代理伺服器的密碼。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:15
-msgid "List of hosts to connect to without proxy"
-msgstr "不使用代理伺服器連接的主機清單"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:16
-msgid "List of hosts for which do not use proxy."
-msgstr "不使用代理伺服器連接的主機清單。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:17
-msgid "Host name for HTTPS requests"
-msgstr "HTTPS 要求的主機名稱"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:18
-msgid "Host name to use for HTTPS requests."
-msgstr "對 HTTPS 要求使用的主機名稱。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:19
-msgid "Port number for HTTPS requests"
-msgstr "HTTPS 要求使用的連接埠號"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:20
-msgid "Port number to use for HTTPS requests."
-msgstr "對 HTTPS 要求使用的連接埠號。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:21
-msgid "Host name for SOCKS requests"
-msgstr "SOCKS 要求的主機名稱"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:22
-msgid "Host name to use for SOCKS requests."
-msgstr "對 SOCKS 要求使用的主機名稱。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:23
-msgid "Port number for SOCKS requests"
-msgstr "SOCKS 要求使用的連接埠號"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:24
-msgid "Port number to use for SOCKS requests."
-msgstr "對 SOCKS 要求使用的連接埠號。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:25
-msgid "Automatic proxy configuration URL"
-msgstr "自動代理伺服器組態網址"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:26
-msgid "Where to read automatic proxy configuration from."
-msgstr "要從何處讀取自動代理伺服器組態。"
-
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:129
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:365
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:130
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:364
 #, c-format
 msgid "No such data source for UID '%s'"
 msgstr "沒有 UID「%s」的資料來源"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:141
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:142
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
@@ -5219,48 +5156,48 @@ msgstr ""
 "找不到在 org.gnome 中對應的帳號。這是 OnlineAccounts 服務用來獲得「%s」的密碼"
 "的地方"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:213
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:218
 #, c-format
 msgid "Invalid password for '%s'"
 msgstr "「%s」的密碼無效"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:222
+#: ../modules/gnome-online-accounts/goaewsclient.c:219
 #, c-format
 msgid "Code: %u - Unexpected response from server"
 msgstr "代碼:%u - 從伺服器傳回未預期的回應"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:243
+#: ../modules/gnome-online-accounts/goaewsclient.c:240
 #, c-format
 msgid "Failed to parse autodiscover response XML"
 msgstr "無法解析自動偵測回應的 XML"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:252
+#: ../modules/gnome-online-accounts/goaewsclient.c:249
 #, c-format
 msgid "Failed to find Autodiscover element"
 msgstr "找不到自動偵測元素"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:264
+#: ../modules/gnome-online-accounts/goaewsclient.c:261
 #, c-format
 msgid "Failed to find Response element"
 msgstr "找不到回應元素"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:276
+#: ../modules/gnome-online-accounts/goaewsclient.c:273
 #, c-format
 msgid "Failed to find Account element"
 msgstr "找不到帳號元素"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:290
+#: ../modules/gnome-online-accounts/goaewsclient.c:287
 #, c-format
 msgid "Failed to find ASUrl and OABUrl in autodiscover response"
 msgstr "在自動探索回應中找不到 ASUrl 與 OABUrl"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1238
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1240
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
@@ -5269,381 +5206,73 @@ msgstr ""
 "找不到在 org.gnome 中對應的帳號。這是 OnlineAccounts 服務用來獲得「%s」的存取"
 "記號的地方"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1265
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1267
 #, c-format
 msgid "Failed to obtain an access token for '%s': "
 msgstr "無法獲得「%s」的存取記號:"
 
-#: ../modules/google-backend/module-google-backend.c:192
+#: ../modules/google-backend/module-google-backend.c:191
 #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
-#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+#: ../modules/yahoo-backend/module-yahoo-backend.c:199
 msgid "Calendar"
 msgstr "行事曆"
 
-#: ../modules/google-backend/module-google-backend.c:261
+#: ../modules/google-backend/module-google-backend.c:260
 #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
 #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
 msgid "Contacts"
 msgstr "連絡人"
 
-#: ../modules/trust-prompt/certificate-viewer.c:292
-msgid "Not part of certificate"
-msgstr "不是憑證的部分"
-
-#: ../modules/trust-prompt/certificate-viewer.c:575
-msgid "_Close"
-msgstr "關閉(_C)"
-
-#: ../modules/trust-prompt/certificate-viewer.c:600
-msgid "This certificate has been verified for the following uses:"
-msgstr "此憑證已經檢驗用於下列用途:"
-
-#: ../modules/trust-prompt/certificate-viewer.c:604
-#: ../modules/trust-prompt/e-asn1-object.c:387
-msgid "SSL Client Certificate"
-msgstr "SSL 用戶端憑證"
-
-#: ../modules/trust-prompt/certificate-viewer.c:609
-#: ../modules/trust-prompt/e-asn1-object.c:391
-msgid "SSL Server Certificate"
-msgstr "SSL 伺服器憑證"
-
-#: ../modules/trust-prompt/certificate-viewer.c:614
-msgid "Email Signer Certificate"
-msgstr "電子郵件簽署者憑證"
-
-#: ../modules/trust-prompt/certificate-viewer.c:619
-msgid "Email Recipient Certificate"
-msgstr "電子郵件收件者憑證"
-
-#: ../modules/trust-prompt/certificate-viewer.c:634
-msgid "Issued To"
-msgstr "簽發給"
-
-#: ../modules/trust-prompt/certificate-viewer.c:635
-#: ../modules/trust-prompt/certificate-viewer.c:641
-msgid "Common Name (CN)"
-msgstr "一般名稱 (CN)"
-
-#: ../modules/trust-prompt/certificate-viewer.c:636
-#: ../modules/trust-prompt/certificate-viewer.c:642
-msgid "Organization (O)"
-msgstr "組織 (O)"
-
-#: ../modules/trust-prompt/certificate-viewer.c:637
-#: ../modules/trust-prompt/certificate-viewer.c:643
-msgid "Organizational Unit (OU)"
-msgstr "組織單位 (OU)"
-
-#: ../modules/trust-prompt/certificate-viewer.c:638
-#: ../modules/trust-prompt/e-asn1-object.c:134
-msgid "Serial Number"
-msgstr "序號"
-
-#: ../modules/trust-prompt/certificate-viewer.c:640
-msgid "Issued By"
-msgstr "簽發者"
-
-#: ../modules/trust-prompt/certificate-viewer.c:645
-msgid "Validity"
-msgstr "有效性"
-
-#: ../modules/trust-prompt/certificate-viewer.c:646
-msgid "Issued On"
-msgstr "簽發日"
-
-#: ../modules/trust-prompt/certificate-viewer.c:647
-msgid "Expires On"
-msgstr "到期日"
-
-#: ../modules/trust-prompt/certificate-viewer.c:649
-msgid "Fingerprints"
-msgstr "數位指紋"
-
-#: ../modules/trust-prompt/certificate-viewer.c:650
-msgid "SHA1 Fingerprint"
-msgstr "SHA1 指紋"
-
-#: ../modules/trust-prompt/certificate-viewer.c:651
-msgid "MD5 Fingerprint"
-msgstr "MD5 指紋"
-
-#: ../modules/trust-prompt/certificate-viewer.c:653
-msgid "General"
-msgstr "一般"
-
-#: ../modules/trust-prompt/certificate-viewer.c:672
-msgid "Certificate Hierarchy"
-msgstr "憑證階層"
-
-#: ../modules/trust-prompt/certificate-viewer.c:676
-msgid "Certificate Fields"
-msgstr "憑證欄位"
-
-#: ../modules/trust-prompt/certificate-viewer.c:680
-msgid "Field Value"
-msgstr "欄位數值"
-
-#: ../modules/trust-prompt/certificate-viewer.c:682
-msgid "Details"
-msgstr "詳細資料"
-
-#: ../modules/trust-prompt/e-asn1-object.c:95
-msgid "Version"
-msgstr "版本"
-
-#: ../modules/trust-prompt/e-asn1-object.c:110
-msgid "Version 1"
-msgstr "版本 1"
-
-#: ../modules/trust-prompt/e-asn1-object.c:113
-msgid "Version 2"
-msgstr "版本 2"
-
-#: ../modules/trust-prompt/e-asn1-object.c:116
-msgid "Version 3"
-msgstr "版本 3"
-
-#: ../modules/trust-prompt/e-asn1-object.c:192
-msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr "PKCS #1 MD2 附 RSA 加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:195
-msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr "PKCS #1 MD5 附 RSA 加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:198
-msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr "PKCS #1 SHA-1 附 RSA 加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:201
-msgid "PKCS #1 SHA-256 With RSA Encryption"
-msgstr "PKCS #1 SHA-256 附 RSA 加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:204
-msgid "PKCS #1 SHA-384 With RSA Encryption"
-msgstr "PKCS #1 SHA-384 附 RSA 加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:207
-msgid "PKCS #1 SHA-512 With RSA Encryption"
-msgstr "PKCS #1 SHA-512 附 RSA 加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:234
-msgid "PKCS #1 RSA Encryption"
-msgstr "PKCS #1 RSA 加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:237
-msgid "Certificate Key Usage"
-msgstr "憑證金鑰用途"
-
-#: ../modules/trust-prompt/e-asn1-object.c:240
-msgid "Netscape Certificate Type"
-msgstr "Netscape 憑證類型"
-
-#: ../modules/trust-prompt/e-asn1-object.c:243
-msgid "Certificate Authority Key Identifier"
-msgstr "憑證管理中心金鑰識別碼"
-
-#: ../modules/trust-prompt/e-asn1-object.c:255
-#, c-format
-msgid "Object Identifier (%s)"
-msgstr "物件識別碼 (%s)"
-
-#: ../modules/trust-prompt/e-asn1-object.c:306
-msgid "Algorithm Identifier"
-msgstr "演算法識別碼"
-
-#: ../modules/trust-prompt/e-asn1-object.c:314
-msgid "Algorithm Parameters"
-msgstr "演算法參數"
-
-#: ../modules/trust-prompt/e-asn1-object.c:336
-msgid "Subject Public Key Info"
-msgstr "主旨公鑰資訊"
-
-#: ../modules/trust-prompt/e-asn1-object.c:341
-msgid "Subject Public Key Algorithm"
-msgstr "主旨公鑰演算法"
-
-#: ../modules/trust-prompt/e-asn1-object.c:356
-msgid "Subject's Public Key"
-msgstr "主旨的公鑰"
-
-#: ../modules/trust-prompt/e-asn1-object.c:378
-#: ../modules/trust-prompt/e-asn1-object.c:428
-msgid "Error: Unable to process extension"
-msgstr "錯誤:無法處理延伸資訊"
-
-#: ../modules/trust-prompt/e-asn1-object.c:395
-msgid "Email"
-msgstr "電子郵件"
-
-#: ../modules/trust-prompt/e-asn1-object.c:399
-#: ../modules/trust-prompt/e-asn1-object.c:411
-msgid "Object Signer"
-msgstr "物件簽署者"
-
-#: ../modules/trust-prompt/e-asn1-object.c:403
-msgid "SSL Certificate Authority"
-msgstr "SSL 憑證檢核"
-
-#: ../modules/trust-prompt/e-asn1-object.c:407
-msgid "Email Certificate Authority"
-msgstr "電子郵件憑證檢核"
-
-#: ../modules/trust-prompt/e-asn1-object.c:436
-msgid "Signing"
-msgstr "簽署"
-
-#: ../modules/trust-prompt/e-asn1-object.c:440
-msgid "Non-repudiation"
-msgstr "不可否認"
-
-#: ../modules/trust-prompt/e-asn1-object.c:444
-msgid "Key Encipherment"
-msgstr "金鑰加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:448
-msgid "Data Encipherment"
-msgstr "資料加密"
-
-#: ../modules/trust-prompt/e-asn1-object.c:452
-msgid "Key Agreement"
-msgstr "金鑰合同"
-
-#: ../modules/trust-prompt/e-asn1-object.c:456
-msgid "Certificate Signer"
-msgstr "憑證簽署者"
-
-#: ../modules/trust-prompt/e-asn1-object.c:460
-msgid "CRL Signer"
-msgstr "CRL 簽署者"
-
-#: ../modules/trust-prompt/e-asn1-object.c:509
-msgid "Critical"
-msgstr "重要"
-
-#: ../modules/trust-prompt/e-asn1-object.c:511
-#: ../modules/trust-prompt/e-asn1-object.c:514
-msgid "Not Critical"
-msgstr "不重要"
-
-#: ../modules/trust-prompt/e-asn1-object.c:535
-msgid "Extensions"
-msgstr "延伸資訊"
-
-#. Translators: This string is used in Certificate
-#. * details for fields like Issuer or Subject, which
-#. * shows the field name on the left and its respective
-#. * value on the right, both as stored in the
-#. * certificate itself.  You probably do not need to
-#. * change this string, unless changing the order of
-#. * name and value.  As a result example:
-#. * "OU = VeriSign Trust Network"
-#: ../modules/trust-prompt/e-asn1-object.c:615
-#, c-format
-msgid "%s = %s"
-msgstr "%s = %s"
-
-#: ../modules/trust-prompt/e-asn1-object.c:658
-msgid "Certificate"
-msgstr "憑證"
-
-#: ../modules/trust-prompt/e-asn1-object.c:674
-#: ../modules/trust-prompt/e-asn1-object.c:812
-msgid "Certificate Signature Algorithm"
-msgstr "憑證簽章演算法"
-
-#: ../modules/trust-prompt/e-asn1-object.c:683
-msgid "Issuer"
-msgstr "簽發者"
-
-#: ../modules/trust-prompt/e-asn1-object.c:714
-msgid "Subject"
-msgstr "主旨"
-
-#: ../modules/trust-prompt/e-asn1-object.c:738
-msgid "Issuer Unique ID"
-msgstr "簽發者獨有 ID"
-
-#: ../modules/trust-prompt/e-asn1-object.c:757
-msgid "Subject Unique ID"
-msgstr "主旨獨有 ID"
-
-#: ../modules/trust-prompt/e-asn1-object.c:818
-msgid "Certificate Signature Value"
-msgstr "憑證簽章值"
-
-#: ../modules/trust-prompt/module-trust-prompt.c:201
+#: ../modules/trust-prompt/module-trust-prompt.c:82
 msgid "The signing certificate authority is not known."
 msgstr "簽署的憑證授權中心不明。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:203
+#: ../modules/trust-prompt/module-trust-prompt.c:84
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
 msgstr "憑證與取回憑證的網站身分比對不符。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:205
+#: ../modules/trust-prompt/module-trust-prompt.c:86
 msgid "The certificate's activation time is still in the future."
 msgstr "憑證的啟用時刻在未來。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:207
+#: ../modules/trust-prompt/module-trust-prompt.c:88
 msgid "The certificate has expired."
 msgstr "憑證已逾期。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:209
+#: ../modules/trust-prompt/module-trust-prompt.c:90
 msgid ""
 "The certificate has been revoked according to the connection's certificate "
 "revocation list."
 msgstr "根據連線的憑證註銷清單,這個憑證已被註銷。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:211
+#: ../modules/trust-prompt/module-trust-prompt.c:92
 msgid "The certificate's algorithm is considered insecure."
 msgstr "憑證的演算法被認為是不安全的。"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:162
+#: ../modules/trust-prompt/trust-prompt-gtk.c:119
 msgid "Certificate trust..."
 msgstr "憑證信任度…"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:163
-msgid "_View Certificate"
-msgstr "檢視憑證(_V)"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:164
+#: ../modules/trust-prompt/trust-prompt-gtk.c:120
 msgid "_Reject"
 msgstr "拒絕(_R)"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:165
+#: ../modules/trust-prompt/trust-prompt-gtk.c:121
 msgid "Accept _Temporarily"
 msgstr "暫時接受(_T)"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:166
+#: ../modules/trust-prompt/trust-prompt-gtk.c:122
 msgid "_Accept Permanently"
 msgstr "永久接受(_A)"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:203
+#: ../modules/trust-prompt/trust-prompt-gtk.c:160
 #, c-format
 msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
 msgstr "「%s」的 SSL 憑證未受信任。您想要接受它嗎?"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:209
-msgid "Detailed information about the certificate:"
-msgstr "憑證的相關詳細資訊:"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:223
-msgid "Issuer:"
-msgstr "簽發者:"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:224
-msgid "Subject:"
-msgstr "主旨:"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:225
-msgid "Fingerprint:"
-msgstr "數位指紋:"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:226
+#: ../modules/trust-prompt/trust-prompt-gtk.c:175
 msgid "Reason:"
 msgstr "原因:"
 
@@ -5655,7 +5284,7 @@ msgstr "整合您的行事曆"
 msgid "Integrate your contacts"
 msgstr "整合您的連絡人"
 
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:257
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:256
 msgid "Signon service did not return a secret"
 msgstr "Signon 服務尚未傳回機密"
 
@@ -5687,25 +5316,40 @@ msgstr "郵件"
 msgid "Integrate your mailboxes"
 msgstr "整合您的信箱"
 
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:971
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008
 #, c-format
 msgid ""
 "Cannot find a corresponding account service in the accounts database from "
 "which to obtain an access token for '%s'"
 msgstr "在帳號資料庫中找不到對應的帳號服務以獲得「%s」的存取記號"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:79
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:84
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:281
 #, c-format
-msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
-msgstr "請求 guid 時預期的狀態為 200,但卻取得狀態 %d (%s)"
+msgid ""
+"Expected status 200 when requesting your identity, instead got status %d (%s)"
+msgstr "請求您的身分識別時預期的狀態為 200,但卻取得狀態 %d (%s)"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:96
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:101
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:298
 msgid "Error parsing response as JSON: "
 msgstr "以 JSON 解析回應時發生錯誤:"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:112
-msgid "Didn't find email member in JSON data"
-msgstr "JSON 資料中找不到電子郵件成員"
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:119
+msgid "Didn't find 'email' in JSON data"
+msgstr "在 JSON 資料中找不到「email」"
+
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:316
+msgid "Didn't find 'id' in JSON data"
+msgstr "在 JSON 資料中找不到「id」"
+
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:321
+msgid "Didn't find 'emails.account' in JSON data"
+msgstr "在 JSON 資料中找不到「email.account」"
+
+#: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1
+msgid "Windows Live Mail"
+msgstr "Windows Live Mail"
 
 #: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
 msgid "Yahoo! Calendar"
@@ -5715,18 +5359,18 @@ msgstr "Yahoo! 行事曆"
 msgid "Yahoo! Mail"
 msgstr "Yahoo! 電子信箱"
 
-#: ../modules/yahoo-backend/module-yahoo-backend.c:227
+#: ../modules/yahoo-backend/module-yahoo-backend.c:226
 msgid "Tasks"
 msgstr "工作"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51
-#: ../services/evolution-user-prompter/evolution-user-prompter.c:31
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50
+#: ../services/evolution-user-prompter/evolution-user-prompter.c:30
 msgid "Keep running after the last client is closed"
 msgstr "在上次關閉客戶端之後保持執行"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52
 msgid "Wait running until at least one client is connected"
 msgstr "直到至少有一個客戶端連線前等候執行"
 
@@ -5767,10 +5411,407 @@ msgstr "於網站"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../services/evolution-user-prompter/prompt-user-gtk.c:122
+#: ../services/evolution-source-registry/evolution-source-registry.c:38
+msgid "Don't migrate user data from previous versions of Evolution"
+msgstr "不要從前一版的 Evolution 轉換使用者資料"
+
+#: ../services/evolution-user-prompter/prompt-user-gtk.c:121
 msgid "_Dismiss"
 msgstr "解除(_D)"
 
+#~ msgid "You may not import keys with this cipher"
+#~ msgstr "您不能匯入這種加密方式的金鑰"
+
+#~ msgid "You may not export keys with this cipher"
+#~ msgstr "您不能匯出這種加密方式的金鑰"
+
+#~ msgid ""
+#~ "Could not write log entry: %s\n"
+#~ "Further operations on this server will not be replayed when you\n"
+#~ "reconnect to the network."
+#~ msgstr ""
+#~ "無法寫入紀錄: %s\n"
+#~ "接下來在此伺服器上的操作,在您重新連線到網路時\n"
+#~ "將不會重播。"
+
+#~ msgid ""
+#~ "Could not open '%s':\n"
+#~ "%s\n"
+#~ "Changes made to this folder will not be resynchronized."
+#~ msgstr ""
+#~ "無法開啟「%s」:\n"
+#~ "%s\n"
+#~ "這個資料夾內所做的變更將不會重新同步。"
+
+#~ msgid "Resynchronizing with server"
+#~ msgstr "與伺服器重新同步"
+
+#~ msgid "Preparing folder '%s' for offline"
+#~ msgstr "準備資料夾「%s」供離線使用"
+
+#~ msgid "Canceled"
+#~ msgstr "已取消"
+
+#~ msgid ""
+#~ "Alert from IMAP server %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "來自 IMAP 伺服器 %s 的警示:\n"
+#~ "%s"
+
+#~ msgid "Error while fetching messages"
+#~ msgstr "當取回郵件時發生錯誤"
+
+#~ msgid "Fetching summary information for %d message in '%s'"
+#~ msgid_plural "Fetching summary information for %d messages in '%s'"
+#~ msgstr[0] "正取得「%2$s」中 %1$d 封郵件的摘要資訊"
+
+#~ msgid "Unknown parent folder: %s"
+#~ msgstr "不明的母資料夾: %s"
+
+#~ msgid "The parent folder is not allowed to contain subfolders"
+#~ msgstr "母資料夾並不允許包含子資料夾"
+
+#~ msgid "Resolving address"
+#~ msgstr "解析位址"
+
+#~ msgid "Name lookup failed"
+#~ msgstr "查詢名稱失敗"
+
+#~ msgid "Name lookup failed. Check your host name for spelling errors."
+#~ msgstr "名稱查詢失敗。請檢查您的主機名稱是否有拼錯字。"
+
+#~ msgid "Name lookup failed: %s"
+#~ msgstr "搜尋名稱失敗: %s"
+
+#~ msgid "Could not connect to '%s:%s': "
+#~ msgstr "無法連接到「%s:%s」:"
+
+#~ msgid "Please enter the %s password for %s on host %s."
+#~ msgstr "請輸入 %2$s 於主機 %3$s 的 %1$s 密碼。"
+
+#~ msgid "NSPR error code %d"
+#~ msgstr "NSPR 錯誤代碼 %d"
+
+#~ msgid "The proxy host does not support SOCKS4"
+#~ msgstr "代理伺服器主機不支援 SOCKS4"
+
+#~ msgid "The proxy host denied our request: code %d"
+#~ msgstr "代理伺服器主機拒絕我們的要求:代碼 %d"
+
+#~ msgid "The proxy host does not support SOCKS5"
+#~ msgstr "代理伺服器主機不支援 SOCKS5"
+
+#~ msgid "Could not find a suitable authentication type: code 0x%x"
+#~ msgstr "找不到合適的核對類型:代碼 0x%x"
+
+#~ msgid "General SOCKS server failure"
+#~ msgstr "一般性 SOCKS 伺服器失敗"
+
+#~ msgid "SOCKS server's rules do not allow connection"
+#~ msgstr "SOCKS 伺服器的規則不允許連線"
+
+#~ msgid "Network is unreachable from SOCKS server"
+#~ msgstr "網路無法透過 SOCKS 伺服器到達"
+
+#~ msgid "Host is unreachable from SOCKS server"
+#~ msgstr "主機無法透過 SOCKS 伺服器到達"
+
+#~ msgid "Connection refused"
+#~ msgstr "連線被拒絕"
+
+#~ msgid "Time-to-live expired"
+#~ msgstr "超過 Time-to-live 時間"
+
+#~ msgid "Command not supported by SOCKS server"
+#~ msgstr "SOCKS 伺服器不支援指令"
+
+#~ msgid "Address type not supported by SOCKS server"
+#~ msgstr "SOCKS 伺服器不支援位址類型"
+
+#~ msgid "Unknown error from SOCKS server"
+#~ msgstr "來自 SOCKS 伺服器的不明錯誤"
+
+#~ msgid "Got unknown address type from SOCKS server"
+#~ msgstr "從 SOCKS 伺服器取得不明的位址類型"
+
+#~ msgid "Incomplete reply from SOCKS server"
+#~ msgstr "來自 SOCKS 伺服器的不完整回覆"
+
+#~ msgid "Hostname is too long (maximum is 255 characters)"
+#~ msgstr "主機名稱太長(最多 255 字元)"
+
+#~ msgid "Invalid reply from proxy server"
+#~ msgstr "從代理伺服器傳回無效的回覆"
+
+#~ msgid "Unable to add message to summary: unknown reason"
+#~ msgstr "無法新增郵件到摘要資訊:不明的原因"
+
+#~ msgid "Fatal mail parser error near position %s in folder %s"
+#~ msgstr "靠近 %s (於資料夾 %s)的位置發生嚴重的郵件分析錯誤"
+
+#~ msgid "You cannot post NNTP messages while working offline!"
+#~ msgstr "離線工作時無法張貼 NNTP 訊息!"
+
+#~ msgid ""
+#~ "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
+#~ "means manual proxy."
+#~ msgstr ""
+#~ "要使用哪種類型的代理伺服器。「0」表示使用系統值,「1」表示不使用代理伺服"
+#~ "器,「2」表示手動設定代理伺服器。"
+
+#~ msgid "Whether to use proxy for HTTP requests."
+#~ msgstr "對 HTTP 要求是否使用代理伺服器。"
+
+#~ msgid "Whether authentication is required to access proxy server."
+#~ msgstr "存取代理伺服器是否要求核對。"
+
+#~ msgid "Host name to use for HTTP requests."
+#~ msgstr "對 HTTP 要求使用的主機名稱。"
+
+#~ msgid "Port number to use for HTTP requests."
+#~ msgstr "對 HTTP 要求使用的連接埠號。"
+
+#~ msgid "User name to use to authenticate against proxy server."
+#~ msgstr "用來核對代理伺服器的使用者名稱。"
+
+#~ msgid "Password to use to authenticate against proxy server."
+#~ msgstr "用來核對代理伺服器的密碼。"
+
+#~ msgid "List of hosts for which do not use proxy."
+#~ msgstr "不使用代理伺服器連接的主機清單。"
+
+#~ msgid "Host name to use for HTTPS requests."
+#~ msgstr "對 HTTPS 要求使用的主機名稱。"
+
+#~ msgid "Port number to use for HTTPS requests."
+#~ msgstr "對 HTTPS 要求使用的連接埠號。"
+
+#~ msgid "Host name to use for SOCKS requests."
+#~ msgstr "對 SOCKS 要求使用的主機名稱。"
+
+#~ msgid "Port number to use for SOCKS requests."
+#~ msgstr "對 SOCKS 要求使用的連接埠號。"
+
+#~ msgid "Where to read automatic proxy configuration from."
+#~ msgstr "要從何處讀取自動代理伺服器組態。"
+
+#~ msgid "Not part of certificate"
+#~ msgstr "不是憑證的部分"
+
+#~ msgid "_Close"
+#~ msgstr "關閉(_C)"
+
+#~ msgid "This certificate has been verified for the following uses:"
+#~ msgstr "此憑證已經檢驗用於下列用途:"
+
+#~ msgid "SSL Client Certificate"
+#~ msgstr "SSL 用戶端憑證"
+
+#~ msgid "SSL Server Certificate"
+#~ msgstr "SSL 伺服器憑證"
+
+#~ msgid "Email Signer Certificate"
+#~ msgstr "電子郵件簽署者憑證"
+
+#~ msgid "Email Recipient Certificate"
+#~ msgstr "電子郵件收件者憑證"
+
+#~ msgid "Issued To"
+#~ msgstr "簽發給"
+
+#~ msgid "Common Name (CN)"
+#~ msgstr "一般名稱 (CN)"
+
+#~ msgid "Organization (O)"
+#~ msgstr "組織 (O)"
+
+#~ msgid "Organizational Unit (OU)"
+#~ msgstr "組織單位 (OU)"
+
+#~ msgid "Serial Number"
+#~ msgstr "序號"
+
+#~ msgid "Issued By"
+#~ msgstr "簽發者"
+
+#~ msgid "Validity"
+#~ msgstr "有效性"
+
+#~ msgid "Issued On"
+#~ msgstr "簽發日"
+
+#~ msgid "Expires On"
+#~ msgstr "到期日"
+
+#~ msgid "Fingerprints"
+#~ msgstr "數位指紋"
+
+#~ msgid "SHA1 Fingerprint"
+#~ msgstr "SHA1 指紋"
+
+#~ msgid "MD5 Fingerprint"
+#~ msgstr "MD5 指紋"
+
+#~ msgid "General"
+#~ msgstr "一般"
+
+#~ msgid "Certificate Hierarchy"
+#~ msgstr "憑證階層"
+
+#~ msgid "Certificate Fields"
+#~ msgstr "憑證欄位"
+
+#~ msgid "Field Value"
+#~ msgstr "欄位數值"
+
+#~ msgid "Details"
+#~ msgstr "詳細資料"
+
+#~ msgid "Version"
+#~ msgstr "版本"
+
+#~ msgid "Version 1"
+#~ msgstr "版本 1"
+
+#~ msgid "Version 2"
+#~ msgstr "版本 2"
+
+#~ msgid "Version 3"
+#~ msgstr "版本 3"
+
+#~ msgid "PKCS #1 MD2 With RSA Encryption"
+#~ msgstr "PKCS #1 MD2 附 RSA 加密"
+
+#~ msgid "PKCS #1 MD5 With RSA Encryption"
+#~ msgstr "PKCS #1 MD5 附 RSA 加密"
+
+#~ msgid "PKCS #1 SHA-1 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-1 附 RSA 加密"
+
+#~ msgid "PKCS #1 SHA-256 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-256 附 RSA 加密"
+
+#~ msgid "PKCS #1 SHA-384 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-384 附 RSA 加密"
+
+#~ msgid "PKCS #1 SHA-512 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-512 附 RSA 加密"
+
+#~ msgid "PKCS #1 RSA Encryption"
+#~ msgstr "PKCS #1 RSA 加密"
+
+#~ msgid "Certificate Key Usage"
+#~ msgstr "憑證金鑰用途"
+
+#~ msgid "Netscape Certificate Type"
+#~ msgstr "Netscape 憑證類型"
+
+#~ msgid "Certificate Authority Key Identifier"
+#~ msgstr "憑證管理中心金鑰識別碼"
+
+#~ msgid "Object Identifier (%s)"
+#~ msgstr "物件識別碼 (%s)"
+
+#~ msgid "Algorithm Identifier"
+#~ msgstr "演算法識別碼"
+
+#~ msgid "Algorithm Parameters"
+#~ msgstr "演算法參數"
+
+#~ msgid "Subject Public Key Info"
+#~ msgstr "主旨公鑰資訊"
+
+#~ msgid "Subject Public Key Algorithm"
+#~ msgstr "主旨公鑰演算法"
+
+#~ msgid "Subject's Public Key"
+#~ msgstr "主旨的公鑰"
+
+#~ msgid "Error: Unable to process extension"
+#~ msgstr "錯誤:無法處理延伸資訊"
+
+#~ msgid "Email"
+#~ msgstr "電子郵件"
+
+#~ msgid "Object Signer"
+#~ msgstr "物件簽署者"
+
+#~ msgid "SSL Certificate Authority"
+#~ msgstr "SSL 憑證檢核"
+
+#~ msgid "Email Certificate Authority"
+#~ msgstr "電子郵件憑證檢核"
+
+#~ msgid "Signing"
+#~ msgstr "簽署"
+
+#~ msgid "Non-repudiation"
+#~ msgstr "不可否認"
+
+#~ msgid "Key Encipherment"
+#~ msgstr "金鑰加密"
+
+#~ msgid "Data Encipherment"
+#~ msgstr "資料加密"
+
+#~ msgid "Key Agreement"
+#~ msgstr "金鑰合同"
+
+#~ msgid "Certificate Signer"
+#~ msgstr "憑證簽署者"
+
+#~ msgid "CRL Signer"
+#~ msgstr "CRL 簽署者"
+
+#~ msgid "Critical"
+#~ msgstr "重要"
+
+#~ msgid "Not Critical"
+#~ msgstr "不重要"
+
+#~ msgid "Extensions"
+#~ msgstr "延伸資訊"
+
+#~ msgid "%s = %s"
+#~ msgstr "%s = %s"
+
+#~ msgid "Certificate"
+#~ msgstr "憑證"
+
+#~ msgid "Certificate Signature Algorithm"
+#~ msgstr "憑證簽章演算法"
+
+#~ msgid "Issuer"
+#~ msgstr "簽發者"
+
+#~ msgid "Subject"
+#~ msgstr "主旨"
+
+#~ msgid "Issuer Unique ID"
+#~ msgstr "簽發者獨有 ID"
+
+#~ msgid "Subject Unique ID"
+#~ msgstr "主旨獨有 ID"
+
+#~ msgid "Certificate Signature Value"
+#~ msgstr "憑證簽章值"
+
+#~ msgid "_View Certificate"
+#~ msgstr "檢視憑證(_V)"
+
+#~ msgid "Detailed information about the certificate:"
+#~ msgstr "憑證的相關詳細資訊:"
+
+#~ msgid "Issuer:"
+#~ msgstr "簽發者:"
+
+#~ msgid "Subject:"
+#~ msgstr "主旨:"
+
+#~ msgid "Fingerprint:"
+#~ msgstr "數位指紋:"
+
 #~ msgid "Cannot write offline journal for folder '%s': %s"
 #~ msgstr "不能寫入資料夾「%s」的離線日誌:%s"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]