[evolution-data-server] Update Chinese (Taiwan) translation

[Translations User D-L <translations src gnome org>]

commit ac04d39525696db9951bc5cc061b8118006d79a0
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Tue Aug 21 16:15:42 2018 +0000

    Update Chinese (Taiwan) translation

 po/zh_TW.po | 3925 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 2867 insertions(+), 1058 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 56abc9df8..ad229c71c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,21 +8,105 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server 3.3.91\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution-data-server&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-27 08:42+0800\n"
-"PO-Revision-Date: 2017-02-27 08:42+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution-data-server/";
+"issues\n"
+"POT-Creation-Date: 2018-07-17 12:28+0000\n"
+"PO-Revision-Date: 2018-08-22 00:00+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (traditional)\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.1.1\n"
 "X-Project-Style: gnome\n"
 "X-Poedit-Bookmarks: -1,257,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:220
+#, c-format
+msgid "Given URL “%s” doesn’t reference CardDAV address book"
+msgstr ""
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:279
+#: ../src/addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1159
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4326
+#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:49
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:54
+#: ../src/addressbook/libebook/e-book.c:1079
+#: ../src/addressbook/libebook/e-book-client.c:2130
+#: ../src/addressbook/libebook/e-book-client.c:2302
+#: ../src/addressbook/libebook/e-book-client.c:2515
+#: ../src/addressbook/libebook/e-book-client.c:2646
+#: ../src/addressbook/libebook/e-book-client.c:2805
+#: ../src/addressbook/libebook/e-book-client.c:2939
+#: ../src/addressbook/libebook/e-book-client.c:3070
+#: ../src/addressbook/libebook/e-book-client.c:3228
+#: ../src/addressbook/libebook/e-book-client.c:3423
+#: ../src/addressbook/libebook/e-book-client.c:3641
+#: ../src/addressbook/libedata-book/e-book-backend-sexp.c:877
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:263
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:274
+#: ../src/calendar/backends/http/e-cal-backend-http.c:210
+#: ../src/calendar/libecal/e-cal.c:2334
+#: ../src/calendar/libecal/e-cal-client.c:277
+#: ../src/calendar/libecal/e-cal-client.c:3544
+#: ../src/calendar/libecal/e-cal-client.c:3717
+#: ../src/calendar/libecal/e-cal-client.c:3981
+#: ../src/calendar/libecal/e-cal-client.c:4222
+#: ../src/calendar/libecal/e-cal-client.c:4412
+#: ../src/calendar/libecal/e-cal-client.c:4605
+#: ../src/calendar/libecal/e-cal-client.c:4814
+#: ../src/calendar/libecal/e-cal-client.c:4983
+#: ../src/calendar/libecal/e-cal-client.c:5186
+#: ../src/calendar/libecal/e-cal-client.c:5336
+#: ../src/calendar/libecal/e-cal-client.c:5530
+#: ../src/calendar/libecal/e-cal-client.c:5683
+#: ../src/calendar/libecal/e-cal-client.c:5900
+#: ../src/calendar/libecal/e-cal-client.c:6054
+#: ../src/calendar/libecal/e-cal-client.c:6280
+#: ../src/calendar/libecal/e-cal-client.c:6476
+#: ../src/calendar/libecal/e-cal-client.c:6839
+#: ../src/calendar/libecal/e-cal-client.c:7061
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1757
+#: ../src/camel/camel-filter-driver.c:1719
+#: ../src/camel/camel-filter-driver.c:1851
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3204
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3210
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3220
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3232
+#: ../src/camel/providers/nntp/camel-nntp-store.c:422
+#: ../src/libebackend/e-server-side-source.c:501
+#: ../src/libedataserver/e-client.c:188
+#: ../src/libedataserver/e-soup-session.c:1136
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:204
+#: ../src/libedataserverui/e-reminders-widget.c:1780
+#: ../src/tools/list-sources/list-sources.c:429
+msgid "Unknown error"
+msgstr "不明的錯誤"
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1036
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1192
+#, fuzzy
+#| msgid "Signon service did not return a secret"
+msgid "Server didn’t return object’s href"
+msgstr "Signon 服務尚未傳回機密"
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1038
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1194
+msgid "Server didn’t return object’s ETag"
+msgstr ""
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1040
+msgid "Received object is not a valid vCard"
+msgstr ""
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1147
+#: ../src/addressbook/backends/google/e-book-backend-google.c:1010
+msgid "Object to save is not a valid vCard"
+msgstr ""
+
 #: ../src/addressbook/backends/file/e-book-backend-file.c:120
 #, c-format
 msgid "Failed to remove file “%s”: %s"
@@ -39,144 +123,72 @@ msgid "Failed to create hardlink for resource “%s”: %s"
 msgstr "無法建立資源「%s」的硬連結：%s"
 
 #: ../src/addressbook/backends/file/e-book-backend-file.c:524
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1256
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1260
 msgid "No UID in the contact"
 msgstr "在連絡人中沒有 UID"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:851
+#: ../src/addressbook/backends/file/e-book-backend-file.c:856
 #, c-format
 msgid "Conflicting UIDs found in added contacts"
 msgstr "在加入的連絡人中發現衝突的 UID"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:990
+#: ../src/addressbook/backends/file/e-book-backend-file.c:994
 msgid "Loading..."
 msgstr "載入中…"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:992
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4353
+#: ../src/addressbook/backends/file/e-book-backend-file.c:996
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4436
 msgid "Searching..."
 msgstr "搜尋中…"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1284
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1288
 #, c-format
 msgid "Tried to modify contact “%s” with out of sync revision"
 msgstr "嘗試不使用同步修訂來修改連絡人「%s」"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1475
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1560
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1479
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1564
 #: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3085
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7342
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7411
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7365
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7434
 #, c-format
 msgid "Contact “%s” not found"
 msgstr "找不到連絡人「%s」"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1620
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1701
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1624
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1705
 #, c-format
 msgid "Query “%s” not supported"
 msgstr "查詢「%s」不支援"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1629
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1710
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1633
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1714
 #, c-format
 msgid "Invalid Query “%s”"
 msgstr "無效的查詢「%s」"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1975
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1979
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:2015
 msgid "Requested to delete an unrelated cursor"
 msgstr "已要求刪除無關的游標"
 
-#: ../src/addressbook/backends/file/e-book-backend-file.c:2046
+#: ../src/addressbook/backends/file/e-book-backend-file.c:2050
 #, c-format
 msgid "Failed to rename old database from “%s” to “%s”: %s"
 msgstr "無法將舊資料庫「%s」重新命名為「%s」： %s"
 
-#: ../src/addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1162
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4243
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:384
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:867
-#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:49
-#: ../src/addressbook/libebook-contacts/e-phone-number.c:54
-#: ../src/addressbook/libebook/e-book.c:1079
-#: ../src/addressbook/libebook/e-book-client.c:2129
-#: ../src/addressbook/libebook/e-book-client.c:2301
-#: ../src/addressbook/libebook/e-book-client.c:2514
-#: ../src/addressbook/libebook/e-book-client.c:2645
-#: ../src/addressbook/libebook/e-book-client.c:2804
-#: ../src/addressbook/libebook/e-book-client.c:2938
-#: ../src/addressbook/libebook/e-book-client.c:3069
-#: ../src/addressbook/libebook/e-book-client.c:3227
-#: ../src/addressbook/libebook/e-book-client.c:3422
-#: ../src/addressbook/libebook/e-book-client.c:3640
-#: ../src/addressbook/libedata-book/e-book-backend-sexp.c:877
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:707
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:755
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:772
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:272
-#: ../src/calendar/libecal/e-cal.c:2334
-#: ../src/calendar/libecal/e-cal-client.c:277
-#: ../src/calendar/libecal/e-cal-client.c:3518
-#: ../src/calendar/libecal/e-cal-client.c:3691
-#: ../src/calendar/libecal/e-cal-client.c:3955
-#: ../src/calendar/libecal/e-cal-client.c:4196
-#: ../src/calendar/libecal/e-cal-client.c:4386
-#: ../src/calendar/libecal/e-cal-client.c:4579
-#: ../src/calendar/libecal/e-cal-client.c:4788
-#: ../src/calendar/libecal/e-cal-client.c:4957
-#: ../src/calendar/libecal/e-cal-client.c:5160
-#: ../src/calendar/libecal/e-cal-client.c:5310
-#: ../src/calendar/libecal/e-cal-client.c:5504
-#: ../src/calendar/libecal/e-cal-client.c:5657
-#: ../src/calendar/libecal/e-cal-client.c:5874
-#: ../src/calendar/libecal/e-cal-client.c:6028
-#: ../src/calendar/libecal/e-cal-client.c:6254
-#: ../src/calendar/libecal/e-cal-client.c:6450
-#: ../src/calendar/libecal/e-cal-client.c:6813
-#: ../src/calendar/libecal/e-cal-client.c:7035
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3048
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3058
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3070
-#: ../src/camel/providers/nntp/camel-nntp-store.c:422
-#: ../src/libebackend/e-server-side-source.c:498
-#: ../src/libedataserver/e-client.c:188
-msgid "Unknown error"
-msgstr "不明的錯誤"
-
-#. Query for new contacts asynchronously
-#: ../src/addressbook/backends/google/e-book-backend-google.c:782
-msgid "Querying for updated contacts…"
-msgstr "查詢更新的連絡人…"
-
-#. Run the query asynchronously
-#: ../src/addressbook/backends/google/e-book-backend-google.c:966
-msgid "Querying for updated groups…"
-msgstr "查詢更新的群組…"
-
-#: ../src/addressbook/backends/google/e-book-backend-google.c:1749
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4995
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1504
-msgid "The backend does not support bulk additions"
-msgstr "後端不支援大量增加"
-
-#: ../src/addressbook/backends/google/e-book-backend-google.c:1906
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5131
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1626
-msgid "The backend does not support bulk modifications"
-msgstr "後端不支援大量修改"
-
-#: ../src/addressbook/backends/google/e-book-backend-google.c:2115
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1726
-msgid "The backend does not support bulk removals"
-msgstr "後端不支援大量移除"
+#: ../src/addressbook/backends/google/e-book-backend-google.c:1066
+#, fuzzy
+#| msgid "Failed to authenticate on POP server %s: "
+msgid "Failed to create contact from returned server data"
+msgstr "無法核對 POP 伺服器 %s："
 
-#: ../src/addressbook/backends/google/e-book-backend-google.c:2237
-msgid "Loading…"
-msgstr "載入中…"
+#: ../src/addressbook/backends/google/e-book-backend-google.c:1082
+msgid "Server returned contact without UID"
+msgstr ""
 
 #. System Group: My Contacts
-#: ../src/addressbook/backends/google/e-book-google-utils.c:1670
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1656
 #: ../src/services/evolution-source-registry/builtin/system-address-book.source.in.h:1
 #: ../src/services/evolution-source-registry/builtin/system-calendar.source.in.h:1
 #: ../src/services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
@@ -185,140 +197,101 @@ msgid "Personal"
 msgstr "個人"
 
 #. System Group: Friends
-#: ../src/addressbook/backends/google/e-book-google-utils.c:1672
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1658
 msgid "Friends"
 msgstr "朋友"
 
 #. System Group: Family
-#: ../src/addressbook/backends/google/e-book-google-utils.c:1674
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1660
 msgid "Family"
 msgstr "家人"
 
 #. System Group: Coworkers
-#: ../src/addressbook/backends/google/e-book-google-utils.c:1676
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1662
 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
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:110
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:112
 msgid "Not connected"
 msgstr "未連線"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:888
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:881
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr "無法使用 v3 或 v2 的 binds 來綁定"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1012
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1005
 msgid "Reconnecting to LDAP server..."
 msgstr "正在重新連接 LDAP 伺服器…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1143
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1140
 msgid "Invalid DN syntax"
 msgstr "無效的 DN 語法"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1159
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4242
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1156
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4325
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "LDAP 錯誤 0x%x (%s)"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1771
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2094
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1772
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2116
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2129
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s：從 ldap_first_entry 傳回 NULL"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2024
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2152
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2043
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2190
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s：傳回未處理的類型 %d"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2285
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2412
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2335
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2474
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr "%s：傳回未處理的搜尋結果類型 %d"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4191
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4261
 msgid "Receiving LDAP search results..."
 msgstr "正在接收 LDAP 搜尋結果…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4375
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4462
 msgid "Error performing search"
 msgstr "進行搜尋時發生錯誤"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4508
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4602
 #, c-format
 msgid "Downloading contacts (%d)..."
 msgstr "下載連絡人 (%d)…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5078
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5093
+msgid "The backend does not support bulk additions"
+msgstr "後端不支援大量增加"
+
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5176
 msgid "Adding contact to LDAP server..."
 msgstr "正在新增連絡人至 LDAP 伺服器…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5153
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5233
+msgid "The backend does not support bulk modifications"
+msgstr "後端不支援大量修改"
+
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5255
 msgid "Modifying contact from LDAP server..."
 msgstr "正在修改 LDAP 伺服器中的連絡人…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5219
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5325
 msgid "Removing contact from LDAP server..."
 msgstr "正在移除 LDAP 伺服器中的連絡人…"
 
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5614
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5743
 #, c-format
 msgid "Failed to get the DN for user “%s”"
 msgstr "無法擷取 DN 給使用者「%s」"
 
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:588
-#: ../src/calendar/backends/http/e-cal-backend-http.c:514
-#, c-format
-msgid "Malformed URI: %s"
-msgstr "格式不良的 URI：%s"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:836
-msgid "Loading Addressbook summary..."
-msgstr "載入通訊錄摘要…"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:864
-#, c-format
-msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
-msgstr "webdav PROPFIND 失敗，HTTP 狀態：%d (%s)"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:883
-msgid "No response body in webdav PROPFIND result"
-msgstr "在 webdav PROPFIND 結果沒有回應本體"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:944
-#, c-format
-msgid "Loading Contacts (%d%%)"
-msgstr "載入聯絡人 (%d%%)"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1358
-msgid "Cannot transform SoupURI to string"
-msgstr "不能將 SoupURI 轉換為字串"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1555
-#, c-format
-msgid "Create resource “%s” failed with HTTP status %d (%s)"
-msgstr "建立資源「%s」失敗，HTTP 狀態：%d (%s)"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1657
-msgid "Contact on server changed -> not modifying"
-msgstr "伺服器上的連絡人已變更 -> 尚未修改"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1665
-#, c-format
-msgid "Modify contact failed with HTTP status %d (%s)"
-msgstr "修改連絡人失敗，HTTP 狀態：%d (%s)"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1758
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1774
-#, c-format
-msgid "DELETE failed with HTTP status %d"
-msgstr "DELETE 失敗，HTTP 狀態：%d"
-
 #: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:38
 msgid "No such book"
 msgstr "沒有這個通訊錄"
@@ -809,7 +782,7 @@ msgid "Birth Date"
 msgstr "出生日期"
 
 #: ../src/addressbook/libebook-contacts/e-contact.c:291
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:946
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:936
 msgid "Anniversary"
 msgstr "週年紀念日"
 
@@ -983,19 +956,21 @@ msgid "Client disappeared"
 msgstr "客戶端已消失"
 
 #: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:905
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:2254
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:2255
 #, c-format
 msgid "Error introspecting unknown summary field “%s”"
 msgstr "插補不明的摘要欄位「%s」時發生錯誤"
 
 #: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:1393
+#: ../src/addressbook/libedata-book/e-book-cache.c:543
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1394
 msgid "Error parsing regular expression"
 msgstr "解析正規表示式時發生錯誤"
 
 #: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:1877
-#: ../src/camel/camel-db.c:802
+#: ../src/addressbook/libedata-book/e-book-cache.c:4522
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1878
+#: ../src/camel/camel-db.c:820
 #, c-format
 msgid "Insufficient memory"
 msgstr "記憶體不足"
@@ -1006,7 +981,8 @@ msgid "Invalid contact field “%d” specified in summary"
 msgstr "在摘要中指定了無效的連絡人欄位「%d」"
 
 #: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:604
+#: ../src/addressbook/libedata-book/e-book-cache.c:366
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:605
 #, c-format
 msgid ""
 "Contact field “%s” of type “%s” specified in summary, but only boolean, "
@@ -1016,32 +992,33 @@ msgstr ""
 "列表欄位類型"
 
 #: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3073
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4176
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4177
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. vcards cannot be returned."
 msgstr "完整搜尋連絡人未儲存於快取。不能傳回 vcard。"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4307
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4400
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:5817
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4308
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4401
+#: ../src/addressbook/libedata-book/e-book-cache.c:3441
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5840
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr "查詢包含了不支援的元素"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4311
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4312
 #, c-format
 msgid "Invalid Query"
 msgstr "無效的查詢"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4335
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4336
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
 "supported."
 msgstr "完整搜尋連絡人未儲存於快取。因此只支援摘要查詢。"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4404
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4405
 #: ../src/addressbook/libedata-book/e-data-book.c:394
 #: ../src/addressbook/libedata-book/e-data-book.c:1144
 #: ../src/calendar/libedata-cal/e-data-cal.c:429
@@ -1051,60 +1028,135 @@ msgstr "完整搜尋連絡人未儲存於快取。因此只支援摘要查詢。
 msgid "Invalid query"
 msgstr "無效的查詢"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4447
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4448
 #, c-format
 msgid ""
 "Full vcards are not stored in cache. Hence only summary query is supported."
 msgstr "完整 vcard 未儲存於快取。因此只支援摘要查詢。"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:5270
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:5271
 #, c-format
 msgid "Unable to remove the db file: errno %d"
 msgstr "無法移除 db 檔案：錯誤 %d"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6057
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6457
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6058
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6458
 #, c-format
 msgid "Only summary queries are supported by EbSdbCursor"
 msgstr "EbSdbCursor 只支援摘要查詢。"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6064
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6065
 #, c-format
 msgid "At least one sort field must be specified to use an EbSdbCursor"
 msgstr "必須選擇至少一項排序欄位使用 EbSdbCursor"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6079
 #, c-format
 msgid "Cannot sort by a field that is not in the summary"
 msgstr "不能排序不在摘要中的欄位"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6085
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6086
 #, c-format
 msgid "Cannot sort by a field which may have multiple values"
 msgstr "不能排序可能含有多重數值的欄位"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6218
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:8116
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6219
+#: ../src/addressbook/libedata-book/e-book-cache.c:5608
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:8139
 #, c-format
 msgid ""
 "Tried to step a cursor in reverse, but cursor is already at the beginning of "
 "the contact list"
 msgstr "嘗試反向推進游標，但是游標已在連絡人列表的開頭"
 
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6226
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:8124
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6227
+#: ../src/addressbook/libedata-book/e-book-cache.c:5615
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:8147
 #, c-format
 msgid ""
 "Tried to step a cursor forwards, but cursor is already at the end of the "
 "contact list"
 msgstr "嘗試推進游標，但是游標已在連絡人列表的結尾"
 
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:570
+#: ../src/addressbook/libedata-book/e-book-cache.c:331
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:571
 #, c-format
 msgid "Unsupported contact field “%d” specified in summary"
 msgstr "在摘要中指定了不支援的連絡人欄位「%d」"
 
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:1950
+#: ../src/addressbook/libedata-book/e-book-cache.c:3436
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5833
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1621
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3314
+#, c-format
+msgid "Invalid query: %s"
+msgstr "無效的查詢：%s"
+
+#: ../src/addressbook/libedata-book/e-book-cache.c:3606
+#, fuzzy
+#| msgid "Invalid query for EbSqlCursor"
+msgid "Invalid query for a book cursor"
+msgstr "EbSqlCursor 的無效查詢"
+
+#: ../src/addressbook/libedata-book/e-book-cache.c:4526
+#: ../src/libebackend/e-cache.c:759
+#, fuzzy, c-format
+#| msgid "Cannot open mailbox: %s: "
+msgid "Can’t open database %s: %s"
+msgstr "不能開啟 mailbox：%s"
+
+#: ../src/addressbook/libedata-book/e-book-cache.c:5129
+#: ../src/addressbook/libedata-book/e-book-cache.c:5181
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2730
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2793
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2964
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1342
+#: ../src/libebackend/e-cache.c:1374 ../src/libebackend/e-cache.c:2298
+#: ../src/libebackend/e-cache.c:2338
+#, fuzzy, c-format
+#| msgid "Contact “%s” not found"
+msgid "Object “%s” not found"
+msgstr "找不到連絡人「%s」"
+
+#: ../src/addressbook/libedata-book/e-book-cache.c:5241
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2855
+#, fuzzy, c-format
+#| msgid "Contact “%s” not found"
+msgid "Object with extra “%s” not found"
+msgstr "找不到連絡人「%s」"
+
+#: ../src/addressbook/libedata-book/e-book-cache.c:5395
+#, fuzzy
+#| msgid "At least one sort field must be specified to use an EbSdbCursor"
+msgid "At least one sort field must be specified to use a cursor"
+msgstr "必須選擇至少一項排序欄位使用 EbSdbCursor"
+
+#: ../src/addressbook/libedata-book/e-book-cache.c:5404
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7979
+msgid "Cannot sort by a field that is not a string type"
+msgstr "不能排序不是字串類型的欄位"
+
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1050
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1063
+#, c-format
+msgid "Preloaded object for UID “%s” is invalid"
+msgstr ""
+
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1058
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1071
+#, c-format
+msgid "Received object for UID “%s” is invalid"
+msgstr ""
+
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1885
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:2333
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3210
+#, fuzzy, c-format
+#| msgid "Failed to create child process “%s”: %s"
+msgid "Failed to create cache “%s”:"
+msgstr "無法建構子代處理「%s」：%s"
+
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1951
 msgid ""
 "Cannot upgrade contacts database from a legacy database with more than one "
 "addressbook. Delete one of the entries in the “folders” table first."
@@ -1112,23 +1164,14 @@ msgstr ""
 "有一個以上通訊錄時不能從傳統資料庫升級連絡人資料庫。請先在「folders」表格中刪"
 "除其中一個項目。"
 
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:5810
-#, c-format
-msgid "Invalid query: %s"
-msgstr "無效的查詢：%s"
-
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:5985
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:6008
 msgid "Invalid query for EbSqlCursor"
 msgstr "EbSqlCursor 的無效查詢"
 
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7938
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7961
 msgid "At least one sort field must be specified to use an EbSqlCursor"
 msgstr "要使用 EbSqlCursor 您必須指定至少一個排序欄位"
 
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7956
-msgid "Cannot sort by a field that is not a string type"
-msgstr "不能排序不是字串類型的欄位"
-
 #: ../src/addressbook/libedata-book/e-data-book.c:378
 #: ../src/calendar/libedata-cal/e-data-cal.c:410
 msgid "Success"
@@ -1304,11 +1347,11 @@ msgstr "不能修改連絡人"
 msgid "Cannot remove contacts: "
 msgstr "不能移除連絡人："
 
-#: ../src/addressbook/libedata-book/e-data-book-cursor.c:774
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:777
 msgid "Cursor does not support setting the search expression"
 msgstr "游標不支援設定搜尋正規表示式"
 
-#: ../src/addressbook/libedata-book/e-data-book-cursor.c:857
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:864
 msgid "Cursor does not support step"
 msgstr "游標並不支援步進"
 
@@ -1316,95 +1359,42 @@ msgstr "游標並不支援步進"
 msgid "Cursor does not support alphabetic indexes"
 msgstr "游標不支援字母排列索引"
 
+#: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:92
 #: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:266
 msgid "Unrecognized cursor origin"
 msgstr "無法辨識的游標原始"
 
+#: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:151
 #: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:334
 msgid "Out of sync revision while moving cursor"
 msgstr "當移動游標時用盡同步修訂版"
 
+#: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:222
 #: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:428
 msgid "Alphabetic index was set for incorrect locale"
 msgstr "字母排序索引設定了不正確地區"
 
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:705
-#, c-format
-msgid "Server is unreachable (%s)"
-msgstr "無法連接伺服器 (%s)"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:731
-#, c-format
-msgid "Failed to login to the server: %s"
-msgstr "無法登入伺服器：%s"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:753
-#, c-format
-msgid "Failed to connect to a server using SSL/TLS: %s"
-msgstr "無法使用 SSL/TLS 連線至伺服器：%s"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:769
-#, c-format
-msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
-msgstr "未預期的 HTTP 回應狀態碼 %d (%s) URI：%s"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:790
-msgid "CalDAV backend is not loaded yet"
-msgstr "CalDAV 後端尚未載入"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1232
-#: ../src/libedataserver/e-webdav-discover.c:145
-msgid "Invalid Redirect URL"
-msgstr "無效的重新導向 URL"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:2946
-#, c-format
-msgid "Cannot create local cache folder “%s”"
-msgstr "不能建立本地快取資料夾「%s」"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:3032
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:206
 #, c-format
-msgid ""
-"Server is unreachable, calendar is opened in read-only mode.\n"
-"Error message: %s"
+msgid "Given URL “%s” doesn’t reference CalDAV calendar"
 msgstr ""
-"無法連接伺服器，行事曆會以唯讀模式開啟。\n"
-"錯誤訊息：%s"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:4137
-msgid "CalDAV does not support bulk additions"
-msgstr "CalDAV 不支援大量增加"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:4240
-msgid "CalDAV does not support bulk modifications"
-msgstr "CalDAV 不支援大量修改"
 
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:4521
-msgid "CalDAV does not support bulk removals"
-msgstr "CalDAV 不支援大量移除"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:5268
-msgid "Calendar doesn’t support Free/Busy"
-msgstr "行事曆不支援空閒/忙碌"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:5277
-msgid "Schedule outbox url not found"
-msgstr "找不到排程的寄件匣 url"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:5374
-msgid "Unexpected result in schedule-response"
-msgstr "在排程-回應中未預期的結果"
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1783
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to parse response data"
+msgstr "無法編碼資料"
 
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:948
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:938
 msgid "Birthday"
 msgstr "生日"
 
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:984
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:974
 #, c-format
 msgid "Birthday: %s"
 msgstr "生日：%s"
 
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:1015
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:1005
 #, c-format
 msgid "Anniversary: %s"
 msgstr "紀念日：%s"
@@ -1418,26 +1408,28 @@ msgstr "無法儲存行事曆資料：URI 的格式不正確。"
 msgid "Cannot save calendar data"
 msgstr "不能儲存行事曆資料"
 
-#: ../src/calendar/backends/http/e-cal-backend-http.c:583
-#, c-format
-msgid "Redirected to Invalid URI"
-msgstr "重新指向無效的 URI"
+#: ../src/calendar/backends/http/e-cal-backend-http.c:141
+#, fuzzy
+#| msgid "URI not loaded"
+msgid "URI not set"
+msgstr "URI 未載入"
+
+#: ../src/calendar/backends/http/e-cal-backend-http.c:209
+#, fuzzy, c-format
+#| msgid "Malformed URI: %s"
+msgid "Malformed URI “%s”: %s"
+msgstr "格式不良的 URI：%s"
 
-#: ../src/calendar/backends/http/e-cal-backend-http.c:642
+#: ../src/calendar/backends/http/e-cal-backend-http.c:372
 #, c-format
 msgid "Bad file format."
 msgstr "錯誤的檔案格式。"
 
-#: ../src/calendar/backends/http/e-cal-backend-http.c:652
+#: ../src/calendar/backends/http/e-cal-backend-http.c:381
 #, c-format
 msgid "Not a calendar."
 msgstr "並非行事曆。"
 
-#: ../src/calendar/backends/http/e-cal-backend-http.c:956
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:710
-msgid "Could not create cache file"
-msgstr "無法建構快取檔案"
-
 #: ../src/calendar/backends/weather/e-cal-backend-weather.c:196
 msgid "Could not retrieve weather data"
 msgstr "無法取得天氣資料"
@@ -1506,6 +1498,10 @@ msgstr "%.1f"
 msgid "Forecast"
 msgstr "天氣預報"
 
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:710
+msgid "Could not create cache file"
+msgstr "無法建構快取檔案"
+
 #: ../src/calendar/libecal/e-cal.c:2304
 msgid "Repository is offline"
 msgstr "倉庫已離線"
@@ -1562,7 +1558,7 @@ msgid "Authentication failed"
 msgstr "核對失敗"
 
 #: ../src/calendar/libecal/e-cal.c:2330
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1126
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1124
 #: ../src/libedataserver/e-client.c:150
 msgid "Authentication required"
 msgstr "要求核對"
@@ -1595,265 +1591,1066 @@ msgstr "不明的行事曆屬性「%s」"
 msgid "Cannot change value of calendar property “%s”"
 msgstr "不能改變行事曆屬性「%s」的數值"
 
-#: ../src/calendar/libecal/e-cal-component.c:1358
+#: ../src/calendar/libecal/e-cal-component.c:1330
 msgid "Untitled appointment"
 msgstr "未命名的約會"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4739
+#: ../src/calendar/libecal/e-cal-recur.c:4751
 msgid "1st"
 msgstr "1日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4740
+#: ../src/calendar/libecal/e-cal-recur.c:4752
 msgid "2nd"
 msgstr "2日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4741
+#: ../src/calendar/libecal/e-cal-recur.c:4753
 msgid "3rd"
 msgstr "3日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4742
+#: ../src/calendar/libecal/e-cal-recur.c:4754
 msgid "4th"
 msgstr "4日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4743
+#: ../src/calendar/libecal/e-cal-recur.c:4755
 msgid "5th"
 msgstr "5日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4744
+#: ../src/calendar/libecal/e-cal-recur.c:4756
 msgid "6th"
 msgstr "6日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4745
+#: ../src/calendar/libecal/e-cal-recur.c:4757
 msgid "7th"
 msgstr "7日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4746
+#: ../src/calendar/libecal/e-cal-recur.c:4758
 msgid "8th"
 msgstr "8日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4747
+#: ../src/calendar/libecal/e-cal-recur.c:4759
 msgid "9th"
 msgstr "9日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4748
+#: ../src/calendar/libecal/e-cal-recur.c:4760
 msgid "10th"
 msgstr "10日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4749
+#: ../src/calendar/libecal/e-cal-recur.c:4761
 msgid "11th"
 msgstr "11日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4750
+#: ../src/calendar/libecal/e-cal-recur.c:4762
 msgid "12th"
 msgstr "12日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4751
+#: ../src/calendar/libecal/e-cal-recur.c:4763
 msgid "13th"
 msgstr "13日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4752
+#: ../src/calendar/libecal/e-cal-recur.c:4764
 msgid "14th"
 msgstr "14日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4753
+#: ../src/calendar/libecal/e-cal-recur.c:4765
 msgid "15th"
 msgstr "15日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4754
+#: ../src/calendar/libecal/e-cal-recur.c:4766
 msgid "16th"
 msgstr "16日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4755
+#: ../src/calendar/libecal/e-cal-recur.c:4767
 msgid "17th"
 msgstr "17日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4756
+#: ../src/calendar/libecal/e-cal-recur.c:4768
 msgid "18th"
 msgstr "18日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4757
+#: ../src/calendar/libecal/e-cal-recur.c:4769
 msgid "19th"
 msgstr "19日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4758
+#: ../src/calendar/libecal/e-cal-recur.c:4770
 msgid "20th"
 msgstr "20日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4759
+#: ../src/calendar/libecal/e-cal-recur.c:4771
 msgid "21st"
 msgstr "21日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4760
+#: ../src/calendar/libecal/e-cal-recur.c:4772
 msgid "22nd"
 msgstr "22日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4761
+#: ../src/calendar/libecal/e-cal-recur.c:4773
 msgid "23rd"
 msgstr "23日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4762
+#: ../src/calendar/libecal/e-cal-recur.c:4774
 msgid "24th"
 msgstr "24日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4763
+#: ../src/calendar/libecal/e-cal-recur.c:4775
 msgid "25th"
 msgstr "25日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4764
+#: ../src/calendar/libecal/e-cal-recur.c:4776
 msgid "26th"
 msgstr "26日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4765
+#: ../src/calendar/libecal/e-cal-recur.c:4777
 msgid "27th"
 msgstr "27日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4766
+#: ../src/calendar/libecal/e-cal-recur.c:4778
 msgid "28th"
 msgstr "28日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4767
+#: ../src/calendar/libecal/e-cal-recur.c:4779
 msgid "29th"
 msgstr "29日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4768
+#: ../src/calendar/libecal/e-cal-recur.c:4780
 msgid "30th"
 msgstr "30日"
 
-#: ../src/calendar/libecal/e-cal-recur.c:4769
+#: ../src/calendar/libecal/e-cal-recur.c:4781
 msgid "31st"
 msgstr "31日"
 
-#: ../src/calendar/libecal/e-cal-util.c:707
-#: ../src/calendar/libecal/e-cal-util.c:734
-msgctxt "Priority"
-msgid "High"
-msgstr "高"
-
-#: ../src/calendar/libecal/e-cal-util.c:709
-#: ../src/calendar/libecal/e-cal-util.c:736
-msgctxt "Priority"
-msgid "Normal"
-msgstr "中"
-
-#: ../src/calendar/libecal/e-cal-util.c:711
-#: ../src/calendar/libecal/e-cal-util.c:738
-msgctxt "Priority"
-msgid "Low"
-msgstr "低"
-
-#. An empty string is the same as 'None'.
-#: ../src/calendar/libecal/e-cal-util.c:732
-msgctxt "Priority"
-msgid "Undefined"
-msgstr "未定義"
-
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:83
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1061
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1377
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1504
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1553
+#: ../src/calendar/libecal/e-cal-recur.c:4940
 #, c-format
-msgid "“%s” expects one argument"
-msgstr "「%s」需要一個引數"
+msgid "every day forever"
+msgid_plural "every %d days forever"
+msgstr[0] ""
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:90
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:672
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1384
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1392
+#: ../src/calendar/libecal/e-cal-recur.c:4946
 #, c-format
-msgid "“%s” expects the first argument to be a string"
-msgstr "「%s」的第一個引數必須為字串"
+msgid "Every day forever"
+msgid_plural "Every %d days forever"
+msgstr[0] ""
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:165
+#: ../src/calendar/libecal/e-cal-recur.c:4954
 #, c-format
-msgid "“%s” expects two or three arguments"
-msgstr "「%s」需要二或三個引數"
+msgid "every day"
+msgid_plural "every %d days"
+msgstr[0] ""
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:172
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:261
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:323
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:822
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1068
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1453
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1511
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1560
+#: ../src/calendar/libecal/e-cal-recur.c:4960
 #, c-format
-msgid "“%s” expects the first argument to be a time_t"
-msgstr "「%s」的第一個引數必須為 time_t"
+msgid "Every day"
+msgid_plural "Every %d days"
+msgstr[0] ""
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:181
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:269
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:333
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:831
+#: ../src/calendar/libecal/e-cal-recur.c:5050
 #, c-format
-msgid "“%s” expects the second argument to be a time_t"
-msgstr "「%s」的第二個引數必須為 time_t"
+msgid "every week"
+msgid_plural "every %d weeks"
+msgstr[0] ""
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:191
+#: ../src/calendar/libecal/e-cal-recur.c:5056
 #, c-format
-msgid "“%s” expects the third argument to be a string"
-msgstr "「%s」的第三個引數必須為字串"
+msgid "Every week"
+msgid_plural "Every %d weeks"
+msgstr[0] ""
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:253
+#. Translators: This is used to merge set of week day names in a recurrence, which can contain any
+#. of the week day names. The string always starts with "on DAYNAME", then it can continue either
+#. with ", DAYNAME" or " and DAYNAME", thus it can be something like "on Monday and Tuesday"
+#. or "on Monday, Wednesday and Friday" or simply "on Saturday". The '%1$s' is replaced with
+#. the previously gathered text, while the '%2$s' is replaced with the text to append.
+#: ../src/calendar/libecal/e-cal-recur.c:5070
 #, c-format
-msgid "“%s” expects none or two arguments"
-msgstr "「%s」需要零或二個引數"
+msgctxt "recur-description-dayname"
+msgid "%1$s%2$s"
+msgstr ""
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:316
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:665
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:815
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1446
-#, c-format
-msgid "“%s” expects two arguments"
-msgstr "「%s」需要兩個引數"
+#: ../src/calendar/libecal/e-cal-recur.c:5087
+msgctxt "recur-description"
+msgid "on Sunday"
+msgstr ""
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:601
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:624
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:747
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:779
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:986
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1019
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1338
-#, c-format
-msgid "“%s” expects no arguments"
-msgstr "「%s」不需要引數"
+#: ../src/calendar/libecal/e-cal-recur.c:5088
+msgctxt "recur-description"
+msgid ", Sunday"
+msgstr ""
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:681
-#, c-format
-msgid "“%s” expects the second argument to be a string"
-msgstr "「%s」的第二個引數必須為字串"
+#: ../src/calendar/libecal/e-cal-recur.c:5089
+msgctxt "recur-description"
+msgid " and Sunday"
+msgstr ""
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:712
-#, c-format
-msgid ""
-"“%s” expects the first argument to be either “any”, “summary”, or "
-"“description”, or “location”, or “attendee”, or “organizer”, or "
-"“classification”"
+#: ../src/calendar/libecal/e-cal-recur.c:5092
+msgctxt "recur-description"
+msgid "on Monday"
 msgstr ""
-"「%s」的第一個引數必須為「任何」、「摘要」、「描述」、「位置」、「到會者」、"
-"「召集人」、「分類」其中之一"
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:883
-#, c-format
-msgid "“%s” expects at least one argument"
-msgstr "「%s」需要至少一個引數"
+#: ../src/calendar/libecal/e-cal-recur.c:5093
+msgctxt "recur-description"
+msgid ", Monday"
+msgstr ""
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:898
-#, 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)"
+#: ../src/calendar/libecal/e-cal-recur.c:5094
+msgctxt "recur-description"
+msgid " and Monday"
+msgstr ""
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1401
-#, c-format
-msgid "“%s” expects the first argument to be an ISO 8601 date/time string"
-msgstr "「%s」的第一個引數必須為 ISO 8601 日期/時間字串"
+#: ../src/calendar/libecal/e-cal-recur.c:5097
+msgctxt "recur-description"
+msgid "on Tuesday"
+msgstr ""
 
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1462
-#, c-format
-msgid "“%s” expects the second argument to be an integer"
-msgstr "「%s」的第二個引數必須為整數"
+#: ../src/calendar/libecal/e-cal-recur.c:5098
+msgctxt "recur-description"
+msgid ", Tuesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5099
+msgctxt "recur-description"
+msgid " and Tuesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5102
+msgctxt "recur-description"
+msgid "on Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5103
+msgctxt "recur-description"
+msgid ", Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5104
+msgctxt "recur-description"
+msgid " and Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5107
+msgctxt "recur-description"
+msgid "on Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5108
+msgctxt "recur-description"
+msgid ", Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5109
+msgctxt "recur-description"
+msgid " and Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5112
+#, fuzzy
+#| msgctxt "CategoryName"
+#| msgid "Holiday"
+msgctxt "recur-description"
+msgid "on Friday"
+msgstr "假日"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5113
+msgctxt "recur-description"
+msgid ", Friday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5114
+msgctxt "recur-description"
+msgid " and Friday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5117
+msgctxt "recur-description"
+msgid "on Saturday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5118
+msgctxt "recur-description"
+msgid ", Saturday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5119
+msgctxt "recur-description"
+msgid " and Saturday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5252
+#, c-format
+msgid "every month"
+msgid_plural "every %d months"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5258
+#, c-format
+msgid "Every month"
+msgid_plural "Every %d months"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5268
+#: ../src/calendar/libecal/e-cal-recur.c:5589
+msgctxt "recur-description"
+msgid "on the last Sunday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5271
+#: ../src/calendar/libecal/e-cal-recur.c:5439
+msgctxt "recur-description"
+msgid "on the last Monday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5274
+#: ../src/calendar/libecal/e-cal-recur.c:5464
+msgctxt "recur-description"
+msgid "on the last Tuesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5277
+#: ../src/calendar/libecal/e-cal-recur.c:5489
+msgctxt "recur-description"
+msgid "on the last Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5280
+#: ../src/calendar/libecal/e-cal-recur.c:5514
+msgctxt "recur-description"
+msgid "on the last Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5283
+#: ../src/calendar/libecal/e-cal-recur.c:5539
+msgctxt "recur-description"
+msgid "on the last Friday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5286
+#: ../src/calendar/libecal/e-cal-recur.c:5564
+msgctxt "recur-description"
+msgid "on the last Saturday"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5296
+msgctxt "recur-description"
+msgid "on the 1st day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5300
+msgctxt "recur-description"
+msgid "on the 2nd day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5304
+msgctxt "recur-description"
+msgid "on the 3rd day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5308
+msgctxt "recur-description"
+msgid "on the 4th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5312
+msgctxt "recur-description"
+msgid "on the 5th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5316
+msgctxt "recur-description"
+msgid "on the 6th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5320
+msgctxt "recur-description"
+msgid "on the 7th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5324
+msgctxt "recur-description"
+msgid "on the 8th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5328
+msgctxt "recur-description"
+msgid "on the 9th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5332
+msgctxt "recur-description"
+msgid "on the 10th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5336
+msgctxt "recur-description"
+msgid "on the 11th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5340
+msgctxt "recur-description"
+msgid "on the 12th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5344
+msgctxt "recur-description"
+msgid "on the 13th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5348
+msgctxt "recur-description"
+msgid "on the 14th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5352
+msgctxt "recur-description"
+msgid "on the 15th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5356
+msgctxt "recur-description"
+msgid "on the 16th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5360
+msgctxt "recur-description"
+msgid "on the 17th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5364
+msgctxt "recur-description"
+msgid "on the 18th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5368
+msgctxt "recur-description"
+msgid "on the 19th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5372
+msgctxt "recur-description"
+msgid "on the 20th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5376
+msgctxt "recur-description"
+msgid "on the 21st day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5380
+msgctxt "recur-description"
+msgid "on the 22nd day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5384
+msgctxt "recur-description"
+msgid "on the 23rd day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5388
+msgctxt "recur-description"
+msgid "on the 24th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5392
+msgctxt "recur-description"
+msgid "on the 25th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5396
+msgctxt "recur-description"
+msgid "on the 26th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5400
+msgctxt "recur-description"
+msgid "on the 27th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5404
+msgctxt "recur-description"
+msgid "on the 28th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5408
+msgctxt "recur-description"
+msgid "on the 29th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5412
+msgctxt "recur-description"
+msgid "on the 30th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5416
+msgctxt "recur-description"
+msgid "on the 31st day"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5424
+msgctxt "recur-description"
+msgid "on the first Monday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5427
+msgctxt "recur-description"
+msgid "on the second Monday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5430
+msgctxt "recur-description"
+msgid "on the third Monday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5433
+msgctxt "recur-description"
+msgid "on the fourth Monday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5436
+msgctxt "recur-description"
+msgid "on the fifth Monday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5449
+msgctxt "recur-description"
+msgid "on the first Tuesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5452
+msgctxt "recur-description"
+msgid "on the second Tuesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5455
+msgctxt "recur-description"
+msgid "on the third Tuesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5458
+msgctxt "recur-description"
+msgid "on the fourth Tuesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5461
+msgctxt "recur-description"
+msgid "on the fifth Tuesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5474
+msgctxt "recur-description"
+msgid "on the first Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5477
+msgctxt "recur-description"
+msgid "on the second Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5480
+msgctxt "recur-description"
+msgid "on the third Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5483
+msgctxt "recur-description"
+msgid "on the fourth Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5486
+msgctxt "recur-description"
+msgid "on the fifth Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5499
+msgctxt "recur-description"
+msgid "on the first Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5502
+msgctxt "recur-description"
+msgid "on the second Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5505
+msgctxt "recur-description"
+msgid "on the third Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5508
+msgctxt "recur-description"
+msgid "on the fourth Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5511
+msgctxt "recur-description"
+msgid "on the fifth Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5524
+msgctxt "recur-description"
+msgid "on the first Friday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5527
+msgctxt "recur-description"
+msgid "on the second Friday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5530
+msgctxt "recur-description"
+msgid "on the third Friday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5533
+msgctxt "recur-description"
+msgid "on the fourth Friday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5536
+msgctxt "recur-description"
+msgid "on the fifth Friday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5549
+msgctxt "recur-description"
+msgid "on the first Saturday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5552
+msgctxt "recur-description"
+msgid "on the second Saturday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5555
+msgctxt "recur-description"
+msgid "on the third Saturday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5558
+msgctxt "recur-description"
+msgid "on the fourth Saturday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5561
+msgctxt "recur-description"
+msgid "on the fifth Saturday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5574
+msgctxt "recur-description"
+msgid "on the first Sunday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5577
+msgctxt "recur-description"
+msgid "on the second Sunday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5580
+msgctxt "recur-description"
+msgid "on the third Sunday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5583
+msgctxt "recur-description"
+msgid "on the fourth Sunday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5586
+msgctxt "recur-description"
+msgid "on the fifth Sunday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5615
+#, c-format
+msgid "every year forever"
+msgid_plural "every %d years forever"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5621
+#, c-format
+msgid "Every year forever"
+msgid_plural "Every %d years forever"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5629
+#, c-format
+msgid "every year"
+msgid_plural "every %d years"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5635
+#, c-format
+msgid "Every year"
+msgid_plural "Every %d years"
+msgstr[0] ""
+
+#. Translators: This is one of the last possible parts of a recurrence description.
+#. The text is appended at the end of the complete recurrence description, making it
+#. for example: "Every 3 days for 10 occurrences"
+#: ../src/calendar/libecal/e-cal-recur.c:5654
+#, c-format
+msgid "for one occurrence"
+msgid_plural "for %d occurrences"
+msgstr[0] ""
+
+#. Translators: This is one of the last possible parts of a recurrence description.
+#. The '%s' is replaced with actual date, thus it can create something like
+#. "until Mon 15.1.2018". The text is appended at the end of the complete
+#. recurrence description, making it for example: "Every 3 days until Mon 15.1.2018"
+#: ../src/calendar/libecal/e-cal-recur.c:5689
+#, c-format
+msgctxt "recur-description"
+msgid "until %s"
+msgstr ""
+
+#. Translators: This is one of the last possible parts of a recurrence description.
+#. The text is appended at the end of the complete recurrence description, making it
+#. for example: "Every 2 months on Tuesday, Thursday and Friday forever"
+#: ../src/calendar/libecal/e-cal-recur.c:5695
+msgctxt "recur-description"
+msgid "forever"
+msgstr ""
+
+#. Translators: This constructs a complete recurrence description; the '%1$s' is like "Every 2 weeks",
+#. the '%2$s' is like "on Tuesday and Friday" and the '%3$s' is like "for 10 occurrences", constructing
+#. together one sentence: "Every 2 weeks on Tuesday and Friday for 10 occurrences".
+#: ../src/calendar/libecal/e-cal-recur.c:5705
+#, c-format
+msgctxt "recur-description"
+msgid "%1$s %2$s %3$s"
+msgstr ""
+
+#. Translators: This constructs a complete recurrence description; the '%1$s' is like "Every 2 days",
+#. the '%2$s' is like "for 10 occurrences", constructing together one sentence:
+#. "Every 2 days for 10 occurrences".
+#: ../src/calendar/libecal/e-cal-recur.c:5710
+#, c-format
+msgctxt "recur-description"
+msgid "%1$s %2$s"
+msgstr ""
+
+#. Translators: This text is appended at the end of complete recur description using "%s%s" in
+#. context "recur-description"
+#: ../src/calendar/libecal/e-cal-recur.c:5726
+#, c-format
+msgid ", with one exception"
+msgid_plural ", with %d exceptions"
+msgstr[0] ""
+
+#. Translators: This appends text like ", with 3 exceptions" at the end of complete recurrence description.
+#. The "%1$s" is replaced with the recurrence description, the "%2$s" with the text about exceptions.
+#. It will form something like: "Every 2 weeks on Tuesday and Friday for 10 occurrences, with 3 exceptions"
+#: ../src/calendar/libecal/e-cal-recur.c:5733
+#, c-format
+msgctxt "recur-description"
+msgid "%1$s%2$s"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5746
+#: ../src/calendar/libecal/e-cal-recur.c:5769
+msgctxt "recur-description"
+msgid "The meeting recurs"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5748
+#: ../src/calendar/libecal/e-cal-recur.c:5771
+#, fuzzy
+#| msgid "Untitled appointment"
+msgctxt "recur-description"
+msgid "The appointment recurs"
+msgstr "未命名的約會"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5751
+#: ../src/calendar/libecal/e-cal-recur.c:5774
+msgctxt "recur-description"
+msgid "The task recurs"
+msgstr ""
+
+#. if (icalcomponent_isa (icalcomp) == ICAL_VJOURNAL_COMPONENT)
+#: ../src/calendar/libecal/e-cal-recur.c:5753
+#: ../src/calendar/libecal/e-cal-recur.c:5776
+msgctxt "recur-description"
+msgid "The memo recurs"
+msgstr ""
+
+#. Translators: This adds a prefix in front of the complete recurrence description.
+#. The '%1$s' is replaced with something like "The meeting recurs" and
+#. the '%2$s' with something like "every 2 days forever", thus forming
+#. sentence like "This meeting recurs every 2 days forever"
+#: ../src/calendar/libecal/e-cal-recur.c:5760
+#, c-format
+msgctxt "recur-description-prefix"
+msgid "%1$s %2$s"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-util.c:746
+#: ../src/calendar/libecal/e-cal-util.c:773
+msgctxt "Priority"
+msgid "High"
+msgstr "高"
+
+#: ../src/calendar/libecal/e-cal-util.c:748
+#: ../src/calendar/libecal/e-cal-util.c:775
+msgctxt "Priority"
+msgid "Normal"
+msgstr "中"
+
+#: ../src/calendar/libecal/e-cal-util.c:750
+#: ../src/calendar/libecal/e-cal-util.c:777
+msgctxt "Priority"
+msgid "Low"
+msgstr "低"
+
+#. An empty string is the same as 'None'.
+#: ../src/calendar/libecal/e-cal-util.c:771
+msgctxt "Priority"
+msgid "Undefined"
+msgstr "未定義"
+
+#: ../src/calendar/libecal/e-cal-util.c:813
+#: ../src/libedataserverui/e-reminders-widget.c:291
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-util.c:822
+#: ../src/libedataserverui/e-reminders-widget.c:287
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-util.c:831
+#: ../src/libedataserverui/e-reminders-widget.c:283
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-util.c:840
+#: ../src/libedataserverui/e-reminders-widget.c:279
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+
+#. Translators: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../src/calendar/libecal/e-cal-util.c:845
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-reminder-watcher.c:2522
+msgid "No Summary"
+msgstr ""
+
+#. Translators: The first %s is replaced with the time string,
+#. the second %s with a duration, and the third %s with an event location,
+#. making it something like: "24.1.2018 10:30 (30 minutes) Meeting room A1"
+#: ../src/calendar/libecal/e-reminder-watcher.c:2538
+#, fuzzy, c-format
+#| msgid "%s (%s)"
+msgctxt "overdue"
+msgid "%s (%s) %s"
+msgstr "%s (%s)"
+
+#. Translators: The first %s is replaced with the time string,
+#. the second %s with a duration, making is something like:
+#. "24.1.2018 10:30 (30 minutes)"
+#: ../src/calendar/libecal/e-reminder-watcher.c:2543
+#, fuzzy, c-format
+#| msgid "%s (%s)"
+msgctxt "overdue"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#. Translators: The first %s is replaced with the time string,
+#. the second %s with an event location, making it something like:
+#. "24.1.2018 10:30 Meeting room A1"
+#: ../src/calendar/libecal/e-reminder-watcher.c:2548
+#, c-format
+msgctxt "overdue"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:83
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1086
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1399
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1526
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1575
+#, c-format
+msgid "“%s” expects one argument"
+msgstr "「%s」需要一個引數"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:90
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:689
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1406
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1414
+#, c-format
+msgid "“%s” expects the first argument to be a string"
+msgstr "「%s」的第一個引數必須為字串"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:165
+#, c-format
+msgid "“%s” expects two or three arguments"
+msgstr "「%s」需要二或三個引數"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:172
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:261
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:323
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:839
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1093
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1475
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1533
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1582
+#, c-format
+msgid "“%s” expects the first argument to be a time_t"
+msgstr "「%s」的第一個引數必須為 time_t"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:181
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:269
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:333
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:848
+#, c-format
+msgid "“%s” expects the second argument to be a time_t"
+msgstr "「%s」的第二個引數必須為 time_t"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:191
+#, c-format
+msgid "“%s” expects the third argument to be a string"
+msgstr "「%s」的第三個引數必須為字串"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:253
+#, c-format
+msgid "“%s” expects none or two arguments"
+msgstr "「%s」需要零或二個引數"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:316
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:682
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1468
+#, c-format
+msgid "“%s” expects two arguments"
+msgstr "「%s」需要兩個引數"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:615
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:638
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:764
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:796
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1005
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1038
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1360
+#, c-format
+msgid "“%s” expects no arguments"
+msgstr "「%s」不需要引數"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:698
+#, c-format
+msgid "“%s” expects the second argument to be a string"
+msgstr "「%s」的第二個引數必須為字串"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:729
+#, c-format
+msgid ""
+"“%s” expects the first argument to be either “any”, “summary”, or "
+"“description”, or “location”, or “attendee”, or “organizer”, or "
+"“classification”"
+msgstr ""
+"「%s」的第一個引數必須為「任何」、「摘要」、「描述」、「位置」、「到會者」、"
+"「召集人」、「分類」其中之一"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:900
+#, c-format
+msgid "“%s” expects at least one argument"
+msgstr "「%s」需要至少一個引數"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:915
+#, 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)"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1423
+#, c-format
+msgid "“%s” expects the first argument to be an ISO 8601 date/time string"
+msgstr "「%s」的第一個引數必須為 ISO 8601 日期/時間字串"
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1484
+#, c-format
+msgid "“%s” expects the second argument to be an integer"
+msgstr "「%s」的第二個引數必須為整數"
+
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1756
+#, fuzzy, c-format
+#| msgid "Failed to create hardlink for resource “%s”: %s"
+msgid "Failed to create SQLite function, error code “%d”: %s"
+msgstr "無法建立資源「%s」的硬連結：%s"
+
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2728
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2791
+#, fuzzy, c-format
+#| msgid "Contact “%s” not found"
+msgid "Object “%s”, “%s” not found"
+msgstr "找不到連絡人「%s」"
+
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3531
+#, fuzzy
+#| msgid "Cannot add contact: "
+msgid "Cannot add timezone without tzid"
+msgstr "不能加入連絡人："
+
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3540
+#, fuzzy
+#| msgid "Cannot authenticate without a username"
+msgid "Cannot add timezone without component"
+msgstr "不能核對沒有使用者名稱"
+
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3546
+#, fuzzy
+#| msgid "Cannot send message: one or more invalid recipients"
+msgid "Cannot add timezone with invalid component"
+msgstr "不能傳送郵件：一或多個無效的收件者"
+
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1118
+#, c-format
+msgid "Received object for UID “%s” doesn’t contain any expected component"
+msgstr ""
+
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:4037
+msgid "attachment.dat"
+msgstr ""
 
 #: ../src/calendar/libedata-cal/e-data-cal.c:421
 msgid "Unsupported method"
@@ -1953,15 +2750,15 @@ msgstr "這種加密方式不支援加密"
 msgid "Decryption is not supported by this cipher"
 msgstr "這種加密方式不支援解密"
 
-#: ../src/camel/camel-cipher-context.c:361
+#: ../src/camel/camel-cipher-context.c:362
 msgid "Signing message"
 msgstr "正在簽署訊息"
 
-#: ../src/camel/camel-cipher-context.c:651
+#: ../src/camel/camel-cipher-context.c:654
 msgid "Encrypting message"
 msgstr "正在加密訊息"
 
-#: ../src/camel/camel-cipher-context.c:823
+#: ../src/camel/camel-cipher-context.c:827
 msgid "Decrypting message"
 msgstr "正在解密訊息"
 
@@ -1979,113 +2776,129 @@ msgstr "清空快取檔案"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "無法移除快取項目： %s： %s"
 
-#: ../src/camel/camel-db.c:855
+#: ../src/camel/camel-db.c:874
 #: ../src/camel/providers/local/camel-mbox-store.c:904
 #, c-format
 msgid "Could not rename “%s” to %s: %s"
 msgstr "無法將「%s」重新命名成 %s：%s"
 
-#: ../src/camel/camel-filter-driver.c:990
-#: ../src/camel/camel-filter-search.c:779
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-filter-driver.c:262
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in “%s : %s”"
+msgid "Transferring filtered messages in “%s : %s”"
+msgstr "掃描「%s：%s」中變更過的郵件"
+
+#: ../src/camel/camel-filter-driver.c:1127
+#: ../src/camel/camel-filter-search.c:930
 #, c-format
 msgid "Failed to create child process “%s”: %s"
 msgstr "無法建構子代處理「%s」：%s"
 
-#: ../src/camel/camel-filter-driver.c:1038
+#: ../src/camel/camel-filter-driver.c:1175
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "無法讀取 %s 的歡迎辭： %s"
 
-#: ../src/camel/camel-filter-driver.c:1245
-#: ../src/camel/camel-filter-driver.c:1254
+#: ../src/camel/camel-filter-driver.c:1396
+#: ../src/camel/camel-filter-driver.c:1409
 msgid "Syncing folders"
 msgstr "同步處理資料夾"
 
-#: ../src/camel/camel-filter-driver.c:1352
+#: ../src/camel/camel-filter-driver.c:1517
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "分析過濾器發生錯誤： %s: %s"
 
-#: ../src/camel/camel-filter-driver.c:1363
+#: ../src/camel/camel-filter-driver.c:1528
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "執行過濾器發生錯誤： %s: %s"
 
-#: ../src/camel/camel-filter-driver.c:1460
+#: ../src/camel/camel-filter-driver.c:1626
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "無法開啟排程器資料夾"
 
-#: ../src/camel/camel-filter-driver.c:1472
+#: ../src/camel/camel-filter-driver.c:1638
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "無法處理排程器資料夾"
 
-#: ../src/camel/camel-filter-driver.c:1496
+#: ../src/camel/camel-filter-driver.c:1669
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "接收郵件 %d (%d%%)"
 
-#: ../src/camel/camel-filter-driver.c:1505
-#: ../src/camel/camel-filter-driver.c:1528
+#: ../src/camel/camel-filter-driver.c:1678
+#: ../src/camel/camel-filter-driver.c:1701
 #, c-format
 msgid "Failed on message %d"
 msgstr "在第 %d 封郵件發生錯誤"
 
-#: ../src/camel/camel-filter-driver.c:1547
-#: ../src/camel/camel-filter-driver.c:1661
+#: ../src/camel/camel-filter-driver.c:1719
+#: ../src/camel/camel-filter-driver.c:1851
+#, fuzzy, c-format
+#| msgid "Failed on message %d"
+msgid "Failed to transfer messages: %s"
+msgstr "在第 %d 封郵件發生錯誤"
+
+#: ../src/camel/camel-filter-driver.c:1729
+#: ../src/camel/camel-filter-driver.c:1865
 msgid "Syncing folder"
 msgstr "同步處理資料夾"
 
-#: ../src/camel/camel-filter-driver.c:1552
-#: ../src/camel/camel-filter-driver.c:1669
+#: ../src/camel/camel-filter-driver.c:1734
+#: ../src/camel/camel-filter-driver.c:1873
 msgid "Complete"
 msgstr "完成"
 
-#: ../src/camel/camel-filter-driver.c:1615
+#: ../src/camel/camel-filter-driver.c:1805
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "正在接收第 %d / %d 封郵件"
 
-#: ../src/camel/camel-filter-driver.c:1633
+#: ../src/camel/camel-filter-driver.c:1823
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d / %d 封郵件失敗"
 
-#: ../src/camel/camel-filter-driver.c:1828
-#: ../src/camel/camel-filter-driver.c:1855
+#: ../src/camel/camel-filter-driver.c:2033
+#: ../src/camel/camel-filter-driver.c:2057
 #, c-format
 msgid "Execution of filter “%s” failed: "
 msgstr "過濾器「%s」的執行失敗："
 
-#: ../src/camel/camel-filter-driver.c:1845
+#: ../src/camel/camel-filter-driver.c:2047
 #, c-format
 msgid "Error parsing filter “%s”: %s: %s"
 msgstr "分析過濾器「%s」發生錯誤：%s：%s"
 
-#: ../src/camel/camel-filter-driver.c:1864
+#: ../src/camel/camel-filter-driver.c:2066
 #, c-format
 msgid "Error executing filter “%s”: %s: %s"
 msgstr "執行過濾器「%s」發生錯誤：%s：%s"
 
-#: ../src/camel/camel-filter-search.c:137
+#: ../src/camel/camel-filter-search.c:167
 msgid "Failed to retrieve message"
 msgstr "取回郵件失敗。"
 
-#: ../src/camel/camel-filter-search.c:519
+#: ../src/camel/camel-filter-search.c:631
 msgid "Invalid arguments to (system-flag)"
 msgstr "無效的參數給 (system-flag)"
 
-#: ../src/camel/camel-filter-search.c:537
+#: ../src/camel/camel-filter-search.c:650
 msgid "Invalid arguments to (user-tag)"
 msgstr "無效的參數給 (user-tag)"
 
-#: ../src/camel/camel-filter-search.c:1066
+#: ../src/camel/camel-filter-search.c:1232
 msgid "Invalid arguments to (message-location)"
 msgstr "無效的引數 (訊息-位置)"
 
-#: ../src/camel/camel-filter-search.c:1147
-#: ../src/camel/camel-filter-search.c:1158
+#: ../src/camel/camel-filter-search.c:1331
+#: ../src/camel/camel-filter-search.c:1342
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "執行過濾器搜尋發生錯誤： %s: %s"
@@ -2111,25 +2924,25 @@ msgstr[0] "正在學習「%s：%s」中的廣告郵件"
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:405
+#: ../src/camel/camel-folder.c:402
 #, c-format
 msgid "Filtering new message in “%s : %s”"
 msgid_plural "Filtering new messages in “%s : %s”"
 msgstr[0] "正在過濾「%s：%s」中的新郵件"
 
-#: ../src/camel/camel-folder.c:1016
-#: ../src/camel/providers/local/camel-maildir-folder.c:330
+#: ../src/camel/camel-folder.c:1004
+#: ../src/camel/providers/local/camel-maildir-folder.c:331
 msgid "Moving messages"
 msgstr "正在移動郵件"
 
-#: ../src/camel/camel-folder.c:1019
+#: ../src/camel/camel-folder.c:1007
 msgid "Copying messages"
 msgstr "正在複製郵件"
 
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:1064
+#: ../src/camel/camel-folder.c:1052
 #, c-format
 msgid "Quota information not supported for folder “%s : %s”"
 msgstr "資料夾「%s：%s」不支援限額資訊"
@@ -2137,7 +2950,7 @@ msgstr "資料夾「%s：%s」不支援限額資訊"
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:1166
+#: ../src/camel/camel-folder.c:1154
 #, c-format
 msgid "Filtering folder “%s : %s”"
 msgstr "過濾資料夾「%s：%s」"
@@ -2145,7 +2958,7 @@ msgstr "過濾資料夾「%s：%s」"
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:2971
+#: ../src/camel/camel-folder.c:2987
 #, c-format
 msgid "Expunging folder “%s : %s”"
 msgstr "刪除資料夾「%s：%s」"
@@ -2153,7 +2966,7 @@ msgstr "刪除資料夾「%s：%s」"
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:3105
+#: ../src/camel/camel-folder.c:3122
 #, c-format
 msgid "Retrieving message “%s” in “%s : %s”"
 msgstr "接收「%2$s：%3$s」中的郵件「%1$s」"
@@ -2161,7 +2974,7 @@ msgstr "接收「%2$s：%3$s」中的郵件「%1$s」"
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:3327
+#: ../src/camel/camel-folder.c:3347
 #, c-format
 msgid "Retrieving quota information for “%s : %s”"
 msgstr "取得「%s：%s」的用量限額資訊"
@@ -2169,45 +2982,45 @@ msgstr "取得「%s：%s」的用量限額資訊"
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:3625
+#: ../src/camel/camel-folder.c:3647
 #, c-format
 msgid "Refreshing folder “%s : %s”"
 msgstr "重新整理資料夾「%s：%s」"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../src/camel/camel-folder-search.c:898
-#: ../src/camel/camel-folder-search.c:940
+#: ../src/camel/camel-folder-search.c:920
+#: ../src/camel/camel-folder-search.c:963
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) 需要單一布林值結果"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../src/camel/camel-folder-search.c:975
+#: ../src/camel/camel-folder-search.c:1001
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) 不允許放在 %s 裡面"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../src/camel/camel-folder-search.c:982
-#: ../src/camel/camel-folder-search.c:990
+#: ../src/camel/camel-folder-search.c:1008
+#: ../src/camel/camel-folder-search.c:1016
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) 需要相符類型字串"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../src/camel/camel-folder-search.c:1018
+#: ../src/camel/camel-folder-search.c:1044
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) 期望陣列結果"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../src/camel/camel-folder-search.c:1028
+#: ../src/camel/camel-folder-search.c:1054
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) 需要資料夾設定"
 
-#: ../src/camel/camel-folder-search.c:2106
-#: ../src/camel/camel-folder-search.c:2280
+#: ../src/camel/camel-folder-search.c:2196
+#: ../src/camel/camel-folder-search.c:2370
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2216,8 +3029,8 @@ msgstr ""
 "不能分析搜尋詞句：%s:\n"
 "%s"
 
-#: ../src/camel/camel-folder-search.c:2118
-#: ../src/camel/camel-folder-search.c:2292
+#: ../src/camel/camel-folder-search.c:2208
+#: ../src/camel/camel-folder-search.c:2382
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2229,29 +3042,29 @@ msgstr ""
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder-summary.c:1612
+#: ../src/camel/camel-folder-summary.c:1663
 #, c-format
 msgid "Release unused memory for folder “%s : %s”"
 msgstr "釋放資料夾「%s：%s」未使用的記憶體"
 
 #. Translators: The '%s' is replaced with the actual path and filename of the used gpg, like '/usr/bin/gpg2'
-#: ../src/camel/camel-gpg-context.c:417
+#: ../src/camel/camel-gpg-context.c:451
 #, c-format
 msgid "Output from %s:"
 msgstr "輸出自 %s："
 
-#: ../src/camel/camel-gpg-context.c:834 ../src/camel/camel-gpg-context.c:839
-#: ../src/camel/camel-gpg-context.c:1543
+#: ../src/camel/camel-gpg-context.c:916 ../src/camel/camel-gpg-context.c:921
+#: ../src/camel/camel-gpg-context.c:1634
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "執行 gpg 失敗： %s"
 
-#: ../src/camel/camel-gpg-context.c:839
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1129
+#: ../src/camel/camel-gpg-context.c:921
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1127
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/camel/camel-gpg-context.c:951
+#: ../src/camel/camel-gpg-context.c:1033
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2262,17 +3075,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/camel/camel-gpg-context.c:987
+#: ../src/camel/camel-gpg-context.c:1069
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "解析 gpg userid 提示時失敗。"
 
-#: ../src/camel/camel-gpg-context.c:1012 ../src/camel/camel-gpg-context.c:1027
+#: ../src/camel/camel-gpg-context.c:1094 ../src/camel/camel-gpg-context.c:1109
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "解析 gpg 密語要求時失敗。"
 
-#: ../src/camel/camel-gpg-context.c:1048
+#: ../src/camel/camel-gpg-context.c:1130
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2281,7 +3094,7 @@ msgstr ""
 "需要 PIN 才能為您的智慧卡解鎖：\n"
 "「%s」"
 
-#: ../src/camel/camel-gpg-context.c:1052
+#: ../src/camel/camel-gpg-context.c:1134
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2290,43 +3103,43 @@ msgstr ""
 "您需要密語才能為此使用者的金鑰解鎖：\n"
 "「%s」"
 
-#: ../src/camel/camel-gpg-context.c:1058
+#: ../src/camel/camel-gpg-context.c:1140
 #, c-format
 msgid "Unexpected request from GnuPG for “%s”"
 msgstr "GnuPG 傳回對「%s」未預期的要求"
 
-#: ../src/camel/camel-gpg-context.c:1070
+#: ../src/camel/camel-gpg-context.c:1152
 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 ""
 "注意加密的內容不會包含收件者資訊，因此每個儲存的私密金鑰都會提示輸入密碼。"
 
-#: ../src/camel/camel-gpg-context.c:1101 ../src/camel/camel-net-utils.c:522
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:398
+#: ../src/camel/camel-gpg-context.c:1183 ../src/camel/camel-net-utils.c:522
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:405
 #: ../src/libedataserver/e-client.c:161
 #, c-format
 msgid "Cancelled"
 msgstr "已取消"
 
-#: ../src/camel/camel-gpg-context.c:1122
+#: ../src/camel/camel-gpg-context.c:1204
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "解鎖私密金鑰時失敗：輸入了 3 次錯誤的密語 。"
 
-#: ../src/camel/camel-gpg-context.c:1135
+#: ../src/camel/camel-gpg-context.c:1217
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "從 GnuPG 傳回意外的回應： %s"
 
-#: ../src/camel/camel-gpg-context.c:1249
+#: ../src/camel/camel-gpg-context.c:1333
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "不能加密郵件：沒有提供有效的收件者。"
 
 #. Translators: The first '%s' is replaced with the e-mail address, like '<user example com>';
 #. the second '%s' is replaced with the actual path and filename of the used gpg, like '/usr/bin/gpg2'
-#: ../src/camel/camel-gpg-context.c:1262
+#: ../src/camel/camel-gpg-context.c:1346
 #, c-format
 msgid ""
 "Failed to encrypt: Invalid recipient %s specified. A common issue is that "
@@ -2335,54 +3148,59 @@ msgstr ""
 "無法加密：指定了無效的收件者 %s。常見的問題是 %s 沒有匯入這個收件者的公開金"
 "鑰。"
 
-#: ../src/camel/camel-gpg-context.c:1972 ../src/camel/camel-smime-context.c:841
+#: ../src/camel/camel-gpg-context.c:2145 ../src/camel/camel-smime-context.c:873
 msgid "Could not generate signing data: "
 msgstr "無法產生簽章資料："
 
-#: ../src/camel/camel-gpg-context.c:2023 ../src/camel/camel-gpg-context.c:2259
-#: ../src/camel/camel-gpg-context.c:2375 ../src/camel/camel-gpg-context.c:2551
+#: ../src/camel/camel-gpg-context.c:2196 ../src/camel/camel-gpg-context.c:2435
+#: ../src/camel/camel-gpg-context.c:2574 ../src/camel/camel-gpg-context.c:2751
 msgid "Failed to execute gpg."
 msgstr "執行 gpg 失敗。"
 
-#: ../src/camel/camel-gpg-context.c:2129 ../src/camel/camel-gpg-context.c:2137
-#: ../src/camel/camel-gpg-context.c:2145 ../src/camel/camel-gpg-context.c:2165
-#: ../src/camel/camel-smime-context.c:970
-#: ../src/camel/camel-smime-context.c:984
-#: ../src/camel/camel-smime-context.c:993
+#: ../src/camel/camel-gpg-context.c:2303 ../src/camel/camel-gpg-context.c:2311
+#: ../src/camel/camel-gpg-context.c:2319 ../src/camel/camel-gpg-context.c:2339
+#: ../src/camel/camel-smime-context.c:1002
+#: ../src/camel/camel-smime-context.c:1016
+#: ../src/camel/camel-smime-context.c:1025
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "不能驗證此郵件的簽章：錯誤的訊息格式"
 
-#: ../src/camel/camel-gpg-context.c:2211
+#: ../src/camel/camel-gpg-context.c:2385
 msgid "Cannot verify message signature: "
 msgstr "不能驗證此郵件的簽章："
 
-#: ../src/camel/camel-gpg-context.c:2340
+#: ../src/camel/camel-gpg-context.c:2533
 msgid "Could not generate encrypting data: "
 msgstr "無法產生加密資料："
 
-#: ../src/camel/camel-gpg-context.c:2415
+#: ../src/camel/camel-gpg-context.c:2614
 msgid "This is a digitally encrypted message part"
 msgstr "這是數位化加密訊息部份"
 
-#: ../src/camel/camel-gpg-context.c:2474 ../src/camel/camel-gpg-context.c:2483
-#: ../src/camel/camel-gpg-context.c:2506
+#: ../src/camel/camel-gpg-context.c:2674 ../src/camel/camel-gpg-context.c:2683
+#: ../src/camel/camel-gpg-context.c:2706
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "不能解密此郵件：錯誤的訊息格式"
 
-#: ../src/camel/camel-gpg-context.c:2494
+#: ../src/camel/camel-gpg-context.c:2694
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "解密 MIME 組件時失敗：通訊協定錯誤"
 
-#: ../src/camel/camel-gpg-context.c:2561
+#: ../src/camel/camel-gpg-context.c:2766
 #, c-format
 msgid "Failed to decrypt MIME part: Secret key not found"
 msgstr "解密 MIME 組件時失敗：找不到密鑰"
 
-#: ../src/camel/camel-gpg-context.c:2597
-#: ../src/camel/camel-smime-context.c:1286
+#: ../src/camel/camel-gpg-context.c:2803
+#, c-format
+msgid "GPG blob contains unencrypted text: %s"
+msgstr ""
+
+#: ../src/camel/camel-gpg-context.c:2805
+#: ../src/camel/camel-smime-context.c:1545
 msgid "Encrypted content"
 msgstr "加密內容"
 
@@ -2520,6 +3338,11 @@ msgstr "主機查詢「%s」失敗。請檢查您的主機名稱是否有拼錯
 msgid "Host lookup “%s” failed: %s"
 msgstr "查詢主機「%s」失敗：%s"
 
+#: ../src/camel/camel-network-service.c:1127
+#, c-format
+msgid "Checking reach-ability of account “%s”"
+msgstr ""
+
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
@@ -2552,10 +3375,27 @@ msgstr "正在檢查「%s：%s」的新郵件用於離線模式"
 msgid "Syncing messages in folder “%s : %s” to disk"
 msgstr "正在將資料夾「%s：%s」中的郵件同步到磁碟"
 
-#: ../src/camel/camel-offline-folder.c:513
+#. Translators: The first “%d” is the sequence number of the message, the second “%d”
+#. is the total number of messages to synchronize.
+#. The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-offline-folder.c:491
+#, fuzzy, c-format
+#| msgid "Syncing messages in folder “%s : %s” to disk"
+msgid "Syncing message %d of %d in folder “%s : %s” to disk"
+msgstr "正在將資料夾「%s：%s」中的郵件同步到磁碟"
+
+#: ../src/camel/camel-offline-folder.c:542
 msgid "Copy folder content locally for _offline operation"
 msgstr "複製資料夾內容至本地用於離線作業(_O)"
 
+#: ../src/camel/camel-offline-store.c:268
+#, fuzzy, c-format
+#| msgid "Syncing messages in folder “%s : %s” to disk"
+msgid "Syncing messages in account “%s” to disk"
+msgstr "正在將資料夾「%s：%s」中的郵件同步到磁碟"
+
 #: ../src/camel/camel-provider.c:89
 msgid "Virtual folder email provider"
 msgstr "虛擬資料夾電子郵件供應商"
@@ -2564,28 +3404,28 @@ msgstr "虛擬資料夾電子郵件供應商"
 msgid "For reading mail as a query of another set of folders"
 msgstr "使讀取郵件如同查詢其他資料夾"
 
-#: ../src/camel/camel-provider.c:294
+#: ../src/camel/camel-provider.c:299
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "無法載入模組 %s： 此系統不支援載入模組。"
 
-#: ../src/camel/camel-provider.c:303
+#: ../src/camel/camel-provider.c:308
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "無法載入 %s：%s"
 
-#: ../src/camel/camel-provider.c:312
+#: ../src/camel/camel-provider.c:317
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "無法載入 %s：模組內沒有初始碼。"
 
-#: ../src/camel/camel-provider.c:458 ../src/camel/camel-session.c:434
+#: ../src/camel/camel-provider.c:463 ../src/camel/camel-session.c:434
 #, c-format
 msgid "No provider available for protocol “%s”"
 msgstr "沒有通訊協定「%s」的提供者"
 
 #: ../src/camel/camel-sasl-anonymous.c:35
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:82
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:85
 msgid "Anonymous"
 msgstr "匿名"
 
@@ -2687,70 +3527,93 @@ msgstr "GSSAPI"
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "這個選項將會使用 Kerberos 5 核對連線至伺服器。"
 
-#: ../src/camel/camel-sasl-gssapi.c:146
+#: ../src/camel/camel-sasl-gssapi.c:149
 #, c-format
 msgid "(Unknown GSSAPI mechanism code: %x)"
 msgstr "(不明的 GSSAPI 機制代碼：%x)"
 
-#: ../src/camel/camel-sasl-gssapi.c:179
+#. Translators: the first '%s' is replaced with a generic error message,
+#. the second '%s' is replaced with additional error information.
+#: ../src/camel/camel-sasl-gssapi.c:172 ../src/camel/camel-sasl-gssapi.c:244
+#, fuzzy, c-format
+#| msgid "%s (%s)"
+msgctxt "gssapi_error"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/camel/camel-sasl-gssapi.c:194
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr "提供的證件不支援指定的機制，或者是執行無法辨識。"
 
-#: ../src/camel/camel-sasl-gssapi.c:184
+#: ../src/camel/camel-sasl-gssapi.c:199
 msgid "The provided target_name parameter was ill-formed."
 msgstr "提供的 target_name 參數格式錯誤。"
 
-#: ../src/camel/camel-sasl-gssapi.c:187
+#: ../src/camel/camel-sasl-gssapi.c:202
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "提供的 target_name 參數包含無效或不支援的名稱類型。"
 
-#: ../src/camel/camel-sasl-gssapi.c:191
+#: ../src/camel/camel-sasl-gssapi.c:206
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr ""
 "input_token 包含不同的通道，透過  input_chan_bindings，連結至這些指定的參數。"
 
-#: ../src/camel/camel-sasl-gssapi.c:196
+#: ../src/camel/camel-sasl-gssapi.c:211
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "input_token 包含無效的簽章，或者無法確認的簽章。"
 
-#: ../src/camel/camel-sasl-gssapi.c:200
+#: ../src/camel/camel-sasl-gssapi.c:215
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 msgstr "提供的證件不適用於網路位置，或者證件識別指標未參照任何憑證。"
 
-#: ../src/camel/camel-sasl-gssapi.c:205
+#: ../src/camel/camel-sasl-gssapi.c:220
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "提供的網路位置識別指標未參照有效的網路位置。"
 
-#: ../src/camel/camel-sasl-gssapi.c:208
+#: ../src/camel/camel-sasl-gssapi.c:223
 msgid "The consistency checks performed on the input_token failed."
 msgstr "在 input_token 執行一致性檢查失敗。"
 
-#: ../src/camel/camel-sasl-gssapi.c:211
+#: ../src/camel/camel-sasl-gssapi.c:226
 msgid "The consistency checks performed on the credential failed."
 msgstr "在證件執行一致性檢查失敗。"
 
-#: ../src/camel/camel-sasl-gssapi.c:214
+#: ../src/camel/camel-sasl-gssapi.c:229
 msgid "The referenced credentials have expired."
 msgstr "參照的證件已經過期。"
 
-#: ../src/camel/camel-sasl-gssapi.c:220 ../src/camel/camel-sasl-gssapi.c:402
-#: ../src/camel/camel-sasl-gssapi.c:451 ../src/camel/camel-sasl-gssapi.c:468
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:797
+#: ../src/camel/camel-sasl-gssapi.c:235 ../src/camel/camel-sasl-gssapi.c:439
+#: ../src/camel/camel-sasl-gssapi.c:489 ../src/camel/camel-sasl-gssapi.c:506
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "來自伺服器的不良許可回應。"
 
-#: ../src/camel/camel-sasl-gssapi.c:480
+#: ../src/camel/camel-sasl-gssapi.c:286
+#, fuzzy
+#| msgid "Could not parse response"
+msgid "Could not get session bus:"
+msgstr "無法解析回應"
+
+#: ../src/camel/camel-sasl-gssapi.c:320
+#, c-format
+msgid ""
+"Cannot ask for Kerberos ticket. Obtain the ticket manually, like on command "
+"line with “kinit” or open “Online Accounts” in “Settings” and add the "
+"Kerberos account there. Reported error was: %s"
+msgstr ""
+
+#: ../src/camel/camel-sasl-gssapi.c:518
 #, c-format
 msgid "Unsupported security layer."
 msgstr "不支援的類型"
@@ -2805,6 +3668,34 @@ msgstr "POP 先於 SMTP 允許使用未知的傳輸"
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "以 %s 服務嘗試 POP 先於 SMTP 核對"
 
+#: ../src/camel/camel-sasl-xoauth2.c:26
+msgid "OAuth2"
+msgstr ""
+
+#: ../src/camel/camel-sasl-xoauth2.c:27
+msgid "This option will use an OAuth 2.0 access token to connect to the server"
+msgstr ""
+
+#: ../src/camel/camel-sasl-xoauth2-google.c:23
+msgid "OAuth2 (Google)"
+msgstr ""
+
+#: ../src/camel/camel-sasl-xoauth2-google.c:24
+msgid ""
+"This option will use an OAuth 2.0 access token to connect to the Google "
+"server"
+msgstr ""
+
+#: ../src/camel/camel-sasl-xoauth2-outlook.c:23
+msgid "OAuth2 (Outlook)"
+msgstr ""
+
+#: ../src/camel/camel-sasl-xoauth2-outlook.c:24
+msgid ""
+"This option will use an OAuth 2.0 access token to connect to the Outlook.com "
+"server"
+msgstr ""
+
 #: ../src/camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
@@ -2816,9 +3707,9 @@ msgid "Invalid GType registered for protocol “%s”"
 msgstr "通訊協定「%s」註冊了無效的 GType"
 
 #: ../src/camel/camel-session.c:512
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2997
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3153
 #: ../src/camel/providers/pop3/camel-pop3-store.c:306
-#: ../src/camel/providers/pop3/camel-pop3-store.c:788
+#: ../src/camel/providers/pop3/camel-pop3-store.c:790
 #: ../src/camel/providers/smtp/camel-smtp-transport.c:670
 #, c-format
 msgid "No support for %s authentication"
@@ -2833,241 +3724,246 @@ msgstr "%s 核對失敗"
 msgid "Forwarding messages is not supported"
 msgstr "不支援轉寄郵件"
 
-#: ../src/camel/camel-smime-context.c:346
-#: ../src/camel/camel-smime-context.c:1073
+#: ../src/camel/camel-smime-context.c:347
 #, c-format
 msgid "Cannot find certificate for “%s”"
 msgstr "找不到「%s」的憑證"
 
-#: ../src/camel/camel-smime-context.c:374
+#: ../src/camel/camel-smime-context.c:375
 msgid "Cannot create CMS message"
 msgstr "無法建構 CMS 訊息"
 
-#: ../src/camel/camel-smime-context.c:379
+#: ../src/camel/camel-smime-context.c:380
 msgid "Cannot create CMS signed data"
 msgstr "無法建構 CMS signedData"
 
-#: ../src/camel/camel-smime-context.c:385
+#: ../src/camel/camel-smime-context.c:386
 msgid "Cannot attach CMS signed data"
 msgstr "無法附加 CMS signedData"
 
-#: ../src/camel/camel-smime-context.c:392
+#: ../src/camel/camel-smime-context.c:393
 msgid "Cannot attach CMS data"
 msgstr "無法附加 CMS 資料"
 
-#: ../src/camel/camel-smime-context.c:398
+#: ../src/camel/camel-smime-context.c:399
 msgid "Cannot create CMS Signer information"
 msgstr "無法建構 CMS SignerInfo"
 
-#: ../src/camel/camel-smime-context.c:404
+#: ../src/camel/camel-smime-context.c:405
 msgid "Cannot find certificate chain"
 msgstr "找不到憑證鏈"
 
-#: ../src/camel/camel-smime-context.c:410
+#: ../src/camel/camel-smime-context.c:411
 msgid "Cannot add CMS Signing time"
 msgstr "無法新增 CMS SigningTime"
 
-#: ../src/camel/camel-smime-context.c:434
-#: ../src/camel/camel-smime-context.c:449
+#: ../src/camel/camel-smime-context.c:435
+#: ../src/camel/camel-smime-context.c:450
 #, c-format
 msgid "Encryption certificate for “%s” does not exist"
 msgstr "「%s」的加密憑證不存在"
 
-#: ../src/camel/camel-smime-context.c:456
+#: ../src/camel/camel-smime-context.c:457
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "無法新增 SMIMEEncKeyPrefs 屬性"
 
-#: ../src/camel/camel-smime-context.c:461
+#: ../src/camel/camel-smime-context.c:462
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "無法新增 MS SMIMEEncKeyPrefs 屬性"
 
-#: ../src/camel/camel-smime-context.c:466
+#: ../src/camel/camel-smime-context.c:467
 msgid "Cannot add encryption certificate"
 msgstr "無法新增加密憑證"
 
-#: ../src/camel/camel-smime-context.c:472
+#: ../src/camel/camel-smime-context.c:473
 msgid "Cannot add CMS Signer information"
 msgstr "無法新增 CMS SignerInfo"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../src/camel/camel-smime-context.c:505
+#: ../src/camel/camel-smime-context.c:506
 msgid "Unverified"
 msgstr "未指定"
 
-#: ../src/camel/camel-smime-context.c:507
+#: ../src/camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "良好的簽章"
 
-#: ../src/camel/camel-smime-context.c:509
+#: ../src/camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr "錯誤的簽章"
 
-#: ../src/camel/camel-smime-context.c:511
+#: ../src/camel/camel-smime-context.c:512
 msgid "Content tampered with or altered in transit"
 msgstr "內容在傳送時被竄改或變更"
 
-#: ../src/camel/camel-smime-context.c:513
+#: ../src/camel/camel-smime-context.c:514
 msgid "Signing certificate not found"
 msgstr "找不到簽署憑證"
 
-#: ../src/camel/camel-smime-context.c:515
+#: ../src/camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
 msgstr "簽署憑證不受信任"
 
-#: ../src/camel/camel-smime-context.c:517
+#: ../src/camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "未知的簽章演算法"
 
-#: ../src/camel/camel-smime-context.c:519
+#: ../src/camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
 msgstr "不支援這種簽章演算法"
 
-#: ../src/camel/camel-smime-context.c:521
+#: ../src/camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "格式不良的簽章"
 
-#: ../src/camel/camel-smime-context.c:523
+#: ../src/camel/camel-smime-context.c:524
 msgid "Processing error"
 msgstr "解析錯誤"
 
-#: ../src/camel/camel-smime-context.c:568
+#: ../src/camel/camel-smime-context.c:569
 msgid "No signed data in signature"
 msgstr "簽章中沒有被簽署的資料"
 
-#: ../src/camel/camel-smime-context.c:573
+#: ../src/camel/camel-smime-context.c:574
 msgid "Digests missing from enveloped data"
 msgstr "包裹的資料中遺漏摘要"
 
-#: ../src/camel/camel-smime-context.c:586
-#: ../src/camel/camel-smime-context.c:597
+#: ../src/camel/camel-smime-context.c:587
+#: ../src/camel/camel-smime-context.c:598
 msgid "Cannot calculate digests"
 msgstr "無法計算摘要"
 
-#: ../src/camel/camel-smime-context.c:604
-#: ../src/camel/camel-smime-context.c:608
+#: ../src/camel/camel-smime-context.c:605
+#: ../src/camel/camel-smime-context.c:609
 msgid "Cannot set message digests"
 msgstr "無法設定郵件摘要"
 
-#: ../src/camel/camel-smime-context.c:618
-#: ../src/camel/camel-smime-context.c:623
+#: ../src/camel/camel-smime-context.c:619
+#: ../src/camel/camel-smime-context.c:624
 msgid "Certificate import failed"
 msgstr "憑證匯入失敗"
 
-#: ../src/camel/camel-smime-context.c:633
+#: ../src/camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "限憑證訊息，無法驗證憑證"
 
-#: ../src/camel/camel-smime-context.c:636
+#: ../src/camel/camel-smime-context.c:637
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "限憑證訊息、匯入和驗證的憑證"
 
-#: ../src/camel/camel-smime-context.c:640
+#: ../src/camel/camel-smime-context.c:641
 msgid "Cannot find signature digests"
 msgstr "找不到簽章摘要"
 
-#: ../src/camel/camel-smime-context.c:657
+#: ../src/camel/camel-smime-context.c:660
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "簽署者： %s<%s>： %s\n"
 
-#: ../src/camel/camel-smime-context.c:853
-#: ../src/camel/camel-smime-context.c:1147
+#: ../src/camel/camel-smime-context.c:885
+#: ../src/camel/camel-smime-context.c:1402
 msgid "Cannot create encoder context"
 msgstr "無法建構編碼器網路位置"
 
-#: ../src/camel/camel-smime-context.c:859
+#: ../src/camel/camel-smime-context.c:891
 msgid "Failed to add data to CMS encoder"
 msgstr "無法新增資料至 CMS 編碼器"
 
-#: ../src/camel/camel-smime-context.c:864
-#: ../src/camel/camel-smime-context.c:1164
+#: ../src/camel/camel-smime-context.c:896
+#: ../src/camel/camel-smime-context.c:1419
 msgid "Failed to encode data"
 msgstr "無法編碼資料"
 
-#: ../src/camel/camel-smime-context.c:1012
-#: ../src/camel/camel-smime-context.c:1261
+#: ../src/camel/camel-smime-context.c:1044
+#: ../src/camel/camel-smime-context.c:1520
 msgid "Decoder failed"
 msgstr "解碼器失敗"
 
-#: ../src/camel/camel-smime-context.c:1081
+#: ../src/camel/camel-smime-context.c:1296
+#, fuzzy, c-format
+#| msgid "Cannot find certificate for “%s”"
+msgid "No valid or appropriate certificate for “%s” was found"
+msgstr "找不到「%s」的憑證"
+
+#: ../src/camel/camel-smime-context.c:1336
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "找不到一般大量加密演算法"
 
-#: ../src/camel/camel-smime-context.c:1089
+#: ../src/camel/camel-smime-context.c:1344
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "無法配置插槽給加密大量鑰匙"
 
-#: ../src/camel/camel-smime-context.c:1100
+#: ../src/camel/camel-smime-context.c:1355
 msgid "Cannot create CMS Message"
 msgstr "無法建構 CMS 訊息"
 
-#: ../src/camel/camel-smime-context.c:1106
+#: ../src/camel/camel-smime-context.c:1361
 msgid "Cannot create CMS Enveloped data"
 msgstr "無法建構 CMS EnvelopedData"
 
-#: ../src/camel/camel-smime-context.c:1112
+#: ../src/camel/camel-smime-context.c:1367
 msgid "Cannot attach CMS Enveloped data"
 msgstr "無法附加 CMS EnvelopedData"
 
-#: ../src/camel/camel-smime-context.c:1118
+#: ../src/camel/camel-smime-context.c:1373
 msgid "Cannot attach CMS data object"
 msgstr "無法附加 CMS 資料物件"
 
-#: ../src/camel/camel-smime-context.c:1127
+#: ../src/camel/camel-smime-context.c:1382
 msgid "Cannot create CMS Recipient information"
 msgstr "無法建構 CMS RecipientInfo"
 
-#: ../src/camel/camel-smime-context.c:1132
+#: ../src/camel/camel-smime-context.c:1387
 msgid "Cannot add CMS Recipient information"
 msgstr "無法新增 CMS RecipientInfo"
 
-#: ../src/camel/camel-smime-context.c:1158
+#: ../src/camel/camel-smime-context.c:1413
 msgid "Failed to add data to encoder"
 msgstr "無法新增資料至編碼器"
 
-#: ../src/camel/camel-smime-context.c:1268
+#: ../src/camel/camel-smime-context.c:1527
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME 解密：找不到加密內容"
 
-#: ../src/camel/camel-store.c:1370
+#: ../src/camel/camel-store.c:1421
 #, c-format
 msgid "Opening folder “%s”"
 msgstr "開啟資料夾「%s」"
 
-#: ../src/camel/camel-store.c:1665
+#: ../src/camel/camel-store.c:1718
 #, c-format
 msgid "Scanning folders in “%s”"
 msgstr "掃描「%s」內的資料夾"
 
-#: ../src/camel/camel-store.c:1693 ../src/camel/camel-store.c:1738
+#: ../src/camel/camel-store.c:1746 ../src/camel/camel-store.c:1791
 #: ../src/camel/camel-vtrash-folder.c:48
 msgid "Trash"
-msgstr "回收筒"
+msgstr "垃圾桶"
 
-#: ../src/camel/camel-store.c:1707 ../src/camel/camel-store.c:1755
+#: ../src/camel/camel-store.c:1760 ../src/camel/camel-store.c:1808
 #: ../src/camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: ../src/camel/camel-store.c:2356
+#: ../src/camel/camel-store.c:2413
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "無法建構資料夾：%s：資料夾已存在"
 
-#: ../src/camel/camel-store.c:2363
+#: ../src/camel/camel-store.c:2420
 #, c-format
 msgid "Creating folder “%s”"
 msgstr "正在建立資料夾「%s」"
 
-#: ../src/camel/camel-store.c:2540 ../src/camel/camel-vee-store.c:420
+#: ../src/camel/camel-store.c:2598 ../src/camel/camel-vee-store.c:430
 #: ../src/camel/providers/local/camel-maildir-store.c:344
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "不能刪除資料夾： %s ：無效的操作"
 
-#: ../src/camel/camel-store.c:2730 ../src/camel/camel-vee-store.c:471
+#: ../src/camel/camel-store.c:2789 ../src/camel/camel-vee-store.c:481
 #: ../src/camel/providers/local/camel-maildir-store.c:912
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -3086,7 +3982,7 @@ msgstr "串流類型「%s」不是可尋找的"
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "CamelStreamFilter 只支援重設到開頭"
 
-#: ../src/camel/camel-stream-null.c:76
+#: ../src/camel/camel-stream-null.c:88
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "CamelHttpStream 只支援重設到開頭"
 
@@ -3116,12 +4012,12 @@ msgstr "取消訂閱資料夾「%s」"
 msgid "Could not parse URL “%s”"
 msgstr "無法解析 URL「%s」"
 
-#: ../src/camel/camel-vee-folder.c:498
+#: ../src/camel/camel-vee-folder.c:558
 #, c-format
 msgid "Updating folder “%s”"
 msgstr "更新資料夾「%s」"
 
-#: ../src/camel/camel-vee-folder.c:898 ../src/camel/camel-vee-folder.c:1013
+#: ../src/camel/camel-vee-folder.c:965 ../src/camel/camel-vee-folder.c:1082
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "不能複製或移動郵件到虛擬資料夾中"
@@ -3130,17 +4026,17 @@ msgstr "不能複製或移動郵件到虛擬資料夾中"
 #. is replaced with an account name and the third “%s” is replaced with a full
 #. path name. The spaces around “:” are intentional, as the whole “%s : %s” is
 #. meant as an absolute identification of the folder.
-#: ../src/camel/camel-vee-folder.c:935
+#: ../src/camel/camel-vee-folder.c:1002
 #, c-format
 msgid "No such message %s in “%s : %s”"
 msgstr "沒有 %s 這類郵件在「%s：%s」中"
 
-#: ../src/camel/camel-vee-folder.c:989
+#: ../src/camel/camel-vee-folder.c:1058
 #, c-format
 msgid "Error storing “%s”: "
 msgstr "儲存「%s」發生錯誤："
 
-#: ../src/camel/camel-vee-folder.c:1236
+#: ../src/camel/camel-vee-folder.c:1308
 msgid "Automatically _update on change in source folders"
 msgstr "來源資料夾中變更時自動更新(_U)"
 
@@ -3150,94 +4046,110 @@ msgstr "來源資料夾中變更時自動更新(_U)"
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
-#: ../src/camel/camel-vee-store.c:446
+#: ../src/camel/camel-vee-store.c:456
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
 
-#: ../src/camel/camel-vee-store.c:481
+#: ../src/camel/camel-vee-store.c:491
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "不能重新命名資料夾： %s ：沒有這個資料夾"
 
-#: ../src/camel/camel-vee-store.c:544
+#: ../src/camel/camel-vee-store.c:554
 msgid "Enable _Unmatched folder"
 msgstr "啟用未符合資料夾(_U)"
 
-#: ../src/camel/camel-vee-store.c:1067
+#: ../src/camel/camel-vee-store.c:1109
 msgid "Updating Unmatched search folder"
 msgstr "更新未符合搜尋資料夾"
 
 #: ../src/camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
-msgstr "無法複製訊息到「回收筒」資料夾"
+msgstr "無法複製訊息到「垃圾桶」資料夾"
 
 #: ../src/camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "無法複製訊息到「垃圾郵件」資料夾"
 
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:967
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:985
 #, c-format
 msgid "You must be working online to complete this operation (%s)"
 msgstr "您必須於線上工作才能完成此操作 (%s)"
 
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:975
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3130
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:993
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3292
 #: ../src/camel/providers/nntp/camel-nntp-store.c:351
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1348
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2160
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2304
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1346
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2158
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2306
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:450
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:633
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:835
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:1047
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:922
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:1136
 #: ../src/camel/providers/pop3/camel-pop3-store.c:294
-#: ../src/camel/providers/pop3/camel-pop3-store.c:527
-#: ../src/camel/providers/pop3/camel-pop3-store.c:575
-#: ../src/camel/providers/pop3/camel-pop3-store.c:670
-#: ../src/camel/providers/pop3/camel-pop3-store.c:1105
+#: ../src/camel/providers/pop3/camel-pop3-store.c:529
+#: ../src/camel/providers/pop3/camel-pop3-store.c:577
+#: ../src/camel/providers/pop3/camel-pop3-store.c:672
+#: ../src/camel/providers/pop3/camel-pop3-store.c:1107
 #: ../src/camel/providers/smtp/camel-smtp-transport.c:541
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "您必須於線上工作才能完成此操作"
 
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1555
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1643
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1620
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1716
 #, c-format
 msgid "No destination folder specified"
 msgstr "沒有指定目的地資料夾"
 
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1582
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1647
 msgid "Unable to move junk messages"
 msgstr "無法移動垃圾郵件"
 
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1677
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1750
 msgid "Unable to move deleted messages"
 msgstr "無法移動刪除的郵件"
 
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1818
+#, fuzzy
+#| msgid "Unable to move junk messages"
+msgid "Unable to move messages to Inbox"
+msgstr "無法移動垃圾郵件"
+
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:705
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:758
 #, c-format
 msgid "No quota information available for folder “%s : %s”"
 msgstr "資料夾「%s：%s」不支援限額資訊"
 
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:980
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:754
+#. transfer ownership to 'rcf'
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1025
+#, fuzzy, c-format
+#| msgid "Storing changes in folder “%s : %s”"
+msgid "Removing stale cache files in folder “%s : %s”"
+msgstr "正在儲存資料夾「%s：%s」的變更"
+
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1119
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:841
 msgid "Apply message _filters to this folder"
 msgstr "將郵件過濾條件套用到這個資料夾(_F)"
 
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:991
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1130
 msgid "Always check for _new mail in this folder"
 msgstr "永遠檢查這個資料夾中是否有新郵件(_N)"
 
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1102
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1243
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "無法建立 %s 的資料夾摘要"
 
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1114
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1255
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "無法建立 %s 的快取："
@@ -3245,7 +4157,7 @@ msgstr "無法建立 %s 的快取："
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1330
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1460
 #, c-format
 msgid "No IMAP mailbox available for folder “%s : %s”"
 msgstr "資料夾「%s：%s」沒有 IMAP 郵箱可用"
@@ -3345,215 +4257,217 @@ msgid "IMAP over TLS"
 msgstr "IMAP 透過 TLS"
 
 #: ../src/camel/providers/imapx/camel-imapx-provider.c:87
-msgid "IMAP+"
+#, fuzzy
+#| msgid "IMAP+"
+msgid "IMAP"
 msgstr "IMAP"
 
 #: ../src/camel/providers/imapx/camel-imapx-provider.c:89
 msgid "For reading and storing mail on IMAP servers."
 msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:1166
+#: ../src/camel/providers/imapx/camel-imapx-server.c:1139
 msgid "Error writing to cache stream"
 msgstr "寫入快取串流時發生錯誤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2813
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2901
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3163
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2968
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3056
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3325
 msgid "Failed to get capabilities"
 msgstr "無法取得功能"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2832
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2987
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2833
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2988
 #: ../src/camel/providers/smtp/camel-smtp-transport.c:279
 msgid "STARTTLS not supported"
 msgstr "不支援 STARTTLS"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2842
+#: ../src/camel/providers/imapx/camel-imapx-server.c:2997
 msgid "Failed to issue STARTTLS"
 msgstr "無法發出 STARTTLS"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2890
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3045
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： "
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2984
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3140
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "IMAP 伺服器 %s 不支援 %s 核對"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3015
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3171
 #: ../src/camel/providers/nntp/camel-nntp-store.c:457
 #: ../src/camel/providers/nntp/camel-nntp-store.c:599
 msgid "Cannot authenticate without a username"
 msgstr "不能核對沒有使用者名稱"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3024
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3180
 #: ../src/camel/providers/nntp/camel-nntp-store.c:608
-#: ../src/camel/providers/pop3/camel-pop3-store.c:688
-#: ../src/camel/providers/pop3/camel-pop3-store.c:726
+#: ../src/camel/providers/pop3/camel-pop3-store.c:690
+#: ../src/camel/providers/pop3/camel-pop3-store.c:728
 msgid "Authentication password not available"
 msgstr "沒有核對的密碼"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3032
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3188
 msgid "Failed to authenticate"
 msgstr "無法核對"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3185
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3347
 msgid "Failed to issue NAMESPACE"
 msgstr "無法發出 NAMESPACE"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3203
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3365
 msgid "Failed to enable QResync"
 msgstr "無法啟用 QResync"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3235
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3397
 msgid "Failed to issue NOTIFY"
 msgstr "無法發出 NOTIFY"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3713
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3876
 msgid "Failed to select mailbox"
 msgstr "無法選擇信箱"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3816
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3979
 msgid "Cannot issue command, no stream available"
 msgstr "不能發出指令，沒有可用的串流"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4080
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4245
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "無法取得郵件 ID 為 %s 的郵件： %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4081
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4246
 msgid "No such message available."
 msgstr "沒有這個郵件。"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4118
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4143
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4182
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4294
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4319
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4358
 msgid "Error fetching message"
 msgstr "取回郵件時發生錯誤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4160
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4759
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4336
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5099
 msgid "Error performing NOOP"
 msgstr "進行 NOOP 時發生錯誤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4175
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4351
 msgid "Failed to close the tmp stream"
 msgstr "無法關閉 tmp 的串流"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4206
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4382
 msgid "Failed to copy the tmp file"
 msgstr "無法複製 tmp 檔案"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4369
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4620
 msgid "Error moving messages"
 msgstr "移動郵件時發生錯誤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4369
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4620
 msgid "Error copying messages"
 msgstr "複製郵件時發生錯誤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4554
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4575
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4892
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4913
 msgid "Cannot create spool file: "
 msgstr "不能建立排程器檔案："
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4661
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4999
 msgid "Error appending message"
 msgstr "附加郵件時發生錯誤"
 
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4912
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5252
 #, c-format
 msgid "Scanning for changed messages in “%s : %s”"
 msgstr "掃描「%s：%s」中變更過的郵件"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4916
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5256
 msgid "Error scanning changes"
 msgstr "掃描變更時發生錯誤"
 
 #. Translators: The first “%s” is replaced with an account name and the second “%s”
 #. is replaced with a full path name. The spaces around “:” are intentional, as
 #. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4937
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5277
 #, c-format
 msgid "Fetching summary information for new messages in “%s : %s”"
 msgstr "正取得「%s：%s」中新郵件的摘要資訊"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4955
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5295
 msgid "Error fetching message info"
 msgstr "取回郵件資訊時發生錯誤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5037
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5401
 msgid "Error running STATUS"
 msgstr "執行STATUS 時發生錯誤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5544
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5574
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5609
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5947
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5977
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6012
 msgid "Error syncing changes"
 msgstr "同步變更時發生錯誤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5747
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6150
 msgid "Error expunging message"
 msgstr "清空郵件時發生錯誤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5819
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6228
 msgid "Error fetching folders"
 msgstr "取回資料夾時發生錯誤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5830
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6236
 msgid "Error fetching subscribed folders"
 msgstr "取回已訂閱的資料夾的錯誤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5852
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6291
 msgid "Error creating folder"
 msgstr "建立資料夾時發生錯誤。"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5908
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6347
 msgid "Error deleting folder"
 msgstr "刪除資料夾時發生錯誤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5954
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6393
 msgid "Error renaming folder"
 msgstr "重新命名資料夾時發生錯誤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5986
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6425
 msgid "Error subscribing to folder"
 msgstr "訂閱到資料夾時發生錯誤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6022
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6461
 msgid "Error unsubscribing from folder"
 msgstr "取消訂閱資料夾發生錯誤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6062
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6501
 msgid "IMAP server does not support quotas"
 msgstr "IMAP 伺服器不支援限額"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6074
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6513
 msgid "Error retrieving quota information"
 msgstr "取得用量限額資訊時發生錯誤"
 
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6121
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6576
 msgid "Search failed"
 msgstr "搜尋失敗"
 
 #. Blocks, until the DONE is issued or on inactivity timeout, error, ...
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6239
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6694
 msgid "Error running IDLE"
 msgstr "執行 IDLE 時發生錯誤"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../src/camel/providers/imapx/camel-imapx-store.c:232
-#: ../src/camel/providers/local/camel-maildir-folder.c:478
+#: ../src/camel/providers/imapx/camel-imapx-store.c:354
+#: ../src/camel/providers/local/camel-maildir-folder.c:476
 #: ../src/camel/providers/local/camel-maildir-store.c:345
 #: ../src/camel/providers/local/camel-maildir-store.c:824
 #: ../src/camel/providers/local/camel-maildir-store.c:830
@@ -3562,47 +4476,47 @@ msgstr "執行 IDLE 時發生錯誤"
 msgid "Inbox"
 msgstr "收件匣"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:802
+#: ../src/camel/providers/imapx/camel-imapx-store.c:957
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP 伺服器 %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:805
+#: ../src/camel/providers/imapx/camel-imapx-store.c:960
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s 的 IMAP 服務於 %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:873
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1051
 msgid "No IMAPx connection object provided"
 msgstr "沒有提供 IMAPx 連線物件"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:890
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:92
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1068
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:95
 #: ../src/camel/providers/pop3/camel-pop3-provider.c:80
 msgid "Password"
 msgstr "密碼"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:892
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1070
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:975
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1157
 #, c-format
 msgid "No such folder %s"
 msgstr "沒有這個資料夾 %s"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1425
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1622
 #, c-format
 msgid "No IMAP namespace for folder path “%s”"
 msgstr "資料夾路徑「%s」沒有 IMAP 命名空間可用"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1686
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1920
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1890
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2124
 #, c-format
 msgid "Retrieving folder list for “%s”"
 msgstr "取得「%s」的資料夾列表"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2137
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2341
 #, c-format
 msgid "The folder name “%s” is invalid because it contains the character “%c”"
 msgstr "資料夾名稱「%s」無效，因為它包括字元「%c」"
@@ -3612,97 +4526,97 @@ msgstr "資料夾名稱「%s」無效，因為它包括字元「%c」"
 #. version as well. It's always the folder name (eventually path) as provided by the server,
 #. when returned in given localization. it can be checked semi-easily in the case of
 #. the GMail variants, by changing the GMail interface language in the GMail Preferences.
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2514
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2718
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Drafts"
 msgstr "[Gmail]/草稿"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2515
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2719
 msgctxt "IMAPDefaults"
 msgid "Drafts"
 msgstr "草稿"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2516
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2720
 msgctxt "IMAPDefaults"
 msgid "Draft"
 msgstr "草稿"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2519
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2723
 msgctxt "IMAPDefaults"
 msgid "Templates"
 msgstr "範本"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2522
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2726
 msgctxt "IMAPDefaults"
 msgid "Archive"
 msgstr "封存"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2525
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2729
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Sent Mail"
 msgstr "[Gmail]/發送郵件"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2526
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2730
 msgctxt "IMAPDefaults"
 msgid "Sent"
 msgstr "已傳送"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2527
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2731
 msgctxt "IMAPDefaults"
 msgid "Sent Items"
 msgstr "傳送項目"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2528
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2732
 msgctxt "IMAPDefaults"
 msgid "Sent Messages"
 msgstr "傳送郵件"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2531
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2735
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Spam"
 msgstr "[Gmail]/垃圾郵件"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2532
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2736
 msgctxt "IMAPDefaults"
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2533
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2737
 msgctxt "IMAPDefaults"
 msgid "Junk E-mail"
 msgstr "垃圾郵件"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2534
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2738
 msgctxt "IMAPDefaults"
 msgid "Junk Email"
 msgstr "垃圾郵件"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2535
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2739
 msgctxt "IMAPDefaults"
 msgid "Spam"
 msgstr "垃圾郵件"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2536
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2740
 msgctxt "IMAPDefaults"
 msgid "Bulk Mail"
 msgstr "大宗郵件"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2539
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2743
 msgctxt "IMAPDefaults"
 msgid "[Gmail]/Trash"
-msgstr "[Gmail]/回收筒"
+msgstr "[Gmail]/垃圾桶"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2540
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2744
 msgctxt "IMAPDefaults"
 msgid "Trash"
-msgstr "回收筒"
+msgstr "垃圾桶"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2541
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2745
 msgctxt "IMAPDefaults"
 msgid "Deleted Items"
 msgstr "已删除的項目"
 
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2542
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2746
 msgctxt "IMAPDefaults"
 msgid "Deleted Messages"
 msgstr "刪除郵件"
@@ -3711,7 +4625,7 @@ msgstr "刪除郵件"
 #. * for folders being under $HOME.  The first %s is replaced
 #. * with a relative path under $HOME, the second %s is
 #. * replaced with a protocol name, like mbox/maldir/...
-#: ../src/camel/providers/local/camel-local-folder.c:187
+#: ../src/camel/providers/local/camel-local-folder.c:190
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
@@ -3725,8 +4639,8 @@ msgstr "~%s (%s)"
 #. * folders being under /var/mail.  The first %s is replaced
 #. * with a relative path under /var/mail, the second %s is
 #. * replaced with a protocol name, like mbox/maldir/...
-#: ../src/camel/providers/local/camel-local-folder.c:197
-#: ../src/camel/providers/local/camel-local-folder.c:206
+#: ../src/camel/providers/local/camel-local-folder.c:200
+#: ../src/camel/providers/local/camel-local-folder.c:209
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "信箱：%s (%s)"
@@ -3735,19 +4649,19 @@ msgstr "信箱：%s (%s)"
 #. * The first %s is replaced with a folder's full path,
 #. * the second %s is replaced with a protocol name, like
 #. * mbox/maldir/...
-#: ../src/camel/providers/local/camel-local-folder.c:215
+#: ../src/camel/providers/local/camel-local-folder.c:218
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/camel/providers/local/camel-local-folder.c:505
+#: ../src/camel/providers/local/camel-local-folder.c:511
 msgid "_Index message body data"
 msgstr "索引郵件內文資料(_I)"
 
 #. Translators: The first %s is replaced with a message ID,
 #. * the second %s is replaced with the folder path,
 #. * the third %s is replaced with a detailed error string
-#: ../src/camel/providers/local/camel-local-folder.c:737
+#: ../src/camel/providers/local/camel-local-folder.c:749
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3872,28 +4786,28 @@ msgid "Could not rename “%s”: %s"
 msgstr "無法重新命名「%s」：%s "
 
 #: ../src/camel/providers/local/camel-maildir-folder.c:107
-#: ../src/camel/providers/local/camel-maildir-folder.c:344
-#: ../src/camel/providers/local/camel-mbox-folder.c:128
-#: ../src/camel/providers/local/camel-mbox-folder.c:336
-#: ../src/camel/providers/local/camel-mh-folder.c:157
+#: ../src/camel/providers/local/camel-maildir-folder.c:345
+#: ../src/camel/providers/local/camel-mbox-folder.c:133
+#: ../src/camel/providers/local/camel-mbox-folder.c:348
+#: ../src/camel/providers/local/camel-mh-folder.c:159
 msgid "No such message"
 msgstr "無此郵件"
 
-#: ../src/camel/providers/local/camel-maildir-folder.c:232
+#: ../src/camel/providers/local/camel-maildir-folder.c:239
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "不能將郵件儲存到 maildir 資料夾： %s："
 
-#: ../src/camel/providers/local/camel-maildir-folder.c:282
-#: ../src/camel/providers/local/camel-maildir-folder.c:292
-#: ../src/camel/providers/local/camel-mbox-folder.c:395
-#: ../src/camel/providers/local/camel-mh-folder.c:169
-#: ../src/camel/providers/local/camel-mh-folder.c:179
+#: ../src/camel/providers/local/camel-maildir-folder.c:286
+#: ../src/camel/providers/local/camel-maildir-folder.c:296
+#: ../src/camel/providers/local/camel-mbox-folder.c:407
+#: ../src/camel/providers/local/camel-mh-folder.c:171
+#: ../src/camel/providers/local/camel-mh-folder.c:181
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "不能從資料夾 %2$s 取得郵件 %1$s："
 
-#: ../src/camel/providers/local/camel-maildir-folder.c:362
+#: ../src/camel/providers/local/camel-maildir-folder.c:363
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "不能將郵件傳輸到目的端資料夾：%s"
@@ -3957,21 +4871,21 @@ msgstr "不是一個 maildir 目錄"
 msgid "Could not scan folder “%s”: %s"
 msgstr "無法掃描資料夾「%s」：%s"
 
-#: ../src/camel/providers/local/camel-maildir-summary.c:448
-#: ../src/camel/providers/local/camel-maildir-summary.c:589
+#: ../src/camel/providers/local/camel-maildir-summary.c:457
+#: ../src/camel/providers/local/camel-maildir-summary.c:596
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "不能開啟 maildir 目錄路徑：%s： %s"
 
-#: ../src/camel/providers/local/camel-maildir-summary.c:580
+#: ../src/camel/providers/local/camel-maildir-summary.c:587
 msgid "Checking folder consistency"
 msgstr "檢查資料夾的一致性"
 
-#: ../src/camel/providers/local/camel-maildir-summary.c:679
+#: ../src/camel/providers/local/camel-maildir-summary.c:709
 msgid "Checking for new messages"
 msgstr "檢查新郵件"
 
-#: ../src/camel/providers/local/camel-maildir-summary.c:782
+#: ../src/camel/providers/local/camel-maildir-summary.c:813
 #: ../src/camel/providers/local/camel-mbox-summary.c:367
 #: ../src/camel/providers/local/camel-mbox-summary.c:585
 #: ../src/camel/providers/local/camel-mbox-summary.c:739
@@ -3979,21 +4893,21 @@ msgstr "檢查新郵件"
 msgid "Storing folder"
 msgstr "儲存資料夾"
 
-#: ../src/camel/providers/local/camel-mbox-folder.c:194
+#: ../src/camel/providers/local/camel-mbox-folder.c:205
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "不能開啟 mailbox：%s"
 
-#: ../src/camel/providers/local/camel-mbox-folder.c:257
+#: ../src/camel/providers/local/camel-mbox-folder.c:266
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "不能將郵件儲存到 mbox 檔案：%s"
 
-#: ../src/camel/providers/local/camel-mbox-folder.c:387
+#: ../src/camel/providers/local/camel-mbox-folder.c:399
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "資料夾好像已經損毀並且不能復原。"
 
-#: ../src/camel/providers/local/camel-mbox-folder.c:444
+#: ../src/camel/providers/local/camel-mbox-folder.c:454
 #: ../src/camel/providers/local/camel-spool-folder.c:65
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
@@ -4137,7 +5051,7 @@ msgstr "寫入暫存郵箱失敗：  %s"
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "寫入暫存郵箱失敗： %s： %s"
 
-#: ../src/camel/providers/local/camel-mh-folder.c:114
+#: ../src/camel/providers/local/camel-mh-folder.c:119
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "不能將郵件儲存到 mh 資料夾： %s："
@@ -4253,21 +5167,21 @@ msgstr ""
 "資料夾可能損毀，複本儲存於「%s」"
 
 #: ../src/camel/providers/nntp/camel-nntp-folder.c:219
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:584
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:636
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "內部錯誤：UID 格式無效：%s"
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:289
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:294
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:287
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:292
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:575
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:1003
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:1092
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "無法取得郵件 %s： %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:301
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:618
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:299
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:670
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:479
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:511
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:543
@@ -4283,16 +5197,16 @@ msgstr "無法取得郵件 %s："
 msgid "Posting failed: %s"
 msgstr "張貼失敗：%s"
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:488
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:486
 msgid "Posting failed: "
 msgstr "張貼失敗："
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:607
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:659
 #, c-format
 msgid "This message is not currently available"
 msgstr "這封郵件目前仍未可用"
 
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:716
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:768
 #, c-format
 msgid "You cannot copy messages from a NNTP folder"
 msgstr "您不能從 NNTP 資料夾複製郵件"
@@ -4306,29 +5220,35 @@ msgstr "以簡短表示法顯示資料夾(例如，c.o.linux 而不是 comp.o_s.
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "在訂閱對話方塊，顯示相關資料夾名稱(_D)"
 
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:54
+#. Translators: The '%s' is replaced with a spin button with the actual value to use
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:51
+#, c-format
+msgid "Download only up to %s latest messages"
+msgstr ""
+
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:57
 msgid "Default NNTP port"
 msgstr "預設的 NNTP 連接埠"
 
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:55
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:58
 msgid "NNTP over TLS"
 msgstr "NNTP 透過 TLS"
 
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:61
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:64
 msgid "USENET news"
 msgstr "USENET 新聞"
 
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:63
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:66
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "這是讀取與發信至 USENET 新聞群組的供應者。"
 
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:84
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:87
 msgid ""
 "This option will connect to the NNTP server anonymously, without "
 "authentication."
 msgstr "這個選項將會匿名連線至 NNTP 伺服器，不使用任何核對。"
 
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:94
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:97
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4364,7 +5284,7 @@ msgstr "以安全模式連線到 NNTP 伺服器 %s 時失敗了： "
 msgid "USENET News via %s"
 msgstr "經由 %s 的 USENET 新聞"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1250
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1248
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4375,22 +5295,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1365
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1363
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "您無法在「新聞」儲存區建構資料夾：改以訂閱。"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1381
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1379
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "您無法在「新聞」儲存區重新命名資料夾。"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1404
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1402
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "您無法在「新聞」儲存區移除資料夾：改以取消訂閱。"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1618
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1616
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4401,7 +5321,7 @@ msgstr ""
 "\n"
 "沒有類似的新聞群組。選取的項目可能是父代資料夾。"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1685
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1683
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4412,41 +5332,53 @@ msgstr ""
 "\n"
 "新聞群組不存在！"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2111
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2109
 msgid "NNTP Command failed: "
 msgstr "NNTP 指令失敗："
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2216
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2215
 #, c-format
 msgid "Not connected."
 msgstr "未連線。"
 
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2318
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2320
 #, c-format
 msgid "No such folder: %s"
 msgstr "沒有這個資料夾： %s"
 
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:190
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:333
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:195
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s：掃描新郵件"
 
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:212
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:217
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover 傳來意外的伺服器回應：%s"
 
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:354
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:361
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "標題傳來意外的伺服器回應：%s"
 
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:403
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:410
 #, c-format
 msgid "Operation failed: %s"
 msgstr "作業失敗： %s"
 
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:457
+#, fuzzy, c-format
+#| msgid "%s: Scanning new messages"
+msgid "%s: Scanning existing messages"
+msgstr "%s：掃描新郵件"
+
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:470
+#, fuzzy, c-format
+#| msgid "Unexpected server response from xover: %s"
+msgid "Unexpected server response from listgroup: %s"
+msgstr "xover 傳來意外的伺服器回應：%s"
+
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:358
 #: ../src/camel/providers/pop3/camel-pop3-folder.c:442
 #, c-format
@@ -4474,11 +5406,11 @@ msgstr "取回 POP 的摘要"
 msgid "Cannot get POP summary: "
 msgstr "不能取得 POP 摘要："
 
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:812
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:895
 msgid "Expunging old messages"
 msgstr "清空舊的郵件"
 
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:840
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:927
 msgid "Expunging deleted messages"
 msgstr "清空刪除的郵件"
 
@@ -4573,29 +5505,29 @@ msgstr "無法以安全模式連線到 POP 伺服器 %s%s"
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "無法以安全模式連線到 POP 伺服器 %s："
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:355
+#: ../src/camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "不能登入 POP 伺服器 %s： SASL 通訊協定錯誤"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:377
+#: ../src/camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "無法核對 POP 伺服器 %s："
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:485
+#: ../src/camel/providers/pop3/camel-pop3-store.c:487
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 伺服器 %s"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:488
+#: ../src/camel/providers/pop3/camel-pop3-store.c:490
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "%s 在 %s 的 POP3 伺服器"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:700
-#: ../src/camel/providers/pop3/camel-pop3-store.c:713
-#: ../src/camel/providers/pop3/camel-pop3-store.c:799
+#: ../src/camel/providers/pop3/camel-pop3-store.c:702
+#: ../src/camel/providers/pop3/camel-pop3-store.c:715
+#: ../src/camel/providers/pop3/camel-pop3-store.c:801
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4605,7 +5537,7 @@ msgstr ""
 "傳送密碼時發生錯誤："
 
 #. Translators: Do not translate APOP.
-#: ../src/camel/providers/pop3/camel-pop3-store.c:740
+#: ../src/camel/providers/pop3/camel-pop3-store.c:742
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4616,7 +5548,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../src/camel/providers/pop3/camel-pop3-store.c:814
+#: ../src/camel/providers/pop3/camel-pop3-store.c:816
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4625,12 +5557,12 @@ msgstr ""
 "無法連線 POP 伺服器 %s。\n"
 "傳送使用者名稱發生錯誤%s"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:898
+#: ../src/camel/providers/pop3/camel-pop3-store.c:900
 #, c-format
 msgid "No such folder “%s”."
 msgstr "沒有這個資料夾「%s」"
 
-#: ../src/camel/providers/pop3/camel-pop3-store.c:915
+#: ../src/camel/providers/pop3/camel-pop3-store.c:917
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 儲存區沒有資料夾階層"
@@ -4770,175 +5702,175 @@ msgstr "AUTH 指令失敗：未連線。"
 
 #: ../src/camel/providers/smtp/camel-smtp-transport.c:704
 #: ../src/camel/providers/smtp/camel-smtp-transport.c:718
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:730
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:734
 msgid "AUTH command failed: "
 msgstr "AUTH 指令失敗："
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:887
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:885
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "無法傳送訊息：服務未連線。"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:896
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:894
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "不能傳送郵件：寄件者的地址無效。"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:900
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:898
 msgid "Sending message"
 msgstr "傳送郵件"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:929
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:927
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "不能傳送郵件：沒有定義收件者。"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:944
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:942
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "不能傳送郵件：一或多個無效的收件者"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1076
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1074
 msgid "Syntax error, command unrecognized"
 msgstr "語法錯誤，不認識的指令"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1078
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1076
 msgid "Syntax error in parameters or arguments"
 msgstr "參數內的語法錯誤"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1080
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1078
 msgid "Command not implemented"
 msgstr "指令沒有實作"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1082
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1080
 msgid "Command parameter not implemented"
 msgstr "指令的參數沒有實作"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1084
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1082
 msgid "System status, or system help reply"
 msgstr "系統狀況，或者是系統的求助說明回應"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1086
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Help message"
 msgstr "求助說明訊息"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1088
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1086
 msgid "Service ready"
 msgstr "服務已就緒"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1090
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1088
 msgid "Service closing transmission channel"
 msgstr "此服務將傳輸通道關閉"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1092
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1090
 msgid "Service not available, closing transmission channel"
 msgstr "此服務仍未可用，傳輸通道關閉"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1092
 msgid "Requested mail action okay, completed"
 msgstr " 所要求的郵件動作已成功完成"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1096
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1094
 msgid "User not local; will forward to <forward-path>"
 msgstr "不是本地端的使用者；將會轉寄至 <轉寄路徑>"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1098
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1096
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "所要求的郵件動作無法執行：郵箱仍未可用"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1100
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1098
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "所要求的動作無法執行：郵箱仍未可用"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1102
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1100
 msgid "Requested action aborted: error in processing"
 msgstr "所要求的動作已放棄：正在處理時發生錯誤"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1104
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1102
 msgid "User not local; please try <forward-path>"
 msgstr "不是本地端的使用者；請嘗試使用 <轉寄路徑>"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1106
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1104
 msgid "Requested action not taken: insufficient system storage"
 msgstr "所要求的動作無法執行：系統的儲存空間不足"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1108
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1106
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "所要求的郵件動作已放棄：超出可供儲存空間的限制"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1110
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1108
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "所要求的動作已放棄：不允許的郵箱名稱"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1112
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1110
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "請開始輸入郵件的資料；<CRLF>.<CRLF> 結束撰寫郵件"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1114
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1112
 msgid "Transaction failed"
 msgstr "執行失敗"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1118
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1116
 msgid "A password transition is needed"
 msgstr "需要密碼傳送"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1120
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1118
 msgid "Authentication mechanism is too weak"
 msgstr "核對機制太弱了"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Encryption required for requested authentication mechanism"
 msgstr "所要求的核對機制必須加密處理"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1124
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1122
 msgid "Temporary authentication failure"
 msgstr "臨時核對失敗"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1414
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "SMTP Greeting"
 msgstr "SMTP 迎接"
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1423
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1436
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1443
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1421
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1434
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1441
 msgid "HELO command failed: "
 msgstr "HELO 指令失敗："
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1519
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1533
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1542
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1517
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1531
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1540
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM 指令失敗："
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1570
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1568
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO 指令失敗："
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1586
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1595
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1584
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1593
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> 失敗："
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1669
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1680
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1691
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1740
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1758
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1771
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1779
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1667
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1678
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1689
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1738
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1756
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1769
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1777
 msgid "DATA command failed: "
 msgstr "DATA 指令失敗："
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1805
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1819
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1827
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1803
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1817
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1825
 msgid "RSET command failed: "
 msgstr "RSET 指令失敗："
 
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1853
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1865
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1871
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1851
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1863
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1869
 msgid "QUIT command failed: "
 msgstr "QUIT 指令失敗："
 
@@ -4972,6 +5904,74 @@ msgid ""
 msgstr ""
 "生日和週年紀念日提醒的單位，「minutes」(分鐘)、「hours」(小時)或「days」(日)"
 
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:7
+msgid "Past reminders for EReminderWatcher"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:8
+msgid "Snoozed reminders for EReminderWatcher"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:9
+msgid "Reminder programs"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:10
+msgid "Programs that are allowed to be run by reminders"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:11
+msgid "Show reminders in notification tray only"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:12
+msgid ""
+"When set to true, the reminders are shown only in the notification tray, "
+"otherwise the reminders dialog is shown immediately"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:13
+msgid "Show reminder notification dialog always on top"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:14
+msgid ""
+"Whether or not to show reminder notification dialog always on top. Note this "
+"works only as a hint for the window manager, which may or may not obey it."
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:15
+msgid "X position of the reminder notification dialog"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:16
+msgid "Y position of the reminder notification dialog"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:17
+msgid "Width of the reminder notification dialog"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:18
+msgid "Height of the reminder notification dialog"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:19
+msgid "Show reminder notification for completed tasks"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:20
+msgid "Show reminder notification for past events"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:21
+msgid "The last used snooze time, in minutes"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:22
+msgid "User-defined snooze times, in minutes"
+msgstr ""
+
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:1
 msgid "Whether the migration of old setting was already done"
 msgstr "舊設定值的轉移是否已經完成"
@@ -5038,6 +6038,28 @@ msgstr ""
 "此陣列中的每個項目都預期為這種格式：name=value。這些變數都會在環境變數之前檢"
 "查，但在預先設定的 USER、REALNAME 與 HOST 變數之後。"
 
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:12
+msgid "A list of hints for OAuth2 services"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:13
+msgid ""
+"Users can extend the list of supported protocols and hostnames for defined "
+"OAuth2 services, in addition to those hard-coded. Each line can be of the "
+"form: servicename[-protocol]:hostname1,hostname2,... where “servicename” is "
+"the actual service name; the “-protocol” is optional, and if written, then "
+"the service can be used only if both “protocol” and “hostnameX” match; the "
+"“hostnameX” is the actual host name to compare with, case insensitively. "
+"Each line can contain multiple values, separated by comma. There can be "
+"provided multiple lines for one OAuth2 service. Note that the actual URL "
+"where the token is requested and refreshed cannot be changed here, the "
+"hostname is to allow other servers, where the OAuth2 service can be used. "
+"Examples: Company:mail.company.com — enables “Company” OAuth2 authentication "
+"for “mail.company.com” host Company-CalDAV:caldav.company.com — enables "
+"“Company” OAuth2 authentication for any “CalDAV” source, which reads data "
+"from “caldav.company.com” host"
+msgstr ""
+
 #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
 msgid "(Deprecated) Proxy type to use"
 msgstr "(已廢棄) 要使用的代理伺服器類型"
@@ -5099,17 +6121,37 @@ msgstr "(已廢棄) SOCKS 要求的連接埠"
 msgid "(Deprecated) Automatic proxy configuration URL"
 msgstr "(已廢棄) 自動代理伺服器設定網址"
 
-#: ../src/libebackend/e-collection-backend.c:977
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:1
+msgid "Evolution Alarm Notify"
+msgstr ""
+
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:2
+#, fuzzy
+#| msgid "Calendar authentication request"
+msgid "Calendar event notifications"
+msgstr "行事曆核對要求"
+
+#: ../src/libebackend/e-cache.c:754
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/libebackend/e-cache.c:946
+#, fuzzy, c-format
+#| msgid "Failed to make directory %s: %s"
+msgid "Can not make parent directory: %s"
+msgstr "無法建立目錄「%s」：%s"
+
+#: ../src/libebackend/e-collection-backend.c:1008
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr "%s 不支援建立遠端資源"
 
-#: ../src/libebackend/e-collection-backend.c:1036
+#: ../src/libebackend/e-collection-backend.c:1067
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr "%s 不支援刪除遠端資源"
 
-#: ../src/libebackend/e-data-factory.c:1295
+#: ../src/libebackend/e-data-factory.c:1492
 #, c-format
 msgid "Backend factory for source “%s” and extension “%s” cannot be found."
 msgstr "找不到來源「%s」與擴充功能「%s」的後端工廠。"
@@ -5119,67 +6161,85 @@ msgstr "找不到來源「%s」與擴充功能「%s」的後端工廠。"
 msgid "Data source is missing a [%s] group"
 msgstr "資料來源缺少 [%s] 群組"
 
-#: ../src/libebackend/e-server-side-source.c:467
+#: ../src/libebackend/e-server-side-source.c:470
 msgid "Failed to lookup credentials: "
 msgstr "無法查詢憑證："
 
-#: ../src/libebackend/e-server-side-source.c:1392
-#: ../src/libedataserver/e-source.c:1599
+#: ../src/libebackend/e-server-side-source.c:1395
+#: ../src/libedataserver/e-source.c:1583
 #, c-format
 msgid "Data source “%s” does not support creating remote resources"
 msgstr "資料來源「%s」不支援建立遠端資源"
 
-#: ../src/libebackend/e-server-side-source.c:1406
+#: ../src/libebackend/e-server-side-source.c:1409
 #, c-format
 msgid ""
 "Data source “%s” has no collection backend to create the remote resource"
 msgstr "資料來源「%s」沒有用來建立遠端資料的收集後端"
 
-#: ../src/libebackend/e-server-side-source.c:1434
-#: ../src/libedataserver/e-source.c:1712
+#: ../src/libebackend/e-server-side-source.c:1437
+#: ../src/libedataserver/e-source.c:1696
 #, c-format
 msgid "Data source “%s” does not support deleting remote resources"
 msgstr "資料來源「%s」不支援刪除遠端資源"
 
-#: ../src/libebackend/e-server-side-source.c:1448
+#: ../src/libebackend/e-server-side-source.c:1451
 #, c-format
 msgid ""
 "Data source “%s” has no collection backend to delete the remote resource"
 msgstr "資料來源「%s」沒有用來刪除遠端資料的收集後端"
 
-#: ../src/libebackend/e-server-side-source.c:1479
-#: ../src/libedataserver/e-source.c:1808
+#: ../src/libebackend/e-server-side-source.c:1482
+#: ../src/libedataserver/e-source.c:1792
 #: ../src/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1080
 #, c-format
 msgid "Data source “%s” does not support OAuth 2.0 authentication"
 msgstr "資料來源「%s」不支援 OAuth 2.0 核對"
 
-#: ../src/libebackend/e-server-side-source.c:1857
+#: ../src/libebackend/e-server-side-source.c:1860
 #, c-format
 msgid "File must have a “.source” extension"
 msgstr "檔案必須以「.source」做為延伸檔名"
 
-#: ../src/libebackend/e-source-registry-server.c:320
+#: ../src/libebackend/e-source-registry-server.c:322
 #, c-format
 msgid "UID “%s” is already in use"
 msgstr "UID 「%s」已經在使用中"
 
-#: ../src/libebackend/e-subprocess-factory.c:277
+#: ../src/libebackend/e-source-registry-server.c:447
+#, fuzzy, c-format
+#| msgid "Cannot find certificate for “%s”"
+msgid "Cannot find corresponding collection backend for source “%s”"
+msgstr "找不到「%s」的憑證"
+
+#: ../src/libebackend/e-source-registry-server.c:451
+#, fuzzy, c-format
+#| msgid "Source “%s” (%s) is not a valid Google source"
+msgid "Source “%s” is not a collection source"
+msgstr "來源「%s」(%s) 不是有效的 Google 來源"
+
+#: ../src/libebackend/e-source-registry-server.c:457
+#, fuzzy, c-format
+#| msgid "Cannot find certificate for “%s”"
+msgid "Cannot find source “%s”"
+msgstr "找不到「%s」的憑證"
+
+#: ../src/libebackend/e-subprocess-factory.c:281
 #, c-format
 msgid "Module “%s” for source UID “%s” cannot be loaded"
 msgstr "來源 UID「%2$s」模組「%1$s」不能載入"
 
-#: ../src/libebackend/e-subprocess-factory.c:289
+#: ../src/libebackend/e-subprocess-factory.c:293
 #, c-format
 msgid "No such source for UID “%s”"
 msgstr "沒有 UID「%s」的這類來源"
 
-#: ../src/libebackend/e-subprocess-factory.c:300
+#: ../src/libebackend/e-subprocess-factory.c:302
 #, c-format
 msgid "Failed to create backend of type “%s” for source UID “%s”"
 msgstr "無法建立來源 UID「%2$s」類型「%1$s」的後端程式"
 
-#: ../src/libebackend/e-user-prompter-server.c:303
+#: ../src/libebackend/e-user-prompter-server.c:304
 #, c-format
 msgid "Extension dialog “%s” not found."
 msgstr "找不到延伸功能對話盒「%s」。"
@@ -5319,22 +6379,87 @@ msgstr "D-Bus 錯誤"
 msgid "Timeout was reached"
 msgstr "已達逾時時間"
 
-#: ../src/libedataserver/e-source.c:775
+#. Translators: The first %s is a display name of the source, the second is its UID and
+#. the third is the name of the OAuth service.
+#: ../src/libedataserver/e-oauth2-service.c:1208
+#, fuzzy, c-format
+#| msgid "Source “%s” (%s) is not a valid Google source"
+msgid "Source “%s” (%s) is not valid for “%s” OAuth2 service"
+msgstr "來源「%s」(%s) 不是有效的 Google 來源"
+
+#: ../src/libedataserver/e-oauth2-service.c:1223
+#, fuzzy
+#| msgid "Google secret not found"
+msgid "OAuth2 secret not found"
+msgstr "找不到 Google 密碼"
+
+#: ../src/libedataserver/e-oauth2-service.c:1411
+#, fuzzy, c-format
+#| msgid "Unexpected server response from xover: %s"
+msgid "Received incorrect response from server “%s”."
+msgstr "xover 傳來意外的伺服器回應：%s"
+
+#: ../src/libedataserver/e-oauth2-service.c:1420
+#, fuzzy
+#| msgid "Failed to get access token from refresh_token server response"
+msgid "Failed to refresh access token. Sign to the server again, please."
+msgstr "無法從 refresh_token 伺服器回應獲得存取記號"
+
+#. Translators: The first %s is a display name of the source, the second is its UID.
+#: ../src/libedataserver/e-oauth2-service.c:1462
+#, fuzzy, c-format
+#| msgid "Source “%s” (%s) is not a valid Google source"
+msgid "Source “%s” (%s) is not a valid OAuth2 source"
+msgstr "來源「%s」(%s) 不是有效的 Google 來源"
+
+#: ../src/libedataserver/e-oauth2-service.c:1535
+msgid ""
+"The access token is expired and it failed to refresh it. Sign to the server "
+"again, please."
+msgstr ""
+
+#. Translators: This is a user-visible string, display name of an OAuth2 service.
+#: ../src/libedataserver/e-oauth2-service-google.c:56
+#, fuzzy
+#| msgid "Google"
+msgctxt "OAuth2Service"
+msgid "Google"
+msgstr "Google"
+
+#. Translators: This is a user-visible string, display name of an OAuth2 service.
+#: ../src/libedataserver/e-oauth2-service-outlook.c:57
+msgctxt "OAuth2Service"
+msgid "Outlook"
+msgstr ""
+
+#: ../src/libedataserver/e-soup-session.c:861
+#, fuzzy
+#| msgid "Operation has been cancelled"
+msgid "Operation was cancelled"
+msgstr "操作已取消"
+
+#: ../src/libedataserver/e-soup-session.c:867
+#, fuzzy, c-format
+#| msgid "Failed to make directory %s: %s"
+msgid "Failed with HTTP error %d: %s"
+msgstr "無法建立目錄「%s」：%s"
+
+#: ../src/libedataserver/e-source.c:772
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "來源檔案缺少 [%s] 群組"
 
-#: ../src/libedataserver/e-source.c:1379
+#: ../src/libedataserver/e-source.c:1363
 #, c-format
 msgid "Data source “%s” is not removable"
 msgstr "資料來源「%s」無法移除"
 
-#: ../src/libedataserver/e-source.c:1502
+#: ../src/libedataserver/e-source.c:1486
 #, c-format
 msgid "Data source “%s” is not writable"
 msgstr "資料來源「%s」無法寫入"
 
-#: ../src/libedataserver/e-source.c:2198
+#: ../src/libedataserver/e-source.c:2173
 msgid "Unnamed"
 msgstr "未命名的"
 
@@ -5350,54 +6475,11 @@ msgstr "不支援憑證儲存"
 msgid "Credentials delete is not supported"
 msgstr "不支援憑證刪除"
 
-#. Translators: The first %s is a display name of the source, the second is its UID.
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:79
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:143
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:240
-#, c-format
-msgid "Source “%s” (%s) is not a valid Google source"
-msgstr "來源「%s」(%s) 不是有效的 Google 來源"
-
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:157
-msgid "Google secret not found"
-msgstr "找不到 Google 密碼"
-
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:188
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:210
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:233
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:530
-msgid "Google authentication is not supported"
-msgstr "不支援 Google 憑證"
-
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:400
-msgid "Failed to get Google secret from credentials"
-msgstr "無法從憑證取得 Google 秘件"
-
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:413
-msgid "Refresh token not found in Google secret"
-msgstr "在 Google 密件找不到更新的記號"
-
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:421
-msgid "Failed to construct refresh_token request"
-msgstr "建構 refresh_token 要求失敗"
-
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:454
-msgid "Failed to encode new access token to Google secret"
-msgstr "無法編碼新的存取記號到 Google 秘件"
-
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:464
-msgid "Failed to get access token from refresh_token server response"
-msgstr "無法從 refresh_token 伺服器回應獲得存取記號"
-
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:470
-msgid "Failed to refresh token"
-msgstr "更新記號失敗"
-
 #: ../src/libedataserver/e-source-credentials-provider-impl-password.c:79
 msgid "Password not found"
 msgstr "找不到密碼"
 
-#: ../src/libedataserver/e-source-mail-signature.c:482
+#: ../src/libedataserver/e-source-mail-signature.c:483
 #, c-format
 msgid "Signature script must be a local file"
 msgstr "簽章必須是本地端檔案"
@@ -5511,59 +6593,268 @@ msgstr "%Y/%m/%d"
 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.
-#: ../src/libedataserver/e-time-utils.c:1917
-#: ../src/libedataserver/e-time-utils.c:2026
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
+#. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
+#: ../src/libedataserver/e-time-utils.c:1917
+#: ../src/libedataserver/e-time-utils.c:2026
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
+
+#. strptime format for time of day, without seconds,
+#. * in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. * without seconds.
+#: ../src/libedataserver/e-time-utils.c:1922
+#: ../src/libedataserver/e-time-utils.c:2031
+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.
+#: ../src/libedataserver/e-time-utils.c:1926
+#: ../src/libedataserver/e-time-utils.c:2023
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. strptime format for time of day, without seconds 24-hour format,
+#. * and no colon.
+#: ../src/libedataserver/e-time-utils.c:1930
+msgid "%H%M"
+msgstr "%H%M"
+
+#. strptime format for hour and AM/PM, 12-hour format.
+#: ../src/libedataserver/e-time-utils.c:1934
+msgid "%I %p"
+msgstr "%I %p"
+
+#: ../src/libedataserver/e-webdav-session.c:670
+msgid "Cannot determine destination URL without WebDAV extension"
+msgstr ""
+
+#: ../src/libedataserver/e-webdav-session.c:955
+#, c-format
+msgid ""
+"The server responded with an HTML page, which can mean there’s an error on "
+"the server or with the client request. The used URI was: %s"
+msgstr ""
+
+#: ../src/libedataserver/e-webdav-session.c:957
+#, c-format
+msgid ""
+"The server responded with an HTML page, which can mean there’s an error on "
+"the server or with the client request."
+msgstr ""
+
+#. Translators: The first '%s' is replaced with error prefix, as provided
+#. by the caller, which can be in a form: "Failed with something".
+#. The '%d' is replaced with actual HTTP status code.
+#. The second '%s' is replaced with a reason phrase of the error (user readable text).
+#. The last '%s' is replaced with detailed error text, as returned by the server.
+#: ../src/libedataserver/e-webdav-session.c:978
+#, c-format
+msgid "%s: HTTP error code %d (%s): %s"
+msgstr ""
+
+#. Translators: The '%d' is replaced with actual HTTP status code.
+#. The '%s' is replaced with a reason phrase of the error (user readable text).
+#. The last '%s' is replaced with detailed error text, as returned by the server.
+#: ../src/libedataserver/e-webdav-session.c:986
+#, c-format
+msgid "Failed with HTTP error code %d (%s): %s"
+msgstr ""
+
+#. Translators: The first '%s' is replaced with error prefix, as provided
+#. by the caller, which can be in a form: "Failed with something".
+#. The '%d' is replaced with actual HTTP status code.
+#. The second '%s' is replaced with a reason phrase of the error (user readable text).
+#: ../src/libedataserver/e-webdav-session.c:1001
+#, c-format
+msgid "%s: HTTP error code %d (%s)"
+msgstr ""
+
+#. Translators: The '%d' is replaced with actual HTTP status code.
+#. The '%s' is replaced with a reason phrase of the error (user readable text).
+#: ../src/libedataserver/e-webdav-session.c:1007
+#, c-format
+msgid "Failed with HTTP error code %d (%s)"
+msgstr ""
+
+#: ../src/libedataserver/e-webdav-session.c:1257
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to post data"
+msgstr "無法編碼資料"
+
+#: ../src/libedataserver/e-webdav-session.c:1350
+#: ../src/libedataserver/e-webdav-session.c:1425
+#: ../src/libedataserver/e-webdav-session.c:1529
+#: ../src/libedataserver/e-webdav-session.c:2778
+#: ../src/libedataserver/e-webdav-session.c:4030
+#, fuzzy
+#| msgid "Failed to find Account element"
+msgid "Failed to get input XML content"
+msgstr "找不到帳號元素"
+
+#: ../src/libedataserver/e-webdav-session.c:1361
+#, fuzzy
+#| msgid "Failed to get capabilities"
+msgid "Failed to get properties"
+msgstr "無法取得功能"
+
+#: ../src/libedataserver/e-webdav-session.c:1435
+#, fuzzy
+#| msgid "Failed to authenticate"
+msgid "Failed to update properties"
+msgstr "無法核對"
+
+#: ../src/libedataserver/e-webdav-session.c:1539
+#, fuzzy
+#| msgid "Failed to issue NOTIFY"
+msgid "Failed to issue REPORT"
+msgstr "無法發出 NOTIFY"
+
+#: ../src/libedataserver/e-webdav-session.c:1598
+#, fuzzy
+#| msgid "Failed to refresh token"
+msgid "Failed to create collection"
+msgstr "更新記號失敗"
+
+#: ../src/libedataserver/e-webdav-session.c:1689
+#: ../src/libedataserver/e-webdav-session.c:1843
+#, fuzzy
+#| msgid "Failed to refresh token"
+msgid "Failed to get XML request content"
+msgstr "更新記號失敗"
+
+#: ../src/libedataserver/e-webdav-session.c:1701
+#, fuzzy
+#| msgid "Failed to read From address"
+msgid "Failed to create address book"
+msgstr "讀取寄件者位址失敗"
+
+#: ../src/libedataserver/e-webdav-session.c:1856
+#, fuzzy
+#| msgid "Unable to create cache path"
+msgid "Failed to create calendar"
+msgstr "無法建構快取路徑"
+
+#: ../src/libedataserver/e-webdav-session.c:1988
+#: ../src/libedataserver/e-webdav-session.c:1999
+#, fuzzy
+#| msgid "Failed to read From address"
+msgid "Failed to read resource"
+msgstr "讀取寄件者位址失敗"
+
+#: ../src/libedataserver/e-webdav-session.c:2148
+#, fuzzy
+#| msgid "Credentials store is not supported"
+msgid "Cannot rewind input stream: Not supported"
+msgstr "不支援憑證儲存"
+
+#: ../src/libedataserver/e-webdav-session.c:2311
+#: ../src/libedataserver/e-webdav-session.c:2455
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to put data"
+msgstr "無法編碼資料"
+
+#: ../src/libedataserver/e-webdav-session.c:2330
+#: ../src/libedataserver/e-webdav-session.c:2463
+#, fuzzy, c-format
+#| msgid "Failed to add data to encoder"
+msgid "Failed to put data to server, error code %d (%s)"
+msgstr "無法新增資料至編碼器"
+
+#: ../src/libedataserver/e-webdav-session.c:2555
+#, fuzzy
+#| msgid "Failed to enable QResync"
+msgid "Failed to delete resource"
+msgstr "無法啟用 QResync"
+
+#: ../src/libedataserver/e-webdav-session.c:2622
+#, fuzzy
+#| msgid "Failed to copy the tmp file"
+msgid "Failed to copy resource"
+msgstr "無法複製 tmp 檔案"
+
+#: ../src/libedataserver/e-webdav-session.c:2684
+#, fuzzy
+#| msgid "Failed to refresh token"
+msgid "Failed to move resource"
+msgstr "更新記號失敗"
+
+#: ../src/libedataserver/e-webdav-session.c:2789
+#, fuzzy
+#| msgid "Failed to refresh token"
+msgid "Failed to lock resource"
+msgstr "更新記號失敗"
+
+#: ../src/libedataserver/e-webdav-session.c:2803
+#: ../src/libedataserver/e-webdav-session.c:3005
+msgid "Expected application/xml response, but none returned"
+msgstr ""
+
+#: ../src/libedataserver/e-webdav-session.c:2806
+#: ../src/libedataserver/e-webdav-session.c:3008
+#, c-format
+msgid "Expected application/xml response, but %s returned"
+msgstr ""
+
+#: ../src/libedataserver/e-webdav-session.c:2818
+#: ../src/libedataserver/e-webdav-session.c:3021
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to parse XML data"
+msgstr "無法編碼資料"
+
+#: ../src/libedataserver/e-webdav-session.c:2897
+#, fuzzy
+#| msgid "Failed to refresh token"
+msgid "Failed to refresh lock"
+msgstr "更新記號失敗"
+
+#: ../src/libedataserver/e-webdav-session.c:2956
+#, fuzzy
+#| msgid "Failed to authenticate"
+msgid "Failed to unlock"
+msgstr "無法核對"
 
-#. strptime format for time of day, without seconds,
-#. * in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. * without seconds.
-#: ../src/libedataserver/e-time-utils.c:1922
-#: ../src/libedataserver/e-time-utils.c:2031
-msgid "%I:%M %p"
-msgstr "%p %I:%M"
+#: ../src/libedataserver/e-webdav-session.c:2993
+#, fuzzy, c-format
+#| msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
+msgid "Expected multistatus response, but %d returned (%s)"
+msgstr "未預期的 HTTP 回應狀態碼 %d (%s) URI：%s"
 
-#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. * without seconds.
-#: ../src/libedataserver/e-time-utils.c:1926
-#: ../src/libedataserver/e-time-utils.c:2023
-msgid "%H:%M"
-msgstr "%H:%M"
+#: ../src/libedataserver/e-webdav-session.c:4040
+#, fuzzy
+#| msgid "Failed to get lock using fcntl(2): %s"
+msgid "Failed to get access control list"
+msgstr "使用 fcntl(2) 取得鎖失敗： %s"
 
-#. strptime format for time of day, without seconds 24-hour format,
-#. * and no colon.
-#: ../src/libedataserver/e-time-utils.c:1930
-msgid "%H%M"
-msgstr "%H%M"
+#: ../src/libedataserver/e-webdav-session.c:4781
+msgid "Cannot store protected nor inherited Access Control Entry."
+msgstr ""
 
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../src/libedataserver/e-time-utils.c:1934
-msgid "%I %p"
-msgstr "%I %p"
+#: ../src/libedataserver/e-webdav-session.c:4788
+msgid "Provided invalid principal kind for Access Control Entry."
+msgstr ""
 
-#: ../src/libedataserver/e-webdav-discover.c:447
-#: ../src/libedataserver/e-webdav-discover.c:486
-#: ../src/libedataserver/e-webdav-discover.c:495
-#, c-format
-msgid "HTTP Error: %s"
-msgstr "HTTP 錯誤： %s"
+#: ../src/libedataserver/e-webdav-session.c:4795
+msgid "Cannot store property-based Access Control Entry."
+msgstr ""
 
-#: ../src/libedataserver/e-webdav-discover.c:525
-msgid "Could not parse response"
-msgstr "無法解析回應"
+#: ../src/libedataserver/e-webdav-session.c:4802
+msgid "Access Control Entry can be only to Grant or Deny, but not None."
+msgstr ""
 
-#: ../src/libedataserver/e-webdav-discover.c:534
-msgid "Empty response"
-msgstr "空白的回應"
+#: ../src/libedataserver/e-webdav-session.c:4810
+msgid "Access Control Entry can be only to Grant or Deny, but not both."
+msgstr ""
 
-#: ../src/libedataserver/e-webdav-discover.c:542
-msgid "Unexpected reply from server"
-msgstr "來自伺服器未預期的回應"
+#: ../src/libedataserver/e-webdav-session.c:4869
+msgid "Access Control Entry privilege cannot be NULL."
+msgstr ""
 
 #: ../src/libedataserverui/e-credentials-prompter.c:258
 #: ../src/libedataserverui/e-credentials-prompter.c:1576
@@ -5576,93 +6867,160 @@ msgstr "憑證提示已取消"
 msgid "Source “%s” doesn’t support prompt for credentials"
 msgstr "來源「%s」不支援憑證提示"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:444
-#, c-format
-msgid "Failed to obtain access token from address “%s”. Error code %d (%s)"
-msgstr "無法從位址「%s」獲得位址存取記號：錯誤代碼 %d (%s)"
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:202
+#, fuzzy, c-format
+#| msgid "Failed to obtain an access token for “%s”: "
+msgid "Failed to obtain access token from address “%s”: %s"
+msgstr "無法獲得「%s」的存取記號："
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:492
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:246
 msgid "Requesting access token, please wait..."
 msgstr "正請求存取記號，請稍候..."
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:594
-msgid "Google Address book authentication request"
-msgstr "Google 通訊錄核對要求"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Address Book authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:472
+#, fuzzy, c-format
+#| msgid "Address book authentication request"
+msgid "%s Address Book authentication request"
+msgstr "通訊錄核對要求"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:597
-msgid "Google Calendar authentication request"
-msgstr "Google 行事曆核對要求"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Calendar authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:477
+#, fuzzy, c-format
+#| msgid "Calendar authentication request"
+msgid "%s Calendar authentication request"
+msgstr "行事曆核對要求"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:600
-msgid "Google Memo List authentication request"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Memo List authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:482
+#, fuzzy, c-format
+#| msgid "Google Memo List authentication request"
+msgid "%s Memo List authentication request"
 msgstr "Google 備忘錄列表核對要求"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:603
-msgid "Google Task List authentication request"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Task List authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:487
+#, fuzzy, c-format
+#| msgid "Google Task List authentication request"
+msgid "%s Task List authentication request"
 msgstr "Google 任務列表核對要求"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:607
-msgid "Google Mail authentication request"
-msgstr "Google 郵件核對要求"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Mail authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:493
+#, fuzzy, c-format
+#| msgid "Mail authentication request"
+msgid "%s Mail authentication request"
+msgstr "郵件核對要求"
 
 #. generic account prompt
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:610
-msgid "Google account authentication request"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Google account authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:498
+#, fuzzy, c-format
+#| msgid "Google account authentication request"
+msgid "%s account authentication request"
 msgstr "Google 帳號核對要求"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:621
-#, c-format
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:512
+#, fuzzy, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your address book “%s”."
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
+"Login to your %s account and accept conditions in order to access your "
 "address book “%s”."
 msgstr "登入您的 Google 帳號並接受條款來存取您的通訊錄「%s」。"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:625
-#, c-format
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:519
+#, fuzzy, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your calendar “%s”."
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
+"Login to your %s account and accept conditions in order to access your "
 "calendar “%s”."
 msgstr "登入您的 Google 帳號並接受條款來存取您的行事曆「%s」。"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:629
-#, c-format
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:526
+#, fuzzy, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your mail account “%s”."
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"mail account “%s”."
+"Login to your %s account and accept conditions in order to access your mail "
+"account “%s”."
 msgstr "登入您的 Google 帳號並接受條款來存取您的郵件帳號「%s」。"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:633
-#, c-format
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:533
+#, fuzzy, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your mail transport “%s”."
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"mail transport “%s”."
+"Login to your %s account and accept conditions in order to access your mail "
+"transport “%s”."
 msgstr "登入您的 Google 帳號並接受條款來存取您的郵件「%s」。"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:637
-#, c-format
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:540
+#, fuzzy, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your memo list “%s”."
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"memo list “%s”."
+"Login to your %s account and accept conditions in order to access your memo "
+"list “%s”."
 msgstr "登入您的 Google 帳號並接受條款來存取您的備忘錄列表「%s」。"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:641
-#, c-format
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:547
+#, fuzzy, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your task list “%s”."
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"task list “%s”."
+"Login to your %s account and accept conditions in order to access your task "
+"list “%s”."
 msgstr "登入您的 Google 帳號並接受條款來存取您的工作列表「%s」。"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:645
-#, c-format
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from 
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source 
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:554
+#, fuzzy, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your account “%s”."
 msgid ""
-"Login to your Google account and accept conditions in order to access your "
+"Login to your %s account and accept conditions in order to access your "
 "account “%s”."
 msgstr "登入您的 Google 帳號並接受條款來存取您的帳號「%s」。"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:689
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:602
 #: ../src/libedataserverui/e-credentials-prompter-impl-password.c:230
 #: ../src/libedataserverui/e-trust-prompt.c:112
-#: ../src/libedataserverui/e-webdav-discover-widget.c:1064
+#: ../src/libedataserverui/e-webdav-discover-widget.c:1061
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -5719,23 +7077,109 @@ msgid "Please enter the password for account “%s”."
 msgstr "請輸入帳號「%s」的密碼 。"
 
 #: ../src/libedataserverui/e-credentials-prompter-impl-password.c:231
-#: ../src/libedataserverui/e-webdav-discover-widget.c:1065
+#: ../src/libedataserverui/e-webdav-discover-widget.c:1062
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:341
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:348
 msgid "_User Name:"
 msgstr "使用者名稱(_N)："
 
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:353
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:360
 msgid "_Password:"
 msgstr "密碼(_P)："
 
 #. Remember password check
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:369
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:376
 msgid "_Add this password to your keyring"
 msgstr "將密碼加入您的鑰匙圈(_A)"
 
+#: ../src/libedataserverui/e-reminders-widget.c:225
+msgid "Add custom time…"
+msgstr ""
+
+#: ../src/libedataserverui/e-reminders-widget.c:229
+msgid "Clear custom times"
+msgstr ""
+
+#: ../src/libedataserverui/e-reminders-widget.c:277
+#, fuzzy
+#| msgctxt "Priority"
+#| msgid "Low"
+msgctxt "overdue"
+msgid "now"
+msgstr "低"
+
+#: ../src/libedataserverui/e-reminders-widget.c:295
+#, c-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+
+#: ../src/libedataserverui/e-reminders-widget.c:301
+msgctxt "overdue"
+msgid "overdue"
+msgstr ""
+
+#: ../src/libedataserverui/e-reminders-widget.c:912
+#, fuzzy, c-format
+#| msgid "Failed to open client “%s”: %s"
+msgid "Failed to launch URI “%s”:"
+msgstr "無法開啟客戶端「%s」：%s"
+
+#: ../src/libedataserverui/e-reminders-widget.c:953
+#, fuzzy
+#| msgid "Could not discard reminder: "
+msgid "Failed to dismiss reminder:"
+msgstr "無法取消提醒："
+
+#: ../src/libedataserverui/e-reminders-widget.c:974
+#, fuzzy
+#| msgid "Failed to issue DONE"
+msgid "Failed to dismiss all:"
+msgstr "無法發出 DONE"
+
+#: ../src/libedataserverui/e-reminders-widget.c:1110
+msgid "Set a custom snooze time for"
+msgstr ""
+
+#. Translators: this is part of: "Set a custom snooze time for [nnn] days [nnn] hours [nnn] minutes", where 
the text in "[]" means a separate widget
+#: ../src/libedataserverui/e-reminders-widget.c:1123
+msgctxt "reminders-snooze"
+msgid "da_ys"
+msgstr ""
+
+#. Translators: this is part of: "Set a custom snooze time for [nnn] days [nnn] hours [nnn] minutes", where 
the text in "[]" means a separate widget
+#: ../src/libedataserverui/e-reminders-widget.c:1139
+msgctxt "reminders-snooze"
+msgid "_hours"
+msgstr ""
+
+#. Translators: this is part of: "Set a custom snooze time for [nnn] days [nnn] hours [nnn] minutes", where 
the text in "[]" means a separate widget
+#: ../src/libedataserverui/e-reminders-widget.c:1155
+msgctxt "reminders-snooze"
+msgid "_minutes"
+msgstr ""
+
+#: ../src/libedataserverui/e-reminders-widget.c:1161
+msgid "_Add Snooze time"
+msgstr ""
+
+#: ../src/libedataserverui/e-reminders-widget.c:1428
+#: ../src/services/evolution-user-prompter/prompt-user-gtk.c:119
+msgid "_Dismiss"
+msgstr "解除(_D)"
+
+#: ../src/libedataserverui/e-reminders-widget.c:1429
+#, fuzzy
+#| msgid "_Dismiss"
+msgid "Dismiss _All"
+msgstr "解除(_D)"
+
+#: ../src/libedataserverui/e-reminders-widget.c:1431
+msgid "_Snooze"
+msgstr ""
+
 #: ../src/libedataserverui/e-trust-prompt.c:111
 #: ../src/modules/trust-prompt/trust-prompt-gtk.c:117
 msgid "Certificate trust..."
@@ -5833,23 +7277,19 @@ msgctxt "WebDAVDiscover"
 msgid "Tasks"
 msgstr "工作"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:826
+#: ../src/libedataserverui/e-webdav-discover-widget.c:834
 msgid "Invalid URL"
 msgstr "無效的 URL"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:840
-msgid "User name not filled"
-msgstr "使用者名稱未填"
-
-#: ../src/libedataserverui/e-webdav-discover-widget.c:881
+#: ../src/libedataserverui/e-webdav-discover-widget.c:875
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/libedataserverui/e-webdav-discover-widget.c:884
+#: ../src/libedataserverui/e-webdav-discover-widget.c:878
 msgid "Searching server sources..."
 msgstr "正在搜尋伺服器來源…"
 
-#: ../src/modules/gnome-online-accounts/e-goa-password-based.c:208
+#: ../src/modules/gnome-online-accounts/e-goa-password-based.c:248
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
@@ -5858,7 +7298,7 @@ msgstr ""
 "找不到在 org.gnome 中對應的帳號。這是 OnlineAccounts 服務用來獲得「%s」的密碼"
 "的地方"
 
-#: ../src/modules/gnome-online-accounts/e-goa-password-based.c:271
+#: ../src/modules/gnome-online-accounts/e-goa-password-based.c:315
 msgid "Failed to get password from GOA: "
 msgstr "無法從 GOA 取得密碼： "
 
@@ -5898,7 +7338,7 @@ msgstr "找不到帳號元素"
 msgid "Failed to find ASUrl and OABUrl in autodiscover response"
 msgstr "在自動探索回應中找不到 ASUrl 與 OABUrl"
 
-#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1340
+#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1405
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
@@ -5907,24 +7347,19 @@ msgstr ""
 "找不到在 org.gnome 中對應的帳號。這是 OnlineAccounts 服務用來獲得「%s」的存取"
 "記號的地方"
 
-#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1370
+#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1455
 #, c-format
 msgid "Failed to obtain an access token for “%s”: "
 msgstr "無法獲得「%s」的存取記號："
 
-#: ../src/modules/google-backend/module-google-backend.c:605
-#: ../src/modules/yahoo-backend/module-yahoo-backend.c:227
-msgid "Tasks"
-msgstr "工作"
-
-#: ../src/modules/google-backend/module-google-backend.c:662
+#: ../src/modules/google-backend/module-google-backend.c:589
 #: ../src/modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
 #: ../src/services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
 msgid "Contacts"
 msgstr "連絡人"
 
 #: ../src/modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
-#: ../src/modules/yahoo-backend/module-yahoo-backend.c:200
+#: ../src/tools/list-sources/list-sources.c:148
 msgid "Calendar"
 msgstr "行事曆"
 
@@ -6011,17 +7446,84 @@ msgstr "Yahoo! 行事曆"
 msgid "Yahoo! Mail"
 msgstr "Yahoo! 電子信箱"
 
-#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:37
-#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:39
+#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:38
+#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:40
 #: ../src/services/evolution-user-prompter/evolution-user-prompter.c:33
 msgid "Keep running after the last client is closed"
 msgstr "在上次關閉客戶端之後保持執行"
 
-#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:39
-#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:41
+#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:40
+#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:42
 msgid "Wait running until at least one client is connected"
 msgstr "直到至少有一個客戶端連線前等候執行"
 
+#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:42
+#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:44
+msgid ""
+"Overrides compile-time backend per process option; use 1 to enable, 0 to "
+"disable, any other value is to use compile-time option"
+msgstr ""
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:223
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:250
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:755
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:964
+msgid "Reminders"
+msgstr ""
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:362
+msgid "Warning"
+msgstr ""
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:363
+msgid "_No"
+msgstr ""
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:364
+msgid "_Yes"
+msgstr ""
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:368
+#, c-format
+msgid ""
+"A calendar reminder is about to trigger. This reminder is configured to run "
+"the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
+msgstr ""
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:382
+msgid "Do not ask me about this program again"
+msgstr ""
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:660
+msgid "Display reminders in notification area _only"
+msgstr ""
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:661
+msgid "Keep reminder notification window always on _top"
+msgstr ""
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:662
+msgid "Display reminders for _completed tasks"
+msgstr ""
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:663
+msgid "Display reminders for _past events"
+msgstr ""
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:677
+msgid "Reminders Options:"
+msgstr ""
+
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:771
+#, c-format
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] ""
+
 #: ../src/services/evolution-source-registry/builtin/birthdays.source.in.h:1
 msgid "Birthdays & Anniversaries"
 msgstr "生日及週年紀念日"
@@ -6030,6 +7532,10 @@ msgstr "生日及週年紀念日"
 msgid "CalDAV"
 msgstr "CalDAV"
 
+#: ../src/services/evolution-source-registry/builtin/carddav-stub.source.in.h:1
+msgid "CardDAV"
+msgstr ""
+
 #: ../src/services/evolution-source-registry/builtin/google-stub.source.in.h:1
 msgid "Google"
 msgstr "Google"
@@ -6043,6 +7549,10 @@ msgstr "於 LDAP 伺服器"
 msgid "On This Computer"
 msgstr "我的電腦"
 
+#: ../src/services/evolution-source-registry/builtin/system-proxy.source.in.h:1
+msgid "Default Proxy Settings"
+msgstr ""
+
 #: ../src/services/evolution-source-registry/builtin/vfolder.source.in.h:1
 msgid "Search Folders"
 msgstr "搜尋資料夾"
@@ -6055,61 +7565,363 @@ msgstr "天氣"
 msgid "On The Web"
 msgstr "於網站"
 
-#: ../src/services/evolution-source-registry/builtin/webdav-stub.source.in.h:1
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: ../src/services/evolution-source-registry/evolution-source-registry.c:40
+#: ../src/services/evolution-source-registry/evolution-source-registry.c:41
 msgid "Don’t migrate user data from previous versions of Evolution"
 msgstr "不要從前一版的 Evolution 轉換使用者資料"
 
-#: ../src/services/evolution-user-prompter/prompt-user-gtk.c:119
-msgid "_Dismiss"
-msgstr "解除(_D)"
-
-#: ../src/tools/addressbook-export/addressbook-export.c:68
-#: ../src/tools/addressbook-export/addressbook-export.c:782
+#: ../src/tools/addressbook-export/addressbook-export.c:69
+#: ../src/tools/addressbook-export/addressbook-export.c:781
 msgid "Can not open file"
 msgstr "無法開啟檔案"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:98
+#: ../src/tools/addressbook-export/addressbook-export.c:99
 #, c-format
 msgid "Failed to open client “%s”: %s"
 msgstr "無法開啟客戶端「%s」：%s"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:892
+#: ../src/tools/addressbook-export/addressbook-export.c:889
 msgid "Unhandled error"
 msgstr "未處理的錯誤"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:925
+#: ../src/tools/addressbook-export/addressbook-export.c:922
 msgid "Specify the output file instead of standard output"
 msgstr "指定輸出檔案而不是標準輸出"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:926
+#: ../src/tools/addressbook-export/addressbook-export.c:923
 msgid "OUTPUTFILE"
 msgstr "輸出檔案"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:929
+#: ../src/tools/addressbook-export/addressbook-export.c:926
 msgid "List local address book folders"
 msgstr "列出本地通訊錄資料夾"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:932
+#: ../src/tools/addressbook-export/addressbook-export.c:929
 msgid "Show cards as vcard or csv file"
 msgstr "將名片顯示成 vcard 或 csv 檔案"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:933
+#: ../src/tools/addressbook-export/addressbook-export.c:930
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:981
+#: ../src/tools/addressbook-export/addressbook-export.c:978
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "命令列引數錯誤，請使用 --help 選項來查看用法。"
 
-#: ../src/tools/addressbook-export/addressbook-export.c:995
+#: ../src/tools/addressbook-export/addressbook-export.c:992
 msgid "Only support csv or vcard format."
 msgstr "僅支援 csv 或 vcard 格式。"
 
+#: ../src/tools/list-sources/list-sources.c:83
+#, fuzzy
+#| msgid "_Show only subscribed folders"
+msgid "Show only enabled sources"
+msgstr "只顯示已訂閱的資料夾(_S)"
+
+#: ../src/tools/list-sources/list-sources.c:86
+#, fuzzy
+#| msgid "POP Source UID"
+msgid "Show source’s UID"
+msgstr "POP 來源 UID"
+
+#: ../src/tools/list-sources/list-sources.c:89
+#, fuzzy
+#| msgid "Unsupported authentication method"
+msgid "Show source’s authentication information"
+msgstr "不支援的核對方法"
+
+#: ../src/tools/list-sources/list-sources.c:92
+msgid ""
+"Write in machine readable format (one source per line, without localized "
+"property names and tab as separator)"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:95
+msgid "Limit only to sources with given extension name"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:106
+msgid "yes"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:106
+msgid "no"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:126
+#, fuzzy
+#| msgctxt "CategoryName"
+#| msgid "Competition"
+msgid "Collection"
+msgstr "競爭者"
+
+#: ../src/tools/list-sources/list-sources.c:132
+msgid "Collection/GNOME Online Accounts"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:137
+msgid "Collection/Ubuntu Online Accounts"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:147
+#, fuzzy
+#| msgid "Address List"
+msgid "Address Book"
+msgstr "地址列表"
+
+#: ../src/tools/list-sources/list-sources.c:149
+#, fuzzy
+#| msgctxt "WebDAVDiscover"
+#| msgid "Memos"
+msgid "Memo List"
+msgstr "備忘錄"
+
+#: ../src/tools/list-sources/list-sources.c:150
+#, fuzzy
+#| msgid "Tasks"
+msgid "Task List"
+msgstr "工作"
+
+#: ../src/tools/list-sources/list-sources.c:151
+msgid "Mail Account"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:152
+msgid "Mail Transport"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:153
+msgid "Mail Identity"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:154
+#, fuzzy
+#| msgid "Message submission port"
+msgid "Mail Submission"
+msgstr "郵件提交連接埠"
+
+#: ../src/tools/list-sources/list-sources.c:155
+#, fuzzy
+#| msgid "Bad signature"
+msgid "Mail Signature"
+msgstr "錯誤的簽章"
+
+#: ../src/tools/list-sources/list-sources.c:156
+msgid "Proxy"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:224
+#, c-format
+msgid "UID: %s"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:228
+#, fuzzy, c-format
+#| msgid "Malformed URI: %s"
+msgid "Parent UID: %s"
+msgstr "格式不良的 URI：%s"
+
+#: ../src/tools/list-sources/list-sources.c:231
+#, fuzzy, c-format
+#| msgid "Posting failed: %s"
+msgid "Enabled: %s"
+msgstr "張貼失敗：%s"
+
+#: ../src/tools/list-sources/list-sources.c:233
+#, fuzzy, c-format
+#| msgid "Backend is busy"
+msgid "Backend: %s"
+msgstr "後端忙碌中"
+
+#: ../src/tools/list-sources/list-sources.c:238
+#, fuzzy, c-format
+#| msgid "Calendar does not exist"
+msgid "Calendar enabled: %s"
+msgstr "行事曆不存在"
+
+#: ../src/tools/list-sources/list-sources.c:239
+#, fuzzy, c-format
+#| msgid "Contact ID already exists"
+msgid "Contacts enabled: %s"
+msgstr "連絡人 ID 已經存在"
+
+#: ../src/tools/list-sources/list-sources.c:240
+#, fuzzy, c-format
+#| msgid "Operation failed: %s"
+msgid "Mail enabled: %s"
+msgstr "作業失敗： %s"
+
+#: ../src/tools/list-sources/list-sources.c:247
+#, c-format
+msgid "MIME Type: %s"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:269
+#, c-format
+msgid "Auth Host: %s:%d"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:275
+#, c-format
+msgid "Auth Host: %s"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:283
+#, c-format
+msgid "Auth User: %s"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:291
+#, c-format
+msgid "Auth Method: %s"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:299
+#, c-format
+msgid "Auth Proxy UID: %s"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:420
+#, fuzzy
+#| msgid "Failed to parse autodiscover response XML"
+msgid "Failed to parse arguments: Unknown error"
+msgstr "無法解析自動偵測回應的 XML"
+
+#: ../src/tools/list-sources/list-sources.c:429
+#, fuzzy, c-format
+#| msgid "Failed to connect to a server using SSL/TLS: %s"
+msgid "Failed to connect to source registry: %s\n"
+msgstr "無法使用 SSL/TLS 連線至伺服器：%s"
+
+#: ../src/tools/list-sources/list-sources.c:445
+#, c-format
+msgid "No sources had been found\n"
+msgstr ""
+
+#~ msgid "Querying for updated contacts…"
+#~ msgstr "查詢更新的連絡人…"
+
+#~ msgid "Querying for updated groups…"
+#~ msgstr "查詢更新的群組…"
+
+#~ msgid "The backend does not support bulk removals"
+#~ msgstr "後端不支援大量移除"
+
+#~ msgid "Loading…"
+#~ msgstr "載入中…"
+
+#~ msgid "Loading Addressbook summary..."
+#~ msgstr "載入通訊錄摘要…"
+
+#~ msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
+#~ msgstr "webdav PROPFIND 失敗，HTTP 狀態：%d (%s)"
+
+#~ msgid "No response body in webdav PROPFIND result"
+#~ msgstr "在 webdav PROPFIND 結果沒有回應本體"
+
+#~ msgid "Loading Contacts (%d%%)"
+#~ msgstr "載入聯絡人 (%d%%)"
+
+#~ msgid "Cannot transform SoupURI to string"
+#~ msgstr "不能將 SoupURI 轉換為字串"
+
+#~ msgid "Create resource “%s” failed with HTTP status %d (%s)"
+#~ msgstr "建立資源「%s」失敗，HTTP 狀態：%d (%s)"
+
+#~ msgid "Contact on server changed -> not modifying"
+#~ msgstr "伺服器上的連絡人已變更 -> 尚未修改"
+
+#~ msgid "Modify contact failed with HTTP status %d (%s)"
+#~ msgstr "修改連絡人失敗，HTTP 狀態：%d (%s)"
+
+#~ msgid "DELETE failed with HTTP status %d"
+#~ msgstr "DELETE 失敗，HTTP 狀態：%d"
+
+#~ msgid "Server is unreachable (%s)"
+#~ msgstr "無法連接伺服器 (%s)"
+
+#~ msgid "Failed to login to the server: %s"
+#~ msgstr "無法登入伺服器：%s"
+
+#~ msgid "CalDAV backend is not loaded yet"
+#~ msgstr "CalDAV 後端尚未載入"
+
+#~ msgid "Invalid Redirect URL"
+#~ msgstr "無效的重新導向 URL"
+
+#~ msgid "Cannot create local cache folder “%s”"
+#~ msgstr "不能建立本地快取資料夾「%s」"
+
+#~ msgid ""
+#~ "Server is unreachable, calendar is opened in read-only mode.\n"
+#~ "Error message: %s"
+#~ msgstr ""
+#~ "無法連接伺服器，行事曆會以唯讀模式開啟。\n"
+#~ "錯誤訊息：%s"
+
+#~ msgid "CalDAV does not support bulk additions"
+#~ msgstr "CalDAV 不支援大量增加"
+
+#~ msgid "CalDAV does not support bulk modifications"
+#~ msgstr "CalDAV 不支援大量修改"
+
+#~ msgid "CalDAV does not support bulk removals"
+#~ msgstr "CalDAV 不支援大量移除"
+
+#~ msgid "Calendar doesn’t support Free/Busy"
+#~ msgstr "行事曆不支援空閒/忙碌"
+
+#~ msgid "Schedule outbox url not found"
+#~ msgstr "找不到排程的寄件匣 url"
+
+#~ msgid "Unexpected result in schedule-response"
+#~ msgstr "在排程-回應中未預期的結果"
+
+#~ msgid "Redirected to Invalid URI"
+#~ msgstr "重新指向無效的 URI"
+
+#~ msgid "Google authentication is not supported"
+#~ msgstr "不支援 Google 憑證"
+
+#~ msgid "Failed to get Google secret from credentials"
+#~ msgstr "無法從憑證取得 Google 秘件"
+
+#~ msgid "Refresh token not found in Google secret"
+#~ msgstr "在 Google 密件找不到更新的記號"
+
+#~ msgid "Failed to construct refresh_token request"
+#~ msgstr "建構 refresh_token 要求失敗"
+
+#~ msgid "Failed to encode new access token to Google secret"
+#~ msgstr "無法編碼新的存取記號到 Google 秘件"
+
+#~ msgid "HTTP Error: %s"
+#~ msgstr "HTTP 錯誤： %s"
+
+#~ msgid "Empty response"
+#~ msgstr "空白的回應"
+
+#~ msgid "Unexpected reply from server"
+#~ msgstr "來自伺服器未預期的回應"
+
+#~ msgid "Failed to obtain access token from address “%s”. Error code %d (%s)"
+#~ msgstr "無法從位址「%s」獲得位址存取記號：錯誤代碼 %d (%s)"
+
+#~ msgid "Google Address book authentication request"
+#~ msgstr "Google 通訊錄核對要求"
+
+#~ msgid "Google Calendar authentication request"
+#~ msgstr "Google 行事曆核對要求"
+
+#~ msgid "Google Mail authentication request"
+#~ msgstr "Google 郵件核對要求"
+
+#~ msgid "User name not filled"
+#~ msgstr "使用者名稱未填"
+
+#~ msgid "WebDAV"
+#~ msgstr "WebDAV"
+
 #~ msgid "Update preview data for folder '%s'"
 #~ msgstr "更新資料夾「%s」的預覽資料"
 
@@ -6122,9 +7934,6 @@ msgstr "僅支援 csv 或 vcard 格式。"
 #~ msgid "No such folder '%s'."
 #~ msgstr "沒有這個資料夾「%s」。"
 
-#~ msgid "Failed to issue DONE"
-#~ msgstr "無法發出 DONE"
-
 #~ msgid "Not authenticated"
 #~ msgstr "尚未核對"