Updated Chinese (Taiwan) translation

author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw> 2015-02-21 11:05:17 +0000
committer: GNOME Translation Robot <gnome-sysadmin@gnome.org> 2015-02-21 11:05:17 +0000
commit: 9166ff4ff47e420fb49879849c98861f1f0b6d32 (patch)
tree: 984f095f52a2f26b05e2ea83687f80ea9bf67768 /po/zh_TW.po
parent: 15141129e77ff0dec7a65772fb19f4926534a5be (diff)
download: evolution-data-server-9166ff4ff47e420fb49879849c98861f1f0b6d32.tar.gz
1 files changed, 1371 insertions, 2182 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c2ca10f8e..a24ae6ec7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: evolution-data-server 3.3.91\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2014-01-29 18:55+0000\n"
-"PO-Revision-Date: 2014-02-02 07:19+0800\n"
+"POT-Creation-Date: 2015-02-18 05:32+0000\n"
+"PO-Revision-Date: 2015-02-19 11:40+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional)\n"
 "Language: zh_TW\n"
@@ -19,158 +19,161 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.6.3\n"
+"X-Generator: Poedit 1.7.4\n"
 "X-Project-Style: gnome\n"
 "X-Poedit-Bookmarks: -1,257,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:117
+#: ../addressbook/backends/file/e-book-backend-file.c:120
 #, c-format
 msgid "Failed to remove file '%s': %s"
 msgstr "移除鎖定檔「%s」失敗：%s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:145
+#: ../addressbook/backends/file/e-book-backend-file.c:148
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "無法建立目錄「%s」：%s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:396
+#: ../addressbook/backends/file/e-book-backend-file.c:419
 #, c-format
 msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "無法建立資源「%s」的硬連結：%s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:501
-#: ../addressbook/backends/file/e-book-backend-file.c:1230
+#: ../addressbook/backends/file/e-book-backend-file.c:524
+#: ../addressbook/backends/file/e-book-backend-file.c:1256
 msgid "No UID in the contact"
 msgstr "在連絡人中沒有 UID"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:828
+#: ../addressbook/backends/file/e-book-backend-file.c:851
 #, c-format
 msgid "Conflicting UIDs found in added contacts"
 msgstr "在加入的連絡人中發現衝突的 UID"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:967
+#: ../addressbook/backends/file/e-book-backend-file.c:990
 msgid "Loading..."
 msgstr "載入中…"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:969
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4425
+#: ../addressbook/backends/file/e-book-backend-file.c:992
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4350
 msgid "Searching..."
 msgstr "搜尋中…"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1258
+#: ../addressbook/backends/file/e-book-backend-file.c:1284
 #, c-format
 msgid "Tried to modify contact '%s' with out of sync revision"
 msgstr "嘗試不使用同步修訂來修改連絡人「%s」"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1449
-#: ../addressbook/backends/file/e-book-backend-file.c:1532
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077
-#: ../addressbook/libedata-book/e-book-sqlite.c:6706
+#: ../addressbook/backends/file/e-book-backend-file.c:1475
+#: ../addressbook/backends/file/e-book-backend-file.c:1560
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3083
+#: ../addressbook/libedata-book/e-book-sqlite.c:7270
+#: ../addressbook/libedata-book/e-book-sqlite.c:7339
 #, c-format
 msgid "Contact '%s' not found"
 msgstr "找不到連絡人「%s」"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1592
-#: ../addressbook/backends/file/e-book-backend-file.c:1673
+#: ../addressbook/backends/file/e-book-backend-file.c:1620
+#: ../addressbook/backends/file/e-book-backend-file.c:1701
 #, c-format
 msgid "Query '%s' not supported"
 msgstr "查詢「%s」不支援"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1601
-#: ../addressbook/backends/file/e-book-backend-file.c:1682
+#: ../addressbook/backends/file/e-book-backend-file.c:1629
+#: ../addressbook/backends/file/e-book-backend-file.c:1710
 #, c-format
 msgid "Invalid Query '%s'"
 msgstr "無效的查詢「%s」"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1947
+#: ../addressbook/backends/file/e-book-backend-file.c:1975
 msgid "Requested to delete an unrelated cursor"
 msgstr "已要求刪除無關的游標"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2014
+#: ../addressbook/backends/file/e-book-backend-file.c:2046
 #, c-format
 msgid "Failed to rename old database from '%s' to '%s': %s"
 msgstr "無法將舊資料庫「%s」重新命名為「%s」： %s"
 
-#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1244
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4320
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:378
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:820
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1164
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4240
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:381
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:849
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:49
 #: ../addressbook/libebook-contacts/e-phone-number.c:56
 #: ../addressbook/libebook/e-book.c:1078
-#: ../addressbook/libebook/e-book-client.c:1882
-#: ../addressbook/libebook/e-book-client.c:2054
-#: ../addressbook/libebook/e-book-client.c:2267
-#: ../addressbook/libebook/e-book-client.c:2398
-#: ../addressbook/libebook/e-book-client.c:2557
-#: ../addressbook/libebook/e-book-client.c:2691
-#: ../addressbook/libebook/e-book-client.c:2822
-#: ../addressbook/libebook/e-book-client.c:2980
-#: ../addressbook/libebook/e-book-client.c:3175
-#: ../addressbook/libebook/e-book-client.c:3393
-#: ../addressbook/libedata-book/e-book-backend-sexp.c:878
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:575
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:606
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618
+#: ../addressbook/libebook/e-book-client.c:2131
+#: ../addressbook/libebook/e-book-client.c:2303
+#: ../addressbook/libebook/e-book-client.c:2516
+#: ../addressbook/libebook/e-book-client.c:2647
+#: ../addressbook/libebook/e-book-client.c:2806
+#: ../addressbook/libebook/e-book-client.c:2940
+#: ../addressbook/libebook/e-book-client.c:3071
+#: ../addressbook/libebook/e-book-client.c:3229
+#: ../addressbook/libebook/e-book-client.c:3424
+#: ../addressbook/libebook/e-book-client.c:3642
+#: ../addressbook/libedata-book/e-book-backend-sexp.c:877
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:581
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:612
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:628
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270
 #: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276
-#: ../calendar/libecal/e-cal-client.c:3237
-#: ../calendar/libecal/e-cal-client.c:3410
-#: ../calendar/libecal/e-cal-client.c:3674
-#: ../calendar/libecal/e-cal-client.c:3915
-#: ../calendar/libecal/e-cal-client.c:4103
-#: ../calendar/libecal/e-cal-client.c:4295
-#: ../calendar/libecal/e-cal-client.c:4465
-#: ../calendar/libecal/e-cal-client.c:4634
-#: ../calendar/libecal/e-cal-client.c:4837
-#: ../calendar/libecal/e-cal-client.c:4987
-#: ../calendar/libecal/e-cal-client.c:5181
-#: ../calendar/libecal/e-cal-client.c:5334
-#: ../calendar/libecal/e-cal-client.c:5551
-#: ../calendar/libecal/e-cal-client.c:5705
-#: ../calendar/libecal/e-cal-client.c:5931
-#: ../calendar/libecal/e-cal-client.c:6127
-#: ../calendar/libecal/e-cal-client.c:6490
-#: ../calendar/libecal/e-cal-client.c:6704
-#: ../camel/providers/imapx/camel-imapx-command.c:654
-#: ../libedataserver/e-client.c:185
+#: ../calendar/libecal/e-cal-client.c:3479
+#: ../calendar/libecal/e-cal-client.c:3652
+#: ../calendar/libecal/e-cal-client.c:3916
+#: ../calendar/libecal/e-cal-client.c:4157
+#: ../calendar/libecal/e-cal-client.c:4347
+#: ../calendar/libecal/e-cal-client.c:4539
+#: ../calendar/libecal/e-cal-client.c:4709
+#: ../calendar/libecal/e-cal-client.c:4878
+#: ../calendar/libecal/e-cal-client.c:5081
+#: ../calendar/libecal/e-cal-client.c:5231
+#: ../calendar/libecal/e-cal-client.c:5425
+#: ../calendar/libecal/e-cal-client.c:5578
+#: ../calendar/libecal/e-cal-client.c:5795
+#: ../calendar/libecal/e-cal-client.c:5949
+#: ../calendar/libecal/e-cal-client.c:6175
+#: ../calendar/libecal/e-cal-client.c:6371
+#: ../calendar/libecal/e-cal-client.c:6734
+#: ../calendar/libecal/e-cal-client.c:6956
+#: ../camel/providers/imapx/camel-imapx-command.c:645
+#: ../camel/providers/imapx/camel-imapx-server.c:4831
+#: ../camel/providers/imapx/camel-imapx-server.c:4840
+#: ../libedataserver/e-client.c:187
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:836
+#: ../addressbook/backends/google/e-book-backend-google.c:818
 msgid "Querying for updated contacts…"
 msgstr "查詢更新的連絡人…"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:988
+#: ../addressbook/backends/google/e-book-backend-google.c:1000
 msgid "Querying for updated groups…"
 msgstr "查詢更新的群組…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1705
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5056
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1268
+#: ../addressbook/backends/google/e-book-backend-google.c:1792
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4992
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1460
 msgid "The backend does not support bulk additions"
 msgstr "後端不支援大量增加"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1854
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5192
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1370
+#: ../addressbook/backends/google/e-book-backend-google.c:1947
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5128
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1572
 msgid "The backend does not support bulk modifications"
 msgstr "後端不支援大量修改"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2054
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1462
+#: ../addressbook/backends/google/e-book-backend-google.c:2154
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1672
 msgid "The backend does not support bulk removals"
 msgstr "後端不支援大量移除"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2180
+#: ../addressbook/backends/google/e-book-backend-google.c:2274
 msgid "Loading…"
 msgstr "載入中…"
 
 #. System Group: My Contacts
-#: ../addressbook/backends/google/e-book-google-utils.c:1618
+#: ../addressbook/backends/google/e-book-google-utils.c:1631
 #: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1
 #: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1
 #: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
@@ -179,158 +182,159 @@ msgid "Personal"
 msgstr "個人"
 
 #. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1620
+#: ../addressbook/backends/google/e-book-google-utils.c:1633
 msgid "Friends"
 msgstr "朋友"
 
 #. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1622
+#: ../addressbook/backends/google/e-book-google-utils.c:1635
 msgid "Family"
 msgstr "家人"
 
 #. System Group: Coworkers
-#: ../addressbook/backends/google/e-book-google-utils.c:1624
+#: ../addressbook/backends/google/e-book-google-utils.c:1637
 msgid "Coworkers"
 msgstr "同事"
 
 #. Translators: An error message shown to a user when trying to do an
 #. * operation on the LDAP address book which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:113
 msgid "Not connected"
 msgstr "未連線"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:971
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:891
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr "無法使用 v3 或 v2 的 binds 來綁定"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1094
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1014
 msgid "Reconnecting to LDAP server..."
 msgstr "正在重新連接 LDAP 伺服器…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1225
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1145
 msgid "Invalid DN syntax"
 msgstr "無效的 DN 語法"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1241
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4319
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1161
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4239
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "LDAP 錯誤 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1853
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2176
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1773
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2096
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s：從 ldap_first_entry 傳回 NULL"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2106
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2234
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2026
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2154
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s：傳回未處理的類型 %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2367
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2494
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2287
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2414
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr "%s：傳回未處理的搜尋結果類型 %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4268
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4188
 msgid "Receiving LDAP search results..."
 msgstr "正在接收 LDAP 搜尋結果…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4447
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4372
 msgid "Error performing search"
 msgstr "進行搜尋時發生錯誤"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4505
 #, c-format
 msgid "Downloading contacts (%d)..."
 msgstr "下載連絡人 (%d)…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5139
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5075
 msgid "Adding contact to LDAP server..."
 msgstr "正在新增連絡人至 LDAP 伺服器…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5214
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5150
 msgid "Modifying contact from LDAP server..."
 msgstr "正在修改 LDAP 伺服器中的連絡人…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5280
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5216
 msgid "Removing contact from LDAP server..."
 msgstr "正在移除 LDAP 伺服器中的連絡人…"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5669
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5611
 #, c-format
 msgid "Failed to get the DN for user '%s'"
 msgstr "無法擷取 DN 給使用者「%s」"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:799
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:826
 msgid "Loading Addressbook summary..."
 msgstr "載入通訊錄摘要…"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:817
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:846
 #, c-format
 msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
 msgstr "webdav PROPFIND 失敗，HTTP 狀態：%d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:836
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:865
 msgid "No response body in webdav PROPFIND result"
 msgstr "在 webdav PROPFIND 結果沒有回應本體"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:878
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:926
 #, c-format
 msgid "Loading Contacts (%d%%)"
 msgstr "載入聯絡人 (%d%%)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1191
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1338
 msgid "Cannot transform SoupURI to string"
 msgstr "不能將 SoupURI 轉換為字串"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1301
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1501
 #, c-format
 msgid "Create resource '%s' failed with HTTP status %d (%s)"
 msgstr "建立資源「%s」失敗，HTTP 狀態：%d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1399
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1603
 msgid "Contact on server changed -> not modifying"
 msgstr "伺服器上的連絡人已變更 -> 尚未修改"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1407
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1611
 #, c-format
 msgid "Modify contact failed with HTTP status %d (%s)"
 msgstr "修改連絡人失敗，HTTP 狀態：%d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1483
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1704
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1720
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "DELETE 失敗，HTTP 狀態：%d"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:24
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:38
 msgid "No such book"
 msgstr "沒有這個通訊錄"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:26
-#: ../addressbook/libedata-book/e-data-book.c:371
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:40
+#: ../addressbook/libedata-book/e-data-book.c:379
 msgid "Contact not found"
 msgstr "找不到連絡人"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:28
-#: ../addressbook/libedata-book/e-data-book.c:372
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:42
+#: ../addressbook/libedata-book/e-data-book.c:380
 msgid "Contact ID already exists"
 msgstr "連絡人 ID 已經存在"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:30
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:44
 msgid "No such source"
 msgstr "沒有這個來源"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:32
-#: ../addressbook/libedata-book/e-data-book.c:388
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:46
+#: ../addressbook/libedata-book/e-data-book.c:396
 msgid "No space"
 msgstr "沒有空間"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook-contacts/e-contact.c:131
+#: ../addressbook/libebook-contacts/e-contact.c:130
 msgid "Unique ID"
 msgstr "獨特的 ID"
 
@@ -338,12 +342,12 @@ msgstr "獨特的 ID"
 #. * so we can generate its value if necessary in the getter
 #. Translators: This is an EContact field description, in this case it's a
 #. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
-#: ../addressbook/libebook-contacts/e-contact.c:136
+#: ../addressbook/libebook-contacts/e-contact.c:135
 msgid "File Under"
 msgstr "歸檔為"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook-contacts/e-contact.c:138
+#: ../addressbook/libebook-contacts/e-contact.c:137
 msgid "Book UID"
 msgstr "通訊錄 UID"
 
@@ -351,434 +355,434 @@ msgstr "通訊錄 UID"
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook-contacts/e-contact.c:144
+#: ../addressbook/libebook-contacts/e-contact.c:143
 msgid "Full Name"
 msgstr "全名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:145
+#: ../addressbook/libebook-contacts/e-contact.c:144
 msgid "Given Name"
 msgstr "名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:146
+#: ../addressbook/libebook-contacts/e-contact.c:145
 msgid "Family Name"
 msgstr "姓"
 
-#: ../addressbook/libebook-contacts/e-contact.c:147
+#: ../addressbook/libebook-contacts/e-contact.c:146
 msgid "Nickname"
 msgstr "暱稱"
 
 #. Email fields
-#: ../addressbook/libebook-contacts/e-contact.c:150
+#: ../addressbook/libebook-contacts/e-contact.c:149
 msgid "Email 1"
 msgstr "電子郵件 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:151
+#: ../addressbook/libebook-contacts/e-contact.c:150
 msgid "Email 2"
 msgstr "電子郵件 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:152
+#: ../addressbook/libebook-contacts/e-contact.c:151
 msgid "Email 3"
 msgstr "電子郵件 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:153
+#: ../addressbook/libebook-contacts/e-contact.c:152
 msgid "Email 4"
 msgstr "電子郵件 4"
 
-#: ../addressbook/libebook-contacts/e-contact.c:155
+#: ../addressbook/libebook-contacts/e-contact.c:154
 msgid "Mailer"
 msgstr "寄件者"
 
 #. Address Labels
-#: ../addressbook/libebook-contacts/e-contact.c:158
+#: ../addressbook/libebook-contacts/e-contact.c:157
 msgid "Home Address Label"
 msgstr "住家地址標籤"
 
-#: ../addressbook/libebook-contacts/e-contact.c:159
+#: ../addressbook/libebook-contacts/e-contact.c:158
 msgid "Work Address Label"
 msgstr "工作地址標籤"
 
-#: ../addressbook/libebook-contacts/e-contact.c:160
+#: ../addressbook/libebook-contacts/e-contact.c:159
 msgid "Other Address Label"
 msgstr "其他地址標籤"
 
 #. Phone fields
-#: ../addressbook/libebook-contacts/e-contact.c:163
+#: ../addressbook/libebook-contacts/e-contact.c:162
 msgid "Assistant Phone"
 msgstr "助理電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:164
+#: ../addressbook/libebook-contacts/e-contact.c:163
 msgid "Business Phone"
 msgstr "商務電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:165
+#: ../addressbook/libebook-contacts/e-contact.c:164
 msgid "Business Phone 2"
 msgstr "商務電話 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:166
+#: ../addressbook/libebook-contacts/e-contact.c:165
 msgid "Business Fax"
 msgstr "商務傅真"
 
-#: ../addressbook/libebook-contacts/e-contact.c:167
+#: ../addressbook/libebook-contacts/e-contact.c:166
 msgid "Callback Phone"
 msgstr "回撥電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:168
+#: ../addressbook/libebook-contacts/e-contact.c:167
 msgid "Car Phone"
 msgstr "汽車電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:169
+#: ../addressbook/libebook-contacts/e-contact.c:168
 msgid "Company Phone"
 msgstr "公司電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:170
+#: ../addressbook/libebook-contacts/e-contact.c:169
 msgid "Home Phone"
 msgstr "住家電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:171
+#: ../addressbook/libebook-contacts/e-contact.c:170
 msgid "Home Phone 2"
 msgstr "住家電話 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:172
+#: ../addressbook/libebook-contacts/e-contact.c:171
 msgid "Home Fax"
 msgstr "住家傳真"
 
-#: ../addressbook/libebook-contacts/e-contact.c:173
+#: ../addressbook/libebook-contacts/e-contact.c:172
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook-contacts/e-contact.c:174
+#: ../addressbook/libebook-contacts/e-contact.c:173
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:175
+#: ../addressbook/libebook-contacts/e-contact.c:174
 msgid "Other Phone"
 msgstr "其它電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:176
+#: ../addressbook/libebook-contacts/e-contact.c:175
 msgid "Other Fax"
 msgstr "其它傳真"
 
-#: ../addressbook/libebook-contacts/e-contact.c:177
+#: ../addressbook/libebook-contacts/e-contact.c:176
 msgid "Pager"
 msgstr "呼叫器"
 
-#: ../addressbook/libebook-contacts/e-contact.c:178
+#: ../addressbook/libebook-contacts/e-contact.c:177
 msgid "Primary Phone"
 msgstr "主要電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:179
+#: ../addressbook/libebook-contacts/e-contact.c:178
 msgid "Radio"
 msgstr "無線電電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:180
+#: ../addressbook/libebook-contacts/e-contact.c:179
 msgid "Telex"
 msgstr "電報"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook-contacts/e-contact.c:182
+#: ../addressbook/libebook-contacts/e-contact.c:181
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook-contacts/e-contact.c:185
+#: ../addressbook/libebook-contacts/e-contact.c:184
 msgid "Organization"
 msgstr "團體"
 
-#: ../addressbook/libebook-contacts/e-contact.c:186
+#: ../addressbook/libebook-contacts/e-contact.c:185
 msgid "Organizational Unit"
 msgstr "團體單位"
 
-#: ../addressbook/libebook-contacts/e-contact.c:187
+#: ../addressbook/libebook-contacts/e-contact.c:186
 msgid "Office"
 msgstr "辦公室"
 
-#: ../addressbook/libebook-contacts/e-contact.c:188
+#: ../addressbook/libebook-contacts/e-contact.c:187
 msgid "Title"
 msgstr "頭銜"
 
-#: ../addressbook/libebook-contacts/e-contact.c:189
+#: ../addressbook/libebook-contacts/e-contact.c:188
 msgid "Role"
 msgstr "角色"
 
-#: ../addressbook/libebook-contacts/e-contact.c:190
+#: ../addressbook/libebook-contacts/e-contact.c:189
 msgid "Manager"
 msgstr "主管"
 
-#: ../addressbook/libebook-contacts/e-contact.c:191
+#: ../addressbook/libebook-contacts/e-contact.c:190
 msgid "Assistant"
 msgstr "助理"
 
 #. Web fields
-#: ../addressbook/libebook-contacts/e-contact.c:194
+#: ../addressbook/libebook-contacts/e-contact.c:193
 msgid "Homepage URL"
 msgstr "首頁 URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:195
+#: ../addressbook/libebook-contacts/e-contact.c:194
 msgid "Weblog URL"
 msgstr "網誌 URL"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:198
+#: ../addressbook/libebook-contacts/e-contact.c:197
 msgid "Categories"
 msgstr "分類"
 
 #. Collaboration fields
-#: ../addressbook/libebook-contacts/e-contact.c:201
+#: ../addressbook/libebook-contacts/e-contact.c:200
 msgid "Calendar URI"
 msgstr "行事曆 URI"
 
-#: ../addressbook/libebook-contacts/e-contact.c:202
+#: ../addressbook/libebook-contacts/e-contact.c:201
 msgid "Free/Busy URL"
 msgstr "空閒/忙碌 URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:203
+#: ../addressbook/libebook-contacts/e-contact.c:202
 msgid "ICS Calendar"
 msgstr "ICS 行事曆"
 
-#: ../addressbook/libebook-contacts/e-contact.c:204
+#: ../addressbook/libebook-contacts/e-contact.c:203
 msgid "Video Conferencing URL"
 msgstr "視訊會議 URL"
 
 #. Misc fields
-#: ../addressbook/libebook-contacts/e-contact.c:207
+#: ../addressbook/libebook-contacts/e-contact.c:206
 msgid "Spouse's Name"
 msgstr "配偶姓名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:208
+#: ../addressbook/libebook-contacts/e-contact.c:207
 msgid "Note"
 msgstr "備註"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:211
+#: ../addressbook/libebook-contacts/e-contact.c:210
 msgid "AIM Home Screen Name 1"
 msgstr "AIM 家用螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:212
+#: ../addressbook/libebook-contacts/e-contact.c:211
 msgid "AIM Home Screen Name 2"
 msgstr "AIM 家用螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:213
+#: ../addressbook/libebook-contacts/e-contact.c:212
 msgid "AIM Home Screen Name 3"
 msgstr "AIM 家用螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:214
+#: ../addressbook/libebook-contacts/e-contact.c:213
 msgid "AIM Work Screen Name 1"
 msgstr "AIM 工作螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:215
+#: ../addressbook/libebook-contacts/e-contact.c:214
 msgid "AIM Work Screen Name 2"
 msgstr "AIM 工作螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:216
+#: ../addressbook/libebook-contacts/e-contact.c:215
 msgid "AIM Work Screen Name 3"
 msgstr "AIM 工作螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:217
+#: ../addressbook/libebook-contacts/e-contact.c:216
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise 家用螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:218
+#: ../addressbook/libebook-contacts/e-contact.c:217
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise 家用螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:219
+#: ../addressbook/libebook-contacts/e-contact.c:218
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise 家用螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:220
+#: ../addressbook/libebook-contacts/e-contact.c:219
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise 工作螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:221
+#: ../addressbook/libebook-contacts/e-contact.c:220
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise 工作螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:222
+#: ../addressbook/libebook-contacts/e-contact.c:221
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise 工作螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:223
+#: ../addressbook/libebook-contacts/e-contact.c:222
 msgid "Jabber Home ID 1"
 msgstr "Jabber 家用 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:224
+#: ../addressbook/libebook-contacts/e-contact.c:223
 msgid "Jabber Home ID 2"
 msgstr "Jabber 家用 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:225
+#: ../addressbook/libebook-contacts/e-contact.c:224
 msgid "Jabber Home ID 3"
 msgstr "Jabber 家用 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:226
+#: ../addressbook/libebook-contacts/e-contact.c:225
 msgid "Jabber Work ID 1"
 msgstr "Jabber 工作 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:227
+#: ../addressbook/libebook-contacts/e-contact.c:226
 msgid "Jabber Work ID 2"
 msgstr "Jabber 工作 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:228
+#: ../addressbook/libebook-contacts/e-contact.c:227
 msgid "Jabber Work ID 3"
 msgstr "Jabber 工作 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:229
+#: ../addressbook/libebook-contacts/e-contact.c:228
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo!家用螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:230
+#: ../addressbook/libebook-contacts/e-contact.c:229
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo!家用螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:231
+#: ../addressbook/libebook-contacts/e-contact.c:230
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo!家用螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:232
+#: ../addressbook/libebook-contacts/e-contact.c:231
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo!工作螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:233
+#: ../addressbook/libebook-contacts/e-contact.c:232
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo!工作螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:234
+#: ../addressbook/libebook-contacts/e-contact.c:233
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo!工作螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:235
+#: ../addressbook/libebook-contacts/e-contact.c:234
 msgid "MSN Home Screen Name 1"
 msgstr "MSN 家用螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:236
+#: ../addressbook/libebook-contacts/e-contact.c:235
 msgid "MSN Home Screen Name 2"
 msgstr "MSN 家用螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:237
+#: ../addressbook/libebook-contacts/e-contact.c:236
 msgid "MSN Home Screen Name 3"
 msgstr "MSN 家用螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:238
+#: ../addressbook/libebook-contacts/e-contact.c:237
 msgid "MSN Work Screen Name 1"
 msgstr "MSN 工作螢幕名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:239
+#: ../addressbook/libebook-contacts/e-contact.c:238
 msgid "MSN Work Screen Name 2"
 msgstr "MSN 工作螢幕名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:240
+#: ../addressbook/libebook-contacts/e-contact.c:239
 msgid "MSN Work Screen Name 3"
 msgstr "MSN 工作螢幕名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:241
+#: ../addressbook/libebook-contacts/e-contact.c:240
 msgid "ICQ Home ID 1"
 msgstr "ICQ 家用 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:242
+#: ../addressbook/libebook-contacts/e-contact.c:241
 msgid "ICQ Home ID 2"
 msgstr "ICQ 家用 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:243
+#: ../addressbook/libebook-contacts/e-contact.c:242
 msgid "ICQ Home ID 3"
 msgstr "ICQ 家用 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:244
+#: ../addressbook/libebook-contacts/e-contact.c:243
 msgid "ICQ Work ID 1"
 msgstr "ICQ 工作 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:245
+#: ../addressbook/libebook-contacts/e-contact.c:244
 msgid "ICQ Work ID 2"
 msgstr "ICQ 工作 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:246
+#: ../addressbook/libebook-contacts/e-contact.c:245
 msgid "ICQ Work ID 3"
 msgstr "ICQ 工作 ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook-contacts/e-contact.c:249
+#: ../addressbook/libebook-contacts/e-contact.c:248
 msgid "Last Revision"
 msgstr "上次改版"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * virtual field, which returns either name of the contact or the organization
 #. * name, recognized by multiple other fields, where the first filled is used.
-#: ../addressbook/libebook-contacts/e-contact.c:253
+#: ../addressbook/libebook-contacts/e-contact.c:252
 msgid "Name or Org"
 msgstr "姓名或組織"
 
 #. Address fields
-#: ../addressbook/libebook-contacts/e-contact.c:256
+#: ../addressbook/libebook-contacts/e-contact.c:255
 msgid "Address List"
 msgstr "地址清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:257
+#: ../addressbook/libebook-contacts/e-contact.c:256
 msgid "Home Address"
 msgstr "住家地址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:258
+#: ../addressbook/libebook-contacts/e-contact.c:257
 msgid "Work Address"
 msgstr "工作地址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:259
+#: ../addressbook/libebook-contacts/e-contact.c:258
 msgid "Other Address"
 msgstr "其它地址"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:262
+#: ../addressbook/libebook-contacts/e-contact.c:261
 msgid "Category List"
 msgstr "分類清單"
 
 #. Photo/Logo
-#: ../addressbook/libebook-contacts/e-contact.c:265
+#: ../addressbook/libebook-contacts/e-contact.c:264
 msgid "Photo"
 msgstr "相片"
 
-#: ../addressbook/libebook-contacts/e-contact.c:266
+#: ../addressbook/libebook-contacts/e-contact.c:265
 msgid "Logo"
 msgstr "標誌"
 
 #. Translators: This is an EContact field description, in this case it's a name
 #. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
-#: ../addressbook/libebook-contacts/e-contact.c:270
+#: ../addressbook/libebook-contacts/e-contact.c:269
 msgid "Name"
 msgstr "名稱"
 
-#: ../addressbook/libebook-contacts/e-contact.c:271
+#: ../addressbook/libebook-contacts/e-contact.c:270
 msgid "Email List"
 msgstr "電子郵件清單"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:274
+#: ../addressbook/libebook-contacts/e-contact.c:273
 msgid "AIM Screen Name List"
 msgstr "AIM 螢幕名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:275
+#: ../addressbook/libebook-contacts/e-contact.c:274
 msgid "GroupWise ID List"
 msgstr "GroupWise ID 清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:276
+#: ../addressbook/libebook-contacts/e-contact.c:275
 msgid "Jabber ID List"
 msgstr "Jabber ID 清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:277
+#: ../addressbook/libebook-contacts/e-contact.c:276
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo!螢幕名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:278
+#: ../addressbook/libebook-contacts/e-contact.c:277
 msgid "MSN Screen Name List"
 msgstr "MSN 螢幕名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:279
+#: ../addressbook/libebook-contacts/e-contact.c:278
 msgid "ICQ ID List"
 msgstr "ICQ ID 清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:281
+#: ../addressbook/libebook-contacts/e-contact.c:280
 msgid "Wants HTML Mail"
 msgstr "需要 HTML 郵件"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * field describing whether it's a Contact list (list of email addresses) or a
 #. * regular contact for one person/organization/...
-#: ../addressbook/libebook-contacts/e-contact.c:286
+#: ../addressbook/libebook-contacts/e-contact.c:285
 msgid "List"
 msgstr "清單"
 
@@ -786,127 +790,127 @@ msgstr "清單"
 #. * used to determine whether when sending to Contact lists the addresses should be
 #. * shown or not to other recipients - basically whether to use BCC field or CC
 #. * message header when sending messages to this Contact list.
-#: ../addressbook/libebook-contacts/e-contact.c:291
+#: ../addressbook/libebook-contacts/e-contact.c:290
 msgid "List Shows Addresses"
 msgstr "清單顯示位址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:293
+#: ../addressbook/libebook-contacts/e-contact.c:292
 msgid "Birth Date"
 msgstr "出生日期"
 
-#: ../addressbook/libebook-contacts/e-contact.c:294
+#: ../addressbook/libebook-contacts/e-contact.c:293
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:893
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #. Security fields
-#: ../addressbook/libebook-contacts/e-contact.c:297
+#: ../addressbook/libebook-contacts/e-contact.c:296
 msgid "X.509 Certificate"
 msgstr "X.509 憑證"
 
-#: ../addressbook/libebook-contacts/e-contact.c:299
+#: ../addressbook/libebook-contacts/e-contact.c:298
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu 家用 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:300
+#: ../addressbook/libebook-contacts/e-contact.c:299
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu 家用 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:301
+#: ../addressbook/libebook-contacts/e-contact.c:300
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu 家用 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:302
+#: ../addressbook/libebook-contacts/e-contact.c:301
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu 工作 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:303
+#: ../addressbook/libebook-contacts/e-contact.c:302
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu 工作 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:304
+#: ../addressbook/libebook-contacts/e-contact.c:303
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu 工作 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:305
+#: ../addressbook/libebook-contacts/e-contact.c:304
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID 清單"
 
 #. Geo information
-#: ../addressbook/libebook-contacts/e-contact.c:308
+#: ../addressbook/libebook-contacts/e-contact.c:307
 msgid "Geographic Information"
 msgstr "地理資訊"
 
-#: ../addressbook/libebook-contacts/e-contact.c:310
+#: ../addressbook/libebook-contacts/e-contact.c:309
 msgid "Telephone"
 msgstr "電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:312
+#: ../addressbook/libebook-contacts/e-contact.c:311
 msgid "Skype Home Name 1"
 msgstr "Skype 住家名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:313
+#: ../addressbook/libebook-contacts/e-contact.c:312
 msgid "Skype Home Name 2"
 msgstr "Skype 住家名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:314
+#: ../addressbook/libebook-contacts/e-contact.c:313
 msgid "Skype Home Name 3"
 msgstr "Skype 住家名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:315
+#: ../addressbook/libebook-contacts/e-contact.c:314
 msgid "Skype Work Name 1"
 msgstr "Skype 工作名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:316
+#: ../addressbook/libebook-contacts/e-contact.c:315
 msgid "Skype Work Name 2"
 msgstr "Skype 工作名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:317
+#: ../addressbook/libebook-contacts/e-contact.c:316
 msgid "Skype Work Name 3"
 msgstr "Skype 工作名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:318
+#: ../addressbook/libebook-contacts/e-contact.c:317
 msgid "Skype Name List"
 msgstr "Skype 名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:320
+#: ../addressbook/libebook-contacts/e-contact.c:319
 msgid "SIP address"
 msgstr "SIP 位址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:322
+#: ../addressbook/libebook-contacts/e-contact.c:321
 msgid "Google Talk Home Name 1"
 msgstr "Google Talk 住家名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:323
+#: ../addressbook/libebook-contacts/e-contact.c:322
 msgid "Google Talk Home Name 2"
 msgstr "Google Talk 住家名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:324
+#: ../addressbook/libebook-contacts/e-contact.c:323
 msgid "Google Talk Home Name 3"
 msgstr "Google Talk 住家名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:325
+#: ../addressbook/libebook-contacts/e-contact.c:324
 msgid "Google Talk Work Name 1"
 msgstr "Google Talk 工作名稱 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:326
+#: ../addressbook/libebook-contacts/e-contact.c:325
 msgid "Google Talk Work Name 2"
 msgstr "Google Talk 工作名稱 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:327
+#: ../addressbook/libebook-contacts/e-contact.c:326
 msgid "Google Talk Work Name 3"
 msgstr "Google Talk 工作名稱 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:328
+#: ../addressbook/libebook-contacts/e-contact.c:327
 msgid "Google Talk Name List"
 msgstr "Google Talk 名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:330
+#: ../addressbook/libebook-contacts/e-contact.c:329
 msgid "Twitter Name List"
 msgstr "Twitter 名稱清單"
 
-#: ../addressbook/libebook-contacts/e-contact.c:1635
-#: ../addressbook/libebook/e-destination.c:881
+#: ../addressbook/libebook-contacts/e-contact.c:1659
+#: ../addressbook/libebook/e-destination.c:918
 msgid "Unnamed List"
 msgstr "未命名的清單"
 
@@ -915,7 +919,7 @@ msgid "The library was built without phone number support."
 msgstr "程式庫組建時未加入電話號碼支援。"
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:43
-msgid "The phone number parser reported an yet unkown error code."
+msgid "The phone number parser reported a yet unknown error code."
 msgstr "電話號碼分析器回報了不明的錯誤代碼。"
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:45
@@ -939,49 +943,55 @@ msgstr "文字太短，不符合電話號碼格式"
 msgid "Text is too long for a phone number"
 msgstr "文字太長，不符合電話號碼格式"
 
-#: ../addressbook/libebook/e-book-client.c:807
+#: ../addressbook/libebook/e-book-client.c:931
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "不明的通訊錄屬性「%s」"
 
-#: ../addressbook/libebook/e-book-client.c:822
+#: ../addressbook/libebook/e-book-client.c:946
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "不能改變通訊錄屬性「%s」的數值"
 
-#: ../addressbook/libebook/e-book-client.c:1207
-#: ../addressbook/libebook/e-book-client.c:1382
-#: ../addressbook/libebook/e-book-client.c:1649
-#: ../calendar/libecal/e-cal-client.c:1530
-#: ../calendar/libecal/e-cal-client.c:1712
+#: ../addressbook/libebook/e-book-client.c:1390
+#: ../addressbook/libebook/e-book-client.c:1621
+#: ../addressbook/libebook/e-book-client.c:1898
+#: ../calendar/libecal/e-cal-client.c:1714
+#: ../calendar/libecal/e-cal-client.c:1952
 #, c-format
 msgid "Unable to connect to '%s': "
 msgstr "無法連線至「%s」："
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:899
-#: ../addressbook/libedata-book/e-book-sqlite.c:2163
+#: ../addressbook/libebook/e-book-client-view.c:892
+#: ../calendar/libecal/e-cal-client-view.c:705
+#, c-format
+msgid "Client disappeared"
+msgstr "客戶端已消失"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:905
+#: ../addressbook/libedata-book/e-book-sqlite.c:2212
 #, c-format
 msgid "Error introspecting unknown summary field '%s'"
 msgstr "插補不明的摘要欄位「%s」時發生錯誤"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1509
-#: ../addressbook/libedata-book/e-book-sqlite.c:1319
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
+#: ../addressbook/libedata-book/e-book-sqlite.c:1368
 msgid "Error parsing regular expression"
 msgstr "解析正規表示式時發生錯誤"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1554
-#: ../addressbook/libedata-book/e-book-sqlite.c:1803 ../camel/camel-db.c:545
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
+#: ../addressbook/libedata-book/e-book-sqlite.c:1852 ../camel/camel-db.c:721
 #, c-format
 msgid "Insufficient memory"
 msgstr "記憶體不足"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1691
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1697
 #, c-format
 msgid "Invalid contact field '%d' specified in summary"
 msgstr "在摘要中指定了無效的連絡人欄位「%d」"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1725
-#: ../addressbook/libedata-book/e-book-sqlite.c:557
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
+#: ../addressbook/libedata-book/e-book-sqlite.c:579
 #, c-format
 msgid ""
 "Contact field '%s' of type '%s' specified in summary, but only boolean, "
@@ -990,95 +1000,95 @@ msgstr ""
 "在摘要中指定了類型「%2$s」的連絡人欄位「%1$s」，但是只支援布林值、字串及字串"
 "清單欄位類型"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3065
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4161
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3071
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4167
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. vcards cannot be returned."
 msgstr "完整搜尋連絡人未儲存於快取。不能傳回 vcard。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385
-#: ../addressbook/libedata-book/e-book-sqlite.c:5364
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4298
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4391
+#: ../addressbook/libedata-book/e-book-sqlite.c:5747
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr "查詢包含了不支援的元素"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4296
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4302
 #, c-format
 msgid "Invalid Query"
 msgstr "無效的查詢"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4320
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4326
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
 "supported."
 msgstr "完整搜尋連絡人未儲存於快取。因此只支援摘要查詢。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4389
-#: ../addressbook/libedata-book/e-data-book.c:383
-#: ../addressbook/libedata-book/e-data-book.c:1028
-#: ../calendar/libedata-cal/e-data-cal.c:420
-#: ../calendar/libedata-cal/e-data-cal.c:1307 ../libedataserver/e-client.c:172
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4395
+#: ../addressbook/libedata-book/e-data-book.c:391
+#: ../addressbook/libedata-book/e-data-book.c:1131
+#: ../calendar/libedata-cal/e-data-cal.c:428
+#: ../calendar/libedata-cal/e-data-cal.c:1410 ../libedataserver/e-client.c:174
 #, c-format
 msgid "Invalid query"
 msgstr "無效的查詢"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4432
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4438
 #, c-format
 msgid ""
 "Full vcards are not stored in cache. Hence only summary query is supported."
 msgstr "完整 vcard 未儲存於快取。因此只支援摘要查詢。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5255
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5261
 #, c-format
 msgid "Unable to remove the db file: errno %d"
 msgstr "無法移除 db 檔案：錯誤 %d"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6042
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6442
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6048
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6448
 #, c-format
 msgid "Only summary queries are supported by EbSdbCursor"
 msgstr "EbSdbCursor 只支援摘要查詢。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6049
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6055
 #, c-format
 msgid "At least one sort field must be specified to use an EbSdbCursor"
 msgstr "必須選擇至少一項排序欄位使用 EbSdbCursor"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6063
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6069
 #, c-format
 msgid "Cannot sort by a field that is not in the summary"
 msgstr "不能排序不在摘要中的欄位"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6070
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6076
 #, c-format
 msgid "Cannot sort by a field which may have multiple values"
 msgstr "不能排序可能含有多重數值的欄位"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203
-#: ../addressbook/libedata-book/e-book-sqlite.c:7376
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6209
+#: ../addressbook/libedata-book/e-book-sqlite.c:8044
 #, c-format
 msgid ""
 "Tried to step a cursor in reverse, but cursor is already at the beginning of "
 "the contact list"
 msgstr "嘗試反向推進游標，但是游標已在連絡人清單的開頭"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
-#: ../addressbook/libedata-book/e-book-sqlite.c:7384
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6217
+#: ../addressbook/libedata-book/e-book-sqlite.c:8052
 #, c-format
 msgid ""
 "Tried to step a cursor forwards, but cursor is already at the end of the "
 "contact list"
 msgstr "嘗試推進游標，但是游標已在連絡人清單的結尾"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:524
+#: ../addressbook/libedata-book/e-book-sqlite.c:545
 #, c-format
 msgid "Unsupported contact field '%d' specified in summary"
 msgstr "在摘要中指定了不支援的連絡人欄位「%d」"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:1876
+#: ../addressbook/libedata-book/e-book-sqlite.c:1925
 msgid ""
 "Cannot upgrade contacts database from a legacy database with more than one "
 "addressbook. Delete one of the entries in the 'folders' table first."
@@ -1086,182 +1096,182 @@ msgstr ""
 "有一個以上通訊錄時不能從傳統資料庫升級連絡人資料庫。請先在「folders」表格中刪"
 "除其中一個項目。"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5357
+#: ../addressbook/libedata-book/e-book-sqlite.c:5740
 #, c-format
 msgid "Invalid query: %s"
 msgstr "無效的查詢：%s"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5532
+#: ../addressbook/libedata-book/e-book-sqlite.c:5915
 msgid "Invalid query for EbSqlCursor"
 msgstr "EbSqlCursor 的無效查詢"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7198
+#: ../addressbook/libedata-book/e-book-sqlite.c:7866
 msgid "At least one sort field must be specified to use an EbSqlCursor"
 msgstr "要使用 EbSqlCursor 您必須指定至少一個排序欄位"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7216
+#: ../addressbook/libedata-book/e-book-sqlite.c:7884
 msgid "Cannot sort by a field that is not a string type"
 msgstr "不能排序不是字串類型的欄位"
 
-#: ../addressbook/libedata-book/e-data-book.c:367
-#: ../calendar/libedata-cal/e-data-cal.c:401
+#: ../addressbook/libedata-book/e-data-book.c:375
+#: ../calendar/libedata-cal/e-data-cal.c:409
 msgid "Success"
 msgstr "成功"
 
-#: ../addressbook/libedata-book/e-data-book.c:368
-#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:402
-#: ../libedataserver/e-client.c:139
+#: ../addressbook/libedata-book/e-data-book.c:376
+#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:410
+#: ../libedataserver/e-client.c:141
 msgid "Backend is busy"
 msgstr "後端忙碌中"
 
-#: ../addressbook/libedata-book/e-data-book.c:369
-#: ../calendar/libedata-cal/e-data-cal.c:403 ../libedataserver/e-client.c:149
+#: ../addressbook/libedata-book/e-data-book.c:377
+#: ../calendar/libedata-cal/e-data-cal.c:411 ../libedataserver/e-client.c:151
 msgid "Repository offline"
 msgstr "資料庫離線"
 
-#: ../addressbook/libedata-book/e-data-book.c:370
-#: ../calendar/libecal/e-cal.c:2316 ../calendar/libedata-cal/e-data-cal.c:404
-#: ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:378
+#: ../calendar/libecal/e-cal.c:2316 ../calendar/libedata-cal/e-data-cal.c:412
+#: ../libedataserver/e-client.c:158
 msgid "Permission denied"
 msgstr "權限不足"
 
-#: ../addressbook/libedata-book/e-data-book.c:373
-#: ../calendar/libedata-cal/e-data-cal.c:409
+#: ../addressbook/libedata-book/e-data-book.c:381
+#: ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Authentication Failed"
 msgstr "核對失敗"
 
-#: ../addressbook/libedata-book/e-data-book.c:374
-#: ../calendar/libedata-cal/e-data-cal.c:410
+#: ../addressbook/libedata-book/e-data-book.c:382
+#: ../calendar/libedata-cal/e-data-cal.c:418
 msgid "Authentication Required"
 msgstr "要求核對"
 
-#: ../addressbook/libedata-book/e-data-book.c:375
-#: ../calendar/libedata-cal/e-data-cal.c:411
+#: ../addressbook/libedata-book/e-data-book.c:383
+#: ../calendar/libedata-cal/e-data-cal.c:419
 msgid "Unsupported field"
 msgstr "不支援的欄位"
 
-#: ../addressbook/libedata-book/e-data-book.c:376
-#: ../calendar/libedata-cal/e-data-cal.c:413 ../libedataserver/e-client.c:164
+#: ../addressbook/libedata-book/e-data-book.c:384
+#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:166
 msgid "Unsupported authentication method"
 msgstr "不支援的核對方法"
 
-#: ../addressbook/libedata-book/e-data-book.c:377
-#: ../calendar/libedata-cal/e-data-cal.c:414 ../libedataserver/e-client.c:166
+#: ../addressbook/libedata-book/e-data-book.c:385
+#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:168
 msgid "TLS not available"
 msgstr "無法使用 TLS"
 
-#: ../addressbook/libedata-book/e-data-book.c:378
+#: ../addressbook/libedata-book/e-data-book.c:386
 msgid "Address book does not exist"
 msgstr "通訊錄不存在"
 
-#: ../addressbook/libedata-book/e-data-book.c:379
+#: ../addressbook/libedata-book/e-data-book.c:387
 msgid "Book removed"
 msgstr "通訊錄已經移除"
 
-#: ../addressbook/libedata-book/e-data-book.c:380
-#: ../calendar/libedata-cal/e-data-cal.c:417
+#: ../addressbook/libedata-book/e-data-book.c:388
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Not available in offline mode"
 msgstr "無法在離線模式下使用"
 
-#: ../addressbook/libedata-book/e-data-book.c:381
-#: ../calendar/libedata-cal/e-data-cal.c:418 ../libedataserver/e-client.c:168
+#: ../addressbook/libedata-book/e-data-book.c:389
+#: ../calendar/libedata-cal/e-data-cal.c:426 ../libedataserver/e-client.c:170
 msgid "Search size limit exceeded"
 msgstr "超過搜尋大小限制"
 
-#: ../addressbook/libedata-book/e-data-book.c:382
-#: ../calendar/libedata-cal/e-data-cal.c:419 ../libedataserver/e-client.c:170
+#: ../addressbook/libedata-book/e-data-book.c:390
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:172
 msgid "Search time limit exceeded"
 msgstr "超過搜尋時間限制"
 
-#: ../addressbook/libedata-book/e-data-book.c:384
-#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:174
+#: ../addressbook/libedata-book/e-data-book.c:392
+#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:176
 msgid "Query refused"
 msgstr "查詢被拒絕"
 
-#: ../addressbook/libedata-book/e-data-book.c:385
-#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:160
+#: ../addressbook/libedata-book/e-data-book.c:393
+#: ../calendar/libedata-cal/e-data-cal.c:430 ../libedataserver/e-client.c:162
 msgid "Could not cancel"
 msgstr "無法取消"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:387
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../addressbook/libedata-book/e-data-book.c:395
+#: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Invalid server version"
 msgstr "無效的伺服器版本"
 
-#: ../addressbook/libedata-book/e-data-book.c:389
-#: ../calendar/libecal/e-cal.c:2300 ../calendar/libedata-cal/e-data-cal.c:425
-#: ../libedataserver/e-client.c:137
+#: ../addressbook/libedata-book/e-data-book.c:397
+#: ../calendar/libecal/e-cal.c:2300 ../calendar/libedata-cal/e-data-cal.c:433
+#: ../libedataserver/e-client.c:139
 msgid "Invalid argument"
 msgstr "無效的參數"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:391
+#: ../addressbook/libedata-book/e-data-book.c:399
 #: ../calendar/libecal/e-cal.c:1059 ../calendar/libecal/e-cal.c:1427
 #: ../calendar/libecal/e-cal.c:1907 ../calendar/libecal/e-cal.c:2339
-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:162
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:164
 #, c-format
 msgid "Not supported"
 msgstr "不支援"
 
-#: ../addressbook/libedata-book/e-data-book.c:392
-#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:180
+#: ../addressbook/libedata-book/e-data-book.c:400
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:182
 msgid "Backend is not opened yet"
 msgstr "後端尚未開啟"
 
-#: ../addressbook/libedata-book/e-data-book.c:393
-#: ../libedataserver/e-client.c:182
+#: ../addressbook/libedata-book/e-data-book.c:401
+#: ../libedataserver/e-client.c:184
 msgid "Object is out of sync"
 msgstr "物件沒有同步"
 
-#: ../addressbook/libedata-book/e-data-book.c:401
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:178
+#: ../addressbook/libedata-book/e-data-book.c:409
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:180
 msgid "Other error"
 msgstr "其他錯誤"
 
-#: ../addressbook/libedata-book/e-data-book.c:1053
-#: ../calendar/libedata-cal/e-data-cal.c:1332
+#: ../addressbook/libedata-book/e-data-book.c:1156
+#: ../calendar/libedata-cal/e-data-cal.c:1435
 msgid "Invalid query: "
 msgstr "無效的查詢："
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1272
+#: ../addressbook/libedata-book/e-data-book.c:1375
 msgid "Cannot open book: "
 msgstr "不能開啟通訊錄："
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1309
+#: ../addressbook/libedata-book/e-data-book.c:1412
 msgid "Cannot refresh address book: "
 msgstr "不能重新整理通訊錄："
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1340
+#: ../addressbook/libedata-book/e-data-book.c:1443
 msgid "Cannot get contact: "
 msgstr "不能取得連絡人："
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1378
+#: ../addressbook/libedata-book/e-data-book.c:1481
 msgid "Cannot get contact list: "
 msgstr "不能取得連絡人清單："
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1430
+#: ../addressbook/libedata-book/e-data-book.c:1533
 msgid "Cannot get contact list uids: "
 msgstr "不能取得連絡人清單 uid："
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1477
+#: ../addressbook/libedata-book/e-data-book.c:1580
 msgid "Cannot add contact: "
 msgstr "不能加入連絡人："
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1526
+#: ../addressbook/libedata-book/e-data-book.c:1629
 msgid "Cannot modify contacts: "
 msgstr "不能修改連絡人"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1568
+#: ../addressbook/libedata-book/e-data-book.c:1671
 msgid "Cannot remove contacts: "
 msgstr "不能移除連絡人："
 
@@ -1289,49 +1299,35 @@ msgstr "當移動游標時用盡同步修訂版"
 msgid "Alphabetic index was set for incorrect locale"
 msgstr "字母排序索引設定了不正確地區"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:289
-#: ../calendar/libedata-cal/e-data-cal-factory.c:285
-#, c-format
-msgid "No backend name in source '%s'"
-msgstr "來源「%s」中沒有後端名稱"
-
-#: ../addressbook/libedata-book/e-data-book-factory.c:377
-#: ../calendar/libedata-cal/e-data-cal-factory.c:339
-#, c-format
-msgid "Missing source UID"
-msgstr "缺少來源 UID"
-
-#: ../addressbook/libedata-book/e-data-book-factory.c:388
-#: ../calendar/libedata-cal/e-data-cal-factory.c:349
-#, c-format
-msgid "No such source for UID '%s'"
-msgstr "沒有 UID「%s」的這類來源"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:573
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:579
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "無法連接伺服器 (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:610
 #, c-format
 msgid "Failed to connect to a server using SSL: %s"
 msgstr "無法使用 SSL 連線至伺服器：%s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:615
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:625
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "HTTP 回應未預期的狀態碼 %d (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:634
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:644
 msgid "CalDAV backend is not loaded yet"
 msgstr "CalDAV 後端尚未載入"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1073
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1091
 msgid "Invalid Redirect URL"
 msgstr "無效的重新導向 URL"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2565
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2930
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2886
+#, c-format
+msgid "Cannot create local cache folder '%s'"
+msgstr "不能建立本地快取資料夾「%s」"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2944
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1340,32 +1336,27 @@ msgstr ""
 "無法連接伺服器，行事曆會以唯讀模式開啟。\n"
 "錯誤訊息：%s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2885
-#, c-format
-msgid "Cannot create local cache folder '%s'"
-msgstr "不能建立本地快取資料夾「%s」"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3970
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4016
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV 不支援大量增加"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4073
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4119
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV 不支援大量修改"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4249
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4400
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV 不支援大量移除"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4916
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5082
 msgid "Calendar doesn't support Free/Busy"
 msgstr "行事曆不支援空閒/忙碌"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4925
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5091
 msgid "Schedule outbox url not found"
 msgstr "找不到排程的寄件匣 url"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5022
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5188
 msgid "Unexpected result in schedule-response"
 msgstr "在排程-回應中未預期的結果"
 
@@ -1392,27 +1383,27 @@ msgstr "無法儲存行事曆資料：URI 的格式不正確。"
 msgid "Cannot save calendar data"
 msgstr "不能儲存行事曆資料"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:483
+#: ../calendar/backends/http/e-cal-backend-http.c:512
 #, c-format
 msgid "Malformed URI: %s"
 msgstr "格式不良的 URI：%s"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:574
+#: ../calendar/backends/http/e-cal-backend-http.c:581
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "重新指向無效的 URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:617
+#: ../calendar/backends/http/e-cal-backend-http.c:643
 #, c-format
 msgid "Bad file format."
 msgstr "錯誤的檔案格式。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:627
+#: ../calendar/backends/http/e-cal-backend-http.c:653
 #, c-format
 msgid "Not a calendar."
 msgstr "並非行事曆。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:914
+#: ../calendar/backends/http/e-cal-backend-http.c:955
 #: ../calendar/backends/weather/e-cal-backend-weather.c:536
 msgid "Could not create cache file"
 msgstr "無法建構快取檔案"
@@ -1493,12 +1484,12 @@ msgid "No such calendar"
 msgstr "無此行事曆"
 
 #: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:265
-#: ../calendar/libedata-cal/e-data-cal.c:406
+#: ../calendar/libedata-cal/e-data-cal.c:414
 msgid "Object not found"
 msgstr "找不到物件"
 
 #: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:267
-#: ../calendar/libedata-cal/e-data-cal.c:407
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Invalid object"
 msgstr "無效的物件"
 
@@ -1515,7 +1506,7 @@ msgid "Unknown User"
 msgstr "不明的使用者"
 
 #: ../calendar/libecal/e-cal.c:2320 ../calendar/libecal/e-cal-client.c:271
-#: ../calendar/libedata-cal/e-data-cal.c:408
+#: ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Object ID already exists"
 msgstr "物件 ID 已存在"
 
@@ -1531,13 +1522,13 @@ msgstr "操作已取消"
 msgid "Could not cancel operation"
 msgstr "無法取消操作"
 
-#: ../calendar/libecal/e-cal.c:2328 ../libedataserver/e-client.c:145
+#: ../calendar/libecal/e-cal.c:2328 ../libedataserver/e-client.c:147
 msgid "Authentication failed"
 msgstr "核對失敗"
 
 #: ../calendar/libecal/e-cal.c:2330
-#: ../camel/providers/smtp/camel-smtp-transport.c:921
-#: ../libedataserver/e-client.c:147
+#: ../camel/providers/smtp/camel-smtp-transport.c:959
+#: ../libedataserver/e-client.c:149
 msgid "Authentication required"
 msgstr "要求核對"
 
@@ -1550,150 +1541,150 @@ msgid "No error"
 msgstr "沒有錯誤"
 
 #: ../calendar/libecal/e-cal-client.c:269
-#: ../calendar/libedata-cal/e-data-cal.c:416
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Unknown user"
 msgstr "不明的使用者"
 
 #: ../calendar/libecal/e-cal-client.c:273
-#: ../calendar/libedata-cal/e-data-cal.c:405
+#: ../calendar/libedata-cal/e-data-cal.c:413
 msgid "Invalid range"
 msgstr "無效的範圍"
 
-#: ../calendar/libecal/e-cal-client.c:936
+#: ../calendar/libecal/e-cal-client.c:1062
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "不明的行事曆屬性「%s」"
 
-#: ../calendar/libecal/e-cal-client.c:951
+#: ../calendar/libecal/e-cal-client.c:1077
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "不能改變行事曆屬性「%s」的數值"
 
-#: ../calendar/libecal/e-cal-component.c:1348
+#: ../calendar/libecal/e-cal-component.c:1349
 msgid "Untitled appointment"
 msgstr "未命名的約會"
 
-#: ../calendar/libecal/e-cal-recur.c:4037
+#: ../calendar/libecal/e-cal-recur.c:4040
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/libecal/e-cal-recur.c:4038
+#: ../calendar/libecal/e-cal-recur.c:4041
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/libecal/e-cal-recur.c:4039
+#: ../calendar/libecal/e-cal-recur.c:4042
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/libecal/e-cal-recur.c:4040
+#: ../calendar/libecal/e-cal-recur.c:4043
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:4044
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:4045
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:4046
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:4047
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:4048
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:4049
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:4050
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:4051
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:4052
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:4053
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:4054
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:4055
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:4056
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:4057
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4058
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4059
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4060
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4061
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4062
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4063
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4064
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4065
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4066
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4067
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4068
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4069
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:4070
 msgid "31st"
 msgstr "31日"
 
@@ -1718,83 +1709,83 @@ msgctxt "Priority"
 msgid "Undefined"
 msgstr "未定義"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:84
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1062
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1371
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1498
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1547
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1379
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1506
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1555
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "「%s」需要一個引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:91
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:673
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1378
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:92
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:1386
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1394
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "「%s」的第一個引數必須為字串"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
 #, c-format
 msgid "\"%s\" expects two or three arguments"
 msgstr "「%s」需要二或三個引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:173
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:262
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:324
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:823
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1069
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1447
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1505
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1554
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:263
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:325
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:824
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1070
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1455
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1513
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1562
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "「%s」的第一個引數必須為 time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:270
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:334
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:183
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:271
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:335
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:833
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "「%s」的第二個引數必須為 time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:192
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:193
 #, c-format
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "「%s」的第三個引數必須為字串"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:255
 #, c-format
 msgid "\"%s\" expects none or two arguments"
 msgstr "「%s」需要零或二個引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:317
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:666
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:816
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1440
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1448
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "「%s」需要兩個引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:602
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:625
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:748
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:780
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1332
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:603
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:626
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:749
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:781
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:988
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1021
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1340
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "「%s」不需要引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:682
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:683
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "「%s」的第二個引數必須為字串"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:713
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:714
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1804,135 +1795,135 @@ msgstr ""
 "「%s」的第一個引數必須為「任何」、「摘要」之一，或「描述」、「位置」、「到會"
 "者」、「召集人」、「分類」其中之一"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:885
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "「%s」需要至少一個引數"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:899
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:900
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
 msgstr "「%s」的所有引數必須為字串，或只有一個引數為布林偽值 (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1395
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1403
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "「%s」的第一個引數必須為 ISO 8601 日期/時間字串"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1456
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1464
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "「%s」的第二個引數必須為整數"
 
-#: ../calendar/libedata-cal/e-data-cal.c:412
+#: ../calendar/libedata-cal/e-data-cal.c:420
 msgid "Unsupported method"
 msgstr "不支援的方法"
 
-#: ../calendar/libedata-cal/e-data-cal.c:415
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Calendar does not exist"
 msgstr "行事曆不存在"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1503
+#: ../calendar/libedata-cal/e-data-cal.c:1606
 msgid "Cannot open calendar: "
 msgstr "不能開啟行事曆："
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1540
+#: ../calendar/libedata-cal/e-data-cal.c:1643
 msgid "Cannot refresh calendar: "
 msgstr "不能重新整理行事曆："
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1581
+#: ../calendar/libedata-cal/e-data-cal.c:1684
 msgid "Cannot retrieve calendar object path: "
 msgstr "不能取得行事曆物件路徑："
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1633
+#: ../calendar/libedata-cal/e-data-cal.c:1736
 msgid "Cannot retrieve calendar object list: "
 msgstr "不能取得行事曆物件清單："
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1684
+#: ../calendar/libedata-cal/e-data-cal.c:1787
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "不能取得行事曆空閒/忙碌清單："
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1727
+#: ../calendar/libedata-cal/e-data-cal.c:1830
 msgid "Cannot create calendar object: "
 msgstr "不能建立行事曆物件："
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1795
+#: ../calendar/libedata-cal/e-data-cal.c:1898
 msgid "Cannot modify calendar object: "
 msgstr "不能修改行事曆物件："
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1873
+#: ../calendar/libedata-cal/e-data-cal.c:1976
 msgid "Cannot remove calendar object: "
 msgstr "不能移除行事曆物件："
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1959
+#: ../calendar/libedata-cal/e-data-cal.c:2062
 msgid "Cannot receive calendar objects: "
 msgstr "不能取得行事曆物件："
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2002
+#: ../calendar/libedata-cal/e-data-cal.c:2105
 msgid "Cannot send calendar objects: "
 msgstr "不能傳送行事曆物件："
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2054
+#: ../calendar/libedata-cal/e-data-cal.c:2157
 msgid "Could not retrieve attachment uris: "
 msgstr "無法取得附件 URI："
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2099
+#: ../calendar/libedata-cal/e-data-cal.c:2202
 msgid "Could not discard reminder: "
 msgstr "無法取消提醒："
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2140
+#: ../calendar/libedata-cal/e-data-cal.c:2243
 msgid "Could not retrieve calendar time zone: "
 msgstr "無法取得行事曆時區："
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2180
+#: ../calendar/libedata-cal/e-data-cal.c:2283
 msgid "Could not add calendar time zone: "
 msgstr "無法加入行事曆時區："
 
-#: ../camel/camel-cipher-context.c:200
+#: ../camel/camel-cipher-context.c:199
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "這種加密方式不支援簽署"
 
-#: ../camel/camel-cipher-context.c:213
+#: ../camel/camel-cipher-context.c:212
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "這種加密方式不支援驗證簽署"
 
-#: ../camel/camel-cipher-context.c:229
+#: ../camel/camel-cipher-context.c:228
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "這種加密方式不支援加密"
 
-#: ../camel/camel-cipher-context.c:243
+#: ../camel/camel-cipher-context.c:242
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "這種加密方式不支援解密"
 
-#: ../camel/camel-cipher-context.c:359
+#: ../camel/camel-cipher-context.c:358
 msgid "Signing message"
 msgstr "正在簽署訊息"
 
-#: ../camel/camel-cipher-context.c:649
+#: ../camel/camel-cipher-context.c:648
 msgid "Encrypting message"
 msgstr "正在加密訊息"
 
-#: ../camel/camel-cipher-context.c:821
+#: ../camel/camel-cipher-context.c:820
 msgid "Decrypting message"
 msgstr "正在解密訊息"
 
@@ -1950,7 +1941,7 @@ msgstr "清空快取檔案"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "無法移除快取項目： %s： %s"
 
-#: ../camel/camel-filter-driver.c:914 ../camel/camel-filter-search.c:795
+#: ../camel/camel-filter-driver.c:914 ../camel/camel-filter-search.c:797
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "無法建構子代處理 '%s'：%s"
@@ -2027,106 +2018,115 @@ msgstr "分析過濾器「%s」發生錯誤：%s：%s"
 msgid "Error executing filter '%s': %s: %s"
 msgstr "執行過濾器「%s」發生錯誤：%s：%s"
 
-#: ../camel/camel-filter-search.c:136
+#: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
 msgstr "取回郵件失敗。"
 
-#: ../camel/camel-filter-search.c:535
+#: ../camel/camel-filter-search.c:537
 msgid "Invalid arguments to (system-flag)"
 msgstr "無效的參數給 (system-flag)"
 
-#: ../camel/camel-filter-search.c:553
+#: ../camel/camel-filter-search.c:555
 msgid "Invalid arguments to (user-tag)"
 msgstr "無效的參數給 (user-tag)"
 
-#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053
+#: ../camel/camel-filter-search.c:1064
+msgid "Invalid arguments to (message-location)"
+msgstr "無效的引數 (訊息-位置)"
+
+#: ../camel/camel-filter-search.c:1142 ../camel/camel-filter-search.c:1153
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "執行過濾器搜尋發生錯誤： %s: %s"
 
-#: ../camel/camel-folder.c:300
+#: ../camel/camel-folder.c:321
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "正在學習「%s」中的新垃圾郵件"
 
-#: ../camel/camel-folder.c:340
+#: ../camel/camel-folder.c:361
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "正在學習「%s」中的 ham 郵件"
 
-#: ../camel/camel-folder.c:388
+#: ../camel/camel-folder.c:409
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "正在過濾「%s」中的新郵件"
 
-#: ../camel/camel-folder.c:988
-#: ../camel/providers/local/camel-maildir-folder.c:319
+#: ../camel/camel-folder.c:1015
+#: ../camel/providers/local/camel-maildir-folder.c:330
 msgid "Moving messages"
 msgstr "正在移動郵件"
 
-#: ../camel/camel-folder.c:991
+#: ../camel/camel-folder.c:1018
 msgid "Copying messages"
 msgstr "正在複製郵件"
 
-#: ../camel/camel-folder.c:1033
+#: ../camel/camel-folder.c:1060
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "資料夾「%s」不支援限額資訊"
 
-#: ../camel/camel-folder.c:2847
+#: ../camel/camel-folder.c:1152
+#, c-format
+msgid "Filtering folder '%s'"
+msgstr "過濾資料夾「%s」"
+
+#: ../camel/camel-folder.c:2878
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "刪除資料夾「%s」"
 
-#: ../camel/camel-folder.c:2975
+#: ../camel/camel-folder.c:3009
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "接收 %2$s 中的郵件「%1$s」"
 
-#: ../camel/camel-folder.c:3166
+#: ../camel/camel-folder.c:3200
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "取得「%s」的用量限額資訊"
 
-#: ../camel/camel-folder.c:3466
+#: ../camel/camel-folder.c:3497
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "重新整理資料夾「%s」"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:886 ../camel/camel-folder-search.c:929
+#: ../camel/camel-folder-search.c:898 ../camel/camel-folder-search.c:941
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) 需要單一布林值結果"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:964
+#: ../camel/camel-folder-search.c:976
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) 不允許放在 %s 裡面"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:971 ../camel/camel-folder-search.c:979
+#: ../camel/camel-folder-search.c:983 ../camel/camel-folder-search.c:991
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) 需要相符類型字串"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1007
+#: ../camel/camel-folder-search.c:1019
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) 期望陣列結果"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1017
+#: ../camel/camel-folder-search.c:1029
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) 需要資料夾設定"
 
-#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097
+#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2135,7 +2135,7 @@ msgstr ""
 "不能分析搜尋詞句：%s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109
+#: ../camel/camel-folder-search.c:1955 ../camel/camel-folder-search.c:2121
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2144,18 +2144,28 @@ msgstr ""
 "執行搜尋詞句時發生錯誤：%s:\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:721 ../camel/camel-gpg-context.c:726
-#: ../camel/camel-gpg-context.c:1383
+#: ../camel/camel-folder-summary.c:2139
+#, c-format
+msgid "Release unused memory for folder '%s'"
+msgstr "釋放資料夾「%s」未使用的記憶體"
+
+#: ../camel/camel-folder-summary.c:2351
+#, c-format
+msgid "Update preview data for folder '%s'"
+msgstr "更新資料夾「%s」的預覽資料"
+
+#: ../camel/camel-gpg-context.c:724 ../camel/camel-gpg-context.c:729
+#: ../camel/camel-gpg-context.c:1386
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "執行 gpg 失敗： %s"
 
-#: ../camel/camel-gpg-context.c:726
-#: ../camel/providers/smtp/camel-smtp-transport.c:924
+#: ../camel/camel-gpg-context.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:962
 msgid "Unknown"
 msgstr "不明"
 
-#: ../camel/camel-gpg-context.c:791
+#: ../camel/camel-gpg-context.c:794
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2166,17 +2176,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:830
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "解析 gpg userid 提示時失敗。"
 
-#: ../camel/camel-gpg-context.c:852 ../camel/camel-gpg-context.c:867
+#: ../camel/camel-gpg-context.c:855 ../camel/camel-gpg-context.c:870
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "解析 gpg 密語要求時失敗。"
 
-#: ../camel/camel-gpg-context.c:888
+#: ../camel/camel-gpg-context.c:891
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2185,7 +2195,7 @@ msgstr ""
 "需要 PIN 才能為您的智慧卡解鎖：\n"
 "「%s」"
 
-#: ../camel/camel-gpg-context.c:892
+#: ../camel/camel-gpg-context.c:895
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2194,81 +2204,81 @@ msgstr ""
 "您需要密語才能為此使用者的金鑰解鎖：\n"
 "「%s」"
 
-#: ../camel/camel-gpg-context.c:898
+#: ../camel/camel-gpg-context.c:901
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG 傳回對「%s」未預期的要求"
 
-#: ../camel/camel-gpg-context.c:910
+#: ../camel/camel-gpg-context.c:913
 msgid ""
 "Note the encrypted content doesn't contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
 msgstr ""
 "注意加密的內容不會包含收件者資訊，因此每個儲存的私密金鑰都會提示輸入密碼。"
 
-#: ../camel/camel-gpg-context.c:941 ../camel/camel-net-utils.c:522
+#: ../camel/camel-gpg-context.c:944 ../camel/camel-net-utils.c:524
 #: ../camel/providers/nntp/camel-nntp-summary.c:401
-#: ../libedataserver/e-client.c:158
+#: ../libedataserver/e-client.c:160
 #, c-format
 msgid "Cancelled"
 msgstr "已取消"
 
-#: ../camel/camel-gpg-context.c:962
+#: ../camel/camel-gpg-context.c:965
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "解鎖私密金鑰時失敗：輸入了 3 次錯誤的密語 。"
 
-#: ../camel/camel-gpg-context.c:975
+#: ../camel/camel-gpg-context.c:978
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "從 GnuPG 傳回意外的回應： %s"
 
-#: ../camel/camel-gpg-context.c:1106
+#: ../camel/camel-gpg-context.c:1109
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "不能加密郵件：沒有提供有效的收件者。"
 
-#: ../camel/camel-gpg-context.c:1658 ../camel/camel-smime-context.c:844
+#: ../camel/camel-gpg-context.c:1661 ../camel/camel-smime-context.c:843
 msgid "Could not generate signing data: "
 msgstr "無法產生簽章資料："
 
-#: ../camel/camel-gpg-context.c:1708 ../camel/camel-gpg-context.c:1920
-#: ../camel/camel-gpg-context.c:2030 ../camel/camel-gpg-context.c:2179
+#: ../camel/camel-gpg-context.c:1711 ../camel/camel-gpg-context.c:1923
+#: ../camel/camel-gpg-context.c:2033 ../camel/camel-gpg-context.c:2182
 msgid "Failed to execute gpg."
 msgstr "執行 gpg 失敗。"
 
-#: ../camel/camel-gpg-context.c:1791 ../camel/camel-gpg-context.c:1799
-#: ../camel/camel-gpg-context.c:1807 ../camel/camel-gpg-context.c:1827
-#: ../camel/camel-smime-context.c:973 ../camel/camel-smime-context.c:987
-#: ../camel/camel-smime-context.c:996
+#: ../camel/camel-gpg-context.c:1794 ../camel/camel-gpg-context.c:1802
+#: ../camel/camel-gpg-context.c:1810 ../camel/camel-gpg-context.c:1830
+#: ../camel/camel-smime-context.c:972 ../camel/camel-smime-context.c:986
+#: ../camel/camel-smime-context.c:995
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "不能驗證此郵件的簽章：錯誤的訊息格式"
 
-#: ../camel/camel-gpg-context.c:1873
+#: ../camel/camel-gpg-context.c:1876
 msgid "Cannot verify message signature: "
 msgstr "不能驗證此郵件的簽章："
 
-#: ../camel/camel-gpg-context.c:1996
+#: ../camel/camel-gpg-context.c:1999
 msgid "Could not generate encrypting data: "
 msgstr "無法產生加密資料："
 
-#: ../camel/camel-gpg-context.c:2049
+#: ../camel/camel-gpg-context.c:2052
 msgid "This is a digitally encrypted message part"
 msgstr "這是數位化加密訊息部份"
 
-#: ../camel/camel-gpg-context.c:2105 ../camel/camel-gpg-context.c:2114
-#: ../camel/camel-gpg-context.c:2137
+#: ../camel/camel-gpg-context.c:2108 ../camel/camel-gpg-context.c:2117
+#: ../camel/camel-gpg-context.c:2140
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "不能解密此郵件：錯誤的訊息格式"
 
-#: ../camel/camel-gpg-context.c:2125
+#: ../camel/camel-gpg-context.c:2128
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "解密 MIME 組件時失敗：通訊協定錯誤"
 
-#: ../camel/camel-gpg-context.c:2220 ../camel/camel-smime-context.c:1289
+#: ../camel/camel-gpg-context.c:2223 ../camel/camel-smime-context.c:1288
 msgid "Encrypted content"
 msgstr "加密內容"
 
@@ -2316,154 +2326,156 @@ msgstr "無法鎖定「%s」： lock-helper 協定錯誤"
 msgid "Could not lock '%s'"
 msgstr "無法鎖定「%s」"
 
-#: ../camel/camel-movemail.c:109
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "無法檢查郵件檔案 %s：%s"
-
-#: ../camel/camel-movemail.c:123
+#: ../camel/camel-movemail.c:101
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "無法開啟郵件檔案 %s：%s"
 
-#: ../camel/camel-movemail.c:133
+#: ../camel/camel-movemail.c:121
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "無法檢查郵件檔案 %s：%s"
+
+#: ../camel/camel-movemail.c:136
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "無法開啟暫存郵件檔案 %s：%s"
 
-#: ../camel/camel-movemail.c:163
+#: ../camel/camel-movemail.c:166
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "儲存郵件至暫存檔案時失敗 %s：%s"
 
-#: ../camel/camel-movemail.c:197
+#: ../camel/camel-movemail.c:200
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "無法建構導管：%s"
 
-#: ../camel/camel-movemail.c:211
+#: ../camel/camel-movemail.c:214
 #, c-format
 msgid "Could not fork: %s"
 msgstr "無法另外執行一個行程：%s"
 
-#: ../camel/camel-movemail.c:249
+#: ../camel/camel-movemail.c:252
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail 程式失敗：%s"
 
-#: ../camel/camel-movemail.c:250
+#: ../camel/camel-movemail.c:253
 msgid "(Unknown error)"
 msgstr "(不明的錯誤)"
 
-#: ../camel/camel-movemail.c:277
+#: ../camel/camel-movemail.c:280
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "讀取郵件檔案時發生錯誤：%s"
 
-#: ../camel/camel-movemail.c:290
+#: ../camel/camel-movemail.c:293
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "寫入郵件暫存檔案時發生錯誤：%s"
 
-#: ../camel/camel-movemail.c:497 ../camel/camel-movemail.c:566
+#: ../camel/camel-movemail.c:500 ../camel/camel-movemail.c:569
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "複製郵件暫存檔案時發生錯誤：%s"
 
-#: ../camel/camel-multipart-signed.c:279
+#: ../camel/camel-multipart-signed.c:279 ../camel/camel-multipart-signed.c:432
 #, c-format
 msgid "No content available"
 msgstr "沒有可用的內容"
 
-#: ../camel/camel-multipart-signed.c:287
+#: ../camel/camel-multipart-signed.c:287 ../camel/camel-multipart-signed.c:440
 #, c-format
 msgid "No signature available"
 msgstr "沒有可用的簽章"
 
-#: ../camel/camel-multipart-signed.c:636
+#: ../camel/camel-multipart-signed.c:806
 #, c-format
 msgid "parse error"
 msgstr "解析錯誤"
 
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:706
 #, c-format
 msgid "Resolving: %s"
 msgstr "解析：%s"
 
-#: ../camel/camel-net-utils.c:725
+#: ../camel/camel-net-utils.c:731
 msgid "Host lookup failed"
 msgstr "搜尋主機失敗"
 
-#: ../camel/camel-net-utils.c:731
+#: ../camel/camel-net-utils.c:737
 #, c-format
 msgid "Host lookup '%s' failed. Check your host name for spelling errors."
 msgstr "主機查詢「%s」失敗。請檢查您的主機名稱是否有拼錯字。"
 
-#: ../camel/camel-net-utils.c:735
+#: ../camel/camel-net-utils.c:741
 #, c-format
 msgid "Host lookup '%s' failed: %s"
 msgstr "查詢主機「%s」失敗：%s"
 
-#: ../camel/camel-network-service.c:1009
-msgid "No host information available"
-msgstr "沒有主機資訊可用"
+#: ../camel/camel-offline-folder.c:89
+#, c-format
+msgid "Downloading new messages for offline mode in '%s'"
+msgstr "正在下載「%s」的新訊息用於離線模式"
 
-#: ../camel/camel-offline-folder.c:90
-msgid "Downloading new messages for offline mode"
-msgstr "正在下載新訊息用於離線模式"
+#: ../camel/camel-offline-folder.c:155
+#, c-format
+msgid "Checking download of new messages for offline in '%s'"
+msgstr "正在檢查「%s」的新訊息用於離線模式"
 
-#: ../camel/camel-offline-folder.c:209
+#: ../camel/camel-offline-folder.c:214
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "正在將資料夾「%s」中的郵件同步到磁碟"
 
-#: ../camel/camel-offline-folder.c:266
+#: ../camel/camel-offline-folder.c:271
 msgid "Copy folder content locally for _offline operation"
 msgstr "複製資料夾內容至本地用於離線作業(_O)"
 
-#: ../camel/camel-provider.c:56
+#: ../camel/camel-provider.c:55
 msgid "Virtual folder email provider"
 msgstr "虛擬資料夾電子郵件供應商"
 
-#: ../camel/camel-provider.c:58
+#: ../camel/camel-provider.c:57
 msgid "For reading mail as a query of another set of folders"
 msgstr "使讀取郵件如同查詢其他資料夾"
 
-#: ../camel/camel-provider.c:261
+#: ../camel/camel-provider.c:260
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "無法載入模組 %s： 此系統不支援載入模組。"
 
-#: ../camel/camel-provider.c:270
+#: ../camel/camel-provider.c:269
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "無法載入 %s：%s"
 
-#: ../camel/camel-provider.c:279
+#: ../camel/camel-provider.c:278
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "無法載入 %s：模組內沒有初始碼。"
 
-#: ../camel/camel-provider.c:427 ../camel/camel-session.c:424
+#: ../camel/camel-provider.c:426 ../camel/camel-session.c:424
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "沒有通訊協定「%s」的提供者"
 
-#: ../camel/camel-sasl-anonymous.c:33
-#: ../camel/providers/nntp/camel-nntp-provider.c:83
+#: ../camel/camel-sasl-anonymous.c:32
+#: ../camel/providers/nntp/camel-nntp-provider.c:82
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../camel/camel-sasl-anonymous.c:35
+#: ../camel/camel-sasl-anonymous.c:34
 msgid "This option will connect to the server using an anonymous login."
 msgstr "這個選項將會使用匿名登入至伺服器。"
 
-#: ../camel/camel-sasl-anonymous.c:68
+#: ../camel/camel-sasl-anonymous.c:67
 #, c-format
 msgid "Authentication failed."
 msgstr "核對失敗。"
 
-#: ../camel/camel-sasl-anonymous.c:79
+#: ../camel/camel-sasl-anonymous.c:78
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2472,7 +2484,7 @@ msgstr ""
 "無效的電子郵件地址追蹤資訊：\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:93
+#: ../camel/camel-sasl-anonymous.c:92
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2481,7 +2493,7 @@ msgstr ""
 "無效的不透明追蹤資訊：\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:107
+#: ../camel/camel-sasl-anonymous.c:106
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2490,11 +2502,11 @@ msgstr ""
 "無效的追蹤資訊：\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:44
+#: ../camel/camel-sasl-cram-md5.c:43
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:46
+#: ../camel/camel-sasl-cram-md5.c:45
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2502,11 +2514,11 @@ msgstr ""
 "這個選項將會使用 CRAM-MD5 加密的密碼連線至伺服器，若發現該伺服器支援這種服"
 "務。"
 
-#: ../camel/camel-sasl-digest-md5.c:57
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:59
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2514,116 +2526,121 @@ msgstr ""
 "這個選項將會使用 DIGEST-MD5 加密的密碼連線至伺服器，若發現該伺服器支援這種服"
 "務。"
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:854
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "伺服器查問過長(>2048 位元 )"
 
-#: ../camel/camel-sasl-digest-md5.c:864
+#: ../camel/camel-sasl-digest-md5.c:865
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "伺服器查問無效\n"
 
-#: ../camel/camel-sasl-digest-md5.c:872
+#: ../camel/camel-sasl-digest-md5.c:873
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "伺服器查問包含無效的 「Quality of Protection」代符"
 
-#: ../camel/camel-sasl-digest-md5.c:905
+#: ../camel/camel-sasl-digest-md5.c:906
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "伺服器回應並未包含授權資料"
 
-#: ../camel/camel-sasl-digest-md5.c:926
+#: ../camel/camel-sasl-digest-md5.c:927
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "伺服器回應包含不完整的授權資料"
 
-#: ../camel/camel-sasl-digest-md5.c:939
+#: ../camel/camel-sasl-digest-md5.c:940
 #, c-format
 msgid "Server response does not match"
 msgstr "伺服器回應不符"
 
-#: ../camel/camel-sasl-gssapi.c:89
+#: ../camel/camel-sasl-gssapi.c:94
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:91
+#: ../camel/camel-sasl-gssapi.c:96
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "這個選項將會使用 Kerberos 5 核對連線至伺服器。"
 
-#: ../camel/camel-sasl-gssapi.c:134
+#: ../camel/camel-sasl-gssapi.c:148
+#, c-format
+msgid "(Unknown GSSAPI mechanism code: %x)"
+msgstr "(不明的 GSSAPI 機制代碼：%x)"
+
+#: ../camel/camel-sasl-gssapi.c:181
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr "提供的證件不支援指定的機制，或者是執行無法辨識。"
 
-#: ../camel/camel-sasl-gssapi.c:139
+#: ../camel/camel-sasl-gssapi.c:186
 msgid "The provided target_name parameter was ill-formed."
 msgstr "提供的 target_name 參數格式錯誤。"
 
-#: ../camel/camel-sasl-gssapi.c:142
+#: ../camel/camel-sasl-gssapi.c:189
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "提供的 target_name 參數包含無效或不支援的名稱類型。"
 
-#: ../camel/camel-sasl-gssapi.c:146
+#: ../camel/camel-sasl-gssapi.c:193
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr ""
 "input_token 包含不同的通道，透過  input_chan_bindings，連結至這些指定的參數。"
 
-#: ../camel/camel-sasl-gssapi.c:151
+#: ../camel/camel-sasl-gssapi.c:198
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "input_token 包含無效的簽章，或者無法確認的簽章。"
 
-#: ../camel/camel-sasl-gssapi.c:155
+#: ../camel/camel-sasl-gssapi.c:202
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 msgstr "提供的證件不適用於網路位置，或者證件識別指標未參照任何憑證。"
 
-#: ../camel/camel-sasl-gssapi.c:160
+#: ../camel/camel-sasl-gssapi.c:207
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "提供的網路位置識別指標未參照有效的網路位置。"
 
-#: ../camel/camel-sasl-gssapi.c:163
+#: ../camel/camel-sasl-gssapi.c:210
 msgid "The consistency checks performed on the input_token failed."
 msgstr "在 input_token 執行一致性檢查失敗。"
 
-#: ../camel/camel-sasl-gssapi.c:166
+#: ../camel/camel-sasl-gssapi.c:213
 msgid "The consistency checks performed on the credential failed."
 msgstr "在證件執行一致性檢查失敗。"
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:216
 msgid "The referenced credentials have expired."
 msgstr "參照的證件已經過期。"
 
-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:352
-#: ../camel/camel-sasl-gssapi.c:400 ../camel/camel-sasl-gssapi.c:417
-#: ../camel/providers/smtp/camel-smtp-transport.c:622
+#: ../camel/camel-sasl-gssapi.c:222 ../camel/camel-sasl-gssapi.c:404
+#: ../camel/camel-sasl-gssapi.c:453 ../camel/camel-sasl-gssapi.c:470
+#: ../camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "來自伺服器的不良許可回應。"
 
-#: ../camel/camel-sasl-gssapi.c:429
+#: ../camel/camel-sasl-gssapi.c:482
 #, c-format
 msgid "Unsupported security layer."
 msgstr "不支援的類型"
 
-#: ../camel/camel-sasl-login.c:38
+#: ../camel/camel-sasl-login.c:37
 msgid "Login"
 msgstr "登入"
 
-#: ../camel/camel-sasl-login.c:40 ../camel/camel-sasl-plain.c:44
+#: ../camel/camel-sasl-login.c:39 ../camel/camel-sasl-plain.c:43
 msgid "This option will connect to the server using a simple password."
 msgstr "這個選項將會使用普通的密碼連線至伺服器。"
 
-#: ../camel/camel-sasl-login.c:108
+#: ../camel/camel-sasl-login.c:107
 #, c-format
 msgid "Unknown authentication state."
 msgstr "未知的驗証狀況。"
@@ -2638,33 +2655,33 @@ msgid ""
 "Password Authentication."
 msgstr "這個選項將會使用 NTLM / 安全密碼核對連線至基於 Windows 的伺服器。"
 
-#: ../camel/camel-sasl-plain.c:42
+#: ../camel/camel-sasl-plain.c:41
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:44
+#: ../camel/camel-sasl-popb4smtp.c:43
 msgid "POP before SMTP"
 msgstr "POP 先於 SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:45
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "這個選項將會在進行 SMTP 之前允許 POP連線"
 
-#: ../camel/camel-sasl-popb4smtp.c:82
+#: ../camel/camel-sasl-popb4smtp.c:81
 msgid "POP Source UID"
 msgstr "POP 來源 UID"
 
-#: ../camel/camel-sasl-popb4smtp.c:96
+#: ../camel/camel-sasl-popb4smtp.c:95
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "POP 先於 SMTP 允許使用未知的傳輸"
 
-#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117
+#: ../camel/camel-sasl-popb4smtp.c:107 ../camel/camel-sasl-popb4smtp.c:116
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "以 %s 服務嘗試 POP 先於 SMTP 核對"
 
-#: ../camel/camel-search-private.c:114
+#: ../camel/camel-search-private.c:113
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "正規表示式編譯失敗： %s： %s"
@@ -2675,10 +2692,10 @@ msgid "Invalid GType registered for protocol '%s'"
 msgstr "通訊協定「%s」註冊了無效的 GType"
 
 #: ../camel/camel-session.c:502
-#: ../camel/providers/imapx/camel-imapx-server.c:4629
-#: ../camel/providers/pop3/camel-pop3-store.c:311
-#: ../camel/providers/pop3/camel-pop3-store.c:757
-#: ../camel/providers/smtp/camel-smtp-transport.c:515
+#: ../camel/providers/imapx/camel-imapx-server.c:4781
+#: ../camel/providers/pop3/camel-pop3-store.c:309
+#: ../camel/providers/pop3/camel-pop3-store.c:764
+#: ../camel/providers/smtp/camel-smtp-transport.c:544
 #, c-format
 msgid "No support for %s authentication"
 msgstr "不支援 %s 核對"
@@ -2692,244 +2709,243 @@ msgstr "%s 核對失敗"
 msgid "Forwarding messages is not supported"
 msgstr "不支援轉寄郵件"
 
-#: ../camel/camel-smime-context.c:349 ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1075
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "找不到 '%s' 的憑證"
 
-#: ../camel/camel-smime-context.c:377
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
 msgstr "無法建構 CMS 訊息"
 
-#: ../camel/camel-smime-context.c:382
+#: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
 msgstr "無法建構 CMS signedData"
 
-#: ../camel/camel-smime-context.c:388
+#: ../camel/camel-smime-context.c:387
 msgid "Cannot attach CMS signed data"
 msgstr "無法附加 CMS signedData"
 
-#: ../camel/camel-smime-context.c:395
+#: ../camel/camel-smime-context.c:394
 msgid "Cannot attach CMS data"
 msgstr "無法附加 CMS 資料"
 
-#: ../camel/camel-smime-context.c:401
+#: ../camel/camel-smime-context.c:400
 msgid "Cannot create CMS Signer information"
 msgstr "無法建構 CMS SignerInfo"
 
-#: ../camel/camel-smime-context.c:407
+#: ../camel/camel-smime-context.c:406
 msgid "Cannot find certificate chain"
 msgstr "找不到憑證鏈"
 
-#: ../camel/camel-smime-context.c:413
+#: ../camel/camel-smime-context.c:412
 msgid "Cannot add CMS Signing time"
 msgstr "無法新增 CMS SigningTime"
 
-#: ../camel/camel-smime-context.c:437 ../camel/camel-smime-context.c:452
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' 的加密憑證不存在"
 
-#: ../camel/camel-smime-context.c:459
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "無法新增 SMIMEEncKeyPrefs 屬性"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:463
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "無法新增 MS SMIMEEncKeyPrefs 屬性"
 
-#: ../camel/camel-smime-context.c:469
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot add encryption certificate"
 msgstr "無法新增加密憑證"
 
-#: ../camel/camel-smime-context.c:475
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot add CMS Signer information"
 msgstr "無法新增 CMS SignerInfo"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:507
 msgid "Unverified"
 msgstr "未指定"
 
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:509
 msgid "Good signature"
 msgstr "良好的簽章"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:511
 msgid "Bad signature"
 msgstr "錯誤的簽章"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:513
 msgid "Content tampered with or altered in transit"
 msgstr "內容在傳送時被竄改或變更"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:515
 msgid "Signing certificate not found"
 msgstr "找不到簽署憑證"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:517
 msgid "Signing certificate not trusted"
 msgstr "簽署憑證不受信任"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:519
 msgid "Signature algorithm unknown"
 msgstr "未知的簽章演算法"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:521
 msgid "Signature algorithm unsupported"
 msgstr "不支援這種簽章演算法"
 
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:523
 msgid "Malformed signature"
 msgstr "格式不良的簽章"
 
-#: ../camel/camel-smime-context.c:526
+#: ../camel/camel-smime-context.c:525
 msgid "Processing error"
 msgstr "解析錯誤"
 
-#: ../camel/camel-smime-context.c:571
+#: ../camel/camel-smime-context.c:570
 msgid "No signed data in signature"
 msgstr "簽章中沒有被簽署的資料"
 
-#: ../camel/camel-smime-context.c:576
+#: ../camel/camel-smime-context.c:575
 msgid "Digests missing from enveloped data"
 msgstr "包裹的資料中遺漏摘要"
 
-#: ../camel/camel-smime-context.c:589 ../camel/camel-smime-context.c:600
+#: ../camel/camel-smime-context.c:588 ../camel/camel-smime-context.c:599
 msgid "Cannot calculate digests"
 msgstr "無法計算摘要"
 
-#: ../camel/camel-smime-context.c:607 ../camel/camel-smime-context.c:611
+#: ../camel/camel-smime-context.c:606 ../camel/camel-smime-context.c:610
 msgid "Cannot set message digests"
 msgstr "無法設定郵件摘要"
 
-#: ../camel/camel-smime-context.c:621 ../camel/camel-smime-context.c:626
+#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:625
 msgid "Certificate import failed"
 msgstr "憑證匯入失敗"
 
-#: ../camel/camel-smime-context.c:636
+#: ../camel/camel-smime-context.c:635
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "限憑證訊息，無法驗證憑證"
 
-#: ../camel/camel-smime-context.c:639
+#: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "限憑證訊息、匯入和驗證的憑證"
 
-#: ../camel/camel-smime-context.c:643
+#: ../camel/camel-smime-context.c:642
 msgid "Cannot find signature digests"
 msgstr "找不到簽章摘要"
 
-#: ../camel/camel-smime-context.c:660
+#: ../camel/camel-smime-context.c:659
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "簽署者： %s<%s>： %s\n"
 
-#: ../camel/camel-smime-context.c:856 ../camel/camel-smime-context.c:1150
+#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1149
 msgid "Cannot create encoder context"
 msgstr "無法建構編碼器網路位置"
 
-#: ../camel/camel-smime-context.c:862
+#: ../camel/camel-smime-context.c:861
 msgid "Failed to add data to CMS encoder"
 msgstr "無法新增資料至 CMS 編碼器"
 
-#: ../camel/camel-smime-context.c:867 ../camel/camel-smime-context.c:1167
+#: ../camel/camel-smime-context.c:866 ../camel/camel-smime-context.c:1166
 msgid "Failed to encode data"
 msgstr "無法編碼資料"
 
-#: ../camel/camel-smime-context.c:1015 ../camel/camel-smime-context.c:1264
+#: ../camel/camel-smime-context.c:1014 ../camel/camel-smime-context.c:1263
 msgid "Decoder failed"
 msgstr "解碼器失敗"
 
-#: ../camel/camel-smime-context.c:1084
+#: ../camel/camel-smime-context.c:1083
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "找不到一般大量加密演算法"
 
-#: ../camel/camel-smime-context.c:1092
+#: ../camel/camel-smime-context.c:1091
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "無法配置插槽給加密大量鑰匙"
 
-#: ../camel/camel-smime-context.c:1103
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot create CMS Message"
 msgstr "無法建構 CMS 訊息"
 
-#: ../camel/camel-smime-context.c:1109
+#: ../camel/camel-smime-context.c:1108
 msgid "Cannot create CMS Enveloped data"
 msgstr "無法建構 CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1115
+#: ../camel/camel-smime-context.c:1114
 msgid "Cannot attach CMS Enveloped data"
 msgstr "無法附加 CMS EnvelopedData"
 
-#: ../camel/camel-smime-context.c:1121
+#: ../camel/camel-smime-context.c:1120
 msgid "Cannot attach CMS data object"
 msgstr "無法附加 CMS 資料物件"
 
-#: ../camel/camel-smime-context.c:1130
+#: ../camel/camel-smime-context.c:1129
 msgid "Cannot create CMS Recipient information"
 msgstr "無法建構 CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1135
+#: ../camel/camel-smime-context.c:1134
 msgid "Cannot add CMS Recipient information"
 msgstr "無法新增 CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1161
+#: ../camel/camel-smime-context.c:1160
 msgid "Failed to add data to encoder"
 msgstr "無法新增資料至編碼器"
 
-#: ../camel/camel-smime-context.c:1271
+#: ../camel/camel-smime-context.c:1270
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME 解密：找不到加密內容"
 
-#: ../camel/camel-store.c:1201
-#, c-format
-msgid "Cannot create folder '%s': folder exists"
-msgstr "不能建立資料夾「%s」：資料夾已存在"
-
-#: ../camel/camel-store.c:1244
+#: ../camel/camel-store.c:1248
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "開啟資料夾「%s」"
 
-#: ../camel/camel-store.c:1471
+#: ../camel/camel-store.c:1539
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "掃描「%s」內的資料夾"
 
-#: ../camel/camel-store.c:1499 ../camel/camel-store.c:1544
-#: ../camel/camel-vtrash-folder.c:46
+#: ../camel/camel-store.c:1567 ../camel/camel-store.c:1612
+#: ../camel/camel-vtrash-folder.c:45
 msgid "Trash"
 msgstr "回收筒"
 
-#: ../camel/camel-store.c:1513 ../camel/camel-store.c:1561
-#: ../camel/camel-vtrash-folder.c:48
+#: ../camel/camel-store.c:1581 ../camel/camel-store.c:1629
+#: ../camel/camel-vtrash-folder.c:47
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: ../camel/camel-store.c:2162
+#: ../camel/camel-store.c:2230
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "無法建構資料夾：%s：資料夾已存在"
 
-#: ../camel/camel-store.c:2169
+#: ../camel/camel-store.c:2237
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "正在建立資料夾「%s」"
 
-#: ../camel/camel-store.c:2346 ../camel/camel-vee-store.c:416
-#: ../camel/providers/local/camel-maildir-store.c:320
+#: ../camel/camel-store.c:2414 ../camel/camel-vee-store.c:410
+#: ../camel/providers/local/camel-maildir-store.c:330
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "不能刪除資料夾： %s ：無效的操作"
 
-#: ../camel/camel-store.c:2536 ../camel/camel-vee-store.c:467
-#: ../camel/providers/local/camel-maildir-store.c:851
+#: ../camel/camel-store.c:2604 ../camel/camel-vee-store.c:461
+#: ../camel/providers/local/camel-maildir-store.c:898
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "不能重新命名資料夾： %s ：無效的操作"
 
-#: ../camel/camel-stream.c:285 ../camel/camel-stream.c:336
+#: ../camel/camel-stream.c:168
+msgid "Cannot write with no base stream"
+msgstr "不能寫入基礎串流"
+
+#: ../camel/camel-stream.c:288 ../camel/camel-stream.c:339
 #, c-format
 msgid "Stream type '%s' is not seekable"
 msgstr "串流類型「%s」不是可尋找的"
@@ -2938,16 +2954,16 @@ msgstr "串流類型「%s」不是可尋找的"
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "CamelStreamFilter 只支援重設到開頭"
 
-#: ../camel/camel-stream-null.c:76
+#: ../camel/camel-stream-null.c:74
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "CamelHttpStream 只支援重設到開頭"
 
-#: ../camel/camel-stream-process.c:280
+#: ../camel/camel-stream-process.c:278
 #, c-format
 msgid "Connection cancelled"
 msgstr "連線已取消"
 
-#: ../camel/camel-stream-process.c:285
+#: ../camel/camel-stream-process.c:283
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "無法以指令「%s」連線： %s"
@@ -2962,7 +2978,7 @@ msgstr "訂閱到資料夾「%s」"
 msgid "Unsubscribing from folder '%s'"
 msgstr "取消訂閱資料夾「%s」"
 
-#: ../camel/camel-url.c:329
+#: ../camel/camel-url.c:327
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "無法解析 URL「%s」"
@@ -2987,7 +3003,7 @@ msgstr "沒有 %s 這類郵件在 %s 中"
 msgid "Error storing '%s': "
 msgstr "儲存「%s」發生錯誤："
 
-#: ../camel/camel-vee-folder.c:1167
+#: ../camel/camel-vee-folder.c:1173
 msgid "Automatically _update on change in source folders"
 msgstr "來源資料夾中變更時自動更新(_U)"
 
@@ -2997,67 +3013,80 @@ msgstr "來源資料夾中變更時自動更新(_U)"
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
-#: ../camel/camel-vee-store.c:442
+#: ../camel/camel-vee-store.c:436
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
 
-#: ../camel/camel-vee-store.c:477
+#: ../camel/camel-vee-store.c:471
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "不能重新命名資料夾： %s ：沒有這個資料夾"
 
-#: ../camel/camel-vee-store.c:539
+#: ../camel/camel-vee-store.c:533
 msgid "Enable _Unmatched folder"
 msgstr "啟用未符合資料夾(_U)"
 
-#: ../camel/camel-vtrash-folder.c:47
+#: ../camel/camel-vee-store.c:1025
+msgid "Updating Unmatched search folder"
+msgstr "更新未符合搜尋資料夾"
+
+#: ../camel/camel-vtrash-folder.c:46
 msgid "Cannot copy messages to the Trash folder"
 msgstr "無法複製訊息到「回收筒」資料夾"
 
-#: ../camel/camel-vtrash-folder.c:49
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Cannot copy messages to the Junk folder"
 msgstr "無法複製訊息到「垃圾郵件」資料夾"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:654
+#: ../camel/providers/imapx/camel-imapx-folder.c:812
 #, c-format
 msgid "No quota information available for folder '%s'"
 msgstr "資料夾「%s」不支援限額資訊"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:768
-#: ../camel/providers/imapx/camel-imapx-folder.c:861
+#: ../camel/providers/imapx/camel-imapx-folder.c:952
+#: ../camel/providers/imapx/camel-imapx-folder.c:1045
 #, c-format
 msgid "No destination folder specified"
 msgstr "沒有指定目的地資料夾"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:796
+#: ../camel/providers/imapx/camel-imapx-folder.c:980
 msgid "Unable to move junk messages"
 msgstr "無法移動垃圾郵件"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:889
+#: ../camel/providers/imapx/camel-imapx-folder.c:1073
 msgid "Unable to move deleted messages"
 msgstr "無法移動刪除的郵件"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1115
-#: ../camel/providers/nntp/camel-nntp-folder.c:758
+#: ../camel/providers/imapx/camel-imapx-folder.c:1393
+#: ../camel/providers/nntp/camel-nntp-folder.c:760
 msgid "Apply message _filters to this folder"
 msgstr "將郵件過濾條件套用到這個資料夾(_F)"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1221
+#: ../camel/providers/imapx/camel-imapx-folder.c:1404
+msgid "Always check for _new mail in this folder"
+msgstr "永遠檢查這個資料夾中是否有新郵件(_N)"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1515
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "無法建立 %s 的資料夾摘要"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1230
+#: ../camel/providers/imapx/camel-imapx-folder.c:1524
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "無法建立 %s 的快取："
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:1415
+#: ../camel/providers/imapx/camel-imapx-folder.c:1739
 #, c-format
 msgid "No IMAP mailbox available for folder '%s'"
 msgstr "資料夾「%s」沒有 IMAP 郵箱可用"
 
+#: ../camel/providers/imapx/camel-imapx-input-stream.c:93
+#, c-format
+msgid "Source stream returned no data"
+msgstr "來源串流傳回無資料"
+
 #: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "檢查新郵件"
@@ -3079,335 +3108,335 @@ msgid "_Listen for server change notifications"
 msgstr "聽取伺服器變更通知(_L)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:49
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
+msgid "Connection to Server"
+msgstr "連線至伺服器"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
+msgid "Numbe_r of concurrent connections to use"
+msgstr "要使用的同時連線數量(_R)"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Folders"
 msgstr "資料夾"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "_Show only subscribed folders"
 msgstr "只顯示已訂閱的資料夾(_S)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
 msgid "O_verride server-supplied folder namespace"
 msgstr "覆蓋伺服器提供之資料夾的命名空間(_V)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
 msgid "Namespace:"
 msgstr "命名空間"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
 #: ../camel/providers/local/camel-local-provider.c:39
-#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:77
 #: ../camel/providers/local/camel-local-provider.c:99
-#: ../camel/providers/nntp/camel-nntp-provider.c:39
+#: ../camel/providers/nntp/camel-nntp-provider.c:38
 msgid "Options"
 msgstr "選項"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:61
-#: ../camel/providers/nntp/camel-nntp-provider.c:41
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
+#: ../camel/providers/nntp/camel-nntp-provider.c:40
 msgid "Apply _filters to new messages in all folders"
 msgstr "將過濾條件套用到所有資料夾的新郵件(_F)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "套用過濾器至此伺服器收件匣的新郵件(_A)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:65
+#: ../camel/providers/imapx/camel-imapx-provider.c:70
 msgid "Check new messages for _Junk contents"
 msgstr "檢查新郵件中是否有垃圾內容(_J)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:67
-msgid "Only check for Junk messages in the IN_BOX folder"
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+msgid "Only check for Junk messages in the In_box folder"
 msgstr "只檢查收件匣資料夾中的垃圾郵件(_B)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:69
-msgid "Automatically synchroni_ze remote mail locally"
-msgstr "自動將遠端郵件同步到本地端(_Z)"
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
+msgid "Synchroni_ze remote mail locally in all folders"
+msgstr "將遠端郵件同步到本地端所有的資料夾(_Z)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:75
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Default IMAP port"
 msgstr "預設的 IMAP 連接埠"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
+#: ../camel/providers/imapx/camel-imapx-provider.c:81
 msgid "IMAP over SSL"
 msgstr "IMAP 透過 SSL"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:83
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
 msgid "IMAP+"
 msgstr "IMAP"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:85
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
 msgid "For reading and storing mail on IMAP servers."
 msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:819
+#: ../camel/providers/imapx/camel-imapx-server.c:1006
+#: ../camel/providers/imapx/camel-imapx-server.c:1013
 #, c-format
 msgid "Not authenticated"
 msgstr "尚未核對"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1763
+#: ../camel/providers/imapx/camel-imapx-server.c:1734
 msgid "Server disconnected"
 msgstr "伺服器斷線"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2226
+#: ../camel/providers/imapx/camel-imapx-server.c:2228
 msgid "Error writing to cache stream"
 msgstr "寫入快取串流時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3596
+#: ../camel/providers/imapx/camel-imapx-server.c:3616
 msgid "Error performing IDLE"
 msgstr "進行 IDLE 時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4490
+#: ../camel/providers/imapx/camel-imapx-server.c:4622
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4491
+#: ../camel/providers/imapx/camel-imapx-server.c:4623
 #: ../camel/providers/smtp/camel-smtp-transport.c:215
 msgid "STARTTLS not supported"
 msgstr "不支援 STARTTLS"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4538
+#: ../camel/providers/imapx/camel-imapx-server.c:4683
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4618
+#: ../camel/providers/imapx/camel-imapx-server.c:4770
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "IMAP 伺服器 %s 不支援 %s 核對"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4648
-#: ../camel/providers/nntp/camel-nntp-store.c:394
-#: ../camel/providers/nntp/camel-nntp-store.c:531
+#: ../camel/providers/imapx/camel-imapx-server.c:4800
+#: ../camel/providers/nntp/camel-nntp-store.c:393
+#: ../camel/providers/nntp/camel-nntp-store.c:530
 msgid "Cannot authenticate without a username"
 msgstr "不能核對沒有使用者名稱"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4657
-#: ../camel/providers/nntp/camel-nntp-store.c:540
-#: ../camel/providers/pop3/camel-pop3-store.c:678
-#: ../camel/providers/pop3/camel-pop3-store.c:699
+#: ../camel/providers/imapx/camel-imapx-server.c:4809
+#: ../camel/providers/nntp/camel-nntp-store.c:539
+#: ../camel/providers/pop3/camel-pop3-store.c:676
+#: ../camel/providers/pop3/camel-pop3-store.c:706
 msgid "Authentication password not available"
 msgstr "沒有核對的密碼"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4908
+#: ../camel/providers/imapx/camel-imapx-server.c:5045
+#: ../camel/providers/imapx/camel-imapx-server.c:5104
 msgid "Error fetching message"
 msgstr "取回郵件時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4954
-#: ../camel/providers/imapx/camel-imapx-server.c:4961
+#: ../camel/providers/imapx/camel-imapx-server.c:5097
 msgid "Failed to close the tmp stream"
 msgstr "無法關閉 tmp 的串流"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4996
+#: ../camel/providers/imapx/camel-imapx-server.c:5133
 msgid "Failed to copy the tmp file"
 msgstr "無法複製 tmp 檔案"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5122
+#: ../camel/providers/imapx/camel-imapx-server.c:5274
 msgid "Error moving messages"
 msgstr "移動郵件時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5126
+#: ../camel/providers/imapx/camel-imapx-server.c:5278
 msgid "Error copying messages"
 msgstr "複製郵件時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5285
+#: ../camel/providers/imapx/camel-imapx-server.c:5500
 msgid "Error appending message"
 msgstr "附加郵件時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5479
+#: ../camel/providers/imapx/camel-imapx-server.c:5736
 msgid "Error fetching message headers"
 msgstr "取回郵件檔頭時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5644
+#: ../camel/providers/imapx/camel-imapx-server.c:5903
 msgid "Error retrieving message"
 msgstr "取回郵件時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5774
-#: ../camel/providers/imapx/camel-imapx-server.c:5997
+#: ../camel/providers/imapx/camel-imapx-server.c:6037
+#: ../camel/providers/imapx/camel-imapx-server.c:6266
 #, c-format
 msgid "Fetching summary information for new messages in '%s'"
 msgstr "正取得「%s」中新郵件的摘要資訊"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5826
+#: ../camel/providers/imapx/camel-imapx-server.c:6089
 #, c-format
 msgid "Scanning for changed messages in '%s'"
 msgstr "掃描「%s」中變更過的郵件"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5878
+#: ../camel/providers/imapx/camel-imapx-server.c:6141
 msgid "Error fetching new messages"
 msgstr "取回新郵件時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6146
+#: ../camel/providers/imapx/camel-imapx-server.c:6414
 msgid "Error refreshing folder"
 msgstr "重新整理資料夾時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6296
+#: ../camel/providers/imapx/camel-imapx-server.c:6564
 msgid "Error expunging message"
 msgstr "清空郵件時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6405
-#: ../camel/providers/imapx/camel-imapx-server.c:6430
+#: ../camel/providers/imapx/camel-imapx-server.c:6679
+#: ../camel/providers/imapx/camel-imapx-server.c:6704
 msgid "Error fetching folders"
 msgstr "取回資料夾時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6510
+#: ../camel/providers/imapx/camel-imapx-server.c:6784
 msgid "Error creating folder"
 msgstr "建立資料夾時發生錯誤。"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6562
+#: ../camel/providers/imapx/camel-imapx-server.c:6836
 msgid "Error deleting folder"
 msgstr "刪除資料夾時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6629
+#: ../camel/providers/imapx/camel-imapx-server.c:6912
 msgid "Error renaming folder"
 msgstr "重新命名資料夾時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6716
+#: ../camel/providers/imapx/camel-imapx-server.c:6986
 msgid "Error subscribing to folder"
 msgstr "訂閱到資料夾時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6776
+#: ../camel/providers/imapx/camel-imapx-server.c:7052
 msgid "Error unsubscribing from folder"
 msgstr "取消訂閱資料夾發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6832
+#: ../camel/providers/imapx/camel-imapx-server.c:7114
 msgid "Error retrieving quota information"
 msgstr "取得用量限額資訊時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6884
+#: ../camel/providers/imapx/camel-imapx-server.c:7166
 msgid "Search failed"
 msgstr "搜尋失敗"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6946
+#: ../camel/providers/imapx/camel-imapx-server.c:7228
 msgid "Error performing NOOP"
 msgstr "進行 NOOP 時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7053
+#: ../camel/providers/imapx/camel-imapx-server.c:7335
 msgid "Error syncing changes"
 msgstr "同步變更時發生錯誤"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7340
-msgid "Lost connection to IMAP server"
-msgstr "失去 IMAP 伺服器的連線"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:8195
+#: ../camel/providers/imapx/camel-imapx-server.c:8332
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "無法取得郵件 ID 為 %s 的郵件： %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:8196
+#: ../camel/providers/imapx/camel-imapx-server.c:8333
 msgid "No such message available."
 msgstr "沒有這個郵件。"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:8395
-#: ../camel/providers/imapx/camel-imapx-server.c:8410
+#: ../camel/providers/imapx/camel-imapx-server.c:8554
+#: ../camel/providers/imapx/camel-imapx-server.c:8575
 msgid "Cannot create spool file: "
 msgstr "不能建立排程器檔案："
 
-#: ../camel/providers/imapx/camel-imapx-server.c:9150
+#: ../camel/providers/imapx/camel-imapx-server.c:9383
 msgid "IMAP server does not support quotas"
 msgstr "IMAP 伺服器不支援限額"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imapx/camel-imapx-store.c:207
-#: ../camel/providers/local/camel-maildir-folder.c:471
-#: ../camel/providers/local/camel-maildir-store.c:321
-#: ../camel/providers/local/camel-maildir-store.c:763
-#: ../camel/providers/local/camel-maildir-store.c:769
-#: ../camel/providers/local/camel-maildir-store.c:852
+#: ../camel/providers/imapx/camel-imapx-store.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:482
+#: ../camel/providers/local/camel-maildir-store.c:331
+#: ../camel/providers/local/camel-maildir-store.c:810
+#: ../camel/providers/local/camel-maildir-store.c:816
+#: ../camel/providers/local/camel-maildir-store.c:899
 #: ../camel/providers/local/camel-spool-store.c:393
 msgid "Inbox"
 msgstr "收件匣"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:823
+#: ../camel/providers/imapx/camel-imapx-store.c:758
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP 伺服器 %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:826
+#: ../camel/providers/imapx/camel-imapx-store.c:761
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s 的 IMAP 服務於 %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1035
-#: ../camel/providers/nntp/camel-nntp-provider.c:93
-#: ../camel/providers/pop3/camel-pop3-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-store.c:836
+#: ../camel/providers/nntp/camel-nntp-provider.c:92
+#: ../camel/providers/pop3/camel-pop3-provider.c:80
 msgid "Password"
 msgstr "密碼"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1037
+#: ../camel/providers/imapx/camel-imapx-store.c:838
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1062
-#: ../camel/providers/imapx/camel-imapx-store.c:2600
-#: ../camel/providers/nntp/camel-nntp-store.c:1250
-#: ../camel/providers/pop3/camel-pop3-folder.c:450
-#: ../camel/providers/pop3/camel-pop3-folder.c:593
-#: ../camel/providers/pop3/camel-pop3-folder.c:789
-#: ../camel/providers/pop3/camel-pop3-folder.c:987
-#: ../camel/providers/pop3/camel-pop3-store.c:299
-#: ../camel/providers/pop3/camel-pop3-store.c:528
-#: ../camel/providers/pop3/camel-pop3-store.c:576
-#: ../camel/providers/pop3/camel-pop3-store.c:668
-#: ../camel/providers/pop3/camel-pop3-store.c:1072
-#, c-format
-msgid "You must be working online to complete this operation"
-msgstr "您必須於線上工作才能完成此操作"
-
-#: ../camel/providers/imapx/camel-imapx-store.c:1129
+#: ../camel/providers/imapx/camel-imapx-store.c:917
 #, c-format
 msgid "No such folder %s"
 msgstr "沒有這個資料夾 %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1524
+#: ../camel/providers/imapx/camel-imapx-store.c:1331
 #, c-format
 msgid "No IMAP namespace for folder path '%s'"
 msgstr "資料夾路徑「%s」沒有 IMAP 命名空間可用"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1673
+#: ../camel/providers/imapx/camel-imapx-store.c:1512
+#: ../camel/providers/imapx/camel-imapx-store.c:1757
 #, c-format
-msgid "Retrieving folder list for %s"
-msgstr "取得 %s 的資料夾清單"
+msgid "Retrieving folder list for '%s'"
+msgstr "取得「%s」的資料夾清單"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2079
+#: ../camel/providers/imapx/camel-imapx-store.c:1977
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "資料夾名稱「%s」無效，因為它包括字元「%c」"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:96
+#: ../camel/providers/imapx/camel-imapx-store.c:2749
+#: ../camel/providers/nntp/camel-nntp-store.c:1249
+#: ../camel/providers/pop3/camel-pop3-folder.c:448
+#: ../camel/providers/pop3/camel-pop3-folder.c:591
+#: ../camel/providers/pop3/camel-pop3-folder.c:787
+#: ../camel/providers/pop3/camel-pop3-folder.c:985
+#: ../camel/providers/pop3/camel-pop3-store.c:297
+#: ../camel/providers/pop3/camel-pop3-store.c:526
+#: ../camel/providers/pop3/camel-pop3-store.c:574
+#: ../camel/providers/pop3/camel-pop3-store.c:666
+#: ../camel/providers/pop3/camel-pop3-store.c:1079
 #, c-format
-msgid "Source stream returned no data"
-msgstr "來源串流傳回無資料"
+msgid "You must be working online to complete this operation"
+msgstr "您必須於線上工作才能完成此操作"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:105
+#: ../camel/providers/imapx/camel-imapx-store.c:2754
 #, c-format
-msgid "Source stream unavailable"
-msgstr "來源串流無法使用"
+msgid "You must be working online to complete this operation (%s)"
+msgstr "您必須於線上工作才能完成此操作 (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:192
+#: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:202
-#: ../camel/providers/local/camel-local-folder.c:211
+#: ../camel/providers/local/camel-local-folder.c:204
+#: ../camel/providers/local/camel-local-folder.c:213
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "信箱：%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:220
+#: ../camel/providers/local/camel-local-folder.c:222
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:497
+#: ../camel/providers/local/camel-local-folder.c:499
 msgid "_Index message body data"
 msgstr "索引郵件內文資料(_I)"
 
-#: ../camel/providers/local/camel-local-folder.c:725
+#: ../camel/providers/local/camel-local-folder.c:727
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3439,16 +3468,16 @@ msgid ""
 msgstr ""
 "用於自標準 mbox 格式排程器接收（移動）本地端郵件至 Evolution 管理的資料夾。"
 
-#: ../camel/providers/local/camel-local-provider.c:81
+#: ../camel/providers/local/camel-local-provider.c:79
 #: ../camel/providers/local/camel-local-provider.c:101
 msgid "_Apply filters to new messages in Inbox"
 msgstr "將過濾條件套用於收件匣裡的新郵件(_A)"
 
-#: ../camel/providers/local/camel-local-provider.c:88
+#: ../camel/providers/local/camel-local-provider.c:86
 msgid "Maildir-format mail directories"
 msgstr "Maildir-format 郵件目錄"
 
-#: ../camel/providers/local/camel-local-provider.c:89
+#: ../camel/providers/local/camel-local-provider.c:87
 msgid "For storing local mail in maildir directories."
 msgstr "用於儲存本地端郵件至 maildir 目錄。"
 
@@ -3473,140 +3502,140 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "標準 Unix mbox 排程器目錄"
 
-#: ../camel/providers/local/camel-local-store.c:96
+#: ../camel/providers/local/camel-local-store.c:88
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "無法將資料夾 %s 重新命名為 %s： %s"
 
-#: ../camel/providers/local/camel-local-store.c:178
+#: ../camel/providers/local/camel-local-store.c:170
 #, c-format
 msgid "Local mail file %s"
 msgstr "本地端郵件檔案 %s"
 
-#: ../camel/providers/local/camel-local-store.c:221
-#: ../camel/providers/local/camel-local-store.c:381
-#: ../camel/providers/local/camel-maildir-store.c:122
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-local-store.c:213
+#: ../camel/providers/local/camel-local-store.c:373
+#: ../camel/providers/local/camel-maildir-store.c:123
+#: ../camel/providers/local/camel-mbox-store.c:572
 #: ../camel/providers/local/camel-spool-store.c:87
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "儲存根目錄 %s 不是絕對路徑"
 
-#: ../camel/providers/local/camel-local-store.c:230
+#: ../camel/providers/local/camel-local-store.c:222
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "儲存根目錄 %s 不是合法的目錄"
 
-#: ../camel/providers/local/camel-local-store.c:242
-#: ../camel/providers/local/camel-local-store.c:252
-#: ../camel/providers/local/camel-local-store.c:394
-#: ../camel/providers/local/camel-maildir-store.c:150
+#: ../camel/providers/local/camel-local-store.c:234
+#: ../camel/providers/local/camel-local-store.c:244
+#: ../camel/providers/local/camel-local-store.c:386
+#: ../camel/providers/local/camel-maildir-store.c:165
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "不能取得資料夾：%s：%s"
 
-#: ../camel/providers/local/camel-local-store.c:289
+#: ../camel/providers/local/camel-local-store.c:281
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "本地端的存儲沒有收件匣"
 
-#: ../camel/providers/local/camel-local-store.c:454
-#: ../camel/providers/local/camel-mbox-store.c:746
+#: ../camel/providers/local/camel-local-store.c:446
+#: ../camel/providers/local/camel-mbox-store.c:739
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "不能刪除資料夾索引檔案「%s」： %s"
 
-#: ../camel/providers/local/camel-local-store.c:482
-#: ../camel/providers/local/camel-mbox-store.c:776
+#: ../camel/providers/local/camel-local-store.c:474
+#: ../camel/providers/local/camel-mbox-store.c:769
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "不能刪除資料夾中繼檔案「%s」：%s"
 
-#: ../camel/providers/local/camel-local-store.c:594
+#: ../camel/providers/local/camel-local-store.c:587
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "無法重新命名「%s」：%s "
 
-#: ../camel/providers/local/camel-maildir-folder.c:98
-#: ../camel/providers/local/camel-maildir-folder.c:333
-#: ../camel/providers/local/camel-mbox-folder.c:115
-#: ../camel/providers/local/camel-mbox-folder.c:328
+#: ../camel/providers/local/camel-maildir-folder.c:109
+#: ../camel/providers/local/camel-maildir-folder.c:344
+#: ../camel/providers/local/camel-mbox-folder.c:126
+#: ../camel/providers/local/camel-mbox-folder.c:339
 #: ../camel/providers/local/camel-mh-folder.c:157
 msgid "No such message"
 msgstr "無此郵件"
 
-#: ../camel/providers/local/camel-maildir-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:234
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "不能將郵件儲存到 maildir 資料夾： %s："
 
-#: ../camel/providers/local/camel-maildir-folder.c:271
-#: ../camel/providers/local/camel-maildir-folder.c:281
-#: ../camel/providers/local/camel-mbox-folder.c:389
+#: ../camel/providers/local/camel-maildir-folder.c:282
+#: ../camel/providers/local/camel-maildir-folder.c:292
+#: ../camel/providers/local/camel-mbox-folder.c:400
 #: ../camel/providers/local/camel-mh-folder.c:169
 #: ../camel/providers/local/camel-mh-folder.c:179
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "不能從資料夾 %2$s 取得郵件 %1$s："
 
-#: ../camel/providers/local/camel-maildir-folder.c:351
+#: ../camel/providers/local/camel-maildir-folder.c:362
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "不能將郵件傳輸到目的端資料夾：%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:130
-#: ../camel/providers/local/camel-maildir-store.c:860
+#: ../camel/providers/local/camel-maildir-store.c:131
+#: ../camel/providers/local/camel-maildir-store.c:915
+#, c-format
+msgid "Cannot create folder containing '%s'"
+msgstr "不能建立包含「%s」的資料夾"
+
+#: ../camel/providers/local/camel-maildir-store.c:139
+#: ../camel/providers/local/camel-maildir-store.c:158
+#: ../camel/providers/local/camel-maildir-store.c:907
 #, c-format
 msgid "Folder %s already exists"
 msgstr "資料夾 %s 已存在"
 
-#: ../camel/providers/local/camel-maildir-store.c:235
-#: ../camel/providers/local/camel-maildir-store.c:266
+#: ../camel/providers/local/camel-maildir-store.c:250
+#: ../camel/providers/local/camel-maildir-store.c:281
 #: ../camel/providers/local/camel-mbox-store.c:401
 #: ../camel/providers/local/camel-mbox-store.c:422
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "不能建立資料夾「%s」：%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:250
+#: ../camel/providers/local/camel-maildir-store.c:265
 #: ../camel/providers/local/camel-mbox-store.c:367
 #: ../camel/providers/local/camel-mh-store.c:523
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "不能建立資料夾「%s」：%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:256
+#: ../camel/providers/local/camel-maildir-store.c:271
 #: ../camel/providers/local/camel-mbox-store.c:377
 #: ../camel/providers/local/camel-mh-store.c:532
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "不能取得資料夾「%s」：資料夾不存在。"
 
-#: ../camel/providers/local/camel-maildir-store.c:283
+#: ../camel/providers/local/camel-maildir-store.c:298
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "不能取得資料夾「%s」：不是 maildir 目錄。"
 
-#: ../camel/providers/local/camel-maildir-store.c:288
-#: ../camel/providers/local/camel-mbox-store.c:440
-#: ../camel/providers/local/camel-mh-store.c:565
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "不能建立資料夾「%s」：資料夾已存在。"
-
-#: ../camel/providers/local/camel-maildir-store.c:352
-#: ../camel/providers/local/camel-maildir-store.c:392
-#: ../camel/providers/local/camel-mh-store.c:683
+#: ../camel/providers/local/camel-maildir-store.c:362
+#: ../camel/providers/local/camel-maildir-store.c:402
+#: ../camel/providers/local/camel-mh-store.c:676
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "無法刪除資料夾「%s」：%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:354
+#: ../camel/providers/local/camel-maildir-store.c:364
 msgid "not a maildir directory"
 msgstr "不是一個 maildir 目錄"
 
-#: ../camel/providers/local/camel-maildir-store.c:635
-#: ../camel/providers/local/camel-maildir-store.c:1074
+#: ../camel/providers/local/camel-maildir-store.c:650
+#: ../camel/providers/local/camel-maildir-store.c:1130
 #: ../camel/providers/local/camel-spool-store.c:212
 #: ../camel/providers/local/camel-spool-store.c:231
 #, c-format
@@ -3627,36 +3656,36 @@ msgstr "檢查資料夾的一致性"
 msgid "Checking for new messages"
 msgstr "檢查新郵件"
 
-#: ../camel/providers/local/camel-maildir-summary.c:784
+#: ../camel/providers/local/camel-maildir-summary.c:791
 #: ../camel/providers/local/camel-mbox-summary.c:466
-#: ../camel/providers/local/camel-mbox-summary.c:682
-#: ../camel/providers/local/camel-mbox-summary.c:831
+#: ../camel/providers/local/camel-mbox-summary.c:687
+#: ../camel/providers/local/camel-mbox-summary.c:836
 #: ../camel/providers/local/camel-spool-summary.c:139
 msgid "Storing folder"
 msgstr "儲存資料夾"
 
-#: ../camel/providers/local/camel-mbox-folder.c:185
+#: ../camel/providers/local/camel-mbox-folder.c:196
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "不能開啟 mailbox：%s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:251
+#: ../camel/providers/local/camel-mbox-folder.c:262
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "不能將郵件儲存到 mbox 檔案：%s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:381
+#: ../camel/providers/local/camel-mbox-folder.c:392
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "資料夾好像已經損毀並且不能復原。"
 
-#: ../camel/providers/local/camel-mbox-folder.c:438
+#: ../camel/providers/local/camel-mbox-folder.c:449
 #: ../camel/providers/local/camel-spool-folder.c:67
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "不能建構資料夾鎖定 %s ： %s"
 
 #: ../camel/providers/local/camel-mbox-store.c:389
-#: ../camel/providers/local/camel-mbox-store.c:587
+#: ../camel/providers/local/camel-mbox-store.c:580
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "無法建構以此為名的資料夾"
@@ -3666,23 +3695,23 @@ msgstr "無法建構以此為名的資料夾"
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "不能取得資料夾「%s」：不是一般檔案。"
 
-#: ../camel/providers/local/camel-mbox-store.c:603
+#: ../camel/providers/local/camel-mbox-store.c:596
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "不能建立目錄「%s」： %s。"
 
-#: ../camel/providers/local/camel-mbox-store.c:615
+#: ../camel/providers/local/camel-mbox-store.c:608
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "不能取得資料夾：%s：%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:617
+#: ../camel/providers/local/camel-mbox-store.c:610
 msgid "Folder already exists"
 msgstr "資料夾已存在"
 
-#: ../camel/providers/local/camel-mbox-store.c:657
-#: ../camel/providers/local/camel-mbox-store.c:670
-#: ../camel/providers/local/camel-mbox-store.c:699
+#: ../camel/providers/local/camel-mbox-store.c:650
+#: ../camel/providers/local/camel-mbox-store.c:663
+#: ../camel/providers/local/camel-mbox-store.c:692
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3691,33 +3720,33 @@ msgstr ""
 "無法刪除資料夾「%s」：\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:680
+#: ../camel/providers/local/camel-mbox-store.c:673
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "「%s」不是普通的檔案。"
 
-#: ../camel/providers/local/camel-mbox-store.c:689
+#: ../camel/providers/local/camel-mbox-store.c:682
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "資料夾「%s」內仍有檔案。所以不刪除。"
 
-#: ../camel/providers/local/camel-mbox-store.c:716
-#: ../camel/providers/local/camel-mbox-store.c:731
+#: ../camel/providers/local/camel-mbox-store.c:709
+#: ../camel/providers/local/camel-mbox-store.c:724
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "無法刪除資料夾摘要檔案「%s」： %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:813
+#: ../camel/providers/local/camel-mbox-store.c:806
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "新的資料夾名稱不合法。"
 
-#: ../camel/providers/local/camel-mbox-store.c:829
+#: ../camel/providers/local/camel-mbox-store.c:822
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "無法重新命名「%s」：「%s」：%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:913
+#: ../camel/providers/local/camel-mbox-store.c:906
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "無法將 '%s' 重新命名成 %s：%s"
@@ -3727,73 +3756,73 @@ msgstr "無法將 '%s' 重新命名成 %s：%s"
 msgid "Could not open folder: %s: %s"
 msgstr "無法開啟資料夾： %s： %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:606
+#: ../camel/providers/local/camel-mbox-summary.c:611
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "不能檢查資料夾：%s： %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:695
-#: ../camel/providers/local/camel-mbox-summary.c:840
+#: ../camel/providers/local/camel-mbox-summary.c:696
+#: ../camel/providers/local/camel-mbox-summary.c:845
 #: ../camel/providers/local/camel-spool-summary.c:146
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "無法開啟檔案： %s： %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:710
+#: ../camel/providers/local/camel-mbox-summary.c:715
 #: ../camel/providers/local/camel-spool-summary.c:161
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "不能開啟暫存 mailbox：%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-mbox-summary.c:962
+#: ../camel/providers/local/camel-mbox-summary.c:732
+#: ../camel/providers/local/camel-mbox-summary.c:967
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "無法關閉來源資料夾 %s ： %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:740
+#: ../camel/providers/local/camel-mbox-summary.c:745
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "無法關閉暫存資料夾： %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:759
+#: ../camel/providers/local/camel-mbox-summary.c:764
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "無法重新命名資料夾：%s "
 
-#: ../camel/providers/local/camel-mbox-summary.c:854
-#: ../camel/providers/local/camel-mbox-summary.c:1127
+#: ../camel/providers/local/camel-mbox-summary.c:859
+#: ../camel/providers/local/camel-mbox-summary.c:1132
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "無法儲存資料夾：%s "
 
-#: ../camel/providers/local/camel-mbox-summary.c:893
-#: ../camel/providers/local/camel-mbox-summary.c:1167
+#: ../camel/providers/local/camel-mbox-summary.c:898
+#: ../camel/providers/local/camel-mbox-summary.c:1172
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
 "it.)"
 msgstr "MBOX 檔案已損壞，請修正它。（預期有 From 這一列，卻找不到它。）"
 
-#: ../camel/providers/local/camel-mbox-summary.c:903
-#: ../camel/providers/local/camel-mbox-summary.c:1179
+#: ../camel/providers/local/camel-mbox-summary.c:908
+#: ../camel/providers/local/camel-mbox-summary.c:1184
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "摘要與資料夾不協調，即使經過同步"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1072
+#: ../camel/providers/local/camel-mbox-summary.c:1077
 #: ../camel/providers/local/camel-spool-summary.c:356
 #, c-format
 msgid "Unknown error: %s"
 msgstr "不明的錯誤： %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1237
-#: ../camel/providers/local/camel-mbox-summary.c:1267
+#: ../camel/providers/local/camel-mbox-summary.c:1242
+#: ../camel/providers/local/camel-mbox-summary.c:1272
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "寫入暫存郵箱失敗：  %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1256
+#: ../camel/providers/local/camel-mbox-summary.c:1261
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "寫入暫存郵箱失敗： %s： %s"
@@ -3914,24 +3943,24 @@ msgstr ""
 "資料夾可能損毀，複本儲存於「%s」"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:222
-#: ../camel/providers/nntp/camel-nntp-folder.c:588
+#: ../camel/providers/nntp/camel-nntp-folder.c:590
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "內部錯誤：UID 格式無效：%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:291
-#: ../camel/providers/nntp/camel-nntp-folder.c:296
-#: ../camel/providers/pop3/camel-pop3-folder.c:546
-#: ../camel/providers/pop3/camel-pop3-folder.c:945
+#: ../camel/providers/nntp/camel-nntp-folder.c:292
+#: ../camel/providers/nntp/camel-nntp-folder.c:297
+#: ../camel/providers/pop3/camel-pop3-folder.c:544
+#: ../camel/providers/pop3/camel-pop3-folder.c:943
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "無法取得郵件 %s： %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:303
-#: ../camel/providers/nntp/camel-nntp-folder.c:622
-#: ../camel/providers/pop3/camel-pop3-folder.c:476
-#: ../camel/providers/pop3/camel-pop3-folder.c:536
-#: ../camel/providers/pop3/camel-pop3-folder.c:555
+#: ../camel/providers/nntp/camel-nntp-folder.c:304
+#: ../camel/providers/nntp/camel-nntp-folder.c:624
+#: ../camel/providers/pop3/camel-pop3-folder.c:474
+#: ../camel/providers/pop3/camel-pop3-folder.c:534
+#: ../camel/providers/pop3/camel-pop3-folder.c:553
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "無法取得郵件 %s："
@@ -3942,73 +3971,73 @@ msgstr "無法取得郵件 %s："
 msgid "Posting failed: %s"
 msgstr "張貼失敗：%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:501
+#: ../camel/providers/nntp/camel-nntp-folder.c:503
 msgid "Posting failed: "
 msgstr "張貼失敗："
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:611
+#: ../camel/providers/nntp/camel-nntp-folder.c:613
 #, c-format
 msgid "This message is not currently available"
 msgstr "這封郵件目前仍未可用"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:720
+#: ../camel/providers/nntp/camel-nntp-folder.c:722
 #, c-format
 msgid "You cannot copy messages from a NNTP folder"
 msgstr "您不能從 NNTP 資料夾複製郵件"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:45
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "以簡短表示法顯示資料夾(例如，c.o.linux 而不是 comp.o_s.linux)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:49
+#: ../camel/providers/nntp/camel-nntp-provider.c:48
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "在訂閱對話方塊，顯示相關資料夾名稱(_D)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:54
 msgid "Default NNTP port"
 msgstr "預設的 NNTP 連接埠"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:56
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "NNTP over SSL"
 msgstr "NNTP 透過 SSL"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:61
 msgid "USENET news"
 msgstr "USENET 新聞"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:64
+#: ../camel/providers/nntp/camel-nntp-provider.c:63
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "這是讀取與發信至 USENET 新聞群組的供應者。"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:85
+#: ../camel/providers/nntp/camel-nntp-provider.c:84
 msgid ""
 "This option will connect to the NNTP server anonymously, without "
 "authentication."
 msgstr "這個選項將會匿名連線至 NNTP 伺服器，不使用任何核對。"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:95
+#: ../camel/providers/nntp/camel-nntp-provider.c:94
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "這個選項將會使用純文字的密碼核對 NNTP 伺服器。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:371
+#: ../camel/providers/nntp/camel-nntp-store.c:370
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "無法讀取 %s 的歡迎辭："
 
-#: ../camel/providers/nntp/camel-nntp-store.c:379
+#: ../camel/providers/nntp/camel-nntp-store.c:378
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP 伺服器 %s 傳回錯誤代碼 %d ： %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:449
+#: ../camel/providers/nntp/camel-nntp-store.c:448
 #, c-format
 msgid "USENET News via %s"
 msgstr "經由 %s 的 USENET 新聞"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1151
+#: ../camel/providers/nntp/camel-nntp-store.c:1150
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4019,22 +4048,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1267
+#: ../camel/providers/nntp/camel-nntp-store.c:1266
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "您無法在「新聞」儲存區建構資料夾：改以訂閱。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1283
+#: ../camel/providers/nntp/camel-nntp-store.c:1282
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "您無法在「新聞」儲存區重新命名資料夾。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#: ../camel/providers/nntp/camel-nntp-store.c:1305
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "您無法在「新聞」儲存區移除資料夾：改以取消訂閱。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1516
+#: ../camel/providers/nntp/camel-nntp-store.c:1515
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4045,7 +4074,7 @@ msgstr ""
 "\n"
 "沒有類似的新聞群組。選取的項目可能是父代資料夾。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1583
+#: ../camel/providers/nntp/camel-nntp-store.c:1582
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4056,16 +4085,16 @@ msgstr ""
 "\n"
 "新聞群組不存在！"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2009
+#: ../camel/providers/nntp/camel-nntp-store.c:2008
 msgid "NNTP Command failed: "
 msgstr "NNTP 指令失敗："
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2106
+#: ../camel/providers/nntp/camel-nntp-store.c:2105
 #, c-format
 msgid "Not connected."
 msgstr "未連線。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2200
+#: ../camel/providers/nntp/camel-nntp-store.c:2199
 #, c-format
 msgid "No such folder: %s"
 msgstr "沒有這個資料夾： %s"
@@ -4091,81 +4120,81 @@ msgstr "標題傳來意外的伺服器回應：%s"
 msgid "Operation failed: %s"
 msgstr "作業失敗： %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:359
-#: ../camel/providers/pop3/camel-pop3-folder.c:442
+#: ../camel/providers/pop3/camel-pop3-folder.c:357
+#: ../camel/providers/pop3/camel-pop3-folder.c:440
 #, c-format
 msgid "No message with UID %s"
 msgstr "沒有郵件具有這個 UID %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:458
+#: ../camel/providers/pop3/camel-pop3-folder.c:456
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "接收 POP 郵件 %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:547
+#: ../camel/providers/pop3/camel-pop3-folder.c:545
 msgid "Unknown reason"
 msgstr "不明的原因"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:598
+#: ../camel/providers/pop3/camel-pop3-folder.c:596
 msgid "Retrieving POP summary"
 msgstr "取回 POP 的摘要"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:659
-#: ../camel/providers/pop3/camel-pop3-folder.c:662
-#: ../camel/providers/pop3/camel-pop3-folder.c:675
-#: ../camel/providers/pop3/camel-pop3-folder.c:688
-#: ../camel/providers/pop3/camel-pop3-folder.c:702
+#: ../camel/providers/pop3/camel-pop3-folder.c:657
+#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/pop3/camel-pop3-folder.c:673
+#: ../camel/providers/pop3/camel-pop3-folder.c:686
+#: ../camel/providers/pop3/camel-pop3-folder.c:700
 msgid "Cannot get POP summary: "
 msgstr "不能取得 POP 摘要："
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:766
+#: ../camel/providers/pop3/camel-pop3-folder.c:764
 msgid "Expunging old messages"
 msgstr "清空舊的郵件"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:794
+#: ../camel/providers/pop3/camel-pop3-folder.c:792
 msgid "Expunging deleted messages"
 msgstr "清空刪除的郵件"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:37
+#: ../camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message Storage"
 msgstr "郵件儲存空間"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:39
+#: ../camel/providers/pop3/camel-pop3-provider.c:38
 msgid "_Leave messages on server"
 msgstr "在伺服器保留郵件備份(_L)"
 
 #. Translators: '%s' is replaced with a widget, where user can
 #. * select how many days can be message left on the server.
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:42
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "刪除 %s 天後的郵件(_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 msgid "Delete _expunged from local Inbox"
 msgstr "刪除在本地端收件匣清除的(_E)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
 msgid "Disable _support for all POP3 extensions"
 msgstr "停止所有 P_OP3 延伸功能的支援"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:53
+#: ../camel/providers/pop3/camel-pop3-provider.c:52
 msgid "Default POP3 port"
 msgstr "預設 POP3 連接埠"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:54
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "POP3 over SSL"
 msgstr "POP3 透過 SSL"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:61
+#: ../camel/providers/pop3/camel-pop3-provider.c:60
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:63
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "用於連線到 POP 伺服器並下載郵件。"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4173,7 +4202,7 @@ msgstr ""
 "這個選項將會使用純文字的密碼連線到 POP 伺服器。一般的 POP 伺服器只會支援這種"
 "方式。"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:93
+#: ../camel/providers/pop3/camel-pop3-provider.c:92
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4183,66 +4212,58 @@ msgstr ""
 "聲稱能夠支援，但對於所有使用者來講都未必一定可行。"
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:97
+#: ../camel/providers/pop3/camel-pop3-store.c:95
 msgid ": "
 msgstr "："
 
-#: ../camel/providers/pop3/camel-pop3-store.c:164
+#: ../camel/providers/pop3/camel-pop3-store.c:162
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "無法從 POP 伺服器 %s 讀取有效的問候語"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:179
+#: ../camel/providers/pop3/camel-pop3-store.c:177
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "無法以安全模式連線到 POP 伺服器 %s： %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:180
+#: ../camel/providers/pop3/camel-pop3-store.c:178
 msgid "STLS not supported by server"
 msgstr "伺服器不支援 STLS"
 
 #. Translators: Last %s is an optional
 #. * explanation beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:201
+#: ../camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "無法以安全模式連線到 POP 伺服器 %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:219
+#: ../camel/providers/pop3/camel-pop3-store.c:217
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "無法以安全模式連線到 POP 伺服器 %s："
 
-#: ../camel/providers/pop3/camel-pop3-store.c:360
+#: ../camel/providers/pop3/camel-pop3-store.c:358
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "不能登入 POP 伺服器 %s： SASL 通訊協定錯誤"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:382
+#: ../camel/providers/pop3/camel-pop3-store.c:380
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "無法核對 POP 伺服器 %s："
 
-#: ../camel/providers/pop3/camel-pop3-store.c:490
+#: ../camel/providers/pop3/camel-pop3-store.c:488
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 伺服器 %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:493
+#: ../camel/providers/pop3/camel-pop3-store.c:491
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "%s 在 %s 的 POP3 伺服器"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:713
-#, c-format
-msgid ""
-"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
-"attack suspected. Please contact your admin."
-msgstr ""
-"無法連線至 POP 伺服器 %s：\t收到無效的 APOP ID。推測可能是使用者假冒攻擊。請"
-"聯絡您的系統管理者。"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:768
+#: ../camel/providers/pop3/camel-pop3-store.c:688
+#: ../camel/providers/pop3/camel-pop3-store.c:775
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4251,9 +4272,18 @@ msgstr ""
 "無法連線到 POP 伺服器 %s。\n"
 "傳送密碼時發生錯誤："
 
+#: ../camel/providers/pop3/camel-pop3-store.c:720
+#, c-format
+msgid ""
+"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
+"attack suspected. Please contact your admin."
+msgstr ""
+"無法連線至 POP 伺服器 %s：\t收到無效的 APOP ID。推測可能是使用者假冒攻擊。請"
+"聯絡您的系統管理者。"
+
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:783
+#: ../camel/providers/pop3/camel-pop3-store.c:790
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4262,101 +4292,101 @@ msgstr ""
 "無法連線 POP 伺服器 %s。\n"
 "傳送使用者名稱發生錯誤%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:865
+#: ../camel/providers/pop3/camel-pop3-store.c:872
 #, c-format
 msgid "No such folder '%s'."
 msgstr "沒有這個資料夾「%s」。"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:882
+#: ../camel/providers/pop3/camel-pop3-store.c:889
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 儲存區沒有資料夾階層"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:34
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:33
 #: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:35
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr "將遞送的郵件交給本地端系統上的「sendmail」程式處理。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:46
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
 msgid "Mail delivery via the sendmail program"
 msgstr "經由 sendmail 程式傳送郵件"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:138
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:136
 #, c-format
 msgid "Failed to read From address"
 msgstr "讀取寄件者位址失敗"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:155
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
 #, c-format
 msgid "Message send in offline mode is disabled"
 msgstr "離線模式下傳送郵件已停用"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:183
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:181
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "無法分析收件人清單"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:200
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "Could not parse arguments"
 msgstr "無法解析引數"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:231
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, c-format
 msgid "Could not create pipe to '%s': %s: mail not sent"
 msgstr "無法建構導管到「%s」： %s：郵件無法傳送"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:256
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:254
 #, c-format
 msgid "Could not fork '%s': %s: mail not sent"
 msgstr "無法另外再啟動一個「%s」： %s：郵件無法傳送"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:305
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:303
 msgid "Could not send message: "
 msgstr "無法傳送郵件："
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:335
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:333
 #, c-format
 msgid "'%s' exited with signal %s: mail not sent."
 msgstr "「%s」已結束，訊息為 %s：郵件無法傳送。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:345
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:343
 #, c-format
 msgid "Could not execute '%s': mail not sent."
 msgstr "無法執行「%s」： 郵件無法傳送。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:350
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:348
 #, c-format
 msgid "'%s' exited with status %d: mail not sent."
 msgstr "「%s」由於狀況 %d 關閉： 郵件無法傳送。"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:40
+#: ../camel/providers/smtp/camel-smtp-provider.c:39
 msgid "Default SMTP port"
 msgstr "預設 SMTP 連接埠"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:40
 msgid "SMTP over SSL"
 msgstr "SMTP 透過 SSL"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:42
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
 msgid "Message submission port"
 msgstr "郵件提交連接埠"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:48
+#: ../camel/providers/smtp/camel-smtp-provider.c:47
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:50
+#: ../camel/providers/smtp/camel-smtp-provider.c:49
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "使用 SMTP 連線到遠端 mailhub 來傳送郵件。"
 
@@ -4371,207 +4401,207 @@ msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "無法以安全模式連線到 SMTP 伺服器 %s： %s"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:224
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
-#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:239
+#: ../camel/providers/smtp/camel-smtp-transport.c:247
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS 指令失敗："
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:265
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "無法以安全模式連線到 SMTP 伺服器 %s："
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP 伺服器 %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:360
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "經由 %s 傳送 SMTP 郵件"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:434
+#: ../camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP 伺服器 %s 不支援 %s 核對"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/smtp/camel-smtp-transport.c:535
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr "沒有指定 SASL 機制"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:536
-#: ../camel/providers/smtp/camel-smtp-transport.c:547
-#: ../camel/providers/smtp/camel-smtp-transport.c:560
+#: ../camel/providers/smtp/camel-smtp-transport.c:570
+#: ../camel/providers/smtp/camel-smtp-transport.c:582
+#: ../camel/providers/smtp/camel-smtp-transport.c:595
 msgid "AUTH command failed: "
 msgstr "AUTH 指令失敗："
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "無法傳送訊息：服務未連線。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:708
+#: ../camel/providers/smtp/camel-smtp-transport.c:746
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "不能傳送郵件：寄件者的地址無效。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:712
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
 msgid "Sending message"
 msgstr "傳送郵件"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:775
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "不能傳送郵件：沒有定義收件者。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:750
+#: ../camel/providers/smtp/camel-smtp-transport.c:788
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "不能傳送郵件：一或多個無效的收件者"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:871
+#: ../camel/providers/smtp/camel-smtp-transport.c:909
 msgid "Syntax error, command unrecognized"
 msgstr "語法錯誤，不認識的指令"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:873
+#: ../camel/providers/smtp/camel-smtp-transport.c:911
 msgid "Syntax error in parameters or arguments"
 msgstr "參數內的語法錯誤"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:875
+#: ../camel/providers/smtp/camel-smtp-transport.c:913
 msgid "Command not implemented"
 msgstr "指令沒有實作"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:877
+#: ../camel/providers/smtp/camel-smtp-transport.c:915
 msgid "Command parameter not implemented"
 msgstr "指令的參數沒有實作"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:879
+#: ../camel/providers/smtp/camel-smtp-transport.c:917
 msgid "System status, or system help reply"
 msgstr "系統狀況，或者是系統的求助說明回應"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:881
+#: ../camel/providers/smtp/camel-smtp-transport.c:919
 msgid "Help message"
 msgstr "求助說明訊息"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:883
+#: ../camel/providers/smtp/camel-smtp-transport.c:921
 msgid "Service ready"
 msgstr "服務已就緒"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:885
+#: ../camel/providers/smtp/camel-smtp-transport.c:923
 msgid "Service closing transmission channel"
 msgstr "此服務將傳輸通道關閉"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:887
+#: ../camel/providers/smtp/camel-smtp-transport.c:925
 msgid "Service not available, closing transmission channel"
 msgstr "此服務仍未可用，傳輸通道關閉"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:889
+#: ../camel/providers/smtp/camel-smtp-transport.c:927
 msgid "Requested mail action okay, completed"
 msgstr " 所要求的郵件動作已成功完成"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:891
+#: ../camel/providers/smtp/camel-smtp-transport.c:929
 msgid "User not local; will forward to <forward-path>"
 msgstr "不是本地端的使用者；將會轉寄至 <轉寄路徑>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:893
+#: ../camel/providers/smtp/camel-smtp-transport.c:931
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "所要求的郵件動作無法執行：郵箱仍未可用"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:895
+#: ../camel/providers/smtp/camel-smtp-transport.c:933
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "所要求的動作無法執行：郵箱仍未可用"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:897
+#: ../camel/providers/smtp/camel-smtp-transport.c:935
 msgid "Requested action aborted: error in processing"
 msgstr "所要求的動作已放棄：正在處理時發生錯誤"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:899
+#: ../camel/providers/smtp/camel-smtp-transport.c:937
 msgid "User not local; please try <forward-path>"
 msgstr "不是本地端的使用者；請嘗試使用 <轉寄路徑>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:901
+#: ../camel/providers/smtp/camel-smtp-transport.c:939
 msgid "Requested action not taken: insufficient system storage"
 msgstr "所要求的動作無法執行：系統的儲存空間不足"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:903
+#: ../camel/providers/smtp/camel-smtp-transport.c:941
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "所要求的郵件動作已放棄：超出可供儲存空間的限制"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:905
+#: ../camel/providers/smtp/camel-smtp-transport.c:943
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "所要求的動作已放棄：不允許的郵箱名稱"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:907
+#: ../camel/providers/smtp/camel-smtp-transport.c:945
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "請開始輸入郵件的資料；<CRLF>.<CRLF> 結束撰寫郵件"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:909
+#: ../camel/providers/smtp/camel-smtp-transport.c:947
 msgid "Transaction failed"
 msgstr "執行失敗"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:913
+#: ../camel/providers/smtp/camel-smtp-transport.c:951
 msgid "A password transition is needed"
 msgstr "需要密碼傳送"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:915
+#: ../camel/providers/smtp/camel-smtp-transport.c:953
 msgid "Authentication mechanism is too weak"
 msgstr "核對機制太弱了"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:917
+#: ../camel/providers/smtp/camel-smtp-transport.c:955
 msgid "Encryption required for requested authentication mechanism"
 msgstr "所要求的核對機制必須加密處理"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:919
+#: ../camel/providers/smtp/camel-smtp-transport.c:957
 msgid "Temporary authentication failure"
 msgstr "臨時核對失敗"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1207
+#: ../camel/providers/smtp/camel-smtp-transport.c:1246
 msgid "SMTP Greeting"
 msgstr "SMTP 迎接"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1217
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#: ../camel/providers/smtp/camel-smtp-transport.c:1239
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#: ../camel/providers/smtp/camel-smtp-transport.c:1271
+#: ../camel/providers/smtp/camel-smtp-transport.c:1279
 msgid "HELO command failed: "
 msgstr "HELO 指令失敗："
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:1329
-#: ../camel/providers/smtp/camel-smtp-transport.c:1339
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#: ../camel/providers/smtp/camel-smtp-transport.c:1370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1380
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM 指令失敗："
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1366
+#: ../camel/providers/smtp/camel-smtp-transport.c:1407
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO 指令失敗："
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1383
-#: ../camel/providers/smtp/camel-smtp-transport.c:1393
+#: ../camel/providers/smtp/camel-smtp-transport.c:1425
+#: ../camel/providers/smtp/camel-smtp-transport.c:1435
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> 失敗："
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1436
-#: ../camel/providers/smtp/camel-smtp-transport.c:1447
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
-#: ../camel/providers/smtp/camel-smtp-transport.c:1517
-#: ../camel/providers/smtp/camel-smtp-transport.c:1537
-#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1478
+#: ../camel/providers/smtp/camel-smtp-transport.c:1490
+#: ../camel/providers/smtp/camel-smtp-transport.c:1501
 #: ../camel/providers/smtp/camel-smtp-transport.c:1560
+#: ../camel/providers/smtp/camel-smtp-transport.c:1580
+#: ../camel/providers/smtp/camel-smtp-transport.c:1595
+#: ../camel/providers/smtp/camel-smtp-transport.c:1604
 msgid "DATA command failed: "
 msgstr "DATA 指令失敗："
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1585
-#: ../camel/providers/smtp/camel-smtp-transport.c:1600
-#: ../camel/providers/smtp/camel-smtp-transport.c:1609
+#: ../camel/providers/smtp/camel-smtp-transport.c:1629
+#: ../camel/providers/smtp/camel-smtp-transport.c:1645
+#: ../camel/providers/smtp/camel-smtp-transport.c:1654
 msgid "RSET command failed: "
 msgstr "RSET 指令失敗："
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1634
-#: ../camel/providers/smtp/camel-smtp-transport.c:1648
-#: ../camel/providers/smtp/camel-smtp-transport.c:1655
+#: ../camel/providers/smtp/camel-smtp-transport.c:1679
+#: ../camel/providers/smtp/camel-smtp-transport.c:1693
+#: ../camel/providers/smtp/camel-smtp-transport.c:1700
 msgid "QUIT command failed: "
 msgstr "QUIT 指令失敗："
 
@@ -4667,41 +4697,6 @@ msgstr "(已廢棄) SOCKS 要求的連接埠"
 msgid "(Deprecated) Automatic proxy configuration URL"
 msgstr "(已廢棄) 自動代理伺服器組態網址"
 
-#: ../libebackend/e-authentication-mediator.c:204
-#: ../libebackend/e-authentication-mediator.c:215
-#: ../libebackend/e-authentication-mediator.c:861
-#: ../libebackend/e-authentication-mediator.c:1198
-msgid "Bus name vanished (client terminated?)"
-msgstr "匯流排名稱消失了 (客戶端終止？)"
-
-#: ../libebackend/e-authentication-mediator.c:263
-msgid "No response from client"
-msgstr "客戶端沒有回應"
-
-#: ../libebackend/e-authentication-mediator.c:333
-#: ../libebackend/e-authentication-mediator.c:344
-#: ../libebackend/e-authentication-mediator.c:855
-#: ../libebackend/e-authentication-mediator.c:1192
-msgid "Client cancelled the operation"
-msgstr "客戶端已取消操作"
-
-#: ../libebackend/e-authentication-mediator.c:415
-msgid "Client reports password was rejected"
-msgstr "客戶端回報密碼被拒絕"
-
-#: ../libebackend/e-authentication-session.c:568
-msgid "Add this password to your keyring"
-msgstr "將密碼加入您的鑰匙圈"
-
-#: ../libebackend/e-authentication-session.c:673
-msgid "Password was incorrect"
-msgstr "密碼是不正確的"
-
-#: ../libebackend/e-backend.c:408
-#, c-format
-msgid "%s does not support authentication"
-msgstr "%s 不支援核對"
-
 #: ../libebackend/e-collection-backend.c:900
 #, c-format
 msgid "%s does not support creating remote resources"
@@ -4712,270 +4707,238 @@ msgstr "%s 不支援建立遠端資源"
 msgid "%s does not support deleting remote resources"
 msgstr "%s 不支援刪除遠端資源"
 
-#: ../libebackend/e-data-factory.c:303
+#: ../libebackend/e-data-factory.c:1233
 #, c-format
-msgid "No backend factory for hash key '%s'"
-msgstr "雜湊鍵「%s」中沒有後端工廠"
+msgid "Backend factory for source '%s' and extension '%s' cannot be found."
+msgstr "找不到來源「%s」與擴充功能「%s」的後端工廠。"
 
-#: ../libebackend/e-server-side-source.c:133
+#: ../libebackend/e-server-side-source.c:141
 #, c-format
 msgid "Data source is missing a [%s] group"
 msgstr "資料來源缺少 [%s] 群組"
 
-#: ../libebackend/e-server-side-source.c:1007
-#: ../libedataserver/e-source.c:1331
+#: ../libebackend/e-server-side-source.c:1324
+#: ../libedataserver/e-source.c:1837
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
 msgstr "資料來源「%s」不支援建立遠端資源"
 
-#: ../libebackend/e-server-side-source.c:1021
+#: ../libebackend/e-server-side-source.c:1338
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to create the remote resource"
 msgstr "資料來源「%s」沒有用來建立遠端資料的收集後端"
 
-#: ../libebackend/e-server-side-source.c:1049
-#: ../libedataserver/e-source.c:1444
+#: ../libebackend/e-server-side-source.c:1366
+#: ../libedataserver/e-source.c:1950
 #, c-format
 msgid "Data source '%s' does not support deleting remote resources"
 msgstr "資料來源「%s」不支援刪除遠端資源"
 
-#: ../libebackend/e-server-side-source.c:1063
+#: ../libebackend/e-server-side-source.c:1380
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to delete the remote resource"
 msgstr "資料來源「%s」沒有用來刪除遠端資料的收集後端"
 
-#: ../libebackend/e-server-side-source.c:1094
-#: ../libedataserver/e-source.c:1540
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027
+#: ../libebackend/e-server-side-source.c:1411
+#: ../libedataserver/e-source.c:2046
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1021
 #, c-format
 msgid "Data source '%s' does not support OAuth 2.0 authentication"
 msgstr "資料來源「%s」不支援 OAuth 2.0 核對"
 
-#: ../libebackend/e-server-side-source.c:1439
+#: ../libebackend/e-server-side-source.c:1773
 #, c-format
 msgid "File must have a '.source' extension"
 msgstr "檔案必須以「.source」做為延伸檔名"
 
-#: ../libebackend/e-source-registry-server.c:531
-#: ../libedataserver/e-source-registry.c:1878
-msgid "The user declined to authenticate"
-msgstr "使用者拒絕核對"
-
-#: ../libebackend/e-source-registry-server.c:800
+#: ../libebackend/e-source-registry-server.c:315
 #, c-format
 msgid "UID '%s' is already in use"
 msgstr "UID 「%s」已經在使用中"
 
+#: ../libebackend/e-subprocess-factory.c:285
+#, c-format
+msgid "No such source for UID '%s'"
+msgstr "沒有 UID「%s」的這類來源"
+
 #: ../libebackend/e-user-prompter-server.c:305
 #, c-format
 msgid "Extension dialog '%s' not found."
 msgstr "找不到延伸功能對話盒「%s」。"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "週年紀念日"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "生日"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "商務"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "競爭者"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "喜愛的"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "禮物"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:55
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "終點/目標"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "假日"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "假日邀請卡"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "熱門連絡人"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "創意"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "International"
 msgstr "國際的"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "關鍵客戶"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:63
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "雜項"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:64
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "個人"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "電話"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "狀態"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "策略"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "供應商"
 
-#: ../libedataserver/e-categories.c:69
+#: ../libedataserver/e-categories.c:70
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "時間與開銷"
 
-#: ../libedataserver/e-categories.c:70
+#: ../libedataserver/e-categories.c:71
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:71
+#: ../libedataserver/e-categories.c:72
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "正在等待"
 
-#: ../libedataserver/e-client.c:141
+#: ../libedataserver/e-client.c:143
 msgid "Source not loaded"
 msgstr "來源未載入"
 
-#: ../libedataserver/e-client.c:143
+#: ../libedataserver/e-client.c:145
 msgid "Source already loaded"
 msgstr "來源已載入"
 
 #. Translators: This means that the EClient does not
 #. * support offline mode, or it's not set to by a user,
 #. * thus it is unavailable while user is not connected.
-#: ../libedataserver/e-client.c:154
+#: ../libedataserver/e-client.c:156
 msgid "Offline unavailable"
 msgstr "離線無法使用"
 
-#: ../libedataserver/e-client.c:176
+#: ../libedataserver/e-client.c:178
 msgid "D-Bus error"
 msgstr "D-Bus 錯誤"
 
-#: ../libedataserver/e-source-authenticator.c:162
-msgid "Address book authentication request"
-msgstr "通訊錄核對要求"
-
-#: ../libedataserver/e-source-authenticator.c:167
-msgid "Calendar authentication request"
-msgstr "行事曆核對要求"
-
-#: ../libedataserver/e-source-authenticator.c:171
-msgid "Mail authentication request"
-msgstr "郵件核對要求"
-
-#. generic account prompt
-#: ../libedataserver/e-source-authenticator.c:174
-msgid "Authentication request"
-msgstr "核對要求"
-
-#: ../libedataserver/e-source-authenticator.c:184
-#, c-format
-msgid "Please enter the password for address book \"%s\"."
-msgstr "請輸入通訊錄「%s」的密碼 。"
-
-#: ../libedataserver/e-source-authenticator.c:190
-#, c-format
-msgid "Please enter the password for calendar \"%s\"."
-msgstr "請輸入行事曆「%s」的密碼 。"
+#: ../libedataserver/e-client.c:2020
+msgid "Timeout was reached"
+msgstr "已達逾時時間"
 
-#: ../libedataserver/e-source-authenticator.c:196
-#, c-format
-msgid "Please enter the password for mail account \"%s\"."
-msgstr "請輸入郵件帳號「%s」的密碼 。"
-
-#: ../libedataserver/e-source-authenticator.c:202
-#, c-format
-msgid "Please enter the password for mail transport \"%s\"."
-msgstr "請輸入郵件傳輸「%s」的密碼 。"
-
-#: ../libedataserver/e-source-authenticator.c:208
-#, c-format
-msgid "Please enter the password for memo list \"%s\"."
-msgstr "請輸入備忘錄清單「%s」的密碼 。"
-
-#: ../libedataserver/e-source-authenticator.c:214
-#, c-format
-msgid "Please enter the password for task list \"%s\"."
-msgstr "請輸入工作清單「%s」的密碼 。"
-
-#: ../libedataserver/e-source-authenticator.c:220
-#, c-format
-msgid "Please enter the password for account \"%s\"."
-msgstr "請輸入帳號「%s」的密碼 。"
-
-#: ../libedataserver/e-source.c:748
+#: ../libedataserver/e-source.c:967
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "來源檔案缺少 [%s] 群組"
 
-#: ../libedataserver/e-source.c:1111
+#: ../libedataserver/e-source.c:1617
 #, c-format
 msgid "Data source '%s' is not removable"
 msgstr "資料來源「%s」無法移除"
 
-#: ../libedataserver/e-source.c:1234
+#: ../libedataserver/e-source.c:1740
 #, c-format
 msgid "Data source '%s' is not writable"
 msgstr "資料來源「%s」無法寫入"
 
-#: ../libedataserver/e-source.c:1847
+#: ../libedataserver/e-source.c:2401
 msgid "Unnamed"
 msgstr "未命名的"
 
-#: ../libedataserver/e-source-mail-signature.c:486
+#: ../libedataserver/e-source-credentials-provider-impl.c:41
+msgid "Credentials lookup is not supported"
+msgstr "不支援憑證查詢"
+
+#: ../libedataserver/e-source-credentials-provider-impl.c:54
+msgid "Credentials store is not supported"
+msgstr "不支援憑證儲存"
+
+#: ../libedataserver/e-source-credentials-provider-impl.c:65
+msgid "Credentials delete is not supported"
+msgstr "不支援憑證刪除"
+
+#: ../libedataserver/e-source-credentials-provider-impl-password.c:81
+msgid "Password not found"
+msgstr "找不到密碼"
+
+#: ../libedataserver/e-source-mail-signature.c:485
 #, c-format
 msgid "Signature script must be a local file"
 msgstr "簽章必須是本地端檔案"
@@ -4985,39 +4948,11 @@ msgstr "簽章必須是本地端檔案"
 msgid "Source '%s' does not support proxy lookups"
 msgstr "來源「%s」不支援代理伺服器查詢"
 
-#: ../libedataserver/e-source-webdav.c:1551
-#, c-format
-msgid ""
-"SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
-"you wish to accept it?"
-msgstr "主機「%s」用於通訊錄「%s」的 SSL 憑證未受信任。您想要接受它嗎？"
-
-#: ../libedataserver/e-source-webdav.c:1560
-#, c-format
-msgid ""
-"SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
-"wish to accept it?"
-msgstr "主機「%s」用於行事曆「%s」的 SSL 憑證未受信任。您想要接受它嗎？"
-
-#: ../libedataserver/e-source-webdav.c:1569
-#, c-format
-msgid ""
-"SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
-"you wish to accept it?"
-msgstr "主機「%s」用於備忘錄清單「%s」的 SSL 憑證未受信任。您想要接受它嗎？"
-
-#: ../libedataserver/e-source-webdav.c:1578
-#, c-format
-msgid ""
-"SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
-"you wish to accept it?"
-msgstr "主機「%s」用於工作清單「%s」的 SSL 憑證未受信任。您想要接受它嗎？"
-
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1961
+#: ../libedataserver/e-time-utils.c:1673 ../libedataserver/e-time-utils.c:1972
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
@@ -5025,7 +4960,7 @@ msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1667 ../libedataserver/e-time-utils.c:1952
+#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1963
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
@@ -5033,7 +4968,7 @@ msgstr "%Y/%m/%d (%a) %H:%M:%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1957
+#: ../libedataserver/e-time-utils.c:1683 ../libedataserver/e-time-utils.c:1968
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -5041,78 +4976,78 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1677 ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1688 ../libedataserver/e-time-utils.c:1959
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1682
+#: ../libedataserver/e-time-utils.c:1693
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1687
+#: ../libedataserver/e-time-utils.c:1698
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1690 ../libedataserver/e-time-utils.c:1810
-#: ../libedataserver/e-time-utils.c:1943
+#: ../libedataserver/e-time-utils.c:1701 ../libedataserver/e-time-utils.c:1821
+#: ../libedataserver/e-time-utils.c:1954
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1697
+#: ../libedataserver/e-time-utils.c:1708
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1701
+#: ../libedataserver/e-time-utils.c:1712
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1706
+#: ../libedataserver/e-time-utils.c:1717
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1711
+#: ../libedataserver/e-time-utils.c:1722
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1716
+#: ../libedataserver/e-time-utils.c:1727
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1721
+#: ../libedataserver/e-time-utils.c:1732
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1724 ../libedataserver/e-time-utils.c:1813
+#: ../libedataserver/e-time-utils.c:1735 ../libedataserver/e-time-utils.c:1824
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1884 ../libedataserver/e-time-utils.c:2005
+#: ../libedataserver/e-time-utils.c:1895 ../libedataserver/e-time-utils.c:2016
 msgid "%I:%M:%S %p"
 msgstr "%p %I:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1888 ../libedataserver/e-time-utils.c:1997
+#: ../libedataserver/e-time-utils.c:1899 ../libedataserver/e-time-utils.c:2008
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5120,35 +5055,183 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1893 ../libedataserver/e-time-utils.c:2002
+#: ../libedataserver/e-time-utils.c:1904 ../libedataserver/e-time-utils.c:2013
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1897 ../libedataserver/e-time-utils.c:1994
+#: ../libedataserver/e-time-utils.c:1908 ../libedataserver/e-time-utils.c:2005
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format,
 #. * and no colon.
-#: ../libedataserver/e-time-utils.c:1901
+#: ../libedataserver/e-time-utils.c:1912
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1905
+#: ../libedataserver/e-time-utils.c:1916
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:130
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:364
+#: ../libedataserverui/e-credentials-prompter.c:259
+#: ../libedataserverui/e-credentials-prompter.c:1561
+#: ../libedataserverui/e-credentials-prompter.c:1605
+msgid "Credentials prompt was cancelled"
+msgstr "憑證提示已取消"
+
+#: ../libedataserverui/e-credentials-prompter.c:663
+#, c-format
+msgid "Source '%s' doesn't support prompt for credentials"
+msgstr "來源「%s」不支援憑證提示"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:133
+msgid "Address book authentication request"
+msgstr "通訊錄核對要求"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:138
+msgid "Calendar authentication request"
+msgstr "行事曆核對要求"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:142
+msgid "Mail authentication request"
+msgstr "郵件核對要求"
+
+#. generic account prompt
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:145
+msgid "Authentication request"
+msgstr "核對要求"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:156
+#, c-format
+msgid "Please enter the password for address book \"%s\"."
+msgstr "請輸入通訊錄「%s」的密碼 。"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:160
+#, c-format
+msgid "Please enter the password for calendar \"%s\"."
+msgstr "請輸入行事曆「%s」的密碼 。"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:164
 #, c-format
-msgid "No such data source for UID '%s'"
-msgstr "沒有 UID「%s」的資料來源"
+msgid "Please enter the password for mail account \"%s\"."
+msgstr "請輸入郵件帳號「%s」的密碼 。"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:168
+#, c-format
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr "請輸入郵件傳輸「%s」的密碼 。"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:142
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:172
+#, c-format
+msgid "Please enter the password for memo list \"%s\"."
+msgstr "請輸入備忘錄清單「%s」的密碼 。"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:176
+#, c-format
+msgid "Please enter the password for task list \"%s\"."
+msgstr "請輸入工作清單「%s」的密碼 。"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:180
+#, c-format
+msgid "Please enter the password for account \"%s\"."
+msgstr "請輸入帳號「%s」的密碼 。"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:229
+#: ../libedataserverui/e-trust-prompt.c:114
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:230
+msgid "_OK"
+msgstr "確定(_O)"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:343
+msgid "_User Name:"
+msgstr "使用者名稱(_N)："
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:355
+msgid "_Password:"
+msgstr "密碼(_P)："
+
+#. Remember password check
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:371
+msgid "_Add this password to your keyring"
+msgstr "將密碼加入您的鑰匙圈(_A)"
+
+#: ../libedataserverui/e-trust-prompt.c:113
+#: ../modules/trust-prompt/trust-prompt-gtk.c:119
+msgid "Certificate trust..."
+msgstr "憑證信任度…"
+
+#: ../libedataserverui/e-trust-prompt.c:115
+#: ../modules/trust-prompt/trust-prompt-gtk.c:120
+msgid "_Reject"
+msgstr "拒絕(_R)"
+
+#: ../libedataserverui/e-trust-prompt.c:116
+#: ../modules/trust-prompt/trust-prompt-gtk.c:121
+msgid "Accept _Temporarily"
+msgstr "暫時接受(_T)"
+
+#: ../libedataserverui/e-trust-prompt.c:117
+#: ../modules/trust-prompt/trust-prompt-gtk.c:122
+msgid "_Accept Permanently"
+msgstr "永久接受(_A)"
+
+#: ../libedataserverui/e-trust-prompt.c:188
+#: ../modules/trust-prompt/trust-prompt-gtk.c:159
+#, c-format
+msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
+msgstr "「%s」的 SSL 憑證未受信任。您想要接受它嗎？"
+
+#: ../libedataserverui/e-trust-prompt.c:210
+#: ../modules/trust-prompt/trust-prompt-gtk.c:174
+msgid "Reason:"
+msgstr "原因："
+
+#: ../libedataserverui/e-trust-prompt.c:213
+msgid "Detailed error:"
+msgstr "詳細的錯誤訊息："
+
+#: ../libedataserverui/e-trust-prompt.c:275
+#: ../modules/trust-prompt/module-trust-prompt.c:82
+msgid "The signing certificate authority is not known."
+msgstr "簽署的憑證授權中心不明。"
+
+#: ../libedataserverui/e-trust-prompt.c:277
+#: ../modules/trust-prompt/module-trust-prompt.c:84
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr "憑證與取回憑證的網站身分比對不符。"
+
+#: ../libedataserverui/e-trust-prompt.c:279
+#: ../modules/trust-prompt/module-trust-prompt.c:86
+msgid "The certificate's activation time is still in the future."
+msgstr "憑證的啟用時刻在未來。"
+
+#: ../libedataserverui/e-trust-prompt.c:281
+#: ../modules/trust-prompt/module-trust-prompt.c:88
+msgid "The certificate has expired."
+msgstr "憑證已逾期。"
+
+#: ../libedataserverui/e-trust-prompt.c:283
+#: ../modules/trust-prompt/module-trust-prompt.c:90
+msgid ""
+"The certificate has been revoked according to the connection's certificate "
+"revocation list."
+msgstr "根據連線的憑證註銷清單，這個憑證已被註銷。"
+
+#: ../libedataserverui/e-trust-prompt.c:285
+#: ../modules/trust-prompt/module-trust-prompt.c:92
+msgid "The certificate's algorithm is considered insecure."
+msgstr "憑證的演算法被認為是不安全的。"
+
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:174
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
@@ -5157,11 +5240,6 @@ msgstr ""
 "找不到在 org.gnome 中對應的帳號。這是 OnlineAccounts 服務用來獲得「%s」的密碼"
 "的地方"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:218
-#, c-format
-msgid "Invalid password for '%s'"
-msgstr "「%s」的密碼無效"
-
 #. TODO: more specific
 #: ../modules/gnome-online-accounts/goaewsclient.c:219
 #, c-format
@@ -5198,7 +5276,7 @@ msgstr "找不到帳號元素"
 msgid "Failed to find ASUrl and OABUrl in autodiscover response"
 msgstr "在自動探索回應中找不到 ASUrl 與 OABUrl"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1240
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1252
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
@@ -5207,76 +5285,28 @@ msgstr ""
 "找不到在 org.gnome 中對應的帳號。這是 OnlineAccounts 服務用來獲得「%s」的存取"
 "記號的地方"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1267
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1282
 #, c-format
 msgid "Failed to obtain an access token for '%s': "
 msgstr "無法獲得「%s」的存取記號："
 
-#: ../modules/google-backend/module-google-backend.c:191
+#: ../modules/google-backend/module-google-backend.c:205
 #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
 #: ../modules/yahoo-backend/module-yahoo-backend.c:199
 msgid "Calendar"
 msgstr "行事曆"
 
-#: ../modules/google-backend/module-google-backend.c:260
+#: ../modules/google-backend/module-google-backend.c:279
+#: ../modules/yahoo-backend/module-yahoo-backend.c:226
+msgid "Tasks"
+msgstr "工作"
+
+#: ../modules/google-backend/module-google-backend.c:333
 #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
 #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
 msgid "Contacts"
 msgstr "連絡人"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:82
-msgid "The signing certificate authority is not known."
-msgstr "簽署的憑證授權中心不明。"
-
-#: ../modules/trust-prompt/module-trust-prompt.c:84
-msgid ""
-"The certificate does not match the expected identity of the site that it was "
-"retrieved from."
-msgstr "憑證與取回憑證的網站身分比對不符。"
-
-#: ../modules/trust-prompt/module-trust-prompt.c:86
-msgid "The certificate's activation time is still in the future."
-msgstr "憑證的啟用時刻在未來。"
-
-#: ../modules/trust-prompt/module-trust-prompt.c:88
-msgid "The certificate has expired."
-msgstr "憑證已逾期。"
-
-#: ../modules/trust-prompt/module-trust-prompt.c:90
-msgid ""
-"The certificate has been revoked according to the connection's certificate "
-"revocation list."
-msgstr "根據連線的憑證註銷清單，這個憑證已被註銷。"
-
-#: ../modules/trust-prompt/module-trust-prompt.c:92
-msgid "The certificate's algorithm is considered insecure."
-msgstr "憑證的演算法被認為是不安全的。"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:119
-msgid "Certificate trust..."
-msgstr "憑證信任度…"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:120
-msgid "_Reject"
-msgstr "拒絕(_R)"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:121
-msgid "Accept _Temporarily"
-msgstr "暫時接受(_T)"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:122
-msgid "_Accept Permanently"
-msgstr "永久接受(_A)"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:160
-#, c-format
-msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
-msgstr "「%s」的 SSL 憑證未受信任。您想要接受它嗎？"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:175
-msgid "Reason:"
-msgstr "原因："
-
 #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2
 msgid "Integrate your calendars"
 msgstr "整合您的行事曆"
@@ -5285,7 +5315,7 @@ msgstr "整合您的行事曆"
 msgid "Integrate your contacts"
 msgstr "整合您的連絡人"
 
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:256
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:237
 msgid "Signon service did not return a secret"
 msgstr "Signon 服務尚未傳回機密"
 
@@ -5317,7 +5347,7 @@ msgstr "郵件"
 msgid "Integrate your mailboxes"
 msgstr "整合您的信箱"
 
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1002
 #, c-format
 msgid ""
 "Cannot find a corresponding account service in the accounts database from "
@@ -5360,18 +5390,14 @@ msgstr "Yahoo! 行事曆"
 msgid "Yahoo! Mail"
 msgstr "Yahoo! 電子信箱"
 
-#: ../modules/yahoo-backend/module-yahoo-backend.c:226
-msgid "Tasks"
-msgstr "工作"
-
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50
-#: ../services/evolution-user-prompter/evolution-user-prompter.c:30
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:36
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:40
+#: ../services/evolution-user-prompter/evolution-user-prompter.c:32
 msgid "Keep running after the last client is closed"
 msgstr "在上次關閉客戶端之後保持執行"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:38
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:42
 msgid "Wait running until at least one client is connected"
 msgstr "直到至少有一個客戶端連線前等候執行"
 
@@ -5412,847 +5438,10 @@ msgstr "於網站"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../services/evolution-source-registry/evolution-source-registry.c:38
+#: ../services/evolution-source-registry/evolution-source-registry.c:39
 msgid "Don't migrate user data from previous versions of Evolution"
 msgstr "不要從前一版的 Evolution 轉換使用者資料"
 
 #: ../services/evolution-user-prompter/prompt-user-gtk.c:121
 msgid "_Dismiss"
 msgstr "解除(_D)"
-
-#~ msgid "You may not import keys with this cipher"
-#~ msgstr "您不能匯入這種加密方式的金鑰"
-
-#~ msgid "You may not export keys with this cipher"
-#~ msgstr "您不能匯出這種加密方式的金鑰"
-
-#~ msgid ""
-#~ "Could not write log entry: %s\n"
-#~ "Further operations on this server will not be replayed when you\n"
-#~ "reconnect to the network."
-#~ msgstr ""
-#~ "無法寫入紀錄： %s\n"
-#~ "接下來在此伺服器上的操作，在您重新連線到網路時\n"
-#~ "將不會重播。"
-
-#~ msgid ""
-#~ "Could not open '%s':\n"
-#~ "%s\n"
-#~ "Changes made to this folder will not be resynchronized."
-#~ msgstr ""
-#~ "無法開啟「%s」：\n"
-#~ "%s\n"
-#~ "這個資料夾內所做的變更將不會重新同步。"
-
-#~ msgid "Resynchronizing with server"
-#~ msgstr "與伺服器重新同步"
-
-#~ msgid "Preparing folder '%s' for offline"
-#~ msgstr "準備資料夾「%s」供離線使用"
-
-#~ msgid "Canceled"
-#~ msgstr "已取消"
-
-#~ msgid ""
-#~ "Alert from IMAP server %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "來自 IMAP 伺服器 %s 的警示：\n"
-#~ "%s"
-
-#~ msgid "Error while fetching messages"
-#~ msgstr "當取回郵件時發生錯誤"
-
-#~ msgid "Fetching summary information for %d message in '%s'"
-#~ msgid_plural "Fetching summary information for %d messages in '%s'"
-#~ msgstr[0] "正取得「%2$s」中 %1$d 封郵件的摘要資訊"
-
-#~ msgid "Unknown parent folder: %s"
-#~ msgstr "不明的母資料夾： %s"
-
-#~ msgid "The parent folder is not allowed to contain subfolders"
-#~ msgstr "母資料夾並不允許包含子資料夾"
-
-#~ msgid "Resolving address"
-#~ msgstr "解析位址"
-
-#~ msgid "Name lookup failed"
-#~ msgstr "查詢名稱失敗"
-
-#~ msgid "Name lookup failed. Check your host name for spelling errors."
-#~ msgstr "名稱查詢失敗。請檢查您的主機名稱是否有拼錯字。"
-
-#~ msgid "Name lookup failed: %s"
-#~ msgstr "搜尋名稱失敗： %s"
-
-#~ msgid "Could not connect to '%s:%s': "
-#~ msgstr "無法連接到「%s：%s」："
-
-#~ msgid "Please enter the %s password for %s on host %s."
-#~ msgstr "請輸入 %2$s 於主機 %3$s 的 %1$s 密碼。"
-
-#~ msgid "NSPR error code %d"
-#~ msgstr "NSPR 錯誤代碼 %d"
-
-#~ msgid "The proxy host does not support SOCKS4"
-#~ msgstr "代理伺服器主機不支援 SOCKS4"
-
-#~ msgid "The proxy host denied our request: code %d"
-#~ msgstr "代理伺服器主機拒絕我們的要求：代碼 %d"
-
-#~ msgid "The proxy host does not support SOCKS5"
-#~ msgstr "代理伺服器主機不支援 SOCKS5"
-
-#~ msgid "Could not find a suitable authentication type: code 0x%x"
-#~ msgstr "找不到合適的核對類型：代碼 0x%x"
-
-#~ msgid "General SOCKS server failure"
-#~ msgstr "一般性 SOCKS 伺服器失敗"
-
-#~ msgid "SOCKS server's rules do not allow connection"
-#~ msgstr "SOCKS 伺服器的規則不允許連線"
-
-#~ msgid "Network is unreachable from SOCKS server"
-#~ msgstr "網路無法透過 SOCKS 伺服器到達"
-
-#~ msgid "Host is unreachable from SOCKS server"
-#~ msgstr "主機無法透過 SOCKS 伺服器到達"
-
-#~ msgid "Connection refused"
-#~ msgstr "連線被拒絕"
-
-#~ msgid "Time-to-live expired"
-#~ msgstr "超過 Time-to-live 時間"
-
-#~ msgid "Command not supported by SOCKS server"
-#~ msgstr "SOCKS 伺服器不支援指令"
-
-#~ msgid "Address type not supported by SOCKS server"
-#~ msgstr "SOCKS 伺服器不支援位址類型"
-
-#~ msgid "Unknown error from SOCKS server"
-#~ msgstr "來自 SOCKS 伺服器的不明錯誤"
-
-#~ msgid "Got unknown address type from SOCKS server"
-#~ msgstr "從 SOCKS 伺服器取得不明的位址類型"
-
-#~ msgid "Incomplete reply from SOCKS server"
-#~ msgstr "來自 SOCKS 伺服器的不完整回覆"
-
-#~ msgid "Hostname is too long (maximum is 255 characters)"
-#~ msgstr "主機名稱太長（最多 255 字元）"
-
-#~ msgid "Invalid reply from proxy server"
-#~ msgstr "從代理伺服器傳回無效的回覆"
-
-#~ msgid "Unable to add message to summary: unknown reason"
-#~ msgstr "無法新增郵件到摘要資訊：不明的原因"
-
-#~ msgid "Fatal mail parser error near position %s in folder %s"
-#~ msgstr "靠近 %s (於資料夾 %s)的位置發生嚴重的郵件分析錯誤"
-
-#~ msgid "You cannot post NNTP messages while working offline!"
-#~ msgstr "離線工作時無法張貼 NNTP 訊息！"
-
-#~ msgid ""
-#~ "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
-#~ "means manual proxy."
-#~ msgstr ""
-#~ "要使用哪種類型的代理伺服器。「0」表示使用系統值，「1」表示不使用代理伺服"
-#~ "器，「2」表示手動設定代理伺服器。"
-
-#~ msgid "Whether to use proxy for HTTP requests."
-#~ msgstr "對 HTTP 要求是否使用代理伺服器。"
-
-#~ msgid "Whether authentication is required to access proxy server."
-#~ msgstr "存取代理伺服器是否要求核對。"
-
-#~ msgid "Host name to use for HTTP requests."
-#~ msgstr "對 HTTP 要求使用的主機名稱。"
-
-#~ msgid "Port number to use for HTTP requests."
-#~ msgstr "對 HTTP 要求使用的連接埠號。"
-
-#~ msgid "User name to use to authenticate against proxy server."
-#~ msgstr "用來核對代理伺服器的使用者名稱。"
-
-#~ msgid "Password to use to authenticate against proxy server."
-#~ msgstr "用來核對代理伺服器的密碼。"
-
-#~ msgid "List of hosts for which do not use proxy."
-#~ msgstr "不使用代理伺服器連接的主機清單。"
-
-#~ msgid "Host name to use for HTTPS requests."
-#~ msgstr "對 HTTPS 要求使用的主機名稱。"
-
-#~ msgid "Port number to use for HTTPS requests."
-#~ msgstr "對 HTTPS 要求使用的連接埠號。"
-
-#~ msgid "Host name to use for SOCKS requests."
-#~ msgstr "對 SOCKS 要求使用的主機名稱。"
-
-#~ msgid "Port number to use for SOCKS requests."
-#~ msgstr "對 SOCKS 要求使用的連接埠號。"
-
-#~ msgid "Where to read automatic proxy configuration from."
-#~ msgstr "要從何處讀取自動代理伺服器組態。"
-
-#~ msgid "Not part of certificate"
-#~ msgstr "不是憑證的部分"
-
-#~ msgid "_Close"
-#~ msgstr "關閉(_C)"
-
-#~ msgid "This certificate has been verified for the following uses:"
-#~ msgstr "此憑證已經檢驗用於下列用途："
-
-#~ msgid "SSL Client Certificate"
-#~ msgstr "SSL 用戶端憑證"
-
-#~ msgid "SSL Server Certificate"
-#~ msgstr "SSL 伺服器憑證"
-
-#~ msgid "Email Signer Certificate"
-#~ msgstr "電子郵件簽署者憑證"
-
-#~ msgid "Email Recipient Certificate"
-#~ msgstr "電子郵件收件者憑證"
-
-#~ msgid "Issued To"
-#~ msgstr "簽發給"
-
-#~ msgid "Common Name (CN)"
-#~ msgstr "一般名稱 (CN)"
-
-#~ msgid "Organization (O)"
-#~ msgstr "組織 (O)"
-
-#~ msgid "Organizational Unit (OU)"
-#~ msgstr "組織單位 (OU)"
-
-#~ msgid "Serial Number"
-#~ msgstr "序號"
-
-#~ msgid "Issued By"
-#~ msgstr "簽發者"
-
-#~ msgid "Validity"
-#~ msgstr "有效性"
-
-#~ msgid "Issued On"
-#~ msgstr "簽發日"
-
-#~ msgid "Expires On"
-#~ msgstr "到期日"
-
-#~ msgid "Fingerprints"
-#~ msgstr "數位指紋"
-
-#~ msgid "SHA1 Fingerprint"
-#~ msgstr "SHA1 指紋"
-
-#~ msgid "MD5 Fingerprint"
-#~ msgstr "MD5 指紋"
-
-#~ msgid "General"
-#~ msgstr "一般"
-
-#~ msgid "Certificate Hierarchy"
-#~ msgstr "憑證階層"
-
-#~ msgid "Certificate Fields"
-#~ msgstr "憑證欄位"
-
-#~ msgid "Field Value"
-#~ msgstr "欄位數值"
-
-#~ msgid "Details"
-#~ msgstr "詳細資料"
-
-#~ msgid "Version"
-#~ msgstr "版本"
-
-#~ msgid "Version 1"
-#~ msgstr "版本 1"
-
-#~ msgid "Version 2"
-#~ msgstr "版本 2"
-
-#~ msgid "Version 3"
-#~ msgstr "版本 3"
-
-#~ msgid "PKCS #1 MD2 With RSA Encryption"
-#~ msgstr "PKCS #1 MD2 附 RSA 加密"
-
-#~ msgid "PKCS #1 MD5 With RSA Encryption"
-#~ msgstr "PKCS #1 MD5 附 RSA 加密"
-
-#~ msgid "PKCS #1 SHA-1 With RSA Encryption"
-#~ msgstr "PKCS #1 SHA-1 附 RSA 加密"
-
-#~ msgid "PKCS #1 SHA-256 With RSA Encryption"
-#~ msgstr "PKCS #1 SHA-256 附 RSA 加密"
-
-#~ msgid "PKCS #1 SHA-384 With RSA Encryption"
-#~ msgstr "PKCS #1 SHA-384 附 RSA 加密"
-
-#~ msgid "PKCS #1 SHA-512 With RSA Encryption"
-#~ msgstr "PKCS #1 SHA-512 附 RSA 加密"
-
-#~ msgid "PKCS #1 RSA Encryption"
-#~ msgstr "PKCS #1 RSA 加密"
-
-#~ msgid "Certificate Key Usage"
-#~ msgstr "憑證金鑰用途"
-
-#~ msgid "Netscape Certificate Type"
-#~ msgstr "Netscape 憑證類型"
-
-#~ msgid "Certificate Authority Key Identifier"
-#~ msgstr "憑證管理中心金鑰識別碼"
-
-#~ msgid "Object Identifier (%s)"
-#~ msgstr "物件識別碼 (%s)"
-
-#~ msgid "Algorithm Identifier"
-#~ msgstr "演算法識別碼"
-
-#~ msgid "Algorithm Parameters"
-#~ msgstr "演算法參數"
-
-#~ msgid "Subject Public Key Info"
-#~ msgstr "主旨公鑰資訊"
-
-#~ msgid "Subject Public Key Algorithm"
-#~ msgstr "主旨公鑰演算法"
-
-#~ msgid "Subject's Public Key"
-#~ msgstr "主旨的公鑰"
-
-#~ msgid "Error: Unable to process extension"
-#~ msgstr "錯誤：無法處理延伸資訊"
-
-#~ msgid "Email"
-#~ msgstr "電子郵件"
-
-#~ msgid "Object Signer"
-#~ msgstr "物件簽署者"
-
-#~ msgid "SSL Certificate Authority"
-#~ msgstr "SSL 憑證檢核"
-
-#~ msgid "Email Certificate Authority"
-#~ msgstr "電子郵件憑證檢核"
-
-#~ msgid "Signing"
-#~ msgstr "簽署"
-
-#~ msgid "Non-repudiation"
-#~ msgstr "不可否認"
-
-#~ msgid "Key Encipherment"
-#~ msgstr "金鑰加密"
-
-#~ msgid "Data Encipherment"
-#~ msgstr "資料加密"
-
-#~ msgid "Key Agreement"
-#~ msgstr "金鑰合同"
-
-#~ msgid "Certificate Signer"
-#~ msgstr "憑證簽署者"
-
-#~ msgid "CRL Signer"
-#~ msgstr "CRL 簽署者"
-
-#~ msgid "Critical"
-#~ msgstr "重要"
-
-#~ msgid "Not Critical"
-#~ msgstr "不重要"
-
-#~ msgid "Extensions"
-#~ msgstr "延伸資訊"
-
-#~ msgid "%s = %s"
-#~ msgstr "%s = %s"
-
-#~ msgid "Certificate"
-#~ msgstr "憑證"
-
-#~ msgid "Certificate Signature Algorithm"
-#~ msgstr "憑證簽章演算法"
-
-#~ msgid "Issuer"
-#~ msgstr "簽發者"
-
-#~ msgid "Subject"
-#~ msgstr "主旨"
-
-#~ msgid "Issuer Unique ID"
-#~ msgstr "簽發者獨有 ID"
-
-#~ msgid "Subject Unique ID"
-#~ msgstr "主旨獨有 ID"
-
-#~ msgid "Certificate Signature Value"
-#~ msgstr "憑證簽章值"
-
-#~ msgid "_View Certificate"
-#~ msgstr "檢視憑證(_V)"
-
-#~ msgid "Detailed information about the certificate:"
-#~ msgstr "憑證的相關詳細資訊："
-
-#~ msgid "Issuer:"
-#~ msgstr "簽發者："
-
-#~ msgid "Subject:"
-#~ msgstr "主旨："
-
-#~ msgid "Fingerprint:"
-#~ msgstr "數位指紋："
-
-#~ msgid "Cannot write offline journal for folder '%s': %s"
-#~ msgstr "不能寫入資料夾「%s」的離線日誌：%s"
-
-#~ msgid "Creating new contact…"
-#~ msgstr "建立新的連絡人…"
-
-#~ msgid "Deleting contact…"
-#~ msgstr "刪除連絡人…"
-
-#~ msgid "Modifying contact…"
-#~ msgstr "修改連絡人…"
-
-#~ msgid "Clients cannot set backend properties"
-#~ msgstr "客戶端不能設定後端屬性"
-
-#~ msgid "Cannot retrieve backend property: "
-#~ msgstr "不能取得後端屬性："
-
-#~ msgid "Could not get calendar view path: "
-#~ msgstr "不能取得行事曆檢視路徑："
-
-#~ msgid "Invalid backend name '%s' in source '%s'"
-#~ msgstr "來源「%2$s」中有無效的後端名稱「%1$s」"
-
-#~ msgid "Failed to run book factory"
-#~ msgstr "無法執行通訊錄工廠"
-
-#~ msgid "Cannot get connection to view"
-#~ msgstr "不能取得要檢視的連線"
-
-#~ msgid "Cannot process, book backend is opening"
-#~ msgstr "不能處理，通訊錄後端程式已開啟"
-
-#~ msgid "Empty query: "
-#~ msgstr "空的查詢："
-
-#~ msgid "Cannot get backend property: "
-#~ msgstr "不能取得後端屬性："
-
-#~ msgid "Failed to run calendar factory"
-#~ msgstr "無法執行行事曆工廠"
-
-#~ msgid "Cannot process, calendar backend is opening"
-#~ msgstr "不能處理，行事曆後端已開啟"
-
-#~ msgid "Invalid call"
-#~ msgstr "無效的呼叫"
-
-#~ msgid "Cannot create folder: %s: Folder name cannot contain a dot"
-#~ msgstr "不能建立資料夾：%s：資料夾名稱不能包含「.」"
-
-#~ msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
-#~ msgstr "不能重新命名資料夾：%s：資料夾名稱不能包含「.」"
-
-#~ msgid "Failed to build summary for an address book %s"
-#~ msgstr "無法建立通訊錄 %s 的摘要"
-
-#~ msgid "Using Distinguished Name (DN)"
-#~ msgstr "使用辨認的名稱 (DN)"
-
-#~ msgid "Using Email Address"
-#~ msgstr "使用電子郵件地址"
-
-#~ msgid "Cannot remove book: "
-#~ msgstr "不能移除通訊錄："
-
-#~ msgid ""
-#~ "Failed to connect to a server using SSL. One possible reason is an "
-#~ "invalid certificate being used by the server. If this is expected, like "
-#~ "self-signed certificate being used on the server, then disable "
-#~ "certificate validity tests by selecting 'Ignore invalid SSL certificate' "
-#~ "option in Properties"
-#~ msgstr ""
-#~ "無法使用 SSL 連線到伺服器。一個可能的原因是伺服器使用了無效的憑證。如果是"
-#~ "這樣，像是伺服器使用了自我簽署的憑證，可以在屬性中選擇「忽略無效的 SSL 憑"
-#~ "證」選項來停用憑證效力檢測"
-
-#~ msgid "Cannot create local store"
-#~ msgstr "不能建立本地儲存區"
-
-#~ msgid "Could not create synch slave thread"
-#~ msgstr "無法建立 synch 從屬執行緒"
-
-#~ msgid "Cannot remove calendar: "
-#~ msgstr "不能移除行事曆："
-
-#~ msgid ""
-#~ "   Issuer:       %s\n"
-#~ "   Subject:      %s\n"
-#~ "   Fingerprint:  %s\n"
-#~ "   Signature:    %s"
-#~ msgstr ""
-#~ "發照者：           %s\n"
-#~ "主旨：              %s\n"
-#~ "數位指紋：              %s\n"
-#~ "簽章：              %s"
-
-#~ msgid "GOOD"
-#~ msgstr "良好"
-
-#~ msgid "BAD"
-#~ msgstr "不良"
-
-#~ msgid ""
-#~ "Certificate problem: %s\n"
-#~ "Issuer: %s"
-#~ msgstr ""
-#~ "憑證問題： %s\n"
-#~ "發照者： %s"
-
-#~ msgid ""
-#~ "Bad certificate domain: %s\n"
-#~ "Issuer: %s"
-#~ msgstr ""
-#~ "不正確的憑證網域： %s\n"
-#~ "發照者： %s"
-
-#~ msgid ""
-#~ "Certificate expired: %s\n"
-#~ "Issuer: %s"
-#~ msgstr ""
-#~ "憑證已逾期： %s\n"
-#~ "發照者： %s"
-
-#~ msgid ""
-#~ "Certificate revocation list expired: %s\n"
-#~ "Issuer: %s"
-#~ msgstr ""
-#~ "憑證撒銷清單已逾期： %s\n"
-#~ "發照者： %s"
-
-#~ msgid "No output stream"
-#~ msgstr "沒有輸出串流"
-
-#~ msgid "No input stream"
-#~ msgstr "沒有輸入串流"
-
-#~ msgid "Server unexpectedly disconnected: %s"
-#~ msgstr "伺服器突然中斷連線： %s"
-
-#~ msgid ""
-#~ "Alert from IMAP server %s@%s in folder %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "來自 IMAP 伺服器 %s@%s 資料夾 %s 的警報：\n"
-#~ "%s"
-
-#~ msgid "Unexpected response from IMAP server: %s"
-#~ msgstr "從 IMAP 伺服器傳回不當的回應： %s"
-
-#~ msgid "IMAP command failed: %s"
-#~ msgstr "IMAP 指令失敗： %s"
-
-#~ msgid "Server response ended too soon."
-#~ msgstr "伺服器太早傳回結束的回應。"
-
-#~ msgid "IMAP server response did not contain %s information"
-#~ msgstr "IMAP 伺服器的回應沒有包含 %s 資訊"
-
-#~ msgid "Unexpected OK response from IMAP server: %s"
-#~ msgstr "從 IMAP 伺服器傳回不當的 OK 回應： %s"
-
-#~ msgid "Always check for _new mail in this folder"
-#~ msgstr "永遠檢查這個資料夾中是否有新郵件(_N)"
-
-#~ msgid "Could not create directory %s: %s"
-#~ msgstr "無法建立目錄 %s：%s"
-
-#~ msgid "Could not load summary for %s"
-#~ msgstr "無法載入 %s 的摘要"
-
-#~ msgid "Scanning for changed messages in %s"
-#~ msgstr "掃描 %s 中變更過的郵件"
-
-#~ msgid "Fetching summary information for new messages in %s"
-#~ msgstr "正取得 %s 中新郵件的摘要資訊"
-
-#~ msgid "Incomplete server response: no information provided for message %d"
-#~ msgstr "不完整的伺服器回應：未提供任何資訊給訊息 %d"
-
-#~ msgid "Incomplete server response: no UID provided for message %d"
-#~ msgstr "不完整的伺服器回應：未提供 UID 給訊息 %d"
-
-#~ msgid "Could not find message body in FETCH response."
-#~ msgstr "在 FETCH 的回應內找不到郵件的內文。"
-
-#~ msgid "Could not open cache directory: "
-#~ msgstr "無法開啟快取目錄："
-
-#~ msgid "Failed to cache message %s: %s"
-#~ msgstr "快取郵件 %s 失敗： %s"
-
-#~ msgid "Failed to cache message %s: "
-#~ msgstr "快取郵件 %s 失敗："
-
-#~ msgid "Failed to cache %s: "
-#~ msgstr "快取 %s 失敗："
-
-#~ msgid "Names_pace:"
-#~ msgstr "命名空間(_P):"
-
-#~ msgid "IMAP default port"
-#~ msgstr "IMAP 預設連接埠"
-
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-#~ msgid "Retrieving list of folders at '%s'"
-#~ msgstr "取回在「%s」的資料夾清單"
-
-#~ msgid "Server unexpectedly disconnected"
-#~ msgstr "伺服器突然中斷連線"
-
-#~ msgid "Server unexpectedly disconnected: "
-#~ msgstr "伺服器突然中斷連線："
-
-#~ msgid "Could not connect to POP server %s"
-#~ msgstr "無法連線到 POP 伺服器 %s"
-
-#~ msgid "Keyring operation was cancelled"
-#~ msgstr "鑰匙圈操作已取消"
-
-#~ msgid "Currently _used categories:"
-#~ msgstr "目前使用的分類(_U):"
-
-#~ msgid "_Available Categories:"
-#~ msgstr "可用的分類(_A):"
-
-#~ msgid "Icon"
-#~ msgstr "圖示"
-
-#~ msgid "Category"
-#~ msgstr "分類"
-
-#~ msgid "Create category \"%s\""
-#~ msgstr "建立分類「%s」"
-
-#~ msgid "Category Icon"
-#~ msgstr "分類圖示"
-
-#~ msgid "_No Image"
-#~ msgstr "沒有圖片(_N)"
-
-#~ msgid "Category _Name"
-#~ msgstr "分類名稱(_N)"
-
-#~ msgid "Category _Icon"
-#~ msgstr "分類圖示(_I)"
-
-#~ msgid "Category Properties"
-#~ msgstr "分類屬性"
-
-#~ msgid ""
-#~ "There is already a category '%s' in the configuration. Please use another "
-#~ "name"
-#~ msgstr "在組態中已經有名為「%s」的分類。請使用另外的名稱"
-
-#~ msgid "Show Contacts"
-#~ msgstr "顯示連絡人"
-
-#~ msgid "Address B_ook:"
-#~ msgstr "通訊錄(_O):"
-
-#~ msgid "Cat_egory:"
-#~ msgstr "分類(_E):"
-
-#~ msgid "_Search:"
-#~ msgstr "搜尋(_S):"
-
-#~ msgid "Any Category"
-#~ msgstr "任何分類"
-
-#~ msgid "Co_ntacts"
-#~ msgstr "連絡人(_N)"
-
-#~ msgid "Search"
-#~ msgstr "搜尋"
-
-#~ msgid "Address Book"
-#~ msgstr "通訊錄"
-
-#~ msgid "Select Contacts from Address Book"
-#~ msgstr "從通訊錄選取連絡人"
-
-#~ msgid "_Add"
-#~ msgstr "加入(_A)"
-
-#~ msgid "_Remove"
-#~ msgstr "移除(_R)"
-
-#~ msgid "Error loading address book: %s"
-#~ msgstr "載入通訊錄時發生錯誤：%s"
-
-#~ msgid "E_xpand %s Inline"
-#~ msgstr "展開行內 %s"
-
-#~ msgid "Cop_y %s"
-#~ msgstr "複製(_Y) %s"
-
-#~ msgid "C_ut %s"
-#~ msgstr "剪下(_U) %s"
-
-#~ msgid "_Edit %s"
-#~ msgstr "編輯 %s(_E)"
-
-#~ msgid "_Delete %s"
-#~ msgstr "刪除(_D) %s"
-
-#~ msgid "Keyring key is unusable: no user or host name"
-#~ msgstr "鑰匙圈金鑰無法使用：沒有使用者或主機名稱"
-
-#~ msgid "You have the Caps Lock key on."
-#~ msgstr "您的 Caps Lock 是開啟的。"
-
-#~ msgid "_Remember this passphrase"
-#~ msgstr "記住這個密語(_R)"
-
-#~ msgid "_Remember this passphrase for the remainder of this session"
-#~ msgstr "記住這個用於剩餘的工作階段的密語(_R)"
-
-#~ msgid "_Remember this password"
-#~ msgstr "記住這個密碼(_R)"
-
-#~ msgid "_Remember this password for the remainder of this session"
-#~ msgstr "記住這個用於剩餘的工作階段的密碼(_R)"
-
-#~ msgid "_Destination"
-#~ msgstr "目的端(_D)"
-
-#~ msgid "Select destination"
-#~ msgstr "選取目的地"
-
-#~ msgid "Evolution Source Viewer"
-#~ msgstr "GNOME 來源瀏覽程式"
-
-#~ msgid "Display Name"
-#~ msgstr "顯示名稱"
-
-#~ msgid "Flags"
-#~ msgstr "旗標"
-
-#~ msgid "Identity"
-#~ msgstr "身分"
-
-#~ msgid "Updating %s folder"
-#~ msgstr "更新 %s 資料夾"
-
-#~ msgid "Authenticating with the server…"
-#~ msgstr "與伺服器核對…"
-
-#~ msgid "%s: there was no source for UID '%s' stored in GConf."
-#~ msgstr "%s：沒有儲存於 GConf 中的 UID「%s」來源。"
-
-#~ msgid "Incorrect uri '%s'"
-#~ msgstr "不正確的 URI「%s」"
-
-#~ msgid "Failed to find system book"
-#~ msgstr "無法尋找系統通訊錄"
-
-#~ msgid "There was no source for UID '%s' stored in a source list."
-#~ msgstr "沒有儲存於來源清單中的 UID「%s」來源。"
-
-#~ msgid "Cannot authenticate user: "
-#~ msgstr "不能核對使用者："
-
-#~ msgid "Empty URI"
-#~ msgstr "空的 URI"
-
-#~ msgid ""
-#~ "Enter password for address book %s (user %s)\n"
-#~ "Reason: %s"
-#~ msgstr ""
-#~ "輸入通訊錄 %s (使用者 %s) 的密碼 \n"
-#~ "原因：%s"
-
-#~ msgid "Enter password for address book %s (user %s)"
-#~ msgstr "輸入通訊錄 %s (使用者 %s) 的密碼 "
-
-#~ msgid "Enter password for %s (user %s)"
-#~ msgstr "輸入 %s (使用者 %s) 的密碼 "
-
-#~ msgid "Enter password for %s to enable proxy for user %s"
-#~ msgstr "輸入 %s 的密碼以便使用者 %s 能使用代理伺服器"
-
-#~ msgid "Invalid source type"
-#~ msgstr "無效的來源類型"
-
-#~ msgid "_Use custom command to connect to server"
-#~ msgstr "使用自訂指令來連線到伺服器(_U)"
-
-#~ msgid "Co_mmand:"
-#~ msgstr "指令(_M):"
-
-#~ msgid "Command:"
-#~ msgstr "指令："
-
-#~ msgid "Numbe_r of cached connections to use"
-#~ msgstr "要使用的快取連線數量(_R)"
-
-#~ msgid "Closing tmp stream failed: "
-#~ msgstr "無法關閉 tmp 串流："
-
-#~ msgid "SMTP Authentication"
-#~ msgstr "SMTP 核對"
-
-#~ msgid "Accessing LDAP Server anonymously"
-#~ msgstr "正以匿名方式存取 LDAP 伺服器"
-
-#~ msgid ""
-#~ "Enter password for calendar %s (user %s)\n"
-#~ "Reason: %s"
-#~ msgstr ""
-#~ "輸入日曆 %s (使用者 %s) 的密碼 \n"
-#~ "原因：%s"
-
-#~ msgid "Enter password for calendar %s (user %s)"
-#~ msgstr "輸入日曆 %s (使用者 %s) 的密碼 "
-
-#~ msgid ""
-#~ "Enter password for task list %s (user %s)\n"
-#~ "Reason: %s"
-#~ msgstr ""
-#~ "輸入工作表 %s (使用者 %s) 的密碼 \n"
-#~ "原因：%s"
-
-#~ msgid "Enter password for task list %s (user %s)"
-#~ msgstr "輸入工作表 %s (使用者 %s) 的密碼 "
-
-#~ msgid ""
-#~ "Enter password for memo list %s (user %s)\n"
-#~ "Reason: %s"
-#~ msgstr ""
-#~ "輸入筆記 %s (使用者 %s) 的密碼 \n"
-#~ "原因：%s"
-
-#~ msgid "Enter password for memo list %s (user %s)"
-#~ msgstr "輸入筆記 %s (使用者 %s) 的密碼 "
-
-#~ msgid "Enter Passphrase"
-#~ msgstr "輸入密語"
-
-#~ msgid "Enter Password"
-#~ msgstr "輸入密碼"
author	Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>	2015-02-21 11:05:17 +0000
committer	GNOME Translation Robot <gnome-sysadmin@gnome.org>	2015-02-21 11:05:17 +0000
commit	9166ff4ff47e420fb49879849c98861f1f0b6d32 (patch)
tree	984f095f52a2f26b05e2ea83687f80ea9bf67768 /po/zh_TW.po
parent	15141129e77ff0dec7a65772fb19f4926534a5be (diff)
download	evolution-data-server-9166ff4ff47e420fb49879849c98861f1f0b6d32.tar.gz