[evolution-data-server] Update Chinese simplified translation



commit 0e1221c2900f10289e81c8556a37d2a9a03f0d5b
Author: eternalhui <www eternalhui gmail com>
Date:   Sun Dec 1 22:19:28 2013 +0800

    Update Chinese simplified translation

 po/zh_CN.po | 3801 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 1848 insertions(+), 1953 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f2d1971..ec29929 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@
 # Tao Wang <dancefire gmail com>, 2010.
 # Dean Lee <xslidian gmail com>, 2010.
 # Lele Long <schemacs gmail com>, 2011.
-# Wylmer Wang <wantinghard gmail com>, 2011.
+# Wylmer Wang <wantinghard gmail com>, 2011, 2013.
 # YunQiang Su <wzssyqa gmail com>, 2011.
 # Aron Xu <happyaron xu gmail com>, 2009, 2012.
 #
@@ -21,131 +21,165 @@ 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: 2013-07-12 14:26+0000\n"
-"PO-Revision-Date: 2013-07-12 22:24+0800\n"
-"Last-Translator: tuhaihe <1132321739qq gmail com>\n"
+"POT-Creation-Date: 2013-12-01 06:45+0000\n"
+"PO-Revision-Date: 2013-08-20 10:54+0800\n"
+"Last-Translator: Luo Lei <luolei ubuntukylin 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"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:114
+#: ../addressbook/backends/file/e-book-backend-file.c:119
 #, c-format
 msgid "Failed to remove file '%s': %s"
 msgstr "删除文件“%s”失败:%s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:142
+#: ../addressbook/backends/file/e-book-backend-file.c:147
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "创建目录“%s”失败:%s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:393
+#: ../addressbook/backends/file/e-book-backend-file.c:398
 #, c-format
 msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "创建资源“%s”的硬链接失败:%s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:498
-#: ../addressbook/backends/file/e-book-backend-file.c:1134
+#: ../addressbook/backends/file/e-book-backend-file.c:503
+#: ../addressbook/backends/file/e-book-backend-file.c:1224
 msgid "No UID in the contact"
 msgstr "联系人没有 UID"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:772
+#: ../addressbook/backends/file/e-book-backend-file.c:830
 #, c-format
 msgid "Conflicting UIDs found in added contacts"
-msgstr ""
+msgstr "增加的联系人有 UID 冲突"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:880
+#: ../addressbook/backends/file/e-book-backend-file.c:969
 msgid "Loading..."
 msgstr "正在载入..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:882
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4402
+#: ../addressbook/backends/file/e-book-backend-file.c:971
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4422
 msgid "Searching..."
 msgstr "正在搜索..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1163
+#: ../addressbook/backends/file/e-book-backend-file.c:1252
 #, c-format
 msgid "Tried to modify contact '%s' with out of sync revision"
-msgstr ""
+msgstr "试图修改失去同步的联系人“%s”"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1299
-#: ../addressbook/backends/file/e-book-backend-file.c:1368
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2702
+#: ../addressbook/backends/file/e-book-backend-file.c:1430
+#: ../addressbook/backends/file/e-book-backend-file.c:1512
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3004
+#: ../addressbook/libedata-book/e-book-sqlite.c:6563
 #, c-format
 msgid "Contact '%s' not found"
-msgstr "未找到联系人 %s"
+msgstr "未找到联系人“%s”"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1410
-#: ../addressbook/backends/file/e-book-backend-file.c:1477
-#, fuzzy, c-format
-#| msgid "Protocol not supported"
+#: ../addressbook/backends/file/e-book-backend-file.c:1565
+#: ../addressbook/backends/file/e-book-backend-file.c:1640
+#, c-format
 msgid "Query '%s' not supported"
-msgstr "不支持的协议"
+msgstr "不支持查询“%s”"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1419
-#: ../addressbook/backends/file/e-book-backend-file.c:1486
+#: ../addressbook/backends/file/e-book-backend-file.c:1574
+#: ../addressbook/backends/file/e-book-backend-file.c:1649
 #, c-format
-#| msgid "Invalid query: "
 msgid "Invalid Query '%s'"
 msgstr "无效的查询:“%s”"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1670
-#, fuzzy, c-format
-#| msgid "Could not rename folder %s to %s: %s"
+#: ../addressbook/backends/file/e-book-backend-file.c:1889
+msgid "Requested to delete an unrelated cursor"
+msgstr "请求删除一个无关的 cursor"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1956
+#, c-format
 msgid "Failed to rename old database from '%s' to '%s': %s"
-msgstr "无法将文件夹 %s 改名为 %s:%s"
+msgstr "无法将旧数据库“ %s” 改名为 “%s”:%s"
 
 #: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1237
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4297
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:753
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1241
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4317
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:380
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:823
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
 #: ../addressbook/libebook-contacts/e-phone-number.c:58
-#: ../addressbook/libedata-book/e-book-backend-sexp.c:868
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:571
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:602
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:614
+#: ../addressbook/libebook/e-book.c:1078
+#: ../addressbook/libebook/e-book-client.c:1873
+#: ../addressbook/libebook/e-book-client.c:2044
+#: ../addressbook/libebook/e-book-client.c:2256
+#: ../addressbook/libebook/e-book-client.c:2386
+#: ../addressbook/libebook/e-book-client.c:2544
+#: ../addressbook/libebook/e-book-client.c:2677
+#: ../addressbook/libebook/e-book-client.c:2807
+#: ../addressbook/libebook/e-book-client.c:2964
+#: ../addressbook/libebook/e-book-client.c:3158
+#: ../addressbook/libebook/e-book-client.c:3375
+#: ../addressbook/libedata-book/e-book-backend-sexp.c:874
+#: ../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/contacts/e-cal-backend-contacts.c:270
 #: ../calendar/libecal/e-cal.c:2335 ../calendar/libecal/e-cal-client.c:268
-#: ../camel/camel-imapx-command.c:609 ../libedataserver/e-client.c:177
+#: ../calendar/libecal/e-cal-client.c:3228
+#: ../calendar/libecal/e-cal-client.c:3400
+#: ../calendar/libecal/e-cal-client.c:3663
+#: ../calendar/libecal/e-cal-client.c:3903
+#: ../calendar/libecal/e-cal-client.c:4090
+#: ../calendar/libecal/e-cal-client.c:4281
+#: ../calendar/libecal/e-cal-client.c:4450
+#: ../calendar/libecal/e-cal-client.c:4618
+#: ../calendar/libecal/e-cal-client.c:4820
+#: ../calendar/libecal/e-cal-client.c:4969
+#: ../calendar/libecal/e-cal-client.c:5162
+#: ../calendar/libecal/e-cal-client.c:5314
+#: ../calendar/libecal/e-cal-client.c:5530
+#: ../calendar/libecal/e-cal-client.c:5683
+#: ../calendar/libecal/e-cal-client.c:5908
+#: ../calendar/libecal/e-cal-client.c:6103
+#: ../calendar/libecal/e-cal-client.c:6465
+#: ../calendar/libecal/e-cal-client.c:6678 ../camel/camel-session.c:593
+#: ../camel/providers/imapx/camel-imapx-command.c:655
+#: ../libedataserver/e-client.c:177
 msgid "Unknown error"
 msgstr "未知的错误"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:750
+#: ../addressbook/backends/google/e-book-backend-google.c:838
 msgid "Querying for updated contacts…"
 msgstr "查询更新的联系人..."
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:887
+#: ../addressbook/backends/google/e-book-backend-google.c:990
 msgid "Querying for updated groups…"
 msgstr "查询更新的组..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1572
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5032
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1217
+#: ../addressbook/backends/google/e-book-backend-google.c:1707
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5053
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1269
 msgid "The backend does not support bulk additions"
 msgstr "后端不支持批量添加"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1721
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5169
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1316
+#: ../addressbook/backends/google/e-book-backend-google.c:1856
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5189
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1371
 msgid "The backend does not support bulk modifications"
 msgstr "后端不支持批量修改"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1921
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1404
+#: ../addressbook/backends/google/e-book-backend-google.c:2056
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1463
 msgid "The backend does not support bulk removals"
 msgstr "后端不支持批量删除"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2047
+#: ../addressbook/backends/google/e-book-backend-google.c:2182
 msgid "Loading…"
 msgstr "正在载入..."
 
 #. System Group: My Contacts
-#: ../addressbook/backends/google/e-book-google-utils.c:1606
+#: ../addressbook/backends/google/e-book-google-utils.c:1620
 #: ../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
@@ -154,17 +188,17 @@ msgid "Personal"
 msgstr "个人"
 
 #. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1608
+#: ../addressbook/backends/google/e-book-google-utils.c:1622
 msgid "Friends"
 msgstr "朋友"
 
 #. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1610
+#: ../addressbook/backends/google/e-book-google-utils.c:1624
 msgid "Family"
 msgstr "家人"
 
 #. System Group: Coworkers
-#: ../addressbook/backends/google/e-book-google-utils.c:1612
+#: ../addressbook/backends/google/e-book-google-utils.c:1626
 msgid "Coworkers"
 msgstr "同事"
 
@@ -174,112 +208,109 @@ msgstr "同事"
 msgid "Not connected"
 msgstr "未连接。"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:965
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:968
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr "无法使用 v3 或 v2 绑定"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1088
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1091
 msgid "Reconnecting to LDAP server..."
 msgstr "正在重新连接 LDAP 服务器..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1218
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1222
 msgid "Invalid DN syntax"
 msgstr "无效 DN 语法"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1234
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4296
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1238
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4316
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "LDAP 错误 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1832
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2155
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1850
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2173
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s:ldap_first_entry 返回 NULL"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2085
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2213
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2103
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2231
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s:返回了未处理的结果类型 %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2346
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2473
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2364
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2491
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr "%s:返回了未处理的搜索结果类型 %d"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4245
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4265
 msgid "Receiving LDAP search results..."
 msgstr "正在接收 LDAP 的搜索结果..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4424
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4444
 msgid "Error performing search"
 msgstr "执行搜索错误"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4552
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4572
 #, c-format
-#| msgid "Downloading contacts (%d)... "
 msgid "Downloading contacts (%d)..."
 msgstr "正在下载联系人(%d)..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5116
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5136
 msgid "Adding contact to LDAP server..."
 msgstr "正在将联系人添加到 LDAP 服务器..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5191
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5211
 msgid "Modifying contact from LDAP server..."
 msgstr "正在修改 LDAP 服务器上的联系人..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5257
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5277
 msgid "Removing contact from LDAP server..."
 msgstr "正在从 LDAP 服务器删除联系人..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5646
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5666
 #, c-format
 msgid "Failed to get the DN for user '%s'"
 msgstr "无法获取用户“%s”的 DN"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:732
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:802
 msgid "Loading Addressbook summary..."
 msgstr "正在加载地址簿概要..."
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:750
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:820
 #, 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:769
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:839
 msgid "No response body in webdav PROPFIND result"
 msgstr "在 webdav PROPFIND 结果中无应答主体"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:811
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
 #, c-format
 msgid "Loading Contacts (%d%%)"
 msgstr "正在加载联系人(%d%%)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1139
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1192
 msgid "Cannot transform SoupURI to string"
 msgstr "无法将 SoupURI 转为字符串"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1250
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1302
 #, c-format
-#| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgid "Create resource '%s' failed with HTTP status %d (%s)"
 msgstr "创建资源“%s”失败,HTTP 状态码为: %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1345
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1400
 msgid "Contact on server changed -> not modifying"
 msgstr "服务器上的联系人已更改 -> 将不做更改"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1408
 #, c-format
-#| msgid "Modify contact failed with HTTP status: %d (%s)"
 msgid "Modify contact failed with HTTP status %d (%s)"
 msgstr "修改联系人失败,HTTP 状态码:%d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1425
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1484
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "DELETE 失败,HTTP 状态码:%d"
@@ -289,12 +320,12 @@ msgid "No such book"
 msgstr "没有该地址簿"
 
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:26
-#: ../addressbook/libedata-book/e-data-book.c:346
+#: ../addressbook/libedata-book/e-data-book.c:363
 msgid "Contact not found"
 msgstr "找不到联系人"
 
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:28
-#: ../addressbook/libedata-book/e-data-book.c:347
+#: ../addressbook/libedata-book/e-data-book.c:364
 msgid "Contact ID already exists"
 msgstr "联系人 ID 已经存在"
 
@@ -303,12 +334,12 @@ msgid "No such source"
 msgstr "没有该源"
 
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:32
-#: ../addressbook/libedata-book/e-data-book.c:363
+#: ../addressbook/libedata-book/e-data-book.c:380
 msgid "No space"
 msgstr "没有空间"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook-contacts/e-contact.c:120
+#: ../addressbook/libebook-contacts/e-contact.c:123
 msgid "Unique ID"
 msgstr "唯一的 ID"
 
@@ -316,12 +347,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:125
+#: ../addressbook/libebook-contacts/e-contact.c:128
 msgid "File Under"
 msgstr "存档于"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook-contacts/e-contact.c:127
+#: ../addressbook/libebook-contacts/e-contact.c:130
 msgid "Book UID"
 msgstr "地址簿 UID"
 
@@ -329,434 +360,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:133
+#: ../addressbook/libebook-contacts/e-contact.c:136
 msgid "Full Name"
 msgstr "全名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:134
+#: ../addressbook/libebook-contacts/e-contact.c:137
 msgid "Given Name"
 msgstr "名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:135
+#: ../addressbook/libebook-contacts/e-contact.c:138
 msgid "Family Name"
 msgstr "姓"
 
-#: ../addressbook/libebook-contacts/e-contact.c:136
+#: ../addressbook/libebook-contacts/e-contact.c:139
 msgid "Nickname"
 msgstr "昵称"
 
 #. Email fields
-#: ../addressbook/libebook-contacts/e-contact.c:139
+#: ../addressbook/libebook-contacts/e-contact.c:142
 msgid "Email 1"
 msgstr "电子邮件 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:140
+#: ../addressbook/libebook-contacts/e-contact.c:143
 msgid "Email 2"
 msgstr "电子邮件 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:141
+#: ../addressbook/libebook-contacts/e-contact.c:144
 msgid "Email 3"
 msgstr "电子邮件 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:142
+#: ../addressbook/libebook-contacts/e-contact.c:145
 msgid "Email 4"
 msgstr "电子邮件 4"
 
-#: ../addressbook/libebook-contacts/e-contact.c:144
+#: ../addressbook/libebook-contacts/e-contact.c:147
 msgid "Mailer"
 msgstr "邮件程序"
 
 #. Address Labels
-#: ../addressbook/libebook-contacts/e-contact.c:147
+#: ../addressbook/libebook-contacts/e-contact.c:150
 msgid "Home Address Label"
 msgstr "家庭地址标签"
 
-#: ../addressbook/libebook-contacts/e-contact.c:148
+#: ../addressbook/libebook-contacts/e-contact.c:151
 msgid "Work Address Label"
 msgstr "工作地址标签"
 
-#: ../addressbook/libebook-contacts/e-contact.c:149
+#: ../addressbook/libebook-contacts/e-contact.c:152
 msgid "Other Address Label"
 msgstr "其它地址标签"
 
 #. Phone fields
-#: ../addressbook/libebook-contacts/e-contact.c:152
+#: ../addressbook/libebook-contacts/e-contact.c:155
 msgid "Assistant Phone"
 msgstr "助手电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:153
+#: ../addressbook/libebook-contacts/e-contact.c:156
 msgid "Business Phone"
 msgstr "商务电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:154
+#: ../addressbook/libebook-contacts/e-contact.c:157
 msgid "Business Phone 2"
 msgstr "商务电话 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:155
+#: ../addressbook/libebook-contacts/e-contact.c:158
 msgid "Business Fax"
 msgstr "商务传真"
 
-#: ../addressbook/libebook-contacts/e-contact.c:156
+#: ../addressbook/libebook-contacts/e-contact.c:159
 msgid "Callback Phone"
 msgstr "回拨电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:157
+#: ../addressbook/libebook-contacts/e-contact.c:160
 msgid "Car Phone"
 msgstr "车载电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:158
+#: ../addressbook/libebook-contacts/e-contact.c:161
 msgid "Company Phone"
 msgstr "公司电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:159
+#: ../addressbook/libebook-contacts/e-contact.c:162
 msgid "Home Phone"
 msgstr "家庭电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:160
+#: ../addressbook/libebook-contacts/e-contact.c:163
 msgid "Home Phone 2"
 msgstr "家庭电话 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:161
+#: ../addressbook/libebook-contacts/e-contact.c:164
 msgid "Home Fax"
 msgstr "家庭传真"
 
-#: ../addressbook/libebook-contacts/e-contact.c:162
+#: ../addressbook/libebook-contacts/e-contact.c:165
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook-contacts/e-contact.c:163
+#: ../addressbook/libebook-contacts/e-contact.c:166
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:164
+#: ../addressbook/libebook-contacts/e-contact.c:167
 msgid "Other Phone"
 msgstr "其它电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:165
+#: ../addressbook/libebook-contacts/e-contact.c:168
 msgid "Other Fax"
 msgstr "其它传真"
 
-#: ../addressbook/libebook-contacts/e-contact.c:166
+#: ../addressbook/libebook-contacts/e-contact.c:169
 msgid "Pager"
 msgstr "寻呼机"
 
-#: ../addressbook/libebook-contacts/e-contact.c:167
+#: ../addressbook/libebook-contacts/e-contact.c:170
 msgid "Primary Phone"
 msgstr "主要电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:168
+#: ../addressbook/libebook-contacts/e-contact.c:171
 msgid "Radio"
 msgstr "收音机"
 
-#: ../addressbook/libebook-contacts/e-contact.c:169
+#: ../addressbook/libebook-contacts/e-contact.c:172
 msgid "Telex"
 msgstr "电传"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook-contacts/e-contact.c:171
+#: ../addressbook/libebook-contacts/e-contact.c:174
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook-contacts/e-contact.c:174
+#: ../addressbook/libebook-contacts/e-contact.c:177
 msgid "Organization"
 msgstr "组织"
 
-#: ../addressbook/libebook-contacts/e-contact.c:175
+#: ../addressbook/libebook-contacts/e-contact.c:178
 msgid "Organizational Unit"
 msgstr "组织单元"
 
-#: ../addressbook/libebook-contacts/e-contact.c:176
+#: ../addressbook/libebook-contacts/e-contact.c:179
 msgid "Office"
 msgstr "办公室"
 
-#: ../addressbook/libebook-contacts/e-contact.c:177
+#: ../addressbook/libebook-contacts/e-contact.c:180
 msgid "Title"
 msgstr "头衔"
 
-#: ../addressbook/libebook-contacts/e-contact.c:178
+#: ../addressbook/libebook-contacts/e-contact.c:181
 msgid "Role"
 msgstr "角色"
 
-#: ../addressbook/libebook-contacts/e-contact.c:179
+#: ../addressbook/libebook-contacts/e-contact.c:182
 msgid "Manager"
 msgstr "经理"
 
-#: ../addressbook/libebook-contacts/e-contact.c:180
+#: ../addressbook/libebook-contacts/e-contact.c:183
 msgid "Assistant"
 msgstr "助手"
 
 #. Web fields
-#: ../addressbook/libebook-contacts/e-contact.c:183
+#: ../addressbook/libebook-contacts/e-contact.c:186
 msgid "Homepage URL"
 msgstr "个人主页 URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:184
+#: ../addressbook/libebook-contacts/e-contact.c:187
 msgid "Weblog URL"
 msgstr "网络日记 URL"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:187
+#: ../addressbook/libebook-contacts/e-contact.c:190
 msgid "Categories"
 msgstr "类别"
 
 #. Collaboration fields
-#: ../addressbook/libebook-contacts/e-contact.c:190
+#: ../addressbook/libebook-contacts/e-contact.c:193
 msgid "Calendar URI"
 msgstr "日历 URI"
 
-#: ../addressbook/libebook-contacts/e-contact.c:191
+#: ../addressbook/libebook-contacts/e-contact.c:194
 msgid "Free/Busy URL"
 msgstr "空闲/繁忙 URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:192
+#: ../addressbook/libebook-contacts/e-contact.c:195
 msgid "ICS Calendar"
 msgstr "ICS 日历"
 
-#: ../addressbook/libebook-contacts/e-contact.c:193
+#: ../addressbook/libebook-contacts/e-contact.c:196
 msgid "Video Conferencing URL"
 msgstr "视频会议 URL"
 
 #. Misc fields
-#: ../addressbook/libebook-contacts/e-contact.c:196
+#: ../addressbook/libebook-contacts/e-contact.c:199
 msgid "Spouse's Name"
 msgstr "配偶姓名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:197
+#: ../addressbook/libebook-contacts/e-contact.c:200
 msgid "Note"
 msgstr "注释"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:200
+#: ../addressbook/libebook-contacts/e-contact.c:203
 msgid "AIM Home Screen Name 1"
 msgstr "AIM 家庭屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:201
+#: ../addressbook/libebook-contacts/e-contact.c:204
 msgid "AIM Home Screen Name 2"
 msgstr "AIM 家庭屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:202
+#: ../addressbook/libebook-contacts/e-contact.c:205
 msgid "AIM Home Screen Name 3"
 msgstr "AIM 家庭屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:203
+#: ../addressbook/libebook-contacts/e-contact.c:206
 msgid "AIM Work Screen Name 1"
 msgstr "AIM 工作屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:204
+#: ../addressbook/libebook-contacts/e-contact.c:207
 msgid "AIM Work Screen Name 2"
 msgstr "AIM 工作屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:205
+#: ../addressbook/libebook-contacts/e-contact.c:208
 msgid "AIM Work Screen Name 3"
 msgstr "AIM 工作屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:206
+#: ../addressbook/libebook-contacts/e-contact.c:209
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise 家庭屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:207
+#: ../addressbook/libebook-contacts/e-contact.c:210
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise 家庭屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:208
+#: ../addressbook/libebook-contacts/e-contact.c:211
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise 家庭屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:209
+#: ../addressbook/libebook-contacts/e-contact.c:212
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise 工作屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:210
+#: ../addressbook/libebook-contacts/e-contact.c:213
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise 工作屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:211
+#: ../addressbook/libebook-contacts/e-contact.c:214
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise 工作屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:212
+#: ../addressbook/libebook-contacts/e-contact.c:215
 msgid "Jabber Home ID 1"
 msgstr "Jabber 家庭 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:213
+#: ../addressbook/libebook-contacts/e-contact.c:216
 msgid "Jabber Home ID 2"
 msgstr "Jabber 家庭 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:214
+#: ../addressbook/libebook-contacts/e-contact.c:217
 msgid "Jabber Home ID 3"
 msgstr "Jabber 家庭 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:215
+#: ../addressbook/libebook-contacts/e-contact.c:218
 msgid "Jabber Work ID 1"
 msgstr "Jabber 工作 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:216
+#: ../addressbook/libebook-contacts/e-contact.c:219
 msgid "Jabber Work ID 2"
 msgstr "Jabber 工作 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:217
+#: ../addressbook/libebook-contacts/e-contact.c:220
 msgid "Jabber Work ID 3"
 msgstr "Jabber 工作 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:218
+#: ../addressbook/libebook-contacts/e-contact.c:221
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! 家庭屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:219
+#: ../addressbook/libebook-contacts/e-contact.c:222
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! 家庭屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:220
+#: ../addressbook/libebook-contacts/e-contact.c:223
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! 家庭屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:221
+#: ../addressbook/libebook-contacts/e-contact.c:224
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! 工作屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:222
+#: ../addressbook/libebook-contacts/e-contact.c:225
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! 工作屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:223
+#: ../addressbook/libebook-contacts/e-contact.c:226
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! 工作屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:224
+#: ../addressbook/libebook-contacts/e-contact.c:227
 msgid "MSN Home Screen Name 1"
 msgstr "MSN 家庭屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:225
+#: ../addressbook/libebook-contacts/e-contact.c:228
 msgid "MSN Home Screen Name 2"
 msgstr "MSN 家庭屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:226
+#: ../addressbook/libebook-contacts/e-contact.c:229
 msgid "MSN Home Screen Name 3"
 msgstr "MSN 家庭屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:227
+#: ../addressbook/libebook-contacts/e-contact.c:230
 msgid "MSN Work Screen Name 1"
 msgstr "MSN 工作屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:228
+#: ../addressbook/libebook-contacts/e-contact.c:231
 msgid "MSN Work Screen Name 2"
 msgstr "MSN 工作屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:229
+#: ../addressbook/libebook-contacts/e-contact.c:232
 msgid "MSN Work Screen Name 3"
 msgstr "MSN 工作屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:230
+#: ../addressbook/libebook-contacts/e-contact.c:233
 msgid "ICQ Home ID 1"
 msgstr "ICQ 家庭 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:231
+#: ../addressbook/libebook-contacts/e-contact.c:234
 msgid "ICQ Home ID 2"
 msgstr "ICQ 家庭 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:232
+#: ../addressbook/libebook-contacts/e-contact.c:235
 msgid "ICQ Home ID 3"
 msgstr "ICQ 家庭 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:233
+#: ../addressbook/libebook-contacts/e-contact.c:236
 msgid "ICQ Work ID 1"
 msgstr "ICQ 工作 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:234
+#: ../addressbook/libebook-contacts/e-contact.c:237
 msgid "ICQ Work ID 2"
 msgstr "ICQ 工作 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:235
+#: ../addressbook/libebook-contacts/e-contact.c:238
 msgid "ICQ Work ID 3"
 msgstr "ICQ 工作 ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook-contacts/e-contact.c:238
+#: ../addressbook/libebook-contacts/e-contact.c:241
 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:242
+#: ../addressbook/libebook-contacts/e-contact.c:245
 msgid "Name or Org"
 msgstr "名称或组织"
 
 #. Address fields
-#: ../addressbook/libebook-contacts/e-contact.c:245
+#: ../addressbook/libebook-contacts/e-contact.c:248
 msgid "Address List"
 msgstr "地址列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:246
+#: ../addressbook/libebook-contacts/e-contact.c:249
 msgid "Home Address"
 msgstr "家庭地址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:247
+#: ../addressbook/libebook-contacts/e-contact.c:250
 msgid "Work Address"
 msgstr "办公地址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:248
+#: ../addressbook/libebook-contacts/e-contact.c:251
 msgid "Other Address"
 msgstr "其它地址"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:251
+#: ../addressbook/libebook-contacts/e-contact.c:254
 msgid "Category List"
 msgstr "类别列表"
 
 #. Photo/Logo
-#: ../addressbook/libebook-contacts/e-contact.c:254
+#: ../addressbook/libebook-contacts/e-contact.c:257
 msgid "Photo"
 msgstr "照片"
 
-#: ../addressbook/libebook-contacts/e-contact.c:255
+#: ../addressbook/libebook-contacts/e-contact.c:258
 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:259
+#: ../addressbook/libebook-contacts/e-contact.c:262
 msgid "Name"
 msgstr "姓名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:260
+#: ../addressbook/libebook-contacts/e-contact.c:263
 msgid "Email List"
 msgstr "邮件列表"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:263
+#: ../addressbook/libebook-contacts/e-contact.c:266
 msgid "AIM Screen Name List"
 msgstr "AIM 屏幕名列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:264
+#: ../addressbook/libebook-contacts/e-contact.c:267
 msgid "GroupWise ID List"
 msgstr "GroupWise ID 列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:265
+#: ../addressbook/libebook-contacts/e-contact.c:268
 msgid "Jabber ID List"
 msgstr "Jabber ID 列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:266
+#: ../addressbook/libebook-contacts/e-contact.c:269
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! 屏幕名列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:267
+#: ../addressbook/libebook-contacts/e-contact.c:270
 msgid "MSN Screen Name List"
 msgstr "MSN 屏幕名列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:268
+#: ../addressbook/libebook-contacts/e-contact.c:271
 msgid "ICQ ID List"
 msgstr "ICQ ID 列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:270
+#: ../addressbook/libebook-contacts/e-contact.c:273
 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:275
+#: ../addressbook/libebook-contacts/e-contact.c:278
 msgid "List"
 msgstr "列表"
 
@@ -764,351 +795,418 @@ 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:280
+#: ../addressbook/libebook-contacts/e-contact.c:283
 msgid "List Shows Addresses"
 msgstr "列表显示地址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:282
+#: ../addressbook/libebook-contacts/e-contact.c:285
 msgid "Birth Date"
 msgstr "生日"
 
-#: ../addressbook/libebook-contacts/e-contact.c:283
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:887
+#: ../addressbook/libebook-contacts/e-contact.c:286
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:893
 msgid "Anniversary"
 msgstr "周年纪念日"
 
 #. Security fields
-#: ../addressbook/libebook-contacts/e-contact.c:286
+#: ../addressbook/libebook-contacts/e-contact.c:289
 msgid "X.509 Certificate"
 msgstr "X.509 证书"
 
-#: ../addressbook/libebook-contacts/e-contact.c:288
+#: ../addressbook/libebook-contacts/e-contact.c:291
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu 家庭 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:289
+#: ../addressbook/libebook-contacts/e-contact.c:292
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu 家庭 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:290
+#: ../addressbook/libebook-contacts/e-contact.c:293
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu 家庭 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:291
+#: ../addressbook/libebook-contacts/e-contact.c:294
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu 工作 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:292
+#: ../addressbook/libebook-contacts/e-contact.c:295
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu 工作 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:293
+#: ../addressbook/libebook-contacts/e-contact.c:296
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu 工作 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:294
+#: ../addressbook/libebook-contacts/e-contact.c:297
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID 列表"
 
 #. Geo information
-#: ../addressbook/libebook-contacts/e-contact.c:297
+#: ../addressbook/libebook-contacts/e-contact.c:300
 msgid "Geographic Information"
 msgstr "地理信息"
 
-#: ../addressbook/libebook-contacts/e-contact.c:299
+#: ../addressbook/libebook-contacts/e-contact.c:302
 msgid "Telephone"
 msgstr "电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:301
+#: ../addressbook/libebook-contacts/e-contact.c:304
 msgid "Skype Home Name 1"
 msgstr "Skype 家庭屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:302
+#: ../addressbook/libebook-contacts/e-contact.c:305
 msgid "Skype Home Name 2"
 msgstr "Skype 家庭屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:303
+#: ../addressbook/libebook-contacts/e-contact.c:306
 msgid "Skype Home Name 3"
 msgstr "Skype 家庭屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:304
+#: ../addressbook/libebook-contacts/e-contact.c:307
 msgid "Skype Work Name 1"
 msgstr "Skype 工作屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:305
+#: ../addressbook/libebook-contacts/e-contact.c:308
 msgid "Skype Work Name 2"
 msgstr "Skype 工作屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:306
+#: ../addressbook/libebook-contacts/e-contact.c:309
 msgid "Skype Work Name 3"
 msgstr "Skype 工作屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:307
+#: ../addressbook/libebook-contacts/e-contact.c:310
 msgid "Skype Name List"
 msgstr "Skype 屏幕名列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:309
+#: ../addressbook/libebook-contacts/e-contact.c:312
 msgid "SIP address"
 msgstr "SIP 地址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:311
+#: ../addressbook/libebook-contacts/e-contact.c:314
 msgid "Google Talk Home Name 1"
 msgstr "Google Talk 家庭屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:312
+#: ../addressbook/libebook-contacts/e-contact.c:315
 msgid "Google Talk Home Name 2"
 msgstr "Google Talk 家庭屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:313
+#: ../addressbook/libebook-contacts/e-contact.c:316
 msgid "Google Talk Home Name 3"
 msgstr "Google Talk 家庭屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:314
+#: ../addressbook/libebook-contacts/e-contact.c:317
 msgid "Google Talk Work Name 1"
 msgstr "Google Talk 工作屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:315
+#: ../addressbook/libebook-contacts/e-contact.c:318
 msgid "Google Talk Work Name 2"
 msgstr "Google Talk 工作屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:316
+#: ../addressbook/libebook-contacts/e-contact.c:319
 msgid "Google Talk Work Name 3"
 msgstr "Google Talk 工作屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:317
+#: ../addressbook/libebook-contacts/e-contact.c:320
 msgid "Google Talk Name List"
 msgstr "Google Talk 姓名列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:319
+#: ../addressbook/libebook-contacts/e-contact.c:322
 msgid "Twitter Name List"
 msgstr "Twitter 姓名列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:1624
+#: ../addressbook/libebook-contacts/e-contact.c:1627
 #: ../addressbook/libebook/e-destination.c:883
 msgid "Unnamed List"
 msgstr "未命名的列表"
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:43
 msgid "The library was built without phone number support."
-msgstr ""
+msgstr "建立库时未提供电话号码支持"
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:45
 msgid "The phone number parser reported an yet unkown error code."
-msgstr ""
+msgstr "电话号码分析程序报告了一个未知的错误代码。"
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:47
 msgid "Not a phone number"
-msgstr ""
+msgstr "不是电话号码"
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:49
-#| msgid "Invalid range"
 msgid "Invalid country calling code"
-msgstr "无效的国家拨号代码"
+msgstr "无效的国家代码"
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:51
 msgid ""
 "Remaining text after the country calling code is too short for a phone number"
-msgstr ""
+msgstr "国家代码之后的电话号码太短"
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:53
 msgid "Text is too short for a phone number"
-msgstr ""
+msgstr "电话号码太短"
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:55
 msgid "Text is too long for a phone number"
-msgstr ""
+msgstr "电话号码太长"
 
-#: ../addressbook/libebook/e-book-client.c:748
+#: ../addressbook/libebook/e-book-client.c:800
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "未知的地址簿属性“%s”"
 
-#: ../addressbook/libebook/e-book-client.c:763
+#: ../addressbook/libebook/e-book-client.c:815
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "无法更改地址簿属性“%s”的值"
 
-#: ../addressbook/libebook/e-book-client.c:1098
-#: ../addressbook/libebook/e-book-client.c:1273
+#: ../addressbook/libebook/e-book-client.c:1199
+#: ../addressbook/libebook/e-book-client.c:1374
+#: ../addressbook/libebook/e-book-client.c:1641
 #: ../calendar/libecal/e-cal-client.c:1522
 #: ../calendar/libecal/e-cal-client.c:1704
 #, c-format
-#| msgid "Could not connect to %s: "
 msgid "Unable to connect to '%s': "
 msgstr "无法连接到“%s”:"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:793
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:894
+#: ../addressbook/libedata-book/e-book-sqlite.c:2097
 #, c-format
 msgid "Error introspecting unknown summary field '%s'"
-msgstr ""
+msgstr "检查未知概要信息字段“%s”出错"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1291
-#| msgid ""
-#| "Error executing search expression: %s:\n"
-#| "%s"
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1504
+#: ../addressbook/libedata-book/e-book-sqlite.c:1280
 msgid "Error parsing regular expression"
 msgstr "执行搜索表达式错误"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1335
-#: ../camel/camel-db.c:544
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1549
+#: ../addressbook/libedata-book/e-book-sqlite.c:1756 ../camel/camel-db.c:547
 #, c-format
 msgid "Insufficient memory"
 msgstr "内存不足"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1468
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1686
 #, c-format
 msgid "Invalid contact field '%d' specified in summary"
-msgstr ""
+msgstr "概要中的联系人字段“%d”无效"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1502
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1720
+#: ../addressbook/libedata-book/e-book-sqlite.c:525
 #, c-format
 msgid ""
 "Contact field '%s' of type '%s' specified in summary, but only boolean, "
 "string and string list field types are supported"
 msgstr ""
+"概要中定义了“%2$s”类型的联系人字段“%1$s”,但是程序只持布尔值、字符串和字符串"
+"列表类型。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2690
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3768
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2992
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4079
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. vcards cannot be returned."
-msgstr ""
+msgstr "缓存中没有保存完整的 search_contacts,无法返回电子名片。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3894
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3975
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4205
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4286
+#: ../addressbook/libedata-book/e-book-sqlite.c:5219
 #, c-format
 msgid "Query contained unsupported elements"
-msgstr ""
+msgstr "查询中包含不支持的元素"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3898
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4209
 #, c-format
-#| msgid "Invalid query"
 msgid "Invalid Query"
 msgstr "无效的查询"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3922
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4233
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
 "supported."
-msgstr ""
+msgstr "缓存中没有保存完整的 search_contacts,所以只支持概要查询。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3979
-#: ../addressbook/libedata-book/e-data-book.c:358
-#: ../addressbook/libedata-book/e-data-book.c:992
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4290
+#: ../addressbook/libedata-book/e-data-book.c:375
+#: ../addressbook/libedata-book/e-data-book.c:1010
 #: ../calendar/libedata-cal/e-data-cal.c:412
-#: ../calendar/libedata-cal/e-data-cal.c:1306 ../libedataserver/e-client.c:164
+#: ../calendar/libedata-cal/e-data-cal.c:1299 ../libedataserver/e-client.c:164
 #, c-format
 msgid "Invalid query"
 msgstr "无效的查询"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4022
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4333
 #, c-format
 msgid ""
 "Full vcards are not stored in cache. Hence only summary query is supported."
-msgstr ""
+msgstr "缓存中没有保存完整的电子名片,所以只支持概要查询。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4725
-#, fuzzy, c-format
-#| msgid "Failed to remove file '%s': %s"
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5036
+#, c-format
 msgid "Unable to remove the db file: errno %d"
-msgstr "删除文件“%s”失败:%s"
+msgstr "无法删除数据库文件:错误代码 %d"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5796
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6182
+#, c-format
+msgid "Only summary queries are supported by EbSdbCursor"
+msgstr "EbSdbCursor 只支持概要查询"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5802
+#, 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:5815
+#, c-format
+msgid "Cannot sort by a field that is not in the summary"
+msgstr "无法按不在概要中的字段排序"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5821
+#, c-format
+msgid "Cannot sort by a field which may have multiple values"
+msgstr "无法按可能有多个值的字段排序"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5949
+#: ../addressbook/libedata-book/e-book-sqlite.c:7229
+#, c-format
+msgid ""
+"Tried to step a cursor in reverse, but cursor is already at the beginning of "
+"the contact list"
+msgstr "尝试对 cursor 反向步进,但 cursor 已位于联系人列表的开头"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5956
+#: ../addressbook/libedata-book/e-book-sqlite.c:7237
+#, c-format
+msgid ""
+"Tried to step a cursor forwards, but cursor is already at the end of the "
+"contact list"
+msgstr "尝试向前步进 cursor,但 cursor 已位于联系人列表的末尾"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:493
+#, c-format
+msgid "Unsupported contact field '%d' specified in summary"
+msgstr "不支持概要中指定的联系人字段“%d”"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:1825
+msgid ""
+"Cannot upgrade contacts database from a legacy database with more than one "
+"addressbook. Delete one of the entries in the 'folders' table first."
+msgstr ""
+"无法从包含多于一个地址簿的旧数据库升级联系人数据库。请先删除“folders”表中的一"
+"条记录。"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:5213
+#, c-format
+msgid "Invalid query: %s"
+msgstr "无效的查询:%s"
 
-#: ../addressbook/libedata-book/e-data-book.c:342
+#: ../addressbook/libedata-book/e-book-sqlite.c:5385
+msgid "Invalid query for EbSqlCursor"
+msgstr "无效的 EbSqlCursor 查询"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:7056
+msgid "At least one sort field must be specified to use an EbSqlCursor"
+msgstr "要使用 EbSqlCursor 至少要指定一个排序字段"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:7072
+msgid "Cannot sort by a field that is not a string type"
+msgstr "无法按非字符串类型的字段排序"
+
+#: ../addressbook/libedata-book/e-data-book.c:359
 #: ../calendar/libedata-cal/e-data-cal.c:393
 msgid "Success"
 msgstr "成功"
 
-#: ../addressbook/libedata-book/e-data-book.c:343
+#: ../addressbook/libedata-book/e-data-book.c:360
 #: ../calendar/libecal/e-cal.c:2303 ../calendar/libedata-cal/e-data-cal.c:394
 #: ../libedataserver/e-client.c:131
 msgid "Backend is busy"
 msgstr "后端繁忙"
 
-#: ../addressbook/libedata-book/e-data-book.c:344
+#: ../addressbook/libedata-book/e-data-book.c:361
 #: ../calendar/libedata-cal/e-data-cal.c:395 ../libedataserver/e-client.c:141
 msgid "Repository offline"
 msgstr "仓库离线"
 
-#: ../addressbook/libedata-book/e-data-book.c:345
+#: ../addressbook/libedata-book/e-data-book.c:362
 #: ../calendar/libecal/e-cal.c:2317 ../calendar/libedata-cal/e-data-cal.c:396
 #: ../libedataserver/e-client.c:148
 msgid "Permission denied"
 msgstr "没有权限"
 
-#: ../addressbook/libedata-book/e-data-book.c:348
+#: ../addressbook/libedata-book/e-data-book.c:365
 #: ../calendar/libedata-cal/e-data-cal.c:401
 msgid "Authentication Failed"
 msgstr "认证失败"
 
-#: ../addressbook/libedata-book/e-data-book.c:349
+#: ../addressbook/libedata-book/e-data-book.c:366
 #: ../calendar/libedata-cal/e-data-cal.c:402
 msgid "Authentication Required"
 msgstr "需要认证"
 
-#: ../addressbook/libedata-book/e-data-book.c:350
+#: ../addressbook/libedata-book/e-data-book.c:367
 #: ../calendar/libedata-cal/e-data-cal.c:403
 msgid "Unsupported field"
 msgstr "不支持的字段"
 
-#: ../addressbook/libedata-book/e-data-book.c:351
+#: ../addressbook/libedata-book/e-data-book.c:368
 #: ../calendar/libedata-cal/e-data-cal.c:405 ../libedataserver/e-client.c:156
 msgid "Unsupported authentication method"
 msgstr "不支持的身份认证方式"
 
-#: ../addressbook/libedata-book/e-data-book.c:352
+#: ../addressbook/libedata-book/e-data-book.c:369
 #: ../calendar/libedata-cal/e-data-cal.c:406 ../libedataserver/e-client.c:158
 msgid "TLS not available"
 msgstr "TLS 不可用"
 
-#: ../addressbook/libedata-book/e-data-book.c:353
+#: ../addressbook/libedata-book/e-data-book.c:370
 msgid "Address book does not exist"
 msgstr "地址簿不存在"
 
-#: ../addressbook/libedata-book/e-data-book.c:354
+#: ../addressbook/libedata-book/e-data-book.c:371
 msgid "Book removed"
 msgstr "地址簿已删除"
 
-#: ../addressbook/libedata-book/e-data-book.c:355
+#: ../addressbook/libedata-book/e-data-book.c:372
 #: ../calendar/libedata-cal/e-data-cal.c:409
 msgid "Not available in offline mode"
-msgstr "在脱机模式中无法使用"
+msgstr "在离线模式中无法使用"
 
-#: ../addressbook/libedata-book/e-data-book.c:356
+#: ../addressbook/libedata-book/e-data-book.c:373
 #: ../calendar/libedata-cal/e-data-cal.c:410 ../libedataserver/e-client.c:160
 msgid "Search size limit exceeded"
 msgstr "超过搜索大小限制"
 
-#: ../addressbook/libedata-book/e-data-book.c:357
+#: ../addressbook/libedata-book/e-data-book.c:374
 #: ../calendar/libedata-cal/e-data-cal.c:411 ../libedataserver/e-client.c:162
 msgid "Search time limit exceeded"
 msgstr "超过搜索时间限制"
 
-#: ../addressbook/libedata-book/e-data-book.c:359
+#: ../addressbook/libedata-book/e-data-book.c:376
 #: ../calendar/libedata-cal/e-data-cal.c:413 ../libedataserver/e-client.c:166
 msgid "Query refused"
 msgstr "查询被拒绝"
 
-#: ../addressbook/libedata-book/e-data-book.c:360
+#: ../addressbook/libedata-book/e-data-book.c:377
 #: ../calendar/libedata-cal/e-data-cal.c:414 ../libedataserver/e-client.c:152
 msgid "Could not cancel"
 msgstr "无法取消"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,                   N_("Other error") },
 #. { OtherError,                       N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:362
+#: ../addressbook/libedata-book/e-data-book.c:379
 #: ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Invalid server version"
 msgstr "无效的服务器版本"
 
-#: ../addressbook/libedata-book/e-data-book.c:364
+#: ../addressbook/libedata-book/e-data-book.c:381
 #: ../calendar/libecal/e-cal.c:2301 ../calendar/libedata-cal/e-data-cal.c:417
 #: ../libedataserver/e-client.c:129
 msgid "Invalid argument"
 msgstr "无效参数"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:366
+#: ../addressbook/libedata-book/e-data-book.c:383
 #: ../calendar/libecal/e-cal.c:1060 ../calendar/libecal/e-cal.c:1428
 #: ../calendar/libecal/e-cal.c:1908 ../calendar/libecal/e-cal.c:2340
 #: ../calendar/libedata-cal/e-data-cal.c:419 ../libedataserver/e-client.c:154
@@ -1116,111 +1214,133 @@ msgstr "无效参数"
 msgid "Not supported"
 msgstr "不支持"
 
-#: ../addressbook/libedata-book/e-data-book.c:367
+#: ../addressbook/libedata-book/e-data-book.c:384
 #: ../calendar/libedata-cal/e-data-cal.c:420 ../libedataserver/e-client.c:172
 msgid "Backend is not opened yet"
 msgstr "后端尚未打开"
 
-#: ../addressbook/libedata-book/e-data-book.c:368
+#: ../addressbook/libedata-book/e-data-book.c:385
 #: ../libedataserver/e-client.c:174
-#, fuzzy
-#| msgid "Object not found"
 msgid "Object is out of sync"
-msgstr "找不到对象"
+msgstr "目标尚未同步"
 
-#: ../addressbook/libedata-book/e-data-book.c:376
+#: ../addressbook/libedata-book/e-data-book.c:393
 #: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:170
 msgid "Other error"
 msgstr "其他错误"
 
-#: ../addressbook/libedata-book/e-data-book.c:1017
-#: ../calendar/libedata-cal/e-data-cal.c:1331
+#: ../addressbook/libedata-book/e-data-book.c:1035
+#: ../calendar/libedata-cal/e-data-cal.c:1324
 msgid "Invalid query: "
 msgstr "无效的查询:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1069
+#: ../addressbook/libedata-book/e-data-book.c:1254
 msgid "Cannot open book: "
 msgstr "无法打开地址簿:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1106
+#: ../addressbook/libedata-book/e-data-book.c:1291
 msgid "Cannot refresh address book: "
 msgstr "无法刷新地址薄:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1137
+#: ../addressbook/libedata-book/e-data-book.c:1322
 msgid "Cannot get contact: "
 msgstr "无法获取联系人:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1175
+#: ../addressbook/libedata-book/e-data-book.c:1360
 msgid "Cannot get contact list: "
 msgstr "无法获取联系人列表:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1227
+#: ../addressbook/libedata-book/e-data-book.c:1412
 msgid "Cannot get contact list uids: "
 msgstr "无法获取联系人列表 UID:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1274
+#: ../addressbook/libedata-book/e-data-book.c:1459
 msgid "Cannot add contact: "
 msgstr "无法添加联系人:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1323
+#: ../addressbook/libedata-book/e-data-book.c:1508
 msgid "Cannot modify contacts: "
 msgstr "无法修改联系人:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1365
+#: ../addressbook/libedata-book/e-data-book.c:1550
 msgid "Cannot remove contacts: "
 msgstr "无法移除联系人:"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:246
-#: ../calendar/libedata-cal/e-data-cal-factory.c:249
+#: ../addressbook/libedata-book/e-data-book-cursor.c:773
+msgid "Cursor does not support setting the search expression"
+msgstr "Cursor 不支持设置搜索表达式"
+
+#: ../addressbook/libedata-book/e-data-book-cursor.c:854
+msgid "Cursor does not support step"
+msgstr "Cursor 不支持步进"
+
+#: ../addressbook/libedata-book/e-data-book-cursor.c:935
+msgid "Cursor does not support alphabetic indexes"
+msgstr "Cursor 不支持字母表索引"
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:268
+msgid "Unrecognized cursor origin"
+msgstr "无法识别 cursor 原点"
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:334
+msgid "Out of sync revision while moving cursor"
+msgstr "移动 cursor 时修订失去同步"
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:424
+msgid "Alphabetic index was set for incorrect locale"
+msgstr "对错误的区域设置了字母表索引"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:281
+#: ../calendar/libedata-cal/e-data-cal-factory.c:276
 #, c-format
 msgid "No backend name in source '%s'"
 msgstr "源文件“%s”中无后端名称"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:297
-#: ../calendar/libedata-cal/e-data-cal-factory.c:303
+#: ../addressbook/libedata-book/e-data-book-factory.c:369
+#: ../calendar/libedata-cal/e-data-cal-factory.c:330
 #, c-format
 msgid "Missing source UID"
 msgstr "缺少源 UID"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:308
-#: ../calendar/libedata-cal/e-data-cal-factory.c:313
+#: ../addressbook/libedata-book/e-data-book-factory.c:380
+#: ../calendar/libedata-cal/e-data-cal-factory.c:340
 #, c-format
 msgid "No such source for UID '%s'"
 msgstr "没有 UID “%s”的源"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:569
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:573
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "服务器不可用 (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:600
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604
 #, c-format
 msgid "Failed to connect to a server using SSL: %s"
 msgstr "无法使用 SSL 连接到服务器:%s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:611
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:615
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "返回了意外的 HTTP 状态代码 %d(%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:630
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:634
 msgid "CalDAV backend is not loaded yet"
 msgstr "CalDAV 后端尚未加载"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1051
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1071
 msgid "Invalid Redirect URL"
 msgstr "无效的重定向 URL"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2528
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2880
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2563
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2928
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1229,45 +1349,45 @@ msgstr ""
 "服务器不可用,日历将以只读模式打开。\n"
 "错误消息:%s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2832
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2883
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "无法创建本地缓存文件夹“%s”"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3920
+#: ../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:4023
+#: ../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:4199
+#: ../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:4866
+#: ../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:4875
+#: ../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:4972
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020
 msgid "Unexpected result in schedule-response"
 msgstr "定时响应的结果异常"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:889
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:895
 msgid "Birthday"
 msgstr "生日"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:925
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:931
 #, c-format
 msgid "Birthday: %s"
 msgstr "生日:%s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:956
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:962
 #, c-format
 msgid "Anniversary: %s"
 msgstr "周年:%s"
@@ -1281,72 +1401,95 @@ msgstr "无法保存日历数据:URI 格式错误。"
 msgid "Cannot save calendar data"
 msgstr "无法保存日历数据"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:478
+#: ../calendar/backends/http/e-cal-backend-http.c:484
 #, c-format
 msgid "Malformed URI: %s"
 msgstr "URI 格式错误:%s"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:569
+#: ../calendar/backends/http/e-cal-backend-http.c:575
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "已重定向到无效 URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:606
+#: ../calendar/backends/http/e-cal-backend-http.c:618
 #, c-format
 msgid "Bad file format."
 msgstr "无效的文件格式。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:616
+#: ../calendar/backends/http/e-cal-backend-http.c:628
 #, c-format
 msgid "Not a calendar."
 msgstr "不是日历。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:926
-#: ../calendar/backends/weather/e-cal-backend-weather.c:514
+#: ../calendar/backends/http/e-cal-backend-http.c:915
+#: ../calendar/backends/weather/e-cal-backend-weather.c:537
 msgid "Could not create cache file"
 msgstr "无法创建缓存文件"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:173
+#: ../calendar/backends/weather/e-cal-backend-weather.c:175
 msgid "Could not retrieve weather data"
 msgstr "无法获取天气数据"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:296
 msgid "Weather: Fog"
 msgstr "天气:雾"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:297
 msgid "Weather: Cloudy Night"
 msgstr "天气:多云夜晚"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:298
 msgid "Weather: Cloudy"
 msgstr "天气:多云"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:299
 msgid "Weather: Overcast"
 msgstr "天气:阴天"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:300
 msgid "Weather: Showers"
 msgstr "天气:阵雨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:301
 msgid "Weather: Snow"
 msgstr "天气:雪"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:302
 msgid "Weather: Clear Night"
 msgstr "天气:晴朗夜晚"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:303
 msgid "Weather: Sunny"
 msgstr "天气:晴"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:304
 msgid "Weather: Thunderstorms"
 msgstr "天气:暴风雨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:416
+#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
+#: ../calendar/backends/weather/e-cal-backend-weather.c:330
+#, c-format
+msgid "%.1f °F"
+msgstr "%.1f °F"
+
+#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
+#: ../calendar/backends/weather/e-cal-backend-weather.c:333
+#, c-format
+msgid "%.1f °C"
+msgstr "%.1f °C"
+
+#. TRANSLATOR: This is the temperature in kelvin
+#: ../calendar/backends/weather/e-cal-backend-weather.c:336
+#, c-format
+msgid "%.1f K"
+msgstr "%.1f K"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:342
+#, c-format
+msgid "%.1f"
+msgstr "%.1f"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:453
 msgid "Forecast"
 msgstr "天气预报"
 
@@ -1402,7 +1545,7 @@ msgid "Authentication failed"
 msgstr "认证失败"
 
 #: ../calendar/libecal/e-cal.c:2331
-#: ../camel/providers/smtp/camel-smtp-transport.c:921
+#: ../camel/providers/smtp/camel-smtp-transport.c:923
 #: ../libedataserver/e-client.c:139
 msgid "Authentication required"
 msgstr "必须认证"
@@ -1439,127 +1582,127 @@ msgstr "无法更改日历属性的值“%s”"
 msgid "Untitled appointment"
 msgstr "无标题约会"
 
-#: ../calendar/libecal/e-cal-recur.c:4036
+#: ../calendar/libecal/e-cal-recur.c:4038
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/libecal/e-cal-recur.c:4037
+#: ../calendar/libecal/e-cal-recur.c:4039
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/libecal/e-cal-recur.c:4038
+#: ../calendar/libecal/e-cal-recur.c:4040
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/libecal/e-cal-recur.c:4039
+#: ../calendar/libecal/e-cal-recur.c:4041
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/libecal/e-cal-recur.c:4040
+#: ../calendar/libecal/e-cal-recur.c:4042
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:4043
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:4044
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:4045
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:4046
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:4047
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:4048
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:4049
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:4050
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:4051
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:4052
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:4053
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:4054
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:4055
 msgid "18th"
 msgstr "18八日"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:4056
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4057
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4058
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4059
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4060
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4061
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4062
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4063
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4064
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4065
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4066
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4067
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4068
 msgid "31st"
 msgstr "31日"
 
@@ -1702,72 +1845,72 @@ msgid "Calendar does not exist"
 msgstr "日历不存在"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1502
+#: ../calendar/libedata-cal/e-data-cal.c:1495
 msgid "Cannot open calendar: "
 msgstr "无法打开日历:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1539
+#: ../calendar/libedata-cal/e-data-cal.c:1532
 msgid "Cannot refresh calendar: "
 msgstr "无法刷新日历:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1580
+#: ../calendar/libedata-cal/e-data-cal.c:1573
 msgid "Cannot retrieve calendar object path: "
 msgstr "无法获取日历对象的路径:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1635
+#: ../calendar/libedata-cal/e-data-cal.c:1625
 msgid "Cannot retrieve calendar object list: "
 msgstr "无法获取日历对象的列表:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1691
+#: ../calendar/libedata-cal/e-data-cal.c:1676
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "无法获取日历空闲/繁忙列表:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1734
+#: ../calendar/libedata-cal/e-data-cal.c:1719
 msgid "Cannot create calendar object: "
 msgstr "无法创建日历对象:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1802
+#: ../calendar/libedata-cal/e-data-cal.c:1787
 msgid "Cannot modify calendar object: "
 msgstr "无法修改日历对象:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1877
+#: ../calendar/libedata-cal/e-data-cal.c:1865
 msgid "Cannot remove calendar object: "
 msgstr "无法移除日历对象:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1960
+#: ../calendar/libedata-cal/e-data-cal.c:1951
 msgid "Cannot receive calendar objects: "
 msgstr "无法接收日历对象:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2003
+#: ../calendar/libedata-cal/e-data-cal.c:1994
 msgid "Cannot send calendar objects: "
 msgstr "无法发送日历对象:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2059
+#: ../calendar/libedata-cal/e-data-cal.c:2046
 msgid "Could not retrieve attachment uris: "
 msgstr "无法获取附件 URI:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2104
+#: ../calendar/libedata-cal/e-data-cal.c:2091
 msgid "Could not discard reminder: "
 msgstr "无法取消提醒:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2145
+#: ../calendar/libedata-cal/e-data-cal.c:2132
 msgid "Could not retrieve calendar time zone: "
 msgstr "无法获取日历时区:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2185
+#: ../calendar/libedata-cal/e-data-cal.c:2172
 msgid "Could not add calendar time zone: "
 msgstr "无法添加日历时区:"
 
@@ -1791,25 +1934,15 @@ msgstr "该密码不支持加密"
 msgid "Decryption is not supported by this cipher"
 msgstr "该密码不支持解密"
 
-#: ../camel/camel-cipher-context.c:264
-#, c-format
-msgid "You may not import keys with this cipher"
-msgstr "您不能用此密码导入密钥"
-
-#: ../camel/camel-cipher-context.c:278
-#, c-format
-msgid "You may not export keys with this cipher"
-msgstr "您不能用此密码导出密钥"
-
-#: ../camel/camel-cipher-context.c:819
+#: ../camel/camel-cipher-context.c:646
 msgid "Signing message"
 msgstr "签名消息"
 
-#: ../camel/camel-cipher-context.c:1060
+#: ../camel/camel-cipher-context.c:887
 msgid "Encrypting message"
 msgstr "加密消息"
 
-#: ../camel/camel-cipher-context.c:1187
+#: ../camel/camel-cipher-context.c:1014
 msgid "Decrypting message"
 msgstr "解密消息"
 
@@ -1818,74 +1951,15 @@ msgstr "解密消息"
 msgid "Unable to create cache path"
 msgstr "无法创建缓存路径"
 
-#: ../camel/camel-data-cache.c:440
+#: ../camel/camel-data-cache.c:451
 msgid "Empty cache file"
 msgstr "清空缓存文件"
 
-#: ../camel/camel-data-cache.c:509
+#: ../camel/camel-data-cache.c:524
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "无法删除缓存条目:%s:%s"
 
-#: ../camel/camel-disco-diary.c:207
-#, c-format
-msgid ""
-"Could not write log entry: %s\n"
-"Further operations on this server will not be replayed when you\n"
-"reconnect to the network."
-msgstr ""
-"无法写入日志条目:%s\n"
-"当您重新连接到网络时本服务器\n"
-"上进一步的操作不会重做。"
-
-#: ../camel/camel-disco-diary.c:279
-#, c-format
-msgid ""
-"Could not open '%s':\n"
-"%s\n"
-"Changes made to this folder will not be resynchronized."
-msgstr ""
-"无法打开“%s”:\n"
-"%s\n"
-"对该文件夹的修改不会被重新同步。"
-
-#: ../camel/camel-disco-diary.c:326
-msgid "Resynchronizing with server"
-msgstr "重新与服务器同步"
-
-#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93
-msgid "Downloading new messages for offline mode"
-msgstr "下载新消息以进行脱机操作"
-
-#: ../camel/camel-disco-folder.c:422
-#, c-format
-msgid "Preparing folder '%s' for offline"
-msgstr "准备脱机文件夹“%s”"
-
-#: ../camel/camel-disco-folder.c:489 ../camel/camel-offline-folder.c:336
-msgid "Copy folder content locally for _offline operation"
-msgstr "将文件夹内容复制到本地以进行脱机操作(_O)"
-
-#: ../camel/camel-disco-store.c:516 ../camel/camel-imapx-store.c:454
-#: ../camel/camel-imapx-store.c:2248
-#: ../camel/providers/pop3/camel-pop3-folder.c:555
-#: ../camel/providers/pop3/camel-pop3-folder.c:705
-#: ../camel/providers/pop3/camel-pop3-folder.c:940
-#: ../camel/providers/pop3/camel-pop3-folder.c:1150
-#: ../camel/providers/pop3/camel-pop3-store.c:291
-#: ../camel/providers/pop3/camel-pop3-store.c:510
-#: ../camel/providers/pop3/camel-pop3-store.c:561
-#: ../camel/providers/pop3/camel-pop3-store.c:646
-#: ../camel/providers/pop3/camel-pop3-store.c:1046
-#, c-format
-msgid "You must be working online to complete this operation"
-msgstr "您必须在线工作以便完成该操作"
-
-#: ../camel/camel-file-utils.c:732
-#, c-format
-msgid "Canceled"
-msgstr "已取消"
-
 #: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:797
 #, c-format
 msgid "Failed to create child process '%s': %s"
@@ -1913,12 +1987,12 @@ msgstr "执行过滤规则错误:%s:%s"
 #: ../camel/camel-filter-driver.c:1385
 #, c-format
 msgid "Unable to open spool folder"
-msgstr "无法打开脱机文件夹"
+msgstr "无法打开离线文件夹"
 
 #: ../camel/camel-filter-driver.c:1397
 #, c-format
 msgid "Unable to process spool folder"
-msgstr "无法处理脱机文件夹"
+msgstr "无法处理离线文件夹"
 
 #: ../camel/camel-filter-driver.c:1420
 #, c-format
@@ -1949,22 +2023,19 @@ msgid "Failed at message %d of %d"
 msgstr "在第%d封信失败,共%d封"
 
 #: ../camel/camel-filter-driver.c:1752 ../camel/camel-filter-driver.c:1779
-#, fuzzy, c-format
-#| msgid "Error executing filter: %s: %s"
+#, c-format
 msgid "Execution of filter '%s' failed: "
-msgstr "执行过滤规则错误:%s:%s"
+msgstr "执行过滤规则“%s”失败:"
 
 #: ../camel/camel-filter-driver.c:1769
-#, fuzzy, c-format
-#| msgid "Error parsing filter: %s: %s"
+#, c-format
 msgid "Error parsing filter '%s': %s: %s"
-msgstr "解析过滤规则出错:%s:%s"
+msgstr "解析过滤规则“%s”出错:%s:%s"
 
 #: ../camel/camel-filter-driver.c:1788
-#, fuzzy, c-format
-#| msgid "Error executing filter: %s: %s"
+#, c-format
 msgid "Error executing filter '%s': %s: %s"
-msgstr "执行过滤规则错误:%s:%s"
+msgstr "执行过滤规则“%s”错误:%s:%s"
 
 #: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
@@ -1983,89 +2054,89 @@ msgstr "(user-tag)参数无效"
 msgid "Error executing filter search: %s: %s"
 msgstr "执行过滤规则搜索错误:%s:%s"
 
-#: ../camel/camel-folder.c:291
+#: ../camel/camel-folder.c:307
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "在“%s”中学习新的垃圾邮件"
 
-#: ../camel/camel-folder.c:331
+#: ../camel/camel-folder.c:347
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "在“%s”中学习新的有害邮件"
 
-#: ../camel/camel-folder.c:379
+#: ../camel/camel-folder.c:395
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "在“%s”中过滤新消息"
 
-#: ../camel/camel-folder.c:953
+#: ../camel/camel-folder.c:995
 #: ../camel/providers/local/camel-maildir-folder.c:321
 msgid "Moving messages"
 msgstr "移动消息"
 
-#: ../camel/camel-folder.c:956
+#: ../camel/camel-folder.c:998
 msgid "Copying messages"
 msgstr "复制消息"
 
-#: ../camel/camel-folder.c:1276
+#: ../camel/camel-folder.c:1040
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "文件夹“%s”不支持配额信息"
 
-#: ../camel/camel-folder.c:3506
+#: ../camel/camel-folder.c:2851
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "正在销毁文件夹“%s”"
 
-#: ../camel/camel-folder.c:3738
+#: ../camel/camel-folder.c:2978
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "正在获取 %2$s 中的消息“%1$s”"
 
-#: ../camel/camel-folder.c:3889
+#: ../camel/camel-folder.c:3168
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "正在获取“%s”的配额信息"
 
-#: ../camel/camel-folder.c:4129
+#: ../camel/camel-folder.c:3482
 #, 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:838 ../camel/camel-folder-search.c:881
+#: ../camel/camel-folder-search.c:888 ../camel/camel-folder-search.c:931
 #, 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:916
+#: ../camel/camel-folder-search.c:966
 #, 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:923 ../camel/camel-folder-search.c:931
+#: ../camel/camel-folder-search.c:973 ../camel/camel-folder-search.c:981
 #, 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:959
+#: ../camel/camel-folder-search.c:1009
 #, 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:969
+#: ../camel/camel-folder-search.c:1019
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) 需要文件夹集"
 
-#: ../camel/camel-folder-search.c:1862 ../camel/camel-folder-search.c:2029
+#: ../camel/camel-folder-search.c:1933 ../camel/camel-folder-search.c:2099
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2074,7 +2145,7 @@ msgstr ""
 "无法解析搜索表达式:%s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1874 ../camel/camel-folder-search.c:2041
+#: ../camel/camel-folder-search.c:1945 ../camel/camel-folder-search.c:2111
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2083,18 +2154,18 @@ msgstr ""
 "执行搜索表达式错误:%s:\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:691 ../camel/camel-gpg-context.c:696
-#: ../camel/camel-gpg-context.c:1359
+#: ../camel/camel-gpg-context.c:723 ../camel/camel-gpg-context.c:728
+#: ../camel/camel-gpg-context.c:1385
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "执行 gpg 失败:%s"
 
-#: ../camel/camel-gpg-context.c:696
-#: ../camel/providers/smtp/camel-smtp-transport.c:924
+#: ../camel/camel-gpg-context.c:728
+#: ../camel/providers/smtp/camel-smtp-transport.c:926
 msgid "Unknown"
 msgstr "未知"
 
-#: ../camel/camel-gpg-context.c:761
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2105,17 +2176,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:797
+#: ../camel/camel-gpg-context.c:829
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "解析 gpg userid 提示失败。"
 
-#: ../camel/camel-gpg-context.c:822 ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:854 ../camel/camel-gpg-context.c:869
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "解析 gpg 密码句请求失败。"
 
-#: ../camel/camel-gpg-context.c:858
+#: ../camel/camel-gpg-context.c:890
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2124,7 +2195,7 @@ msgstr ""
 "您需要一个 PIN 用来解锁您的智能卡:\n"
 "“%s”"
 
-#: ../camel/camel-gpg-context.c:862
+#: ../camel/camel-gpg-context.c:894
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2133,548 +2204,231 @@ msgstr ""
 "您需要一个密码句用来解锁以下用户:\n"
 "“%s”"
 
-#: ../camel/camel-gpg-context.c:868
+#: ../camel/camel-gpg-context.c:900
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG 对“%s”的意外响应"
 
-#: ../camel/camel-gpg-context.c:880
+#: ../camel/camel-gpg-context.c:912
 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:911 ../camel/camel-net-utils.c:523
-#: ../camel/camel-tcp-stream-raw.c:268
-#: ../camel/providers/nntp/camel-nntp-summary.c:402
+#: ../camel/camel-gpg-context.c:943 ../camel/camel-net-utils.c:524
+#: ../camel/providers/nntp/camel-nntp-summary.c:403
 #: ../libedataserver/e-client.c:150
 #, c-format
 msgid "Cancelled"
 msgstr "已取消"
 
-#: ../camel/camel-gpg-context.c:932
+#: ../camel/camel-gpg-context.c:964
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "解锁密钥失败:给出了 3 个错误的密码句。"
 
-#: ../camel/camel-gpg-context.c:945
+#: ../camel/camel-gpg-context.c:977
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "来自 GnuPG 的意外应答:%s"
 
-#: ../camel/camel-gpg-context.c:1076
+#: ../camel/camel-gpg-context.c:1108
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "加密失败:没有指定有效的收件人。"
 
-#: ../camel/camel-gpg-context.c:1626 ../camel/camel-smime-context.c:846
+#: ../camel/camel-gpg-context.c:1660 ../camel/camel-smime-context.c:846
 msgid "Could not generate signing data: "
 msgstr "无法生成签名数据:"
 
-#: ../camel/camel-gpg-context.c:1675 ../camel/camel-gpg-context.c:1879
-#: ../camel/camel-gpg-context.c:1989 ../camel/camel-gpg-context.c:2140
-#: ../camel/camel-gpg-context.c:2240 ../camel/camel-gpg-context.c:2288
+#: ../camel/camel-gpg-context.c:1709 ../camel/camel-gpg-context.c:1917
+#: ../camel/camel-gpg-context.c:2027 ../camel/camel-gpg-context.c:2176
 msgid "Failed to execute gpg."
 msgstr "执行 gpg 失败。"
 
-#: ../camel/camel-gpg-context.c:1754 ../camel/camel-gpg-context.c:1762
-#: ../camel/camel-gpg-context.c:1770 ../camel/camel-gpg-context.c:1790
-#: ../camel/camel-smime-context.c:973 ../camel/camel-smime-context.c:987
-#: ../camel/camel-smime-context.c:996
+#: ../camel/camel-gpg-context.c:1792 ../camel/camel-gpg-context.c:1800
+#: ../camel/camel-gpg-context.c:1808 ../camel/camel-gpg-context.c:1828
+#: ../camel/camel-smime-context.c:975 ../camel/camel-smime-context.c:989
+#: ../camel/camel-smime-context.c:998
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "无法校验消息签名:消息格式不对"
 
-#: ../camel/camel-gpg-context.c:1832
+#: ../camel/camel-gpg-context.c:1870
 msgid "Cannot verify message signature: "
 msgstr "无法校验消息签名:"
 
-#: ../camel/camel-gpg-context.c:1955
+#: ../camel/camel-gpg-context.c:1993
 msgid "Could not generate encrypting data: "
 msgstr "无法生成加密数据:"
 
-#: ../camel/camel-gpg-context.c:2008
+#: ../camel/camel-gpg-context.c:2046
 msgid "This is a digitally encrypted message part"
 msgstr "这是消息的数字加密部分"
 
-#: ../camel/camel-gpg-context.c:2066 ../camel/camel-gpg-context.c:2075
-#: ../camel/camel-gpg-context.c:2098
+#: ../camel/camel-gpg-context.c:2102 ../camel/camel-gpg-context.c:2111
+#: ../camel/camel-gpg-context.c:2134
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "无法解密消息:消息格式不对"
 
-#: ../camel/camel-gpg-context.c:2086
+#: ../camel/camel-gpg-context.c:2122
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "解密 MIME 部分失败:协议错误"
 
-#: ../camel/camel-gpg-context.c:2181 ../camel/camel-smime-context.c:1287
+#: ../camel/camel-gpg-context.c:2217 ../camel/camel-smime-context.c:1291
 msgid "Encrypted content"
 msgstr "加密内容"
 
-#: ../camel/camel-imapx-folder.c:643
-#, fuzzy, c-format
-#| msgid "Quota information not supported for folder '%s'"
-msgid "No quota information available for folder '%s'"
-msgstr "文件夹“%s”不支持配额信息"
-
-#: ../camel/camel-imapx-folder.c:727 ../camel/camel-imapx-folder.c:801
-#, c-format
-msgid "No destination folder specified"
-msgstr ""
-
-#: ../camel/camel-imapx-folder.c:747
-#, fuzzy
-#| msgid "Unable to retrieve message: "
-msgid "Unable to move junk messages"
-msgstr "无法获取消息:"
-
-#: ../camel/camel-imapx-folder.c:821
-#, fuzzy
-#| msgid "Unable to retrieve message: "
-msgid "Unable to move deleted messages"
-msgstr "无法获取消息:"
-
-#: ../camel/camel-imapx-folder.c:1008
-#: ../camel/providers/nntp/camel-nntp-folder.c:794
-msgid "Apply message _filters to this folder"
-msgstr "对这个文件夹应用消息过滤器(_F)"
-
-#: ../camel/camel-imapx-folder.c:1117
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "无法为 %s 创建文件夹概要"
-
-#: ../camel/camel-imapx-folder.c:1125
-#, c-format
-msgid "Could not create cache for %s: "
-msgstr "无法为 %s 创建缓存:"
-
-#: ../camel/camel-imapx-server.c:1275
-msgid "Server disconnected"
-msgstr "服务器断开连接"
-
-#: ../camel/camel-imapx-server.c:1764
-#, fuzzy
-#| msgid "Error writing to cache stream: "
-msgid "Error writing to cache stream"
-msgstr "写入缓存流错误:"
-
-#: ../camel/camel-imapx-server.c:2424
-#, fuzzy, c-format
-#| msgid ""
-#| "Alert from IMAP server %s %s:\n"
-#| "%s"
-msgid ""
-"Alert from IMAP server %s:\n"
-"%s"
-msgstr ""
-"来自 IMAP 服务器 %s %s 的提醒:\n"
-"%s"
-
-#: ../camel/camel-imapx-server.c:3012
-#, c-format
-msgid "Not authenticated"
-msgstr "没有验证"
-
-#: ../camel/camel-imapx-server.c:3090
-msgid "Error performing IDLE"
-msgstr "执行 IDLE 命令出错"
-
-#: ../camel/camel-imapx-server.c:3971
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
-
-#: ../camel/camel-imapx-server.c:3972
-#: ../camel/providers/smtp/camel-smtp-transport.c:206
-msgid "STARTTLS not supported"
-msgstr "不支持 STARTTLS"
-
-#: ../camel/camel-imapx-server.c:4011
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: "
-msgstr "以安全模式连接到 IMAP 服务器 %s 失败:"
-
-#: ../camel/camel-imapx-server.c:4091
-#, c-format
-msgid "IMAP server %s does not support %s authentication"
-msgstr "IMAP 服务器 %s 不支持 %s 认证"
-
-#: ../camel/camel-imapx-server.c:4102 ../camel/camel-session.c:494
-#: ../camel/providers/pop3/camel-pop3-store.c:303
-#: ../camel/providers/pop3/camel-pop3-store.c:731
-#: ../camel/providers/smtp/camel-smtp-transport.c:515
-#, c-format
-msgid "No support for %s authentication"
-msgstr "不支持 %s 认证"
-
-#: ../camel/camel-imapx-server.c:4121
-#: ../camel/providers/nntp/camel-nntp-store.c:407
-#: ../camel/providers/nntp/camel-nntp-store.c:595
-msgid "Cannot authenticate without a username"
-msgstr "无法进行无用户名的认证"
-
-#: ../camel/camel-imapx-server.c:4130
-#: ../camel/providers/nntp/camel-nntp-store.c:604
-#: ../camel/providers/pop3/camel-pop3-store.c:656
-#: ../camel/providers/pop3/camel-pop3-store.c:676
-msgid "Authentication password not available"
-msgstr "密码认证不可用"
-
-#: ../camel/camel-imapx-server.c:4337
-msgid "Error fetching message"
-msgstr "取回消息出错"
-
-#: ../camel/camel-imapx-server.c:4387 ../camel/camel-imapx-server.c:4395
-msgid "Failed to close the tmp stream"
-msgstr "无法关闭临时流"
+#: ../camel/camel-junk-filter.c:168
+msgid "Synchronizing junk database"
+msgstr "正在同步垃圾邮件数据库"
 
-#: ../camel/camel-imapx-server.c:4424
-msgid "Failed to copy the tmp file"
-msgstr "无法复制临时文件"
-
-#: ../camel/camel-imapx-server.c:4549
-#, fuzzy
-#| msgid "Error copying messages"
-msgid "Error moving messages"
-msgstr "复制消息出错"
-
-#: ../camel/camel-imapx-server.c:4553
-msgid "Error copying messages"
-msgstr "复制消息出错"
-
-#: ../camel/camel-imapx-server.c:4722
-msgid "Error appending message"
-msgstr "追加消息出错"
-
-#: ../camel/camel-imapx-server.c:4921
-msgid "Error fetching message headers"
-msgstr "取回消息头出错"
-
-#: ../camel/camel-imapx-server.c:5072
-msgid "Error retrieving message"
-msgstr "收取消息出错"
-
-#: ../camel/camel-imapx-server.c:5203 ../camel/camel-imapx-server.c:5431
-#, c-format
-msgid "Fetching summary information for new messages in '%s'"
-msgstr "获取“%s”中新消息的概要信息"
-
-#: ../camel/camel-imapx-server.c:5267
-#, c-format
-msgid "Scanning for changed messages in '%s'"
-msgstr "扫描“%s”中更改了的消息"
-
-#: ../camel/camel-imapx-server.c:5320
-msgid "Error fetching new messages"
-msgstr "取回新消息出错"
-
-#: ../camel/camel-imapx-server.c:5533
-msgid "Error while fetching messages"
-msgstr "取回消息出错"
-
-#: ../camel/camel-imapx-server.c:5541 ../camel/camel-imapx-server.c:5574
-#, c-format
-msgid "Fetching summary information for %d message in '%s'"
-msgid_plural "Fetching summary information for %d messages in '%s'"
-msgstr[0] "获取“%2$s”中“%1$d”条消息的概要信息"
-
-#: ../camel/camel-imapx-server.c:5710 ../camel/camel-imapx-server.c:5740
-msgid "Error refreshing folder"
-msgstr "刷新文件夹出错"
-
-#: ../camel/camel-imapx-server.c:5864
-msgid "Error expunging message"
-msgstr "销毁消息出错"
-
-#: ../camel/camel-imapx-server.c:5975
-msgid "Error fetching folders"
-msgstr "取回文件夹出错"
-
-#: ../camel/camel-imapx-server.c:6057
-msgid "Error subscribing to folder"
-msgstr "订阅文件夹出错"
-
-#: ../camel/camel-imapx-server.c:6122
-msgid "Error creating folder"
-msgstr "创建文件夹出错"
-
-#: ../camel/camel-imapx-server.c:6176
-msgid "Error deleting folder"
-msgstr "删除文件夹出错"
-
-#: ../camel/camel-imapx-server.c:6250
-msgid "Error renaming folder"
-msgstr "重命名文件夹出错"
-
-#: ../camel/camel-imapx-server.c:6325
-#, fuzzy
-#| msgid "Retrieving quota information for '%s'"
-msgid "Error retrieving quota information"
-msgstr "正在获取“%s”的配额信息"
-
-#: ../camel/camel-imapx-server.c:6390
-#, fuzzy
-#| msgid "Decoder failed"
-msgid "Search failed"
-msgstr "解码器失败"
-
-#: ../camel/camel-imapx-server.c:6453
-msgid "Error performing NOOP"
-msgstr "执行 NOOP 出错"
-
-#: ../camel/camel-imapx-server.c:6562
-msgid "Error syncing changes"
-msgstr "同步变更出错"
-
-#: ../camel/camel-imapx-server.c:7334
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "无法获取消息 ID %s:%s"
-
-#: ../camel/camel-imapx-server.c:7335
-msgid "No such message available."
-msgstr "没有该消息。"
-
-#: ../camel/camel-imapx-server.c:7496 ../camel/camel-imapx-server.c:7511
-msgid "Cannot create spool file: "
-msgstr "无法创建脱机文件:"
-
-#: ../camel/camel-imapx-server.c:8253
-#, fuzzy
-#| msgid "IMAP server %s does not support %s authentication"
-msgid "IMAP server does not support quotas"
-msgstr "IMAP 服务器 %s 不支持 %s 认证"
-
-#: ../camel/camel-imapx-store.c:326
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP 服务器 %s"
-
-#: ../camel/camel-imapx-store.c:329
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
-
-#: ../camel/camel-imapx-store.c:427
-#: ../camel/providers/nntp/camel-nntp-provider.c:95
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
-msgid "Password"
-msgstr "密码"
-
-#: ../camel/camel-imapx-store.c:429
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "该选项将使用纯文本密码连接到 IMAP 服务器。"
-
-#: ../camel/camel-imapx-store.c:539
-#, c-format
-msgid "No such folder %s"
-msgstr "没有文件夹 %s"
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/camel-imapx-store.c:565 ../camel/camel-imapx-store.c:1110
-#: ../camel/providers/local/camel-maildir-folder.c:473
-#: ../camel/providers/local/camel-maildir-store.c:316
-#: ../camel/providers/local/camel-maildir-store.c:750
-#: ../camel/providers/local/camel-maildir-store.c:756
-#: ../camel/providers/local/camel-maildir-store.c:840
-#: ../camel/providers/local/camel-spool-store.c:393
-msgid "Inbox"
-msgstr "收件箱"
-
-#: ../camel/camel-imapx-store.c:1384
-#, c-format
-msgid "Retrieving folder list for %s"
-msgstr "正在获取“%s”的文件夹列表"
-
-#: ../camel/camel-imapx-store.c:1774
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "文件夹名“%s”无效,原因是其中含有字符“%c”"
-
-#: ../camel/camel-imapx-store.c:1785
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "未知的父文件夹:%s"
-
-#: ../camel/camel-imapx-store.c:1795
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "父文件夹不允许含有子文件夹"
-
-#: ../camel/camel-imapx-stream.c:98
-#, c-format
-msgid "Source stream returned no data"
-msgstr "源流没返回数据"
-
-#: ../camel/camel-imapx-stream.c:107
-#, c-format
-msgid "Source stream unavailable"
-msgstr "源流不可用"
-
-#: ../camel/camel-lock.c:102
+#: ../camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "无法为 %s 创建锁定文件:%s"
 
-#: ../camel/camel-lock.c:145
+#: ../camel/camel-lock.c:156
 #, c-format
 msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr "对 %s 获取锁文件的尝试超时。请稍后再试。"
 
-#: ../camel/camel-lock.c:205
+#: ../camel/camel-lock.c:218
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "用 fcntl(2) 获取锁失败:%s"
 
-#: ../camel/camel-lock.c:272
+#: ../camel/camel-lock.c:285
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "用 flock(2) 获取锁失败:%s"
 
-#: ../camel/camel-lock-client.c:106
+#: ../camel/camel-lock-client.c:109
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "无法创建锁定助手管道:%s"
 
-#: ../camel/camel-lock-client.c:130
+#: ../camel/camel-lock-client.c:133
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "无法创建锁定助手进程:%s"
 
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#: ../camel/camel-lock-client.c:220 ../camel/camel-lock-client.c:248
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "无法锁定“%s”:lock-helper 协议错误"
 
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:236
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "无法锁定“%s”"
 
-#: ../camel/camel-movemail.c:105
+#: ../camel/camel-movemail.c:111
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "无法检查邮件文件 %s:%s"
 
-#: ../camel/camel-movemail.c:119
+#: ../camel/camel-movemail.c:125
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "无法打开邮件文件 %s:%s"
 
-#: ../camel/camel-movemail.c:129
+#: ../camel/camel-movemail.c:135
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "无法打开临时邮件文件 %s:%s"
 
-#: ../camel/camel-movemail.c:159
+#: ../camel/camel-movemail.c:165
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "将邮件存储到临时文件 %s 失败:%s"
 
-#: ../camel/camel-movemail.c:193
+#: ../camel/camel-movemail.c:199
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "无法创建管道:%s"
 
-#: ../camel/camel-movemail.c:207
+#: ../camel/camel-movemail.c:213
 #, c-format
 msgid "Could not fork: %s"
 msgstr "无法创建进程:%s"
 
-#: ../camel/camel-movemail.c:245
+#: ../camel/camel-movemail.c:251
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "移动邮件程序失败:%s"
 
-#: ../camel/camel-movemail.c:246
+#: ../camel/camel-movemail.c:252
 msgid "(Unknown error)"
 msgstr "(未知的错误)"
 
-#: ../camel/camel-movemail.c:273
+#: ../camel/camel-movemail.c:279
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "阅读邮件文件错误:%s"
 
-#: ../camel/camel-movemail.c:286
+#: ../camel/camel-movemail.c:292
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "写入邮件临时文件错误:%s"
 
-#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562
+#: ../camel/camel-movemail.c:499 ../camel/camel-movemail.c:568
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "复制邮件临时文件错误:%s"
 
-#: ../camel/camel-multipart-signed.c:297
+#: ../camel/camel-multipart-signed.c:281
 #, c-format
 msgid "No content available"
 msgstr "没有可用的内容"
 
-#: ../camel/camel-multipart-signed.c:305
+#: ../camel/camel-multipart-signed.c:289
 #, c-format
 msgid "No signature available"
 msgstr "没有可用的签名"
 
-#: ../camel/camel-multipart-signed.c:689
+#: ../camel/camel-multipart-signed.c:638
 #, c-format
 msgid "parse error"
 msgstr "解析错误"
 
-#: ../camel/camel-net-utils.c:703
+#: ../camel/camel-net-utils.c:704
 #, c-format
 msgid "Resolving: %s"
 msgstr "解析:%s"
 
-#: ../camel/camel-net-utils.c:726
+#: ../camel/camel-net-utils.c:727
 msgid "Host lookup failed"
 msgstr "主机查阅失败"
 
-#: ../camel/camel-net-utils.c:732
+#: ../camel/camel-net-utils.c:733
 #, c-format
 msgid "Host lookup '%s' failed. Check your host name for spelling errors."
-msgstr ""
+msgstr "主机“%s”查找失败,请检查主机名是否存在拼写错误。"
 
-#: ../camel/camel-net-utils.c:736
-#, fuzzy, c-format
-#| msgid "Host lookup failed: %s: %s"
+#: ../camel/camel-net-utils.c:737
+#, c-format
 msgid "Host lookup '%s' failed: %s"
-msgstr "主机查阅失败:%s:%s"
-
-#: ../camel/camel-net-utils.c:857
-msgid "Resolving address"
-msgstr "解析地址"
+msgstr "查找主机“%s”失败:%s"
 
-#: ../camel/camel-net-utils.c:878
-msgid "Name lookup failed"
-msgstr "名称查阅失败"
+#: ../camel/camel-network-service.c:1006
+msgid "No host information available"
+msgstr "无可用的主机信息"
 
-#: ../camel/camel-net-utils.c:885
-msgid "Name lookup failed. Check your host name for spelling errors."
-msgstr ""
-
-#: ../camel/camel-net-utils.c:889
-#, c-format
-msgid "Name lookup failed: %s"
-msgstr "名称查阅失败:%s"
-
-#: ../camel/camel-network-service.c:350
-#, fuzzy, c-format
-#| msgid "Could not connect to %s: "
-msgid "Could not connect to '%s:%s': "
-msgstr "无法连接到 %s:"
+#: ../camel/camel-offline-folder.c:93
+msgid "Downloading new messages for offline mode"
+msgstr "下载新消息以进行离线操作"
 
 #: ../camel/camel-offline-folder.c:212
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "正在将文件夹“%s”中的消息同步到磁盘"
 
-#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177
-#, c-format
-msgid "Cannot write offline journal for folder '%s': %s"
-msgstr "无法写入文件夹“%s”的离线日记:%s"
+#: ../camel/camel-offline-folder.c:336
+msgid "Copy folder content locally for _offline operation"
+msgstr "将文件夹内容复制到本地以进行离线操作(_O)"
 
 #: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
@@ -2699,7 +2453,7 @@ msgstr "无法载入 %s:%s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "无法载入 %s:模块中没有初始化代码。"
 
-#: ../camel/camel-provider.c:429 ../camel/camel-session.c:406
+#: ../camel/camel-provider.c:429 ../camel/camel-session.c:424
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "协议“%s”没有可用的提供者"
@@ -2803,65 +2557,65 @@ msgstr "GSSAPI"
 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:136
 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:141
 msgid "The provided target_name parameter was ill-formed."
 msgstr "提供的 target_name 参数格式不对。"
 
-#: ../camel/camel-sasl-gssapi.c:142
+#: ../camel/camel-sasl-gssapi.c:144
 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:148
 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:153
 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:157
 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:162
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "提供的上下文句柄所引用的上下文无效。"
 
-#: ../camel/camel-sasl-gssapi.c:163
+#: ../camel/camel-sasl-gssapi.c:165
 msgid "The consistency checks performed on the input_token failed."
 msgstr "对 input_token 执行完整性检查失败。"
 
-#: ../camel/camel-sasl-gssapi.c:166
+#: ../camel/camel-sasl-gssapi.c:168
 msgid "The consistency checks performed on the credential failed."
 msgstr "对证书执行完整性检查失败。"
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:171
 msgid "The referenced credentials have expired."
 msgstr "引用的证书已过期。"
 
-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340
-#: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405
-#: ../camel/providers/smtp/camel-smtp-transport.c:622
+#: ../camel/camel-sasl-gssapi.c:177 ../camel/camel-sasl-gssapi.c:354
+#: ../camel/camel-sasl-gssapi.c:402 ../camel/camel-sasl-gssapi.c:419
+#: ../camel/providers/smtp/camel-smtp-transport.c:624
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "来自服务器的无效认证应答。"
 
-#: ../camel/camel-sasl-gssapi.c:417
+#: ../camel/camel-sasl-gssapi.c:431
 #, c-format
 msgid "Unsupported security layer."
 msgstr "不支持的安全层。"
@@ -2920,29 +2674,30 @@ msgstr "试图通过 %s 服务在 SMTP 认证之前进行 POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "常规表达式编译失败:%s:%s"
 
-#: ../camel/camel-session.c:415
+#: ../camel/camel-session.c:433
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "为协议“%s”注册的 GType 无效"
 
-#: ../camel/camel-session.c:509
+#: ../camel/camel-session.c:502
+#: ../camel/providers/imapx/camel-imapx-server.c:4513
+#: ../camel/providers/pop3/camel-pop3-store.c:313
+#: ../camel/providers/pop3/camel-pop3-store.c:759
+#: ../camel/providers/smtp/camel-smtp-transport.c:517
+#, c-format
+msgid "No support for %s authentication"
+msgstr "不支持 %s 认证"
+
+#: ../camel/camel-session.c:517
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s 认证失败"
 
-#: ../camel/camel-session.c:645
+#: ../camel/camel-session.c:657
 msgid "Forwarding messages is not supported"
 msgstr "不支持转发消息"
 
-#. Translators: The first argument is the account type
-#. * (e.g. "IMAP"), the second is the user name, and the
-#. * third is the host name.
-#: ../camel/camel-session.c:1420
-#, c-format
-msgid "Please enter the %s password for %s on host %s."
-msgstr "请输入 %2$s %3$s 的 %1$s 密码"
-
-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1074
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1078
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "无法找到‘%s’的证书"
@@ -3076,7 +2831,7 @@ msgstr "找不到签名摘要"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "签名者:%s <%s>:%s\n"
 
-#: ../camel/camel-smime-context.c:858 ../camel/camel-smime-context.c:1148
+#: ../camel/camel-smime-context.c:858 ../camel/camel-smime-context.c:1152
 msgid "Cannot create encoder context"
 msgstr "无法创建编码器上下文"
 
@@ -3084,101 +2839,106 @@ msgstr "无法创建编码器上下文"
 msgid "Failed to add data to CMS encoder"
 msgstr "将数据添加到 CMS 编码器失败"
 
-#: ../camel/camel-smime-context.c:869 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:869 ../camel/camel-smime-context.c:1169
 msgid "Failed to encode data"
 msgstr "编码数据失败"
 
-#: ../camel/camel-smime-context.c:1013 ../camel/camel-smime-context.c:1262
+#: ../camel/camel-smime-context.c:1017 ../camel/camel-smime-context.c:1266
 msgid "Decoder failed"
 msgstr "解码器失败"
 
-#: ../camel/camel-smime-context.c:1082
+#: ../camel/camel-smime-context.c:1086
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "找不到公共批量加密算法"
 
-#: ../camel/camel-smime-context.c:1090
+#: ../camel/camel-smime-context.c:1094
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "无法为加密批量密钥分配密钥槽"
 
-#: ../camel/camel-smime-context.c:1101
+#: ../camel/camel-smime-context.c:1105
 msgid "Cannot create CMS Message"
 msgstr "无法创建 CMS 消息"
 
-#: ../camel/camel-smime-context.c:1107
+#: ../camel/camel-smime-context.c:1111
 msgid "Cannot create CMS Enveloped data"
 msgstr "无法创建 CMS 信封数据"
 
-#: ../camel/camel-smime-context.c:1113
+#: ../camel/camel-smime-context.c:1117
 msgid "Cannot attach CMS Enveloped data"
 msgstr "无法附加 CMS 信封数据"
 
-#: ../camel/camel-smime-context.c:1119
+#: ../camel/camel-smime-context.c:1123
 msgid "Cannot attach CMS data object"
 msgstr "无法附加 CMS 数据对象"
 
-#: ../camel/camel-smime-context.c:1128
+#: ../camel/camel-smime-context.c:1132
 msgid "Cannot create CMS Recipient information"
 msgstr "无法创建 CMS 收件人信息"
 
-#: ../camel/camel-smime-context.c:1133
+#: ../camel/camel-smime-context.c:1137
 msgid "Cannot add CMS Recipient information"
 msgstr "无法添加 CMS 收件人信息"
 
-#: ../camel/camel-smime-context.c:1159
+#: ../camel/camel-smime-context.c:1163
 msgid "Failed to add data to encoder"
 msgstr "将数据添加到编码器失败"
 
-#: ../camel/camel-smime-context.c:1269
+#: ../camel/camel-smime-context.c:1273
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME 解密:没有找到加密内容"
 
-#: ../camel/camel-store.c:1964
+#: ../camel/camel-store.c:1259
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "无法创建文件夹“%s”文件夹已存在"
 
-#: ../camel/camel-store.c:2007
+#: ../camel/camel-store.c:1302
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "打开文件夹“%s”"
 
-#: ../camel/camel-store.c:2192
+#: ../camel/camel-store.c:1528
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "扫描“%s”中的文件夹"
 
-#: ../camel/camel-store.c:2208 ../camel/camel-store.c:2239
+#: ../camel/camel-store.c:1556 ../camel/camel-store.c:1601
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "回收站"
 
-#: ../camel/camel-store.c:2220 ../camel/camel-store.c:2255
+#: ../camel/camel-store.c:1570 ../camel/camel-store.c:1618
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "垃圾"
 
-#: ../camel/camel-store.c:2708
+#: ../camel/camel-store.c:2221
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "无法创建文件夹:%s:文件夹已存在"
 
-#: ../camel/camel-store.c:2722
+#: ../camel/camel-store.c:2235
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "创建文件夹“%s”"
 
-#: ../camel/camel-store.c:2840 ../camel/camel-vee-store.c:416
-#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/camel-store.c:2394 ../camel/camel-vee-store.c:418
+#: ../camel/providers/local/camel-maildir-store.c:322
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "无法删除文件夹:%s:无效操作"
 
-#: ../camel/camel-store.c:2983 ../camel/camel-vee-store.c:466
-#: ../camel/providers/local/camel-maildir-store.c:839
+#: ../camel/camel-store.c:2569 ../camel/camel-vee-store.c:469
+#: ../camel/providers/local/camel-maildir-store.c:853
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "无法重命名文件夹:%s:无效操作"
 
+#: ../camel/camel-stream.c:287 ../camel/camel-stream.c:338
+#, c-format
+msgid "Stream type '%s' is not seekable"
+msgstr "流类型“%s”是无法定位的"
+
 #: ../camel/camel-stream-filter.c:334
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "CamelStreamFilter 只支持重设到开始"
@@ -3187,135 +2947,52 @@ msgstr "CamelStreamFilter 只支持重设到开始"
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "CamelHttpStream 只支持重设到开始"
 
-#: ../camel/camel-stream-process.c:275
+#: ../camel/camel-stream-process.c:282
 #, c-format
 msgid "Connection cancelled"
 msgstr "连接已取消"
 
-#: ../camel/camel-stream-process.c:280
+#: ../camel/camel-stream-process.c:287
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "无法使用命令“%s”连接:%s"
 
-#: ../camel/camel-subscribable.c:395
+#: ../camel/camel-subscribable.c:250
 #, c-format
 msgid "Subscribing to folder '%s'"
 msgstr "正在订阅文件夹“%s”"
 
-#: ../camel/camel-subscribable.c:527
+#: ../camel/camel-subscribable.c:410
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "正在取消订阅文件夹“%s”"
 
-#: ../camel/camel-tcp-stream-raw.c:310
-#, c-format
-msgid "NSPR error code %d"
-msgstr "NSPR 错误代码 %d"
-
-#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662
-#, c-format
-msgid "The proxy host does not support SOCKS4"
-msgstr "代理主机不支持 SOCKS4"
-
-#: ../camel/camel-tcp-stream-raw.c:675
-#, c-format
-msgid "The proxy host denied our request: code %d"
-msgstr "代理主机拒绝了已方的请求:代码 %d"
-
-#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781
-#, c-format
-msgid "The proxy host does not support SOCKS5"
-msgstr "代理主机不支持 SOCKS5"
-
-#: ../camel/camel-tcp-stream-raw.c:789
-#, c-format
-msgid "Could not find a suitable authentication type: code 0x%x"
-msgstr "无法找到合适的认证类型: 代码 0x%x"
-
-#: ../camel/camel-tcp-stream-raw.c:801
-msgid "General SOCKS server failure"
-msgstr "通用 SOCKS 服务器失败"
-
-#: ../camel/camel-tcp-stream-raw.c:802
-msgid "SOCKS server's rules do not allow connection"
-msgstr "SOCKS 服务器的策略不允许连接"
-
-#: ../camel/camel-tcp-stream-raw.c:803
-msgid "Network is unreachable from SOCKS server"
-msgstr "SOCKS 服务器网络不可及"
-
-#: ../camel/camel-tcp-stream-raw.c:804
-msgid "Host is unreachable from SOCKS server"
-msgstr "SOCKS 服务器主机不可及"
-
-#: ../camel/camel-tcp-stream-raw.c:805
-msgid "Connection refused"
-msgstr "连接被拒绝"
-
-#: ../camel/camel-tcp-stream-raw.c:806
-msgid "Time-to-live expired"
-msgstr "连通时间过期"
-
-#: ../camel/camel-tcp-stream-raw.c:807
-msgid "Command not supported by SOCKS server"
-msgstr "SOCKS 服务器不支持该命令"
-
-#: ../camel/camel-tcp-stream-raw.c:808
-msgid "Address type not supported by SOCKS server"
-msgstr "SOCKS 服务器不支持该地址类型"
-
-#: ../camel/camel-tcp-stream-raw.c:809
-msgid "Unknown error from SOCKS server"
-msgstr "SOCKS 服务器发生未知错误"
-
-#: ../camel/camel-tcp-stream-raw.c:842
-#, c-format
-msgid "Got unknown address type from SOCKS server"
-msgstr "从 SOCKS 服务器获取的地址类型未知"
-
-#: ../camel/camel-tcp-stream-raw.c:860
-#, c-format
-msgid "Incomplete reply from SOCKS server"
-msgstr "SOCKS 服务器的响应不完整"
-
-#: ../camel/camel-tcp-stream-raw.c:880
-#, c-format
-msgid "Hostname is too long (maximum is 255 characters)"
-msgstr "主机名太长 (最长 255 字符)"
-
-#. SOCKS5
-#. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922
-#, c-format
-msgid "Invalid reply from proxy server"
-msgstr "代理服务器的响应无效"
-
 #: ../camel/camel-url.c:331
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "无法解析 URL“%s”"
 
-#: ../camel/camel-vee-folder.c:494
+#: ../camel/camel-vee-folder.c:493
 #, c-format
 msgid "Updating folder '%s'"
 msgstr "正在更新文件夹“%s”"
 
-#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965
+#: ../camel/camel-vee-folder.c:853 ../camel/camel-vee-folder.c:963
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "无法将消息移动或复制到虚拟文件夹中"
 
-#: ../camel/camel-vee-folder.c:888
+#: ../camel/camel-vee-folder.c:886
 #, c-format
 msgid "No such message %s in %s"
 msgstr "在 %2$s 中没有消息 %1$s"
 
-#: ../camel/camel-vee-folder.c:941
+#: ../camel/camel-vee-folder.c:939
 #, c-format
 msgid "Error storing '%s': "
 msgstr "存储“%s”出错:"
 
-#: ../camel/camel-vee-folder.c:1171
+#: ../camel/camel-vee-folder.c:1169
 msgid "Automatically _update on change in source folders"
 msgstr "自动更新源文件夹中的更改(_U)"
 
@@ -3325,17 +3002,17 @@ msgstr "自动更新源文件夹中的更改(_U)"
 msgid "Unmatched"
 msgstr "无匹配"
 
-#: ../camel/camel-vee-store.c:442
+#: ../camel/camel-vee-store.c:444
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "无法删除文件夹:%s:没有该文件夹"
 
-#: ../camel/camel-vee-store.c:476
+#: ../camel/camel-vee-store.c:479
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "无法重命名文件夹:%s:没有该文件夹"
 
-#: ../camel/camel-vee-store.c:538
+#: ../camel/camel-vee-store.c:541
 msgid "Enable _Unmatched folder"
 msgstr "启用不匹配的文件夹(_U)"
 
@@ -3347,44 +3024,83 @@ msgstr "无法将消息复制到回收站文件夹"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "无法将消息复制到垃圾邮件文件夹"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:38
+#: ../camel/providers/imapx/camel-imapx-folder.c:656
+#, c-format
+msgid "No quota information available for folder '%s'"
+msgstr "文件夹“%s”配额信息未定义"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:770
+#: ../camel/providers/imapx/camel-imapx-folder.c:863
+#, c-format
+msgid "No destination folder specified"
+msgstr "目标文件夹未指定"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:798
+msgid "Unable to move junk messages"
+msgstr "无法移动垃圾信息"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:891
+msgid "Unable to move deleted messages"
+msgstr "无法移动已删除信息"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1117
+#: ../camel/providers/nntp/camel-nntp-folder.c:760
+msgid "Apply message _filters to this folder"
+msgstr "对这个文件夹应用消息过滤器(_F)"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1223
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "无法为 %s 创建文件夹概要"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1232
+#, c-format
+msgid "Could not create cache for %s: "
+msgstr "无法为 %s 创建缓存:"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1417
+#, c-format
+msgid "No IMAP mailbox available for folder '%s'"
+msgstr "文件夹“%s”没有可用的 IMAP 邮箱"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "Checking for New Mail"
 msgstr "检查新邮件"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "C_heck for new messages in all folders"
 msgstr "在所有文件夹中检查新消息(_H)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "在订阅的文件夹中检查新消息(_E)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "Use _Quick Resync if the server supports it"
 msgstr "如果服务器支持则使用快速重新同步(_Q)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "_Listen for server change notifications"
 msgstr "监听服务器变化提醒(_L)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "文件夹"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
 msgid "_Show only subscribed folders"
 msgstr "只显示订阅了的文件夹(_S)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "O_verride server-supplied folder namespace"
 msgstr "覆盖服务器提供的文件夹命名空间(_V)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
 msgid "Namespace:"
 msgstr "命名空间:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
 #: ../camel/providers/local/camel-local-provider.c:41
 #: ../camel/providers/local/camel-local-provider.c:81
 #: ../camel/providers/local/camel-local-provider.c:101
@@ -3392,43 +3108,290 @@ msgstr "命名空间:"
 msgid "Options"
 msgstr "选项"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
 #: ../camel/providers/nntp/camel-nntp-provider.c:43
 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:65
 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:67
 msgid "Check new messages for _Junk contents"
 msgstr "检查新消息的垃圾内容(_J)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:67
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 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:71
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "自动将远程邮件同步到本地(_Z)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:75
+#: ../camel/providers/imapx/camel-imapx-provider.c:77
 msgid "Default IMAP port"
 msgstr "默认的 IMAP 端口"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
 msgid "IMAP over SSL"
 msgstr "IMAP (SSL 加密)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:83
+#: ../camel/providers/imapx/camel-imapx-provider.c:85
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:85
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP 服务器上的邮件的读写。"
 
+#: ../camel/providers/imapx/camel-imapx-server.c:1589
+msgid "Server disconnected"
+msgstr "服务器断开连接"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2034
+msgid "Error writing to cache stream"
+msgstr "写入缓存流错误"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3375
+#, c-format
+msgid "Not authenticated"
+msgstr "没有验证"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3453
+msgid "Error performing IDLE"
+msgstr "执行 IDLE 命令出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4374
+#, 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:4375
+#: ../camel/providers/smtp/camel-smtp-transport.c:217
+msgid "STARTTLS not supported"
+msgstr "不支持 STARTTLS"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4422
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "以安全模式连接到 IMAP 服务器 %s 失败:"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4502
+#, c-format
+msgid "IMAP server %s does not support %s authentication"
+msgstr "IMAP 服务器 %s 不支持 %s 认证"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4532
+#: ../camel/providers/nntp/camel-nntp-store.c:396
+#: ../camel/providers/nntp/camel-nntp-store.c:533
+msgid "Cannot authenticate without a username"
+msgstr "无法进行无用户名的认证"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4541
+#: ../camel/providers/nntp/camel-nntp-store.c:542
+#: ../camel/providers/pop3/camel-pop3-store.c:680
+#: ../camel/providers/pop3/camel-pop3-store.c:701
+msgid "Authentication password not available"
+msgstr "密码认证不可用"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4761
+msgid "Error fetching message"
+msgstr "取回消息出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4809
+#: ../camel/providers/imapx/camel-imapx-server.c:4816
+msgid "Failed to close the tmp stream"
+msgstr "无法关闭临时流"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4851
+msgid "Failed to copy the tmp file"
+msgstr "无法复制临时文件"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4977
+msgid "Error moving messages"
+msgstr "移动消息出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4981
+msgid "Error copying messages"
+msgstr "复制消息出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5140
+msgid "Error appending message"
+msgstr "追加消息出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5340
+msgid "Error fetching message headers"
+msgstr "取回消息头出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5512
+msgid "Error retrieving message"
+msgstr "收取消息出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5642
+#: ../camel/providers/imapx/camel-imapx-server.c:5865
+#, c-format
+msgid "Fetching summary information for new messages in '%s'"
+msgstr "获取“%s”中新消息的概要信息"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5694
+#, c-format
+msgid "Scanning for changed messages in '%s'"
+msgstr "扫描“%s”中更改了的消息"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5746
+msgid "Error fetching new messages"
+msgstr "取回新消息出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6014
+msgid "Error refreshing folder"
+msgstr "刷新文件夹出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6164
+msgid "Error expunging message"
+msgstr "销毁消息出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6273
+#: ../camel/providers/imapx/camel-imapx-server.c:6298
+msgid "Error fetching folders"
+msgstr "取回文件夹出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6378
+msgid "Error creating folder"
+msgstr "创建文件夹出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6430
+msgid "Error deleting folder"
+msgstr "删除文件夹出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6497
+msgid "Error renaming folder"
+msgstr "重命名文件夹出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6584
+msgid "Error subscribing to folder"
+msgstr "订阅文件夹出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6644
+msgid "Error unsubscribing from folder"
+msgstr "取消订阅文件夹出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6700
+msgid "Error retrieving quota information"
+msgstr "获取配额信息出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6752
+msgid "Search failed"
+msgstr "搜索失败"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6814
+msgid "Error performing NOOP"
+msgstr "执行 NOOP 出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6921
+msgid "Error syncing changes"
+msgstr "同步变更出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:7227
+msgid "Lost connection to IMAP server"
+msgstr "与 IMAP 服务器的连接中断"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:7977
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "无法获取消息 ID %s:%s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:7978
+msgid "No such message available."
+msgstr "没有该消息。"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:8177
+#: ../camel/providers/imapx/camel-imapx-server.c:8192
+msgid "Cannot create spool file: "
+msgstr "无法创建离线文件:"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:8897
+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:209
+#: ../camel/providers/local/camel-maildir-folder.c:473
+#: ../camel/providers/local/camel-maildir-store.c:323
+#: ../camel/providers/local/camel-maildir-store.c:765
+#: ../camel/providers/local/camel-maildir-store.c:771
+#: ../camel/providers/local/camel-maildir-store.c:854
+#: ../camel/providers/local/camel-spool-store.c:395
+msgid "Inbox"
+msgstr "收件箱"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:825
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP 服务器 %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:828
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1031
+#: ../camel/providers/nntp/camel-nntp-provider.c:95
+#: ../camel/providers/pop3/camel-pop3-provider.c:83
+msgid "Password"
+msgstr "密码"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1033
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr "该选项将使用纯文本密码连接到 IMAP 服务器。"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1058
+#: ../camel/providers/imapx/camel-imapx-store.c:2621
+#: ../camel/providers/nntp/camel-nntp-store.c:1252
+#: ../camel/providers/pop3/camel-pop3-folder.c:452
+#: ../camel/providers/pop3/camel-pop3-folder.c:595
+#: ../camel/providers/pop3/camel-pop3-folder.c:791
+#: ../camel/providers/pop3/camel-pop3-folder.c:989
+#: ../camel/providers/pop3/camel-pop3-store.c:301
+#: ../camel/providers/pop3/camel-pop3-store.c:530
+#: ../camel/providers/pop3/camel-pop3-store.c:578
+#: ../camel/providers/pop3/camel-pop3-store.c:670
+#: ../camel/providers/pop3/camel-pop3-store.c:1074
+#, c-format
+msgid "You must be working online to complete this operation"
+msgstr "您必须在线工作以便完成该操作"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1125
+#, c-format
+msgid "No such folder %s"
+msgstr "没有文件夹 %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1520
+#, c-format
+msgid "No IMAP namespace for folder path '%s'"
+msgstr "没有对应文件夹路径“%s”的 IMAP 名字空间"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1669
+#, c-format
+msgid "Retrieving folder list for %s"
+msgstr "正在获取“%s”的文件夹列表"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2075
+#, 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:98
+#, c-format
+msgid "Source stream returned no data"
+msgstr "源流没返回数据"
+
+#: ../camel/providers/imapx/camel-imapx-stream.c:107
+#, c-format
+msgid "Source stream unavailable"
+msgstr "源流不可用"
+
 #: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
 msgid "~%s (%s)"
@@ -3479,7 +3442,7 @@ msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 msgstr ""
-"对于将本地邮件从标准 mbox 格式脱机文件夹获取(移动)到由 Evolution 管理的文件"
+"对于将本地邮件从标准 mbox 格式离线文件夹获取(移动)到由 Evolution 管理的文件"
 "夹。"
 
 #: ../camel/providers/local/camel-local-provider.c:83
@@ -3501,7 +3464,7 @@ msgstr "以 Elm/Pine/Mutt 格式存储状态头(_S)"
 
 #: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
-msgstr "标准 Unix mbox 脱机文件"
+msgstr "标准 Unix mbox 离线文件"
 
 #: ../camel/providers/local/camel-local-provider.c:112
 #: ../camel/providers/local/camel-local-provider.c:126
@@ -3509,12 +3472,12 @@ msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"对于读取和存储外部标准 mbox 脱机文件中的本地邮件。\n"
+"对于读取和存储外部标准 mbox 离线文件中的本地邮件。\n"
 "也可用于读取 Elm、Pine 或 Mutt 风格的文件夹树。"
 
 #: ../camel/providers/local/camel-local-provider.c:125
 msgid "Standard Unix mbox spool directory"
-msgstr "标准 Unix mbox 脱机目录"
+msgstr "标准 Unix mbox 离线目录"
 
 #: ../camel/providers/local/camel-local-store.c:98
 #, c-format
@@ -3528,7 +3491,7 @@ msgstr "本地邮件文件 %s"
 
 #: ../camel/providers/local/camel-local-store.c:223
 #: ../camel/providers/local/camel-local-store.c:383
-#: ../camel/providers/local/camel-maildir-store.c:117
+#: ../camel/providers/local/camel-maildir-store.c:124
 #: ../camel/providers/local/camel-mbox-store.c:581
 #: ../camel/providers/local/camel-spool-store.c:89
 #, c-format
@@ -3543,7 +3506,7 @@ msgstr "存储根目录 %s 不是普通目录"
 #: ../camel/providers/local/camel-local-store.c:244
 #: ../camel/providers/local/camel-local-store.c:254
 #: ../camel/providers/local/camel-local-store.c:396
-#: ../camel/providers/local/camel-maildir-store.c:145
+#: ../camel/providers/local/camel-maildir-store.c:152
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "无法获取文件夹:%s:%s"
@@ -3570,15 +3533,10 @@ msgstr "无法删除文件夹元文件“%s”:%s"
 msgid "Could not rename '%s': %s"
 msgstr "无法重命名“%s”:%s"
 
-#: ../camel/providers/local/camel-local-summary.c:567
-#, c-format
-msgid "Unable to add message to summary: unknown reason"
-msgstr "无法将消息添加到概要中:未知的原因"
-
 #: ../camel/providers/local/camel-maildir-folder.c:100
 #: ../camel/providers/local/camel-maildir-folder.c:335
 #: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mbox-folder.c:330
 #: ../camel/providers/local/camel-mh-folder.c:159
 msgid "No such message"
 msgstr "没有该消息"
@@ -3590,7 +3548,7 @@ msgstr "无法将消息附加到邮件目录文件夹:%s:"
 
 #: ../camel/providers/local/camel-maildir-folder.c:273
 #: ../camel/providers/local/camel-maildir-folder.c:283
-#: ../camel/providers/local/camel-mbox-folder.c:390
+#: ../camel/providers/local/camel-mbox-folder.c:391
 #: ../camel/providers/local/camel-mh-folder.c:171
 #: ../camel/providers/local/camel-mh-folder.c:181
 #, c-format
@@ -3602,83 +3560,83 @@ msgstr "无法从文件夹 %2$s 获取消息 %1$s:"
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "无法将消息转移到目标文件夹:%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:125
-#: ../camel/providers/local/camel-maildir-store.c:848
+#: ../camel/providers/local/camel-maildir-store.c:132
+#: ../camel/providers/local/camel-maildir-store.c:862
 #, c-format
 msgid "Folder %s already exists"
 msgstr "文件夹 %s 已经存在"
 
-#: ../camel/providers/local/camel-maildir-store.c:230
-#: ../camel/providers/local/camel-maildir-store.c:261
+#: ../camel/providers/local/camel-maildir-store.c:237
+#: ../camel/providers/local/camel-maildir-store.c:268
 #: ../camel/providers/local/camel-mbox-store.c:403
 #: ../camel/providers/local/camel-mbox-store.c:424
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "无法创建文件夹“%s”:%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:245
+#: ../camel/providers/local/camel-maildir-store.c:252
 #: ../camel/providers/local/camel-mbox-store.c:369
-#: ../camel/providers/local/camel-mh-store.c:514
+#: ../camel/providers/local/camel-mh-store.c:525
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "无法获取文件夹“%s”:%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:251
+#: ../camel/providers/local/camel-maildir-store.c:258
 #: ../camel/providers/local/camel-mbox-store.c:379
-#: ../camel/providers/local/camel-mh-store.c:523
+#: ../camel/providers/local/camel-mh-store.c:534
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "无法获得文件夹“%s”:文件夹不存在。"
 
-#: ../camel/providers/local/camel-maildir-store.c:278
+#: ../camel/providers/local/camel-maildir-store.c:285
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "无法获取文件夹“%s”:不是 maildir 目录。"
 
-#: ../camel/providers/local/camel-maildir-store.c:283
+#: ../camel/providers/local/camel-maildir-store.c:290
 #: ../camel/providers/local/camel-mbox-store.c:442
-#: ../camel/providers/local/camel-mh-store.c:556
+#: ../camel/providers/local/camel-mh-store.c:567
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "无法创建文件夹“%s”:文件夹已存在。"
 
-#: ../camel/providers/local/camel-maildir-store.c:347
-#: ../camel/providers/local/camel-maildir-store.c:387
-#: ../camel/providers/local/camel-mh-store.c:674
+#: ../camel/providers/local/camel-maildir-store.c:354
+#: ../camel/providers/local/camel-maildir-store.c:394
+#: ../camel/providers/local/camel-mh-store.c:685
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "无法删除文件夹“%s”:%s"
 
-#: ../camel/providers/local/camel-maildir-store.c:349
+#: ../camel/providers/local/camel-maildir-store.c:356
 msgid "not a maildir directory"
 msgstr "不是 maildir 目录"
 
-#: ../camel/providers/local/camel-maildir-store.c:628
-#: ../camel/providers/local/camel-maildir-store.c:1063
-#: ../camel/providers/local/camel-spool-store.c:212
-#: ../camel/providers/local/camel-spool-store.c:231
+#: ../camel/providers/local/camel-maildir-store.c:637
+#: ../camel/providers/local/camel-maildir-store.c:1076
+#: ../camel/providers/local/camel-spool-store.c:214
+#: ../camel/providers/local/camel-spool-store.c:233
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "无法扫描文件夹“%s”:%s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:458
-#: ../camel/providers/local/camel-maildir-summary.c:591
+#: ../camel/providers/local/camel-maildir-summary.c:467
+#: ../camel/providers/local/camel-maildir-summary.c:607
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "无法打开邮件目录路径:%s:%s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:582
+#: ../camel/providers/local/camel-maildir-summary.c:598
 msgid "Checking folder consistency"
 msgstr "检查文件夹一致性"
 
-#: ../camel/providers/local/camel-maildir-summary.c:675
+#: ../camel/providers/local/camel-maildir-summary.c:691
 msgid "Checking for new messages"
 msgstr "检查新消息"
 
-#: ../camel/providers/local/camel-maildir-summary.c:770
-#: ../camel/providers/local/camel-mbox-summary.c:450
-#: ../camel/providers/local/camel-mbox-summary.c:682
-#: ../camel/providers/local/camel-mbox-summary.c:830
+#: ../camel/providers/local/camel-maildir-summary.c:786
+#: ../camel/providers/local/camel-mbox-summary.c:468
+#: ../camel/providers/local/camel-mbox-summary.c:684
+#: ../camel/providers/local/camel-mbox-summary.c:833
 #: ../camel/providers/local/camel-spool-summary.c:141
 msgid "Storing folder"
 msgstr "存储文件夹"
@@ -3693,11 +3651,11 @@ msgstr "无法打开邮件箱:%s:"
 msgid "Cannot append message to mbox file: %s: "
 msgstr "无法将消息附加到邮件箱文件:%s:"
 
-#: ../camel/providers/local/camel-mbox-folder.c:382
+#: ../camel/providers/local/camel-mbox-folder.c:383
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "文件夹好像已经被不可恢复地破坏了。"
 
-#: ../camel/providers/local/camel-mbox-folder.c:439
+#: ../camel/providers/local/camel-mbox-folder.c:440
 #: ../camel/providers/local/camel-spool-folder.c:69
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
@@ -3770,83 +3728,78 @@ msgstr "无法重命名“%s”:“%s”:%s"
 msgid "Could not rename '%s' to %s: %s"
 msgstr "无法将“%s”重命名为 %s:%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:460
+#: ../camel/providers/local/camel-mbox-summary.c:478
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "无法打开文件夹:%s:%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:522
-#, c-format
-msgid "Fatal mail parser error near position %s in folder %s"
-msgstr "邮件解析发生致命错误,位于 %s (文件夹 %s)"
-
-#: ../camel/providers/local/camel-mbox-summary.c:607
+#: ../camel/providers/local/camel-mbox-summary.c:608
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "无法检查文件夹:%s:%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:695
-#: ../camel/providers/local/camel-mbox-summary.c:839
+#: ../camel/providers/local/camel-mbox-summary.c:697
+#: ../camel/providers/local/camel-mbox-summary.c:842
 #: ../camel/providers/local/camel-spool-summary.c:148
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "无法打开文件:%s:%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:709
+#: ../camel/providers/local/camel-mbox-summary.c:712
 #: ../camel/providers/local/camel-spool-summary.c:163
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "无法打开临时邮件箱:%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:726
-#: ../camel/providers/local/camel-mbox-summary.c:956
+#: ../camel/providers/local/camel-mbox-summary.c:729
+#: ../camel/providers/local/camel-mbox-summary.c:963
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "无法关闭来源文件夹 %s:%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-mbox-summary.c:742
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "无法关闭临时文件夹:%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:758
+#: ../camel/providers/local/camel-mbox-summary.c:761
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "无法重命名文件夹:%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:853
-#: ../camel/providers/local/camel-mbox-summary.c:1122
+#: ../camel/providers/local/camel-mbox-summary.c:856
+#: ../camel/providers/local/camel-mbox-summary.c:1128
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "无法存储文件夹:%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:892
-#: ../camel/providers/local/camel-mbox-summary.c:1162
+#: ../camel/providers/local/camel-mbox-summary.c:895
+#: ../camel/providers/local/camel-mbox-summary.c:1168
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
 "it.)"
 msgstr "MBOX 文件损坏,请修复。(应该有 From 行,但未找到。)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:902
-#: ../camel/providers/local/camel-mbox-summary.c:1174
+#: ../camel/providers/local/camel-mbox-summary.c:905
+#: ../camel/providers/local/camel-mbox-summary.c:1180
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "即使同步后,概要和文件夹仍然不匹配"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1067
-#: ../camel/providers/local/camel-spool-summary.c:356
+#: ../camel/providers/local/camel-mbox-summary.c:1073
+#: ../camel/providers/local/camel-spool-summary.c:358
 #, c-format
 msgid "Unknown error: %s"
 msgstr "未知的错误:%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1232
-#: ../camel/providers/local/camel-mbox-summary.c:1262
+#: ../camel/providers/local/camel-mbox-summary.c:1238
+#: ../camel/providers/local/camel-mbox-summary.c:1268
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "写入临时 mailbox 失败:%s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1251
+#: ../camel/providers/local/camel-mbox-summary.c:1257
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "写入临时 mailbox 失败:%s:%s"
@@ -3856,17 +3809,17 @@ msgstr "写入临时 mailbox 失败:%s:%s"
 msgid "Cannot append message to mh folder: %s: "
 msgstr "无法将消息附加到 mh 文件夹:%s:"
 
-#: ../camel/providers/local/camel-mh-store.c:533
+#: ../camel/providers/local/camel-mh-store.c:544
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "无法创建文件夹“%s”:%s"
 
-#: ../camel/providers/local/camel-mh-store.c:549
+#: ../camel/providers/local/camel-mh-store.c:560
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "无法获取文件夹“%s”:不是目录。"
 
-#: ../camel/providers/local/camel-mh-summary.c:227
+#: ../camel/providers/local/camel-mh-summary.c:238
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "无法打开 MH 目录:%s:%s"
@@ -3874,33 +3827,33 @@ msgstr "无法打开 MH 目录:%s:%s"
 #: ../camel/providers/local/camel-spool-store.c:97
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
-msgstr "无法打开脱机文件“%s”:%s"
+msgstr "无法打开离线文件“%s”:%s"
 
 #: ../camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
-msgstr "脱机文件“%s”不是普通文件或目录"
+msgstr "离线文件“%s”不是普通文件或目录"
 
-#: ../camel/providers/local/camel-spool-store.c:425
+#: ../camel/providers/local/camel-spool-store.c:427
 #, c-format
 msgid "Spool mail file %s"
-msgstr "脱机邮件文件 %s"
+msgstr "离线邮件文件 %s"
 
-#: ../camel/providers/local/camel-spool-store.c:429
+#: ../camel/providers/local/camel-spool-store.c:431
 #, c-format
 msgid "Spool folder tree %s"
-msgstr "脱机文件夹树 %s"
+msgstr "离线文件夹树 %s"
 
-#: ../camel/providers/local/camel-spool-store.c:432
+#: ../camel/providers/local/camel-spool-store.c:434
 msgid "Invalid spool"
 msgstr "无效的本地文件"
 
-#: ../camel/providers/local/camel-spool-store.c:492
+#: ../camel/providers/local/camel-spool-store.c:483
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "文件夹“%s/%s”不存在。"
 
-#: ../camel/providers/local/camel-spool-store.c:505
+#: ../camel/providers/local/camel-spool-store.c:496
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3909,12 +3862,12 @@ msgstr ""
 "无法打开文件夹“%s”:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:511
+#: ../camel/providers/local/camel-spool-store.c:502
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "文件夹“%s”不存在。"
 
-#: ../camel/providers/local/camel-spool-store.c:519
+#: ../camel/providers/local/camel-spool-store.c:510
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3923,25 +3876,25 @@ msgstr ""
 "无法创建文件夹“%s”:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:532
+#: ../camel/providers/local/camel-spool-store.c:523
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "“%s”不是邮件箱文件。"
 
-#: ../camel/providers/local/camel-spool-store.c:596
+#: ../camel/providers/local/camel-spool-store.c:587
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "存储并不支持收件箱"
 
-#: ../camel/providers/local/camel-spool-store.c:615
+#: ../camel/providers/local/camel-spool-store.c:606
 #, c-format
 msgid "Spool folders cannot be deleted"
-msgstr "脱机文件夹无法删除"
+msgstr "离线文件夹无法删除"
 
-#: ../camel/providers/local/camel-spool-store.c:630
+#: ../camel/providers/local/camel-spool-store.c:621
 #, c-format
 msgid "Spool folders cannot be renamed"
-msgstr "脱机文件夹无法改名"
+msgstr "离线文件夹无法改名"
 
 #: ../camel/providers/local/camel-spool-summary.c:179
 #: ../camel/providers/local/camel-spool-summary.c:191
@@ -3953,67 +3906,61 @@ msgstr "无法同步临时文件夹 %s: %s"
 #: ../camel/providers/local/camel-spool-summary.c:221
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
-msgstr "无法同步脱机文件夹 %s: %s"
+msgstr "无法同步离线文件夹 %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:253
-#: ../camel/providers/local/camel-spool-summary.c:272
-#: ../camel/providers/local/camel-spool-summary.c:285
+#: ../camel/providers/local/camel-spool-summary.c:255
+#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:287
 #, c-format
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
-"无法同步脱机文件夹 %s: %s\n"
+"无法同步离线文件夹 %s: %s\n"
 "文件夹可能已损坏,副本已存放在 '%s'"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:285
-#: ../camel/providers/nntp/camel-nntp-folder.c:388
-#: ../camel/providers/nntp/camel-nntp-folder.c:510
+#: ../camel/providers/nntp/camel-nntp-folder.c:224
+#: ../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:349
-#: ../camel/providers/nntp/camel-nntp-folder.c:354
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-#: ../camel/providers/pop3/camel-pop3-folder.c:1107
+#: ../camel/providers/nntp/camel-nntp-folder.c:293
+#: ../camel/providers/nntp/camel-nntp-folder.c:298
+#: ../camel/providers/pop3/camel-pop3-folder.c:548
+#: ../camel/providers/pop3/camel-pop3-folder.c:947
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "无法获取消息 %s:%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:361
-#: ../camel/providers/nntp/camel-nntp-folder.c:536
-#: ../camel/providers/pop3/camel-pop3-folder.c:582
-#: ../camel/providers/pop3/camel-pop3-folder.c:647
-#: ../camel/providers/pop3/camel-pop3-folder.c:666
+#: ../camel/providers/nntp/camel-nntp-folder.c:305
+#: ../camel/providers/nntp/camel-nntp-folder.c:624
+#: ../camel/providers/pop3/camel-pop3-folder.c:478
+#: ../camel/providers/pop3/camel-pop3-folder.c:538
+#: ../camel/providers/pop3/camel-pop3-folder.c:557
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "无法获取消息 %s:"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:525
-#, c-format
-msgid "This message is not currently available"
-msgstr "该消息目前不可用"
-
-#: ../camel/providers/nntp/camel-nntp-folder.c:593
-#: ../camel/providers/nntp/camel-nntp-folder.c:599
+#: ../camel/providers/nntp/camel-nntp-folder.c:432
+#: ../camel/providers/nntp/camel-nntp-folder.c:438
 #, c-format
 msgid "Posting failed: %s"
 msgstr "发送失败:%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:664
+#: ../camel/providers/nntp/camel-nntp-folder.c:503
 msgid "Posting failed: "
 msgstr "发送失败:"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:689
+#: ../camel/providers/nntp/camel-nntp-folder.c:613
 #, c-format
-msgid "You cannot post NNTP messages while working offline!"
-msgstr "您离线时无法投递 NNTP 消息!"
+msgid "This message is not currently available"
+msgstr "该消息目前不可用"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:709
+#: ../camel/providers/nntp/camel-nntp-folder.c:722
 #, c-format
-msgid "You cannot copy messages from a NNTP folder!"
-msgstr "您无法从 NNTP 文件夹复制消息!"
+msgid "You cannot copy messages from a NNTP folder"
+msgstr "您不能从 NNTP 文件夹复制信息"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:48
 msgid ""
@@ -4041,13 +3988,10 @@ msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "这是一个读取 USENET 新闻组和向 USENET 新闻组发布邮件的提供者。"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:87
-#, fuzzy
-#| msgid ""
-#| "This option will connect to the server using Kerberos 5 authentication."
 msgid ""
 "This option will connect to the NNTP server anonymously, without "
 "authentication."
-msgstr "该选项将用 Kerberos 5 认证连接到服务器。"
+msgstr "该选项将放弃认证,匿名连接 NNTP 服务器。"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:97
 msgid ""
@@ -4055,22 +3999,22 @@ msgid ""
 "password."
 msgstr "该选项将以明文密码向进行 NNTP 服务器进行认证。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:386
+#: ../camel/providers/nntp/camel-nntp-store.c:373
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "无法阅读来自 %s 的欢迎信息:"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:394
+#: ../camel/providers/nntp/camel-nntp-store.c:381
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP 服务器 %s 返回错误码 %d:%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:555
+#: ../camel/providers/nntp/camel-nntp-store.c:451
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET 新闻 %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1218
+#: ../camel/providers/nntp/camel-nntp-store.c:1153
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4081,22 +4025,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1319
+#: ../camel/providers/nntp/camel-nntp-store.c:1269
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "您无法在新闻存储中创建文件夹:应该订阅。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1335
+#: ../camel/providers/nntp/camel-nntp-store.c:1285
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "您无法在新闻存储中重命名文件夹。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1358
+#: ../camel/providers/nntp/camel-nntp-store.c:1308
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "您无法在新闻存储中删除文件夹:应该退订。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1577
+#: ../camel/providers/nntp/camel-nntp-store.c:1518
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4107,7 +4051,7 @@ msgstr ""
 "\n"
 "没有这样的新闻组。选中项目可能是父文件夹。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1644
+#: ../camel/providers/nntp/camel-nntp-store.c:1585
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4118,27 +4062,27 @@ msgstr ""
 "\n"
 "新闻组不存在!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2081
+#: ../camel/providers/nntp/camel-nntp-store.c:2011
 msgid "NNTP Command failed: "
 msgstr "NNTP 命令失败:"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2178
+#: ../camel/providers/nntp/camel-nntp-store.c:2108
 #, c-format
 msgid "Not connected."
 msgstr "未连接。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2272
+#: ../camel/providers/nntp/camel-nntp-store.c:2202
 #, c-format
 msgid "No such folder: %s"
 msgstr "没有文件夹:%s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:200
+#: ../camel/providers/nntp/camel-nntp-summary.c:199
 #: ../camel/providers/nntp/camel-nntp-summary.c:339
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s:正在扫描新消息"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:222
+#: ../camel/providers/nntp/camel-nntp-summary.c:221
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "来自 xover 的意外服务器应答:%s"
@@ -4148,43 +4092,43 @@ msgstr "来自 xover 的意外服务器应答:%s"
 msgid "Unexpected server response from head: %s"
 msgstr "来自 head 的意外服务器应答:%s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:407
+#: ../camel/providers/nntp/camel-nntp-summary.c:408
 #, c-format
 msgid "Operation failed: %s"
 msgstr "操作失败:%s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:468
-#: ../camel/providers/pop3/camel-pop3-folder.c:547
+#: ../camel/providers/pop3/camel-pop3-folder.c:361
+#: ../camel/providers/pop3/camel-pop3-folder.c:444
 #, c-format
 msgid "No message with UID %s"
 msgstr "没有 UID 为 %s 的消息"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:563
+#: ../camel/providers/pop3/camel-pop3-folder.c:460
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "正在获取 POP 消息 %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:658
+#: ../camel/providers/pop3/camel-pop3-folder.c:549
 msgid "Unknown reason"
 msgstr "未知原因"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:710
+#: ../camel/providers/pop3/camel-pop3-folder.c:600
 msgid "Retrieving POP summary"
 msgstr "正在获取 POP 概要"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:771
-#: ../camel/providers/pop3/camel-pop3-folder.c:774
-#: ../camel/providers/pop3/camel-pop3-folder.c:787
-#: ../camel/providers/pop3/camel-pop3-folder.c:800
-#: ../camel/providers/pop3/camel-pop3-folder.c:814
+#: ../camel/providers/pop3/camel-pop3-folder.c:661
+#: ../camel/providers/pop3/camel-pop3-folder.c:664
+#: ../camel/providers/pop3/camel-pop3-folder.c:677
+#: ../camel/providers/pop3/camel-pop3-folder.c:690
+#: ../camel/providers/pop3/camel-pop3-folder.c:704
 msgid "Cannot get POP summary: "
 msgstr "无法获取 POP 概要:"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:925
+#: ../camel/providers/pop3/camel-pop3-folder.c:768
 msgid "Expunging old messages"
 msgstr "销毁旧消息"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:945
+#: ../camel/providers/pop3/camel-pop3-folder.c:796
 msgid "Expunging deleted messages"
 msgstr "彻底销毁已删除的消息"
 
@@ -4249,53 +4193,53 @@ msgstr ""
 msgid ": "
 msgstr ":"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:161
+#: ../camel/providers/pop3/camel-pop3-store.c:166
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "从 POP 服务器 %s 读取欢迎词失败"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:176
+#: ../camel/providers/pop3/camel-pop3-store.c:181
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "以安全模式连接到 POP 服务器 %s 失败:%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:177
+#: ../camel/providers/pop3/camel-pop3-store.c:182
 msgid "STLS not supported by server"
 msgstr "服务器不支持 STLS"
 
 #. Translators: Last %s is an optional
 #. * explanation beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:198
+#: ../camel/providers/pop3/camel-pop3-store.c:203
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "以安全模式连接到 POP 服务器 %s 失败%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:211
+#: ../camel/providers/pop3/camel-pop3-store.c:221
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "以安全模式连接到 POP 服务器 %s 失败:"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:342
+#: ../camel/providers/pop3/camel-pop3-store.c:362
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "无法登录到 POP 服务器 %s:SASL 协议错误"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:364
+#: ../camel/providers/pop3/camel-pop3-store.c:384
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "无法认证 POP 服务器 %s:"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:472
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 服务器 %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:475
+#: ../camel/providers/pop3/camel-pop3-store.c:495
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "%2$s 为 %1$s 提供的 POP 服务"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:690
+#: ../camel/providers/pop3/camel-pop3-store.c:715
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4304,7 +4248,7 @@ msgstr ""
 "无法连接到 POP 服务器 %s:\t接收到非法的 APOP ID。可能是冒名攻击。请联系您的"
 "管理员。"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:742
+#: ../camel/providers/pop3/camel-pop3-store.c:770
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4315,7 +4259,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:757
+#: ../camel/providers/pop3/camel-pop3-store.c:785
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4324,12 +4268,12 @@ msgstr ""
 "无法连接到 POP 服务器 %s。\n"
 "发送用户名错误%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:839
+#: ../camel/providers/pop3/camel-pop3-store.c:867
 #, c-format
 msgid "No such folder '%s'."
 msgstr "没有文件夹“%s”。"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:856
+#: ../camel/providers/pop3/camel-pop3-store.c:884
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 的存储没有文件夹结构"
@@ -4354,15 +4298,14 @@ msgid "Mail delivery via the sendmail program"
 msgstr "通过 sendmail 程序发送邮件"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:140
-#, fuzzy, c-format
-#| msgid "Failed to retrieve message"
+#, c-format
 msgid "Failed to read From address"
-msgstr "获取消息失败"
+msgstr "读取 From(来自) 地址失败"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:157
 #, c-format
 msgid "Message send in offline mode is disabled"
-msgstr ""
+msgstr "禁止在离线模式发送信息"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:185
 #, c-format
@@ -4370,44 +4313,38 @@ msgid "Could not parse recipient list"
 msgstr "无法解析收件人列表"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:202
-#, fuzzy, c-format
-#| msgid "Could not parse recipient list"
+#, c-format
 msgid "Could not parse arguments"
-msgstr "无法解析收件人列表"
+msgstr "无法解析参数"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:233
-#, fuzzy, c-format
-#| msgid "Could not create pipe to sendmail: %s: mail not sent"
+#, c-format
 msgid "Could not create pipe to '%s': %s: mail not sent"
-msgstr "无法创建到 sendmail 的管道:%s:邮件未发送"
+msgstr "无法创建到“%s”的管道:%s:邮件未发送"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:258
-#, fuzzy, c-format
-#| msgid "Could not fork sendmail: %s: mail not sent"
+#, c-format
 msgid "Could not fork '%s': %s: mail not sent"
-msgstr "无法创建 sendmail 进程:%s:邮件未发送"
+msgstr "无法 fork “%s”进程:%s:邮件未发送"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:307
 msgid "Could not send message: "
 msgstr "无法发送消息:"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:337
-#, fuzzy, c-format
-#| msgid "sendmail exited with signal %s: mail not sent."
+#, c-format
 msgid "'%s' exited with signal %s: mail not sent."
-msgstr "sendmail 以信号 %s 退出:邮件未发送。"
+msgstr "“%s”以信号 %s 退出:邮件未发送。"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:347
-#, fuzzy, c-format
-#| msgid "Could not execute %s: mail not sent."
+#, c-format
 msgid "Could not execute '%s': mail not sent."
-msgstr "无法执行 %s:邮件未发送。"
+msgstr "无法执行“%s”:邮件未发送。"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:352
-#, fuzzy, c-format
-#| msgid "sendmail exited with status %d: mail not sent."
+#, c-format
 msgid "'%s' exited with status %d: mail not sent."
-msgstr "sendmail 以状态码 %d 退出:邮件未发送。"
+msgstr "“%s”以状态码 %d 退出:邮件未发送。"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:42
 msgid "Default SMTP port"
@@ -4429,218 +4366,218 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "要投递邮件,应该使用 SMTP 连接到远程的邮件交换服务器。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Welcome response error: "
 msgstr "欢迎应答错误:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "以安全模式连接 SMTP 服务器 %s 失败:%s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
-#: ../camel/providers/smtp/camel-smtp-transport.c:227
-#: ../camel/providers/smtp/camel-smtp-transport.c:234
+#: ../camel/providers/smtp/camel-smtp-transport.c:226
+#: ../camel/providers/smtp/camel-smtp-transport.c:240
+#: ../camel/providers/smtp/camel-smtp-transport.c:248
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:245
+#: ../camel/providers/smtp/camel-smtp-transport.c:267
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "以安全模式连接 SMTP 服务器 %s 失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:347
+#: ../camel/providers/smtp/camel-smtp-transport.c:359
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP 服务器 %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:350
+#: ../camel/providers/smtp/camel-smtp-transport.c:362
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "通过 %s 发送 SMTP 邮件"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:424
+#: ../camel/providers/smtp/camel-smtp-transport.c:436
 #, 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:508
 #, 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:538
+#: ../camel/providers/smtp/camel-smtp-transport.c:549
+#: ../camel/providers/smtp/camel-smtp-transport.c:562
 msgid "AUTH command failed: "
 msgstr "AUTH 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
+#: ../camel/providers/smtp/camel-smtp-transport.c:703
 #, 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:710
 #, 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:714
 msgid "Sending message"
 msgstr "正在发送消息"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
 #, 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:752
 #, 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:873
 msgid "Syntax error, command unrecognized"
 msgstr "语法错误,命令无法识别"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:873
+#: ../camel/providers/smtp/camel-smtp-transport.c:875
 msgid "Syntax error in parameters or arguments"
 msgstr "参数语法错误"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:875
+#: ../camel/providers/smtp/camel-smtp-transport.c:877
 msgid "Command not implemented"
 msgstr "命令尚未实现"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:877
+#: ../camel/providers/smtp/camel-smtp-transport.c:879
 msgid "Command parameter not implemented"
 msgstr "命令参数尚未实现"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:879
+#: ../camel/providers/smtp/camel-smtp-transport.c:881
 msgid "System status, or system help reply"
 msgstr "系统状态,或系统求助就绪"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:881
+#: ../camel/providers/smtp/camel-smtp-transport.c:883
 msgid "Help message"
 msgstr "帮助消息"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:883
+#: ../camel/providers/smtp/camel-smtp-transport.c:885
 msgid "Service ready"
 msgstr "服务就绪"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:885
+#: ../camel/providers/smtp/camel-smtp-transport.c:887
 msgid "Service closing transmission channel"
 msgstr "服务正在关闭传输通道"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:887
+#: ../camel/providers/smtp/camel-smtp-transport.c:889
 msgid "Service not available, closing transmission channel"
 msgstr "服务不可用,正在关闭传输通道"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:889
+#: ../camel/providers/smtp/camel-smtp-transport.c:891
 msgid "Requested mail action okay, completed"
 msgstr "邮件动作请求确认,已完成"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:891
+#: ../camel/providers/smtp/camel-smtp-transport.c:893
 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:895
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "邮件动作请求未发生:邮箱无效"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:895
+#: ../camel/providers/smtp/camel-smtp-transport.c:897
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "动作请求未发生:邮箱无效"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:897
+#: ../camel/providers/smtp/camel-smtp-transport.c:899
 msgid "Requested action aborted: error in processing"
 msgstr "动作请求已放弃:处理出错"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:899
+#: ../camel/providers/smtp/camel-smtp-transport.c:901
 msgid "User not local; please try <forward-path>"
 msgstr "用户不在本地;请尝试 <转发路径>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:901
+#: ../camel/providers/smtp/camel-smtp-transport.c:903
 msgid "Requested action not taken: insufficient system storage"
 msgstr "动作请求未发生:系统存储空间不足"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:903
+#: ../camel/providers/smtp/camel-smtp-transport.c:905
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "邮件动作请求已放弃:存储分配超额"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:905
+#: ../camel/providers/smtp/camel-smtp-transport.c:907
 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:909
 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:911
 msgid "Transaction failed"
 msgstr "传送失败"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:913
+#: ../camel/providers/smtp/camel-smtp-transport.c:915
 msgid "A password transition is needed"
 msgstr "必须传输密码"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:915
+#: ../camel/providers/smtp/camel-smtp-transport.c:917
 msgid "Authentication mechanism is too weak"
 msgstr "认证机制太弱"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:917
+#: ../camel/providers/smtp/camel-smtp-transport.c:919
 msgid "Encryption required for requested authentication mechanism"
 msgstr "请求的认证机制必须加密"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:919
+#: ../camel/providers/smtp/camel-smtp-transport.c:921
 msgid "Temporary authentication failure"
 msgstr "临时认证失败"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../camel/providers/smtp/camel-smtp-transport.c:1209
 msgid "SMTP Greeting"
 msgstr "SMTP 欢迎"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
-#: ../camel/providers/smtp/camel-smtp-transport.c:1221
-#: ../camel/providers/smtp/camel-smtp-transport.c:1229
+#: ../camel/providers/smtp/camel-smtp-transport.c:1219
+#: ../camel/providers/smtp/camel-smtp-transport.c:1233
+#: ../camel/providers/smtp/camel-smtp-transport.c:1241
 msgid "HELO command failed: "
 msgstr "HELO 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1304
-#: ../camel/providers/smtp/camel-smtp-transport.c:1319
-#: ../camel/providers/smtp/camel-smtp-transport.c:1329
+#: ../camel/providers/smtp/camel-smtp-transport.c:1316
+#: ../camel/providers/smtp/camel-smtp-transport.c:1331
+#: ../camel/providers/smtp/camel-smtp-transport.c:1341
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1356
+#: ../camel/providers/smtp/camel-smtp-transport.c:1368
 msgid "RCPT TO command failed: "
 msgstr "RSET 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1373
-#: ../camel/providers/smtp/camel-smtp-transport.c:1383
+#: ../camel/providers/smtp/camel-smtp-transport.c:1385
+#: ../camel/providers/smtp/camel-smtp-transport.c:1395
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> 失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1426
-#: ../camel/providers/smtp/camel-smtp-transport.c:1437
-#: ../camel/providers/smtp/camel-smtp-transport.c:1448
-#: ../camel/providers/smtp/camel-smtp-transport.c:1507
-#: ../camel/providers/smtp/camel-smtp-transport.c:1527
-#: ../camel/providers/smtp/camel-smtp-transport.c:1541
-#: ../camel/providers/smtp/camel-smtp-transport.c:1550
+#: ../camel/providers/smtp/camel-smtp-transport.c:1438
+#: ../camel/providers/smtp/camel-smtp-transport.c:1449
+#: ../camel/providers/smtp/camel-smtp-transport.c:1460
+#: ../camel/providers/smtp/camel-smtp-transport.c:1519
+#: ../camel/providers/smtp/camel-smtp-transport.c:1539
+#: ../camel/providers/smtp/camel-smtp-transport.c:1553
+#: ../camel/providers/smtp/camel-smtp-transport.c:1562
 msgid "DATA command failed: "
 msgstr "DATP 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1575
-#: ../camel/providers/smtp/camel-smtp-transport.c:1590
-#: ../camel/providers/smtp/camel-smtp-transport.c:1599
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
+#: ../camel/providers/smtp/camel-smtp-transport.c:1602
+#: ../camel/providers/smtp/camel-smtp-transport.c:1611
 msgid "RSET command failed: "
 msgstr "RSET 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1624
-#: ../camel/providers/smtp/camel-smtp-transport.c:1638
-#: ../camel/providers/smtp/camel-smtp-transport.c:1645
+#: ../camel/providers/smtp/camel-smtp-transport.c:1636
+#: ../camel/providers/smtp/camel-smtp-transport.c:1650
+#: ../camel/providers/smtp/camel-smtp-transport.c:1657
 msgid "QUIT command failed: "
 msgstr "QUIT 命令失败:"
 
@@ -4674,10 +4611,71 @@ msgid ""
 "\"days\""
 msgstr "生日/周年纪念日提醒单位,“分钟”、“小时”或“天”"
 
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
+msgid "(Deprecated) Proxy type to use"
+msgstr "(已废弃)要使用的代理类型"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
+msgid ""
+"This key was deprecated in version 3.12 and should no longer be used. Proxy "
+"settings are now integrated into Evolution-Data-Server's account system. See "
+"the ESourceProxy API documentation for details."
+msgstr ""
+"此键在 3.12 版本废弃,不应再用。代理设置现在集成到了 Evolution-Data-See 的帐"
+"号系统中。详情参阅 ESourceProxy API 文档。"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
+msgid "(Deprecated) Whether to use http-proxy"
+msgstr "(已废弃)是否使用 HTTP 代理"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+msgid "(Deprecated) Whether proxy server requires authentication"
+msgstr "(已废弃)代理服务器是否需要认证"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
+msgid "(Deprecated) Host name for HTTP requests"
+msgstr "(已废弃) HTTP 请求的主机名"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
+msgid "(Deprecated) Port number for HTTP requests"
+msgstr "(已废弃) HTTP 请求端口"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
+msgid "(Deprecated) Proxy authentication user name"
+msgstr "(已废弃)代理认证用户名"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+msgid "(Deprecated) Proxy authentication password"
+msgstr "(已废弃)代理认证密码"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+msgid "(Deprecated) List of hosts to connect to without proxy"
+msgstr "(已废弃)不使用代理连接的主机列表"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+msgid "(Deprecated) Host name for HTTPS requests"
+msgstr "(已废弃) HTTPS 请求的主机名"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+msgid "(Deprecated) Port number for HTTPS requests"
+msgstr "(已废弃) HTTPS 请求端口"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
+msgid "(Deprecated) Host name for SOCKS requests"
+msgstr "(已废弃) SOCKS 请求的主机名"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+msgid "(Deprecated) Port number for SOCKS requests"
+msgstr "(已废弃) SOCKS 请求端口"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+msgid "(Deprecated) Automatic proxy configuration URL"
+msgstr "(已废弃) 自动代理配置 URL"
+
 #: ../libebackend/e-authentication-mediator.c:205
 #: ../libebackend/e-authentication-mediator.c:216
-#: ../libebackend/e-authentication-mediator.c:852
-#: ../libebackend/e-authentication-mediator.c:1185
+#: ../libebackend/e-authentication-mediator.c:862
+#: ../libebackend/e-authentication-mediator.c:1199
 msgid "Bus name vanished (client terminated?)"
 msgstr "Bus 名称消失(客户端终止了?)"
 
@@ -4687,8 +4685,8 @@ msgstr "客户端无响应"
 
 #: ../libebackend/e-authentication-mediator.c:334
 #: ../libebackend/e-authentication-mediator.c:345
-#: ../libebackend/e-authentication-mediator.c:846
-#: ../libebackend/e-authentication-mediator.c:1179
+#: ../libebackend/e-authentication-mediator.c:856
+#: ../libebackend/e-authentication-mediator.c:1193
 msgid "Client cancelled the operation"
 msgstr "客户端已取消操作"
 
@@ -4696,34 +4694,33 @@ msgstr "客户端已取消操作"
 msgid "Client reports password was rejected"
 msgstr "客户端报告密码被拒绝"
 
-#: ../libebackend/e-authentication-session.c:543
+#: ../libebackend/e-authentication-session.c:569
 msgid "Add this password to your keyring"
 msgstr "将该密码添加到您的密钥环"
 
-#: ../libebackend/e-authentication-session.c:648
+#: ../libebackend/e-authentication-session.c:674
 msgid "Password was incorrect"
 msgstr "密码错误"
 
-#: ../libebackend/e-backend.c:428
+#: ../libebackend/e-backend.c:409
 #, c-format
 msgid "%s does not support authentication"
 msgstr "%s 不支持认证"
 
-#: ../libebackend/e-collection-backend.c:800
+#: ../libebackend/e-collection-backend.c:901
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr "%s 不支持创建远程资源"
 
-#: ../libebackend/e-collection-backend.c:859
+#: ../libebackend/e-collection-backend.c:960
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr "%s 不支持删除远程资源"
 
 #: ../libebackend/e-data-factory.c:304
-#, fuzzy, c-format
-#| msgid "No backend name in source '%s'"
+#, c-format
 msgid "No backend factory for hash key '%s'"
-msgstr "源文件“%s”中无后端名称"
+msgstr "散列键“%s”没有对应的后端工厂"
 
 #: ../libebackend/e-server-side-source.c:134
 #, c-format
@@ -4731,7 +4728,7 @@ msgid "Data source is missing a [%s] group"
 msgstr "数据源缺少一个 [%s] 组"
 
 #: ../libebackend/e-server-side-source.c:1008
-#: ../libedataserver/e-source.c:1138
+#: ../libedataserver/e-source.c:1253
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
 msgstr "数据源“%s”不支持创建远程资源"
@@ -4744,7 +4741,7 @@ msgid ""
 msgstr "数据源“%s”没有合集后端来创建远程资源"
 
 #: ../libebackend/e-server-side-source.c:1050
-#: ../libedataserver/e-source.c:1251
+#: ../libedataserver/e-source.c:1366
 #, c-format
 msgid "Data source '%s' does not support deleting remote resources"
 msgstr "数据源“%s”不支持删除远程资源"
@@ -4756,142 +4753,140 @@ msgid ""
 msgstr "数据源“%s”没有合集后端来删除远程资源"
 
 #: ../libebackend/e-server-side-source.c:1095
-#: ../libedataserver/e-source.c:1347
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990
-#, fuzzy, c-format
-#| msgid "IMAP server %s does not support %s authentication"
+#: ../libedataserver/e-source.c:1462
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1028
+#, c-format
 msgid "Data source '%s' does not support OAuth 2.0 authentication"
-msgstr "IMAP 服务器 %s 不支持 %s 认证"
+msgstr "数据源“%s”不支持 OAuth 2.0 认证"
 
-#: ../libebackend/e-server-side-source.c:1438
+#: ../libebackend/e-server-side-source.c:1440
 #, c-format
 msgid "File must have a '.source' extension"
 msgstr "文件扩展名必须为“.source”"
 
-#: ../libebackend/e-source-registry-server.c:521
-#: ../libedataserver/e-source-registry.c:1876
+#: ../libebackend/e-source-registry-server.c:532
+#: ../libedataserver/e-source-registry.c:1879
 msgid "The user declined to authenticate"
 msgstr "用户拒绝认证"
 
-#: ../libebackend/e-source-registry-server.c:790
+#: ../libebackend/e-source-registry-server.c:801
 #, c-format
 msgid "UID '%s' is already in use"
 msgstr "UID“%s” 已在使用"
 
-#: ../libebackend/e-user-prompter-server.c:301
-#, fuzzy, c-format
-#| msgid "Contact '%s' not found"
+#: ../libebackend/e-user-prompter-server.c:306
+#, c-format
 msgid "Extension dialog '%s' not found."
-msgstr "未找到联系人 %s"
+msgstr "扩展对话框“%s”未找到。"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "周年纪念日"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "生日"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "商务"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "完成"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "最爱"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:55
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "礼物"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "目标"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "假日"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "假日卡"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "亲密联系人"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "想法"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "International"
 msgstr "国际"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:63
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "关键客户"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:64
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "杂类"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "个人"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "通电话"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "状态"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "策略"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:70
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "供应商"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:71
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "时间和花费"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:72
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:69
+#: ../libedataserver/e-categories.c:73
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "等候"
@@ -4915,74 +4910,74 @@ msgstr "离线不可用"
 msgid "D-Bus error"
 msgstr "D-Bus 错误"
 
-#: ../libedataserver/e-source-authenticator.c:166
+#: ../libedataserver/e-source-authenticator.c:163
 msgid "Address book authentication request"
 msgstr "地址簿认证请求"
 
-#: ../libedataserver/e-source-authenticator.c:171
+#: ../libedataserver/e-source-authenticator.c:168
 msgid "Calendar authentication request"
 msgstr "日历认证请求"
 
-#: ../libedataserver/e-source-authenticator.c:175
+#: ../libedataserver/e-source-authenticator.c:172
 msgid "Mail authentication request"
 msgstr "邮件认证请求"
 
 #. generic account prompt
-#: ../libedataserver/e-source-authenticator.c:178
+#: ../libedataserver/e-source-authenticator.c:175
 msgid "Authentication request"
 msgstr "认证请求"
 
-#: ../libedataserver/e-source-authenticator.c:188
+#: ../libedataserver/e-source-authenticator.c:185
 #, c-format
 msgid "Please enter the password for address book \"%s\"."
 msgstr "请输入地址簿“%s”的密码。"
 
-#: ../libedataserver/e-source-authenticator.c:194
+#: ../libedataserver/e-source-authenticator.c:191
 #, c-format
 msgid "Please enter the password for calendar \"%s\"."
 msgstr "请输入日历“%s”的密码。"
 
-#: ../libedataserver/e-source-authenticator.c:200
+#: ../libedataserver/e-source-authenticator.c:197
 #, c-format
 msgid "Please enter the password for mail account \"%s\"."
 msgstr "请输入邮件帐号“%s”的密码。"
 
-#: ../libedataserver/e-source-authenticator.c:206
+#: ../libedataserver/e-source-authenticator.c:203
 #, c-format
 msgid "Please enter the password for mail transport \"%s\"."
 msgstr "请输入邮件传输“%s”的密码。"
 
-#: ../libedataserver/e-source-authenticator.c:212
+#: ../libedataserver/e-source-authenticator.c:209
 #, c-format
 msgid "Please enter the password for memo list \"%s\"."
 msgstr "请输入备忘录列表“%s”的密码。"
 
-#: ../libedataserver/e-source-authenticator.c:218
+#: ../libedataserver/e-source-authenticator.c:215
 #, c-format
 msgid "Please enter the password for task list \"%s\"."
 msgstr "请输入任务列表“%s”的密码。"
 
-#: ../libedataserver/e-source-authenticator.c:224
+#: ../libedataserver/e-source-authenticator.c:221
 #, c-format
 msgid "Please enter the password for account \"%s\"."
 msgstr "请输入帐号“%s”的密码。"
 
-#: ../libedataserver/e-source.c:627
+#: ../libedataserver/e-source.c:670
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "源文件缺少一个 [%s] 组"
 
-#: ../libedataserver/e-source.c:949
+#: ../libedataserver/e-source.c:1033
 #, c-format
 msgid "Data source '%s' is not removable"
 msgstr "数据源“%s”不是可删除的"
 
-#: ../libedataserver/e-source.c:1041
+#: ../libedataserver/e-source.c:1156
 #, c-format
 msgid "Data source '%s' is not writable"
 msgstr "数据源“%s”不是可写的"
 
-#: ../libedataserver/e-source.c:1559
+#: ../libedataserver/e-source.c:1769
 msgid "Unnamed"
 msgstr "未命名"
 
@@ -4991,69 +4986,39 @@ msgstr "未命名"
 msgid "Signature script must be a local file"
 msgstr "签名脚本必须为本地文件"
 
-#: ../libedataserver/e-source-webdav.c:1553
-#, fuzzy, c-format
-#| msgid ""
-#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
-#| "\n"
-#| "Detailed information about the certificate:\n"
-#| "%s"
+#: ../libedataserver/e-source-proxy.c:1647
+#, c-format
+msgid "Source '%s' does not support proxy lookups"
+msgstr "数据源“%s”不支持代理查找"
+
+#: ../libedataserver/e-source-webdav.c:1552
+#, c-format
 msgid ""
 "SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
 "you wish to accept it?"
-msgstr ""
-"“%s” 的 SSL 证书不受信任。您是否想要接受它?\n"
-"\n"
-"该证书的详细信息:\n"
-"%s"
+msgstr "地址簿“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任,您是否想要接受它?"
 
-#: ../libedataserver/e-source-webdav.c:1562
-#, fuzzy, c-format
-#| msgid ""
-#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
-#| "\n"
-#| "Detailed information about the certificate:\n"
-#| "%s"
+#: ../libedataserver/e-source-webdav.c:1561
+#, c-format
 msgid ""
 "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
 "wish to accept it?"
-msgstr ""
-"“%s” 的 SSL 证书不受信任。您是否想要接受它?\n"
-"\n"
-"该证书的详细信息:\n"
-"%s"
+msgstr "日历“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任,您是否想要接受它?"
 
-#: ../libedataserver/e-source-webdav.c:1571
-#, fuzzy, c-format
-#| msgid ""
-#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
-#| "\n"
-#| "Detailed information about the certificate:\n"
-#| "%s"
+#: ../libedataserver/e-source-webdav.c:1570
+#, c-format
 msgid ""
 "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
 "you wish to accept it?"
-msgstr ""
-"“%s” 的 SSL 证书不受信任。您是否想要接受它?\n"
-"\n"
-"该证书的详细信息:\n"
-"%s"
+msgstr "备忘录“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任,您是否想要接受它?"
 
-#: ../libedataserver/e-source-webdav.c:1580
-#, fuzzy, c-format
-#| msgid ""
-#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
-#| "\n"
-#| "Detailed information about the certificate:\n"
-#| "%s"
+#: ../libedataserver/e-source-webdav.c:1579
+#, c-format
 msgid ""
 "SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
 "you wish to accept it?"
 msgstr ""
-"“%s” 的 SSL 证书不受信任。您是否想要接受它?\n"
-"\n"
-"该证书的详细信息:\n"
-"%s"
+"任务列表“%2$s”所使用的主机“%1$s” 的 SSL 证书不受信任,您是否想要接受它?"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format.
@@ -5184,133 +5149,23 @@ msgstr "%H%M"
 msgid "%I %p"
 msgstr "%p%I"
 
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
-msgid "Proxy type to use"
-msgstr "代理类型"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
-msgid ""
-"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
-"means manual proxy."
-msgstr ""
-"使用何种类型的代理。0 代表使用系统代理设置、1 代表不使用代理、2 代表手动设置"
-"代理。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
-msgid "Whether to use http-proxy"
-msgstr "是否使用 HTTP 代理"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
-msgid "Whether to use proxy for HTTP requests."
-msgstr "HTTP 请求是否使用代理。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
-msgid "Whether proxy server requires authentication"
-msgstr "代理服务器是否需要认证"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
-msgid "Whether authentication is required to access proxy server."
-msgstr "访问代理服务器是否需要认证。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
-msgid "Host name for HTTP requests"
-msgstr "HTTP 请求的主机名"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
-msgid "Host name to use for HTTP requests."
-msgstr "HTTP 请求使用的主机名"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
-msgid "Port number for HTTP requests"
-msgstr "HTTP 请求端口"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
-msgid "Port number to use for HTTP requests."
-msgstr "HTTP 请求使用的端口。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
-msgid "Proxy authentication user name"
-msgstr "代理认证用户名"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
-msgid "User name to use to authenticate against proxy server."
-msgstr "认证到代理服务器时使用的用户名。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
-msgid "Proxy authentication password"
-msgstr "代理认证密码"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
-msgid "Password to use to authenticate against proxy server."
-msgstr "认证到代理服务器时使用的密码。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:15
-msgid "List of hosts to connect to without proxy"
-msgstr "不使用代理连接的主机列表"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:16
-msgid "List of hosts for which do not use proxy."
-msgstr "不使用代理的主机列表。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:17
-msgid "Host name for HTTPS requests"
-msgstr "HTTPS 请求的主机名"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:18
-msgid "Host name to use for HTTPS requests."
-msgstr "HTTPS 请求使用的主机名。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:19
-msgid "Port number for HTTPS requests"
-msgstr "HTTPS 请求端口"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:20
-msgid "Port number to use for HTTPS requests."
-msgstr "HTTPS 请求使用的端口。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:21
-msgid "Host name for SOCKS requests"
-msgstr "SOCKS 请求的主机名"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:22
-msgid "Host name to use for SOCKS requests."
-msgstr "SOCKS 请求使用的主机名。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:23
-msgid "Port number for SOCKS requests"
-msgstr "SOCKS 请求端口"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:24
-msgid "Port number to use for SOCKS requests."
-msgstr "SOCKS 请求使用的端口。"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:25
-msgid "Automatic proxy configuration URL"
-msgstr "自动代理配置 URL"
-
-#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:26
-msgid "Where to read automatic proxy configuration from."
-msgstr "从何处读取自动代理配置信息。"
-
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:129
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:131
 #: ../modules/ubuntu-online-accounts/e-signon-session-password.c:365
-#, fuzzy, c-format
-#| msgid "No such source for UID '%s'"
+#, c-format
 msgid "No such data source for UID '%s'"
-msgstr "没有 UID “%s”的源"
+msgstr "没有 UID 为“%s”的数据源"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:141
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:143
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain a password for '%s'"
-msgstr ""
+msgstr "通过 org.gnome.OnlineAccounts 服务无法找到“%s”对应的帐号并获取密码"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:213
-#, fuzzy, c-format
-#| msgid "Invalid GType registered for protocol '%s'"
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:219
+#, c-format
 msgid "Invalid password for '%s'"
-msgstr "为协议“%s”注册的 GType 无效"
+msgstr "“%s”的密码错误"
 
 #. TODO: more specific
 #: ../modules/gnome-online-accounts/goaewsclient.c:222
@@ -5348,18 +5203,17 @@ msgstr "无法找到帐号元素"
 msgid "Failed to find ASUrl and OABUrl in autodiscover response"
 msgstr "无法在自动发现响应中找到 ASUrl 和 OABUrl"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1251
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1241
 #, c-format
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an access token for '%s'"
-msgstr ""
+msgstr "通过 org.gnome.OnlineAccounts 服务无法找到“%s”对应的帐号并获取访问令牌"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1278
-#, fuzzy, c-format
-#| msgid "Failed to open addressbook at '%s': %s"
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1268
+#, c-format
 msgid "Failed to obtain an access token for '%s': "
-msgstr "无法打开在“%s”的地址簿:%s"
+msgstr "无法获取“%s”的访问令牌:"
 
 #: ../modules/google-backend/module-google-backend.c:192
 #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
@@ -5373,502 +5227,141 @@ msgstr "日历"
 msgid "Contacts"
 msgstr "联系人"
 
-#: ../modules/trust-prompt/certificate-viewer.c:292
-#, fuzzy
-#| msgid "Cannot add encryption certificate"
-msgid "Not part of certificate"
-msgstr "无法添加加密证书"
-
-#: ../modules/trust-prompt/certificate-viewer.c:600
-msgid "This certificate has been verified for the following uses:"
-msgstr ""
-
-#: ../modules/trust-prompt/certificate-viewer.c:604
-#: ../modules/trust-prompt/e-asn1-object.c:387
-#, fuzzy
-#| msgid "X.509 Certificate"
-msgid "SSL Client Certificate"
-msgstr "X.509 证书"
-
-#: ../modules/trust-prompt/certificate-viewer.c:609
-#: ../modules/trust-prompt/e-asn1-object.c:391
-#, fuzzy
-#| msgid "X.509 Certificate"
-msgid "SSL Server Certificate"
-msgstr "X.509 证书"
-
-#: ../modules/trust-prompt/certificate-viewer.c:614
-msgid "Email Signer Certificate"
-msgstr ""
-
-#: ../modules/trust-prompt/certificate-viewer.c:619
-#, fuzzy
-#| msgid "Cannot add encryption certificate"
-msgid "Email Recipient Certificate"
-msgstr "无法添加加密证书"
-
-#: ../modules/trust-prompt/certificate-viewer.c:634
-msgid "Issued To"
-msgstr ""
-
-#: ../modules/trust-prompt/certificate-viewer.c:635
-#: ../modules/trust-prompt/certificate-viewer.c:641
-msgid "Common Name (CN)"
-msgstr ""
-
-#: ../modules/trust-prompt/certificate-viewer.c:636
-#: ../modules/trust-prompt/certificate-viewer.c:642
-#, fuzzy
-#| msgid "Organization"
-msgid "Organization (O)"
-msgstr "组织"
-
-#: ../modules/trust-prompt/certificate-viewer.c:637
-#: ../modules/trust-prompt/certificate-viewer.c:643
-#, fuzzy
-#| msgid "Organizational Unit"
-msgid "Organizational Unit (OU)"
-msgstr "组织单元"
-
-#: ../modules/trust-prompt/certificate-viewer.c:638
-#: ../modules/trust-prompt/e-asn1-object.c:134
-msgid "Serial Number"
-msgstr ""
-
-#: ../modules/trust-prompt/certificate-viewer.c:640
-msgid "Issued By"
-msgstr ""
-
-#: ../modules/trust-prompt/certificate-viewer.c:645
-msgid "Validity"
-msgstr ""
-
-#: ../modules/trust-prompt/certificate-viewer.c:646
-msgid "Issued On"
-msgstr ""
-
-#: ../modules/trust-prompt/certificate-viewer.c:647
-msgid "Expires On"
-msgstr ""
-
-#: ../modules/trust-prompt/certificate-viewer.c:649
-msgid "Fingerprints"
-msgstr ""
-
-#: ../modules/trust-prompt/certificate-viewer.c:650
-msgid "SHA1 Fingerprint"
-msgstr ""
-
-#: ../modules/trust-prompt/certificate-viewer.c:651
-msgid "MD5 Fingerprint"
-msgstr ""
-
-#: ../modules/trust-prompt/certificate-viewer.c:653
-msgid "General"
-msgstr ""
-
-#: ../modules/trust-prompt/certificate-viewer.c:672
-#, fuzzy
-#| msgid "Certificate import failed"
-msgid "Certificate Hierarchy"
-msgstr "证书导入失败"
-
-#: ../modules/trust-prompt/certificate-viewer.c:676
-#, fuzzy
-#| msgid "Certificate import failed"
-msgid "Certificate Fields"
-msgstr "证书导入失败"
-
-#: ../modules/trust-prompt/certificate-viewer.c:680
-msgid "Field Value"
-msgstr ""
-
-#: ../modules/trust-prompt/certificate-viewer.c:682
-msgid "Details"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:95
-msgid "Version"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:110
-msgid "Version 1"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:113
-msgid "Version 2"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:116
-msgid "Version 3"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:192
-msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:195
-msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:198
-msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:201
-msgid "PKCS #1 SHA-256 With RSA Encryption"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:204
-msgid "PKCS #1 SHA-384 With RSA Encryption"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:207
-msgid "PKCS #1 SHA-512 With RSA Encryption"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:234
-msgid "PKCS #1 RSA Encryption"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:237
-#, fuzzy
-#| msgid "Certificate import failed"
-msgid "Certificate Key Usage"
-msgstr "证书导入失败"
-
-#: ../modules/trust-prompt/e-asn1-object.c:240
-msgid "Netscape Certificate Type"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:243
-#, fuzzy
-#| msgid "Certificate import failed"
-msgid "Certificate Authority Key Identifier"
-msgstr "证书导入失败"
-
-#: ../modules/trust-prompt/e-asn1-object.c:255
-#, c-format
-msgid "Object Identifier (%s)"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:306
-msgid "Algorithm Identifier"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:314
-msgid "Algorithm Parameters"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:336
-msgid "Subject Public Key Info"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:341
-msgid "Subject Public Key Algorithm"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:356
-msgid "Subject's Public Key"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:378
-#: ../modules/trust-prompt/e-asn1-object.c:428
-#, fuzzy
-#| msgid "Unable to process spool folder"
-msgid "Error: Unable to process extension"
-msgstr "无法处理脱机文件夹"
-
-#: ../modules/trust-prompt/e-asn1-object.c:395
-#, fuzzy
-#| msgid "Email 1"
-msgid "Email"
-msgstr "电子邮件 1"
-
-#: ../modules/trust-prompt/e-asn1-object.c:399
-#: ../modules/trust-prompt/e-asn1-object.c:411
-msgid "Object Signer"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:403
-#, fuzzy
-#| msgid "Certificate import failed"
-msgid "SSL Certificate Authority"
-msgstr "证书导入失败"
-
-#: ../modules/trust-prompt/e-asn1-object.c:407
-msgid "Email Certificate Authority"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:436
-#, fuzzy
-#| msgid "Signing message"
-msgid "Signing"
-msgstr "签名消息"
-
-#: ../modules/trust-prompt/e-asn1-object.c:440
-msgid "Non-repudiation"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:444
-msgid "Key Encipherment"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:448
-msgid "Data Encipherment"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:452
-msgid "Key Agreement"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:456
-#, fuzzy
-#| msgid "Certificate import failed"
-msgid "Certificate Signer"
-msgstr "证书导入失败"
-
-#: ../modules/trust-prompt/e-asn1-object.c:460
-msgid "CRL Signer"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:509
-msgid "Critical"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:511
-#: ../modules/trust-prompt/e-asn1-object.c:514
-msgid "Not Critical"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:535
-msgid "Extensions"
-msgstr ""
-
-#. Translators: This string is used in Certificate
-#. * details for fields like Issuer or Subject, which
-#. * shows the field name on the left and its respective
-#. * value on the right, both as stored in the
-#. * certificate itself.  You probably do not need to
-#. * change this string, unless changing the order of
-#. * name and value.  As a result example:
-#. * "OU = VeriSign Trust Network"
-#: ../modules/trust-prompt/e-asn1-object.c:615
-#, c-format
-msgid "%s = %s"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:658
-#, fuzzy
-#| msgid "X.509 Certificate"
-msgid "Certificate"
-msgstr "X.509 证书"
-
-#: ../modules/trust-prompt/e-asn1-object.c:674
-#: ../modules/trust-prompt/e-asn1-object.c:812
-#, fuzzy
-#| msgid "Signature algorithm unknown"
-msgid "Certificate Signature Algorithm"
-msgstr "签名算法未知"
-
-#: ../modules/trust-prompt/e-asn1-object.c:683
-msgid "Issuer"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:714
-msgid "Subject"
-msgstr ""
-
-#: ../modules/trust-prompt/e-asn1-object.c:738
-#, fuzzy
-#| msgid "Unique ID"
-msgid "Issuer Unique ID"
-msgstr "唯一的 ID"
-
-#: ../modules/trust-prompt/e-asn1-object.c:757
-#, fuzzy
-#| msgid "Unique ID"
-msgid "Subject Unique ID"
-msgstr "唯一的 ID"
-
-#: ../modules/trust-prompt/e-asn1-object.c:818
-#, fuzzy
-#| msgid "Certificate import failed"
-msgid "Certificate Signature Value"
-msgstr "证书导入失败"
-
-#: ../modules/trust-prompt/module-trust-prompt.c:201
-#, fuzzy
-#| msgid "Signing certificate not found"
+#: ../modules/trust-prompt/module-trust-prompt.c:83
 msgid "The signing certificate authority is not known."
-msgstr "签名证书找不到"
+msgstr "证书签署机构未知。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:203
+#: ../modules/trust-prompt/module-trust-prompt.c:85
 msgid ""
 "The certificate does not match the expected identity of the site that it was "
 "retrieved from."
-msgstr ""
+msgstr "此证书与取得证书的站点身份不匹配。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:205
+#: ../modules/trust-prompt/module-trust-prompt.c:87
 msgid "The certificate's activation time is still in the future."
-msgstr ""
+msgstr "还没到证书启用时间。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:207
-#, fuzzy
-#| msgid "The referenced credentials have expired."
+#: ../modules/trust-prompt/module-trust-prompt.c:89
 msgid "The certificate has expired."
-msgstr "引用的证书已过期。"
+msgstr "证书已过期。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:209
+#: ../modules/trust-prompt/module-trust-prompt.c:91
 msgid ""
 "The certificate has been revoked according to the connection's certificate "
 "revocation list."
-msgstr ""
+msgstr "根据该连接的证书吊销列表,该证书已被吊销。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:211
+#: ../modules/trust-prompt/module-trust-prompt.c:93
 msgid "The certificate's algorithm is considered insecure."
-msgstr ""
+msgstr "此证书所使用的算法不够安全"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:162
-#, fuzzy
-#| msgid "Signing certificate not trusted"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:120
 msgid "Certificate trust..."
-msgstr "签名证书不可信"
+msgstr "证书信任..."
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:163
-#, fuzzy
-#| msgid "X.509 Certificate"
-msgid "_View Certificate"
-msgstr "X.509 证书"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:164
+#: ../modules/trust-prompt/trust-prompt-gtk.c:121
 msgid "_Reject"
 msgstr "拒绝(_R)"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:165
+#: ../modules/trust-prompt/trust-prompt-gtk.c:122
 msgid "Accept _Temporarily"
 msgstr "临时接受(_T)"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:166
+#: ../modules/trust-prompt/trust-prompt-gtk.c:123
 msgid "_Accept Permanently"
 msgstr "永久接受(_A)"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:203
-#, fuzzy, c-format
-#| msgid ""
-#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
-#| "\n"
-#| "Detailed information about the certificate:\n"
-#| "%s"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:161
+#, c-format
 msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
-msgstr ""
-"“%s” 的 SSL 证书不受信任。您是否想要接受它?\n"
-"\n"
-"该证书的详细信息:\n"
-"%s"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:209
-msgid "Detailed information about the certificate:"
-msgstr ""
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:223
-msgid "Issuer:"
-msgstr ""
+msgstr "“%s” 的 SSL 证书不受信任。您是否想要接受它?"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:224
-msgid "Subject:"
-msgstr ""
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:225
-msgid "Fingerprint:"
-msgstr ""
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:226
+#: ../modules/trust-prompt/trust-prompt-gtk.c:176
 msgid "Reason:"
-msgstr ""
+msgstr "原因:"
 
 #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2
 msgid "Integrate your calendars"
-msgstr ""
+msgstr "集成您的日历"
 
 #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:2
 msgid "Integrate your contacts"
-msgstr ""
+msgstr "集成您的联系人"
 
 #: ../modules/ubuntu-online-accounts/e-signon-session-password.c:257
 msgid "Signon service did not return a secret"
-msgstr ""
+msgstr "Signon 服务未返回密钥(secret)"
 
 #: ../modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:1
-#, fuzzy
-#| msgid "Connection to Server"
 msgid "Evolution Data Server"
-msgstr "连接服务器"
+msgstr "Evolution 数据服务器"
 
 #: ../modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:2
 msgid "Required to have EDS appear in UOA"
-msgstr ""
+msgstr "要求 UOA 中要出现 EDS"
 
 #: ../modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1
-#, fuzzy
-#| msgid "Calendar"
 msgid "Google Calendar"
-msgstr "日历"
+msgstr "Google 日历"
 
 #: ../modules/ubuntu-online-accounts/google-contacts.service.in.in.h:1
-#, fuzzy
-#| msgctxt "CategoryName"
-#| msgid "Hot Contacts"
 msgid "Google Contacts"
-msgstr "亲密联系人"
+msgstr "Google 联系人"
 
 #: ../modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1
-#, fuzzy
-#| msgid "Mailer"
 msgid "GMail"
-msgstr "邮件程序"
+msgstr "GMail"
 
 #: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:1
-#, fuzzy
-#| msgid "Mailer"
 msgid "Mail"
-msgstr "邮件程序"
+msgstr "邮件"
 
 #: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:2
 msgid "Integrate your mailboxes"
-msgstr ""
+msgstr "集成您的邮箱"
 
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:971
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1009
 #, c-format
 msgid ""
 "Cannot find a corresponding account service in the accounts database from "
 "which to obtain an access token for '%s'"
-msgstr ""
+msgstr "在帐号资料库中找不到对应的帐号服务以获取 '%s' 的访问令牌"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:79
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:85
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:282
 #, c-format
-msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
-msgstr ""
+msgid ""
+"Expected status 200 when requesting your identity, instead got status %d (%s)"
+msgstr "请求您身份时的期望状态为 200,但得到的状态为 %d (%s)"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:96
-#, fuzzy
-#| msgid "Error parsing filter: %s: %s"
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:102
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:299
 msgid "Error parsing response as JSON: "
-msgstr "解析过滤规则出错:%s:%s"
+msgstr "以 JSON 解析响应时出错:"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:112
-msgid "Didn't find email member in JSON data"
-msgstr ""
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:120
+msgid "Didn't find 'email' in JSON data"
+msgstr "JSON 数据中找不到“email”"
+
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:317
+msgid "Didn't find 'id' in JSON data"
+msgstr "JSON 数据中找不到“id”"
+
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:322
+msgid "Didn't find 'emails.account' in JSON data"
+msgstr "JSON 数据中找不到“emails.account”"
+
+#: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1
+msgid "Windows Live Mail"
+msgstr "Windows Live 邮箱"
 
 #: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
-#, fuzzy
-#| msgid "Calendar"
 msgid "Yahoo! Calendar"
-msgstr "日历"
+msgstr "Yahoo! 日历"
 
 #: ../modules/ubuntu-online-accounts/yahoo-mail.service.in.in.h:1
 msgid "Yahoo! Mail"
-msgstr ""
+msgstr "Yahoo! 邮箱"
 
 #: ../modules/yahoo-backend/module-yahoo-backend.c:227
 msgid "Tasks"
@@ -5922,9 +5415,411 @@ msgstr "在网上"
 msgid "WebDAV"
 msgstr "WebDAV"
 
+#: ../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:122
 msgid "_Dismiss"
-msgstr ""
+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 "连通时间过期"
+
+#~ 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 "证书持有者的公钥"
+
+#, fuzzy
+#~| msgid "Unable to process spool folder"
+#~ 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 "颁发者唯一标识"
+
+#~ msgid "Subject Unique ID"
+#~ msgstr "持有者唯一标识"
+
+#~ 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 "Failed to build summary for an address book %s"
 #~ msgstr "为地址簿 %s 创建摘要失败"


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