[evolution-data-server] update zh_CN translation

[YunQiang Su <yqsu src gnome org>]

commit 421b35c39d350056509ee7aff6f9afb064e3e67f
Author: YunQiang Su <yqsu src gnome org>
Date:   Tue Jul 29 16:34:47 2014 +0800

    update zh_CN translation

 po/zh_CN.po |  800 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 399 insertions(+), 401 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e4120aa..61fb283 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -21,90 +21,90 @@ msgstr ""
 "Project-Id-Version: evolution-data-server master\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-23 12:42+0000\n"
-"PO-Revision-Date: 2013-08-20 10:54+0800\n"
-"Last-Translator: Luo Lei <luolei ubuntukylin com>\n"
+"POT-Creation-Date: 2014-07-29 04:28+0000\n"
+"PO-Revision-Date: 2014-07-29 16:34+0800\n"
+"Last-Translator: Yunqiang Su <wzssyqa gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.6.7\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:1253
 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:4353
 msgid "Searching..."
 msgstr "正在搜索..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1258
+#: ../addressbook/backends/file/e-book-backend-file.c:1281
 #, 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/backends/file/e-book-backend-file.c:1472
+#: ../addressbook/backends/file/e-book-backend-file.c:1555
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077
-#: ../addressbook/libedata-book/e-book-sqlite.c:6706
+#: ../addressbook/libedata-book/e-book-sqlite.c:6711
 #, 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:1615
+#: ../addressbook/backends/file/e-book-backend-file.c:1696
 #, 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:1624
+#: ../addressbook/backends/file/e-book-backend-file.c:1705
 #, 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:1970
 msgid "Requested to delete an unrelated cursor"
 msgstr "请求删除一个无关的 cursor"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2014
+#: ../addressbook/backends/file/e-book-backend-file.c:2041
 #, 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/backends/file/e-book-backend-file-migrate-bdb.c:148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
 #: ../addressbook/libebook-contacts/e-phone-number.c:56
 #: ../addressbook/libebook/e-book.c:1078
@@ -119,67 +119,69 @@ msgstr "无法将旧数据库“ %s” 改名为 “%s”：%s"
 #: ../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
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621
 #: ../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
+#: ../calendar/libecal/e-cal-client.c:3239
+#: ../calendar/libecal/e-cal-client.c:3412
+#: ../calendar/libecal/e-cal-client.c:3676
+#: ../calendar/libecal/e-cal-client.c:3917
+#: ../calendar/libecal/e-cal-client.c:4107
+#: ../calendar/libecal/e-cal-client.c:4299
+#: ../calendar/libecal/e-cal-client.c:4469
+#: ../calendar/libecal/e-cal-client.c:4638
+#: ../calendar/libecal/e-cal-client.c:4841
+#: ../calendar/libecal/e-cal-client.c:4991
+#: ../calendar/libecal/e-cal-client.c:5185
+#: ../calendar/libecal/e-cal-client.c:5338
+#: ../calendar/libecal/e-cal-client.c:5555
+#: ../calendar/libecal/e-cal-client.c:5709
+#: ../calendar/libecal/e-cal-client.c:5935
+#: ../calendar/libecal/e-cal-client.c:6131
+#: ../calendar/libecal/e-cal-client.c:6494
+#: ../calendar/libecal/e-cal-client.c:6708
+#: ../camel/providers/imapx/camel-imapx-command.c:645
+#: ../camel/providers/imapx/camel-imapx-server.c:4769
+#: ../camel/providers/imapx/camel-imapx-server.c:4778
 #: ../libedataserver/e-client.c:185
 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:828
 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:1010
 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:1757
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433
 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:1912
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545
 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:2119
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645
 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:2239
 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
@@ -188,129 +190,130 @@ 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:899
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr "无法使用 v3 或 v2 绑定"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1094
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
 msgid "Reconnecting to LDAP server..."
 msgstr "正在重新连接 LDAP 服务器..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1225
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1153
 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:1169
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4247
 #, 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:1781
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104
 #, 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:2034
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2162
 #, 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:2295
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2422
 #, 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:4196
 msgid "Receiving LDAP search results..."
 msgstr "正在接收 LDAP 的搜索结果..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4447
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4375
 msgid "Error performing search"
 msgstr "执行搜索错误"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4503
 #, 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:5067
 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:5142
 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:5208
 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:5597
 #, c-format
 msgid "Failed to get the DN for user '%s'"
 msgstr "无法获取用户“%s”的 DN"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:799
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864
 msgid "Loading Addressbook summary..."
 msgstr "正在加载地址簿概要..."
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:817
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884
 #, 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:903
 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:964
 #, 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:1353
 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:1474
 #, 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:1576
 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:1584
 #, 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:1677
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "DELETE 失败，HTTP 状态码：%d"
@@ -914,8 +917,8 @@ msgstr "Google Talk 姓名列表"
 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:1654
+#: ../addressbook/libebook/e-destination.c:920
 msgid "Unnamed List"
 msgstr "未命名的列表"
 
@@ -1008,7 +1011,7 @@ msgstr "缓存中没有保存完整的 search_contacts，无法返回电子名
 
 #: ../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-sqlite.c:5369
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr "查询中包含不支持的元素"
@@ -1067,7 +1070,7 @@ 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-sqlite.c:7381
 #, c-format
 msgid ""
 "Tried to step a cursor in reverse, but cursor is already at the beginning of "
@@ -1075,7 +1078,7 @@ msgid ""
 msgstr "尝试对 cursor 反向步进，但 cursor 已位于联系人列表的开头"
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
-#: ../addressbook/libedata-book/e-book-sqlite.c:7384
+#: ../addressbook/libedata-book/e-book-sqlite.c:7389
 #, c-format
 msgid ""
 "Tried to step a cursor forwards, but cursor is already at the end of the "
@@ -1095,20 +1098,20 @@ msgstr ""
 "无法从包含多于一个地址簿的旧数据库升级联系人数据库。请先删除“folders”表中的一"
 "条记录。"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5357
+#: ../addressbook/libedata-book/e-book-sqlite.c:5362
 #, c-format
 msgid "Invalid query: %s"
 msgstr "无效的查询：%s"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5532
+#: ../addressbook/libedata-book/e-book-sqlite.c:5537
 msgid "Invalid query for EbSqlCursor"
 msgstr "无效的 EbSqlCursor 查询"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7198
+#: ../addressbook/libedata-book/e-book-sqlite.c:7203
 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:7221
 msgid "Cannot sort by a field that is not a string type"
 msgstr "无法按非字符串类型的字段排序"
 
@@ -1316,31 +1319,35 @@ msgstr "缺少源 UID"
 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:576
 #, 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:607
 #, 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:618
 #, 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:637
 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:1079
 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:2882
+#, c-format
+msgid "Cannot create local cache folder '%s'"
+msgstr "无法创建本地缓存文件夹“%s”"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1349,32 +1356,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:3968
 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:4071
 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:4247
 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:4914
 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:4923
 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:5020
 msgid "Unexpected result in schedule-response"
 msgstr "定时响应的结果异常"
 
@@ -1401,27 +1403,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:491
 #, 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:582
 #, 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:625
 #, c-format
 msgid "Bad file format."
 msgstr "无效的文件格式。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:627
+#: ../calendar/backends/http/e-cal-backend-http.c:635
 #, c-format
 msgid "Not a calendar."
 msgstr "不是日历。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:914
+#: ../calendar/backends/http/e-cal-backend-http.c:925
 #: ../calendar/backends/weather/e-cal-backend-weather.c:536
 msgid "Could not create cache file"
 msgstr "无法创建缓存文件"
@@ -2049,94 +2051,94 @@ msgstr "(system-flag)参数无效"
 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:1075 ../camel/camel-filter-search.c:1086
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "执行过滤规则搜索错误：%s：%s"
 
-#: ../camel/camel-folder.c:300
+#: ../camel/camel-folder.c:323
 #, 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:363
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "在“%s”中学习新的有害邮件"
 
-#: ../camel/camel-folder.c:388
+#: ../camel/camel-folder.c:411
 #, 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:1011
+#: ../camel/providers/local/camel-maildir-folder.c:330
 msgid "Moving messages"
 msgstr "移动消息"
 
-#: ../camel/camel-folder.c:991
+#: ../camel/camel-folder.c:1014
 msgid "Copying messages"
 msgstr "复制消息"
 
-#: ../camel/camel-folder.c:1033
+#: ../camel/camel-folder.c:1056
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "文件夹“%s”不支持配额信息"
 
-#: ../camel/camel-folder.c:2847
+#: ../camel/camel-folder.c:2862
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "正在销毁文件夹“%s”"
 
-#: ../camel/camel-folder.c:2975
+#: ../camel/camel-folder.c:2990
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "正在获取 %2$s 中的消息“%1$s”"
 
-#: ../camel/camel-folder.c:3166
+#: ../camel/camel-folder.c:3181
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "正在获取“%s”的配额信息"
 
-#: ../camel/camel-folder.c:3466
+#: ../camel/camel-folder.c:3478
 #, 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"
@@ -2145,7 +2147,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"
@@ -2379,17 +2381,17 @@ msgstr "写入邮件临时文件错误：%s"
 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 "解析错误"
@@ -2413,10 +2415,6 @@ msgstr "主机“%s”查找失败，请检查主机名是否存在拼写错误
 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:90
 msgid "Downloading new messages for offline mode"
 msgstr "下载新消息以进行离线操作"
@@ -2680,7 +2678,7 @@ 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/imapx/camel-imapx-server.c:4719
 #: ../camel/providers/pop3/camel-pop3-store.c:311
 #: ../camel/providers/pop3/camel-pop3-store.c:757
 #: ../camel/providers/smtp/camel-smtp-transport.c:515
@@ -2887,49 +2885,44 @@ msgstr "将数据添加到编码器失败"
 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:1232
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "打开文件夹“%s”"
 
-#: ../camel/camel-store.c:1471
+#: ../camel/camel-store.c:1523
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "扫描“%s”中的文件夹"
 
-#: ../camel/camel-store.c:1499 ../camel/camel-store.c:1544
+#: ../camel/camel-store.c:1551 ../camel/camel-store.c:1596
 #: ../camel/camel-vtrash-folder.c:46
 msgid "Trash"
 msgstr "回收站"
 
-#: ../camel/camel-store.c:1513 ../camel/camel-store.c:1561
+#: ../camel/camel-store.c:1565 ../camel/camel-store.c:1613
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Junk"
 msgstr "垃圾"
 
-#: ../camel/camel-store.c:2162
+#: ../camel/camel-store.c:2214
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "无法创建文件夹：%s：文件夹已存在"
 
-#: ../camel/camel-store.c:2169
+#: ../camel/camel-store.c:2221
 #, 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:2398 ../camel/camel-vee-store.c:410
+#: ../camel/providers/local/camel-maildir-store.c:321
 #, 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:2588 ../camel/camel-vee-store.c:461
+#: ../camel/providers/local/camel-maildir-store.c:872
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "无法重命名文件夹：%s：无效操作"
@@ -3002,17 +2995,17 @@ 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)"
 
@@ -3024,45 +3017,50 @@ msgstr "无法将消息复制到回收站文件夹"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "无法将消息复制到垃圾邮件文件夹"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:654
+#: ../camel/providers/imapx/camel-imapx-folder.c:796
 #, 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:936
+#: ../camel/providers/imapx/camel-imapx-folder.c:1029
 #, c-format
 msgid "No destination folder specified"
 msgstr "目标文件夹未指定"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:796
+#: ../camel/providers/imapx/camel-imapx-folder.c:964
 msgid "Unable to move junk messages"
 msgstr "无法移动垃圾信息"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:889
+#: ../camel/providers/imapx/camel-imapx-folder.c:1057
 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:1374
+#: ../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:1485
 #, 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:1494
 #, 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:1709
 #, 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 "检查新邮件"
@@ -3084,23 +3082,33 @@ msgid "_Listen for server change notifications"
 msgstr "监听服务器变化提醒(_L)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:49
+#| msgid "Lost connection to IMAP server"
+msgid "Connection to Server"
+msgstr "到服务器的连接"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
+#| msgid "Numbe_r of cached connections to use"
+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:44
 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:99
@@ -3108,311 +3116,297 @@ msgstr "命名空间："
 msgid "Options"
 msgstr "选项"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
 #: ../camel/providers/nntp/camel-nntp-provider.c:41
 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
+#: ../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
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 msgid "Automatically synchroni_ze remote mail locally"
 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:1009
+#: ../camel/providers/imapx/camel-imapx-server.c:1016
 #, c-format
 msgid "Not authenticated"
 msgstr "没有验证"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1763
+#: ../camel/providers/imapx/camel-imapx-server.c:1713
 msgid "Server disconnected"
 msgstr "服务器断开连接"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2226
+#: ../camel/providers/imapx/camel-imapx-server.c:2205
 msgid "Error writing to cache stream"
 msgstr "写入缓存流错误"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3596
+#: ../camel/providers/imapx/camel-imapx-server.c:3550
 msgid "Error performing IDLE"
 msgstr "执行 IDLE 命令出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4490
+#: ../camel/providers/imapx/camel-imapx-server.c:4558
 #, 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:4559
 #: ../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:4619
 #, 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:4708
 #, 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/imapx/camel-imapx-server.c:4738
 #: ../camel/providers/nntp/camel-nntp-store.c:394
 #: ../camel/providers/nntp/camel-nntp-store.c:531
 msgid "Cannot authenticate without a username"
 msgstr "无法进行无用户名的认证"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4657
+#: ../camel/providers/imapx/camel-imapx-server.c:4747
 #: ../camel/providers/nntp/camel-nntp-store.c:540
 #: ../camel/providers/pop3/camel-pop3-store.c:678
 #: ../camel/providers/pop3/camel-pop3-store.c:699
 msgid "Authentication password not available"
 msgstr "密码认证不可用"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4908
+#: ../camel/providers/imapx/camel-imapx-server.c:4983
+#: ../camel/providers/imapx/camel-imapx-server.c:5042
 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:5035
 msgid "Failed to close the tmp stream"
 msgstr "无法关闭临时流"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4996
+#: ../camel/providers/imapx/camel-imapx-server.c:5071
 msgid "Failed to copy the tmp file"
 msgstr "无法复制临时文件"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5122
+#: ../camel/providers/imapx/camel-imapx-server.c:5212
 msgid "Error moving messages"
 msgstr "移动消息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5126
+#: ../camel/providers/imapx/camel-imapx-server.c:5216
 msgid "Error copying messages"
 msgstr "复制消息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5285
+#: ../camel/providers/imapx/camel-imapx-server.c:5438
 msgid "Error appending message"
 msgstr "追加消息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5479
+#: ../camel/providers/imapx/camel-imapx-server.c:5674
 msgid "Error fetching message headers"
 msgstr "取回消息头出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5644
+#: ../camel/providers/imapx/camel-imapx-server.c:5841
 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:5975
+#: ../camel/providers/imapx/camel-imapx-server.c:6204
 #, 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:6027
 #, 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:6079
 msgid "Error fetching new messages"
 msgstr "取回新消息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6146
+#: ../camel/providers/imapx/camel-imapx-server.c:6352
 msgid "Error refreshing folder"
 msgstr "刷新文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6296
+#: ../camel/providers/imapx/camel-imapx-server.c:6502
 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:6617
+#: ../camel/providers/imapx/camel-imapx-server.c:6642
 msgid "Error fetching folders"
 msgstr "取回文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6510
+#: ../camel/providers/imapx/camel-imapx-server.c:6722
 msgid "Error creating folder"
 msgstr "创建文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6562
+#: ../camel/providers/imapx/camel-imapx-server.c:6774
 msgid "Error deleting folder"
 msgstr "删除文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6629
+#: ../camel/providers/imapx/camel-imapx-server.c:6850
 msgid "Error renaming folder"
 msgstr "重命名文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6716
+#: ../camel/providers/imapx/camel-imapx-server.c:6924
 msgid "Error subscribing to folder"
 msgstr "订阅文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6776
+#: ../camel/providers/imapx/camel-imapx-server.c:6990
 msgid "Error unsubscribing from folder"
 msgstr "取消订阅文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6832
+#: ../camel/providers/imapx/camel-imapx-server.c:7052
 msgid "Error retrieving quota information"
 msgstr "获取配额信息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6884
+#: ../camel/providers/imapx/camel-imapx-server.c:7104
 msgid "Search failed"
 msgstr "搜索失败"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6946
+#: ../camel/providers/imapx/camel-imapx-server.c:7166
 msgid "Error performing NOOP"
 msgstr "执行 NOOP 出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7053
+#: ../camel/providers/imapx/camel-imapx-server.c:7273
 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:8190
+#: ../camel/providers/imapx/camel-imapx-server.c:8258
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "无法获取消息 ID %s：%s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:8191
+#: ../camel/providers/imapx/camel-imapx-server.c:8259
 msgid "No such message available."
 msgstr "没有该消息。"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:8390
-#: ../camel/providers/imapx/camel-imapx-server.c:8405
+#: ../camel/providers/imapx/camel-imapx-server.c:8466
+#: ../camel/providers/imapx/camel-imapx-server.c:8487
 msgid "Cannot create spool file: "
 msgstr "无法创建离线文件："
 
-#: ../camel/providers/imapx/camel-imapx-server.c:9110
+#: ../camel/providers/imapx/camel-imapx-server.c:9228
 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:322
+#: ../camel/providers/local/camel-maildir-store.c:784
+#: ../camel/providers/local/camel-maildir-store.c:790
+#: ../camel/providers/local/camel-maildir-store.c:873
 #: ../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 "%2$s 为 %1$s 提供的 IMAP 服务"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1035
+#: ../camel/providers/imapx/camel-imapx-store.c:836
 #: ../camel/providers/nntp/camel-nntp-provider.c:93
 #: ../camel/providers/pop3/camel-pop3-provider.c:81
 msgid "Password"
 msgstr "密码"
 
-#: ../camel/providers/imapx/camel-imapx-store.c: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:913
 #, c-format
 msgid "No such folder %s"
 msgstr "没有文件夹 %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1524
+#: ../camel/providers/imapx/camel-imapx-store.c:1324
 #, 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:1472
 #, c-format
 msgid "Retrieving folder list for %s"
 msgstr "正在获取“%s”的文件夹列表"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2079
+#: ../camel/providers/imapx/camel-imapx-store.c:1924
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:96
-#, c-format
-msgid "Source stream returned no data"
-msgstr "源流没返回数据"
-
-#: ../camel/providers/imapx/camel-imapx-stream.c:105
+#: ../camel/providers/imapx/camel-imapx-store.c:2689
+#: ../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 "Source stream unavailable"
-msgstr "源流不可用"
+msgid "You must be working online to complete this operation"
+msgstr "您必须在线工作以便完成该操作"
 
-#: ../camel/providers/local/camel-local-folder.c:192
+#: ../camel/providers/local/camel-local-folder.c:195
 #, 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:205
+#: ../camel/providers/local/camel-local-folder.c:214
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "邮件箱：%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:220
+#: ../camel/providers/local/camel-local-folder.c:223
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:497
+#: ../camel/providers/local/camel-local-folder.c:500
 msgid "_Index message body data"
 msgstr "索引消息正文(_I)"
 
-#: ../camel/providers/local/camel-local-folder.c:725
+#: ../camel/providers/local/camel-local-folder.c:730
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3492,7 +3486,7 @@ 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-mbox-store.c:572
 #: ../camel/providers/local/camel-spool-store.c:87
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -3506,7 +3500,7 @@ 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-maildir-store.c:156
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "无法获取文件夹：%s：%s"
@@ -3517,13 +3511,13 @@ 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-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-mbox-store.c:769
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "无法删除文件夹元文件“%s”：%s"
@@ -3533,86 +3527,80 @@ msgstr "无法删除文件夹元文件“%s”：%s"
 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 "无法将消息附加到邮件目录文件夹：%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:149
+#: ../camel/providers/local/camel-maildir-store.c:881
 #, 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:241
+#: ../camel/providers/local/camel-maildir-store.c:272
 #: ../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:256
 #: ../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:262
 #: ../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:289
 #, 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:353
+#: ../camel/providers/local/camel-maildir-store.c:393
+#: ../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:355
 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:637
+#: ../camel/providers/local/camel-maildir-store.c:1095
 #: ../camel/providers/local/camel-spool-store.c:212
 #: ../camel/providers/local/camel-spool-store.c:231
 #, c-format
@@ -3633,36 +3621,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 "无法打开邮件箱：%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 "无法将消息附加到邮件箱文件：%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 "无法以此名称创建文件夹。"
@@ -3672,23 +3660,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"
@@ -3697,33 +3685,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"
@@ -3733,73 +3721,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:700
+#: ../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 "无法打开临时邮件箱：%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 "写入临时 mailbox 失败：%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 "写入临时 mailbox 失败：%s：%s"
@@ -3920,21 +3908,21 @@ 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/nntp/camel-nntp-folder.c:292
+#: ../camel/providers/nntp/camel-nntp-folder.c:297
 #: ../camel/providers/pop3/camel-pop3-folder.c:546
 #: ../camel/providers/pop3/camel-pop3-folder.c:945
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "无法获取消息 %s：%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:303
-#: ../camel/providers/nntp/camel-nntp-folder.c:622
+#: ../camel/providers/nntp/camel-nntp-folder.c:304
+#: ../camel/providers/nntp/camel-nntp-folder.c:624
 #: ../camel/providers/pop3/camel-pop3-folder.c:476
 #: ../camel/providers/pop3/camel-pop3-folder.c:536
 #: ../camel/providers/pop3/camel-pop3-folder.c:555
@@ -3948,16 +3936,16 @@ 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 文件夹复制信息"
@@ -4674,8 +4662,8 @@ msgstr "(已废弃) 自动代理配置 URL"
 
 #: ../libebackend/e-authentication-mediator.c:204
 #: ../libebackend/e-authentication-mediator.c:215
-#: ../libebackend/e-authentication-mediator.c:861
-#: ../libebackend/e-authentication-mediator.c:1198
+#: ../libebackend/e-authentication-mediator.c:860
+#: ../libebackend/e-authentication-mediator.c:1197
 msgid "Bus name vanished (client terminated?)"
 msgstr "Bus 名称消失(客户端终止了？)"
 
@@ -4685,8 +4673,8 @@ 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
+#: ../libebackend/e-authentication-mediator.c:854
+#: ../libebackend/e-authentication-mediator.c:1191
 msgid "Client cancelled the operation"
 msgstr "客户端已取消操作"
 
@@ -4694,11 +4682,11 @@ msgstr "客户端已取消操作"
 msgid "Client reports password was rejected"
 msgstr "客户端报告密码被拒绝"
 
-#: ../libebackend/e-authentication-session.c:568
+#: ../libebackend/e-authentication-session.c:539
 msgid "Add this password to your keyring"
 msgstr "将该密码添加到您的密钥环"
 
-#: ../libebackend/e-authentication-session.c:673
+#: ../libebackend/e-authentication-session.c:649
 msgid "Password was incorrect"
 msgstr "密码错误"
 
@@ -4707,12 +4695,12 @@ msgstr "密码错误"
 msgid "%s does not support authentication"
 msgstr "%s 不支持认证"
 
-#: ../libebackend/e-collection-backend.c:900
+#: ../libebackend/e-collection-backend.c:901
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr "%s 不支持创建远程资源"
 
-#: ../libebackend/e-collection-backend.c:959
+#: ../libebackend/e-collection-backend.c:960
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr "%s 不支持删除远程资源"
@@ -4727,45 +4715,45 @@ msgstr "散列键“%s”没有对应的后端工厂"
 msgid "Data source is missing a [%s] group"
 msgstr "数据源缺少一个 [%s] 组"
 
-#: ../libebackend/e-server-side-source.c:1007
-#: ../libedataserver/e-source.c:1252
+#: ../libebackend/e-server-side-source.c:1022
+#: ../libedataserver/e-source.c:1394
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
 msgstr "数据源“%s”不支持创建远程资源"
 
 # collection backend，如何翻译更好？
-#: ../libebackend/e-server-side-source.c:1021
+#: ../libebackend/e-server-side-source.c:1036
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to create the remote resource"
 msgstr "数据源“%s”没有合集后端(collection backend)来创建远程资源"
 
-#: ../libebackend/e-server-side-source.c:1049
-#: ../libedataserver/e-source.c:1365
+#: ../libebackend/e-server-side-source.c:1064
+#: ../libedataserver/e-source.c:1507
 #, 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:1078
 #, c-format
 msgid ""
 "Data source '%s' has no collection backend to delete the remote resource"
 msgstr "数据源“%s”没有合集后端(collection backend)来删除远程资源"
 
-#: ../libebackend/e-server-side-source.c:1094
-#: ../libedataserver/e-source.c:1461
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027
+#: ../libebackend/e-server-side-source.c:1109
+#: ../libedataserver/e-source.c:1603
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1026
 #, 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:1456
 #, c-format
 msgid "File must have a '.source' extension"
 msgstr "文件扩展名必须为“.source”"
 
 #: ../libebackend/e-source-registry-server.c:531
-#: ../libedataserver/e-source-registry.c:1878
+#: ../libedataserver/e-source-registry.c:1957
 msgid "The user declined to authenticate"
 msgstr "用户拒绝认证"
 
@@ -4962,26 +4950,26 @@ msgstr "请输入任务列表“%s”的密码。"
 msgid "Please enter the password for account \"%s\"."
 msgstr "请输入帐号“%s”的密码。"
 
-#: ../libedataserver/e-source.c:669
+#: ../libedataserver/e-source.c:768
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "源文件缺少一个 [%s] 组"
 
-#: ../libedataserver/e-source.c:1032
+#: ../libedataserver/e-source.c:1174
 #, c-format
 msgid "Data source '%s' is not removable"
 msgstr "数据源“%s”不是可删除的"
 
-#: ../libedataserver/e-source.c:1155
+#: ../libedataserver/e-source.c:1297
 #, c-format
 msgid "Data source '%s' is not writable"
 msgstr "数据源“%s”不是可写的"
 
-#: ../libedataserver/e-source.c:1768
+#: ../libedataserver/e-source.c:1910
 msgid "Unnamed"
 msgstr "未命名"
 
-#: ../libedataserver/e-source-mail-signature.c:486
+#: ../libedataserver/e-source-mail-signature.c:485
 #, c-format
 msgid "Signature script must be a local file"
 msgstr "签名脚本必须为本地文件"
@@ -4991,28 +4979,28 @@ msgstr "签名脚本必须为本地文件"
 msgid "Source '%s' does not support proxy lookups"
 msgstr "数据源“%s”不支持代理查找"
 
-#: ../libedataserver/e-source-webdav.c:1551
+#: ../libedataserver/e-source-webdav.c:1555
 #, c-format
 msgid ""
 "SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
 "you wish to accept it?"
 msgstr "地址簿“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任，您是否想要接受它？"
 
-#: ../libedataserver/e-source-webdav.c:1560
+#: ../libedataserver/e-source-webdav.c:1564
 #, c-format
 msgid ""
 "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
 "wish to accept it?"
 msgstr "日历“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任，您是否想要接受它？"
 
-#: ../libedataserver/e-source-webdav.c:1569
+#: ../libedataserver/e-source-webdav.c:1573
 #, c-format
 msgid ""
 "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
 "you wish to accept it?"
 msgstr "备忘录“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任，您是否想要接受它？"
 
-#: ../libedataserver/e-source-webdav.c:1578
+#: ../libedataserver/e-source-webdav.c:1582
 #, c-format
 msgid ""
 "SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
@@ -5203,25 +5191,30 @@ 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:1260
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an access token for '%s'"
 msgstr "通过 org.gnome.OnlineAccounts 服务无法找到“%s”对应的帐号并获取访问令牌"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1267
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1290
 #, 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:195
 #: ../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:268
+#: ../modules/yahoo-backend/module-yahoo-backend.c:226
+msgid "Tasks"
+msgstr "任务"
+
+#: ../modules/google-backend/module-google-backend.c:321
 #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
 #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
 msgid "Contacts"
@@ -5320,7 +5313,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:1007
 #, c-format
 msgid ""
 "Cannot find a corresponding account service in the accounts database from "
@@ -5363,10 +5356,6 @@ 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
@@ -5423,6 +5412,18 @@ msgstr "不从先前版本的 Evolution 迁移用户数据"
 msgid "_Dismiss"
 msgstr "解除(_D)"
 
+#~ msgid "No host information available"
+#~ msgstr "无可用的主机信息"
+
+#~ msgid "Cannot create folder '%s': folder exists"
+#~ msgstr "无法创建文件夹“%s”文件夹已存在"
+
+#~ msgid "Source stream unavailable"
+#~ msgstr "源流不可用"
+
+#~ msgid "Cannot create folder '%s': folder exists."
+#~ msgstr "无法创建文件夹“%s”：文件夹已存在。"
+
 #~ msgid "You may not import keys with this cipher"
 #~ msgstr "您不能用此密码导入密钥"
 
@@ -6217,9 +6218,6 @@ msgstr "解除(_D)"
 #~ msgid "Command:"
 #~ msgstr "命令："
 
-#~ msgid "Numbe_r of cached connections to use"
-#~ msgstr "使用的缓存连接的数目(_R)"
-
 #~ msgid "Closing tmp stream failed: "
 #~ msgstr "关闭临时流失败："