[evolution-data-server/gnome-3-20] Update zh_CN translation



commit 7888a51ad621881197b1aa12bf5a46dbcac36a1e
Author: Tong Hui <tonghuix gmail com>
Date:   Thu Feb 16 21:54:30 2017 +0800

    Update zh_CN translation

 po/zh_CN.po | 2160 +++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 1673 insertions(+), 487 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3e58448..26e652d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,23 +15,24 @@
 # Wylmer Wang <wantinghard gmail com>, 2011, 2013.
 # YunQiang Su <wzssyqa gmail com>, 2011.
 # Aron Xu <happyaron xu gmail com>, 2009, 2012.
+# Jeff Bai <jeffbai aosc xyz>, 2016.
+# Tong Hui <tonghuix gmail com> 2016.
 #
 msgid ""
 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: 2016-02-23 12:23+0000\n"
-"PO-Revision-Date: 2016-04-13 16:03+0800\n"
-"Last-Translator: YunQiang Su <wzssyqa gmail com>\n"
+"product=evolution-data-server&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-01-07 12:05+0000\n"
+"PO-Revision-Date: 2017-02-15 21:22+0800\n"
+"Last-Translator: Tong Hui <tonghuix gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-04-13 07:48+0000\n"
 "X-Generator: Poedit 1.8.7.1\n"
-"Language: zh_CN\n"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:120
 #, c-format
@@ -121,64 +122,64 @@ msgstr "无法将旧数据库“ %s” 改名为 “%s”:%s"
 #: ../addressbook/libebook/e-book-client.c:3424
 #: ../addressbook/libebook/e-book-client.c:3642
 #: ../addressbook/libedata-book/e-book-backend-sexp.c:877
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:585
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:633
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:706
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:754
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:771
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:274
 #: ../calendar/libecal/e-cal.c:2336 ../calendar/libecal/e-cal-client.c:279
-#: ../calendar/libecal/e-cal-client.c:3492
-#: ../calendar/libecal/e-cal-client.c:3665
-#: ../calendar/libecal/e-cal-client.c:3929
-#: ../calendar/libecal/e-cal-client.c:4170
-#: ../calendar/libecal/e-cal-client.c:4360
-#: ../calendar/libecal/e-cal-client.c:4553
-#: ../calendar/libecal/e-cal-client.c:4762
-#: ../calendar/libecal/e-cal-client.c:4931
-#: ../calendar/libecal/e-cal-client.c:5134
-#: ../calendar/libecal/e-cal-client.c:5284
-#: ../calendar/libecal/e-cal-client.c:5478
-#: ../calendar/libecal/e-cal-client.c:5631
-#: ../calendar/libecal/e-cal-client.c:5848
-#: ../calendar/libecal/e-cal-client.c:6002
-#: ../calendar/libecal/e-cal-client.c:6228
-#: ../calendar/libecal/e-cal-client.c:6424
-#: ../calendar/libecal/e-cal-client.c:6787
-#: ../calendar/libecal/e-cal-client.c:7009
-#: ../camel/providers/imapx/camel-imapx-server.c:2975
-#: ../camel/providers/imapx/camel-imapx-server.c:2985
-#: ../camel/providers/imapx/camel-imapx-server.c:2997
+#: ../calendar/libecal/e-cal-client.c:3520
+#: ../calendar/libecal/e-cal-client.c:3693
+#: ../calendar/libecal/e-cal-client.c:3957
+#: ../calendar/libecal/e-cal-client.c:4198
+#: ../calendar/libecal/e-cal-client.c:4388
+#: ../calendar/libecal/e-cal-client.c:4581
+#: ../calendar/libecal/e-cal-client.c:4790
+#: ../calendar/libecal/e-cal-client.c:4959
+#: ../calendar/libecal/e-cal-client.c:5162
+#: ../calendar/libecal/e-cal-client.c:5312
+#: ../calendar/libecal/e-cal-client.c:5506
+#: ../calendar/libecal/e-cal-client.c:5659
+#: ../calendar/libecal/e-cal-client.c:5876
+#: ../calendar/libecal/e-cal-client.c:6030
+#: ../calendar/libecal/e-cal-client.c:6256
+#: ../calendar/libecal/e-cal-client.c:6452
+#: ../calendar/libecal/e-cal-client.c:6815
+#: ../calendar/libecal/e-cal-client.c:7037
+#: ../camel/providers/imapx/camel-imapx-server.c:3043
+#: ../camel/providers/imapx/camel-imapx-server.c:3053
+#: ../camel/providers/imapx/camel-imapx-server.c:3065
 #: ../libebackend/e-server-side-source.c:497 ../libedataserver/e-client.c:190
 msgid "Unknown error"
 msgstr "未知的错误"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:814
+#: ../addressbook/backends/google/e-book-backend-google.c:781
 msgid "Querying for updated contacts…"
 msgstr "查询更新的联系人..."
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:998
+#: ../addressbook/backends/google/e-book-backend-google.c:965
 msgid "Querying for updated groups…"
 msgstr "查询更新的组..."
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1792
+#: ../addressbook/backends/google/e-book-backend-google.c:1748
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:4999
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1503
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1504
 msgid "The backend does not support bulk additions"
 msgstr "后端不支持批量添加"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1949
+#: ../addressbook/backends/google/e-book-backend-google.c:1905
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:5135
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1625
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1626
 msgid "The backend does not support bulk modifications"
 msgstr "后端不支持批量修改"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2158
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1725
+#: ../addressbook/backends/google/e-book-backend-google.c:2114
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1726
 msgid "The backend does not support bulk removals"
 msgstr "后端不支持批量删除"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2280
+#: ../addressbook/backends/google/e-book-backend-google.c:2236
 msgid "Loading…"
 msgstr "正在载入..."
 
@@ -279,7 +280,7 @@ msgid "Failed to get the DN for user '%s'"
 msgstr "无法获取用户“%s”的 DN"
 
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:588
-#: ../calendar/backends/http/e-cal-backend-http.c:512
+#: ../calendar/backends/http/e-cal-backend-http.c:513
 #, c-format
 msgid "Malformed URI: %s"
 msgstr "URI 格式错误:%s"
@@ -306,22 +307,22 @@ msgstr "正在加载联系人(%d%%)"
 msgid "Cannot transform SoupURI to string"
 msgstr "无法将 SoupURI 转为字符串"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1554
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1555
 #, c-format
 msgid "Create resource '%s' failed with HTTP status %d (%s)"
 msgstr "创建资源“%s”失败,HTTP 状态码为: %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1656
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1657
 msgid "Contact on server changed -> not modifying"
 msgstr "服务器上的联系人已更改 -> 将不做更改"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1664
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1665
 #, c-format
 msgid "Modify contact failed with HTTP status %d (%s)"
 msgstr "修改联系人失败,HTTP 状态码:%d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1757
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1773
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1758
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1774
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "DELETE 失败,HTTP 状态码:%d"
@@ -941,7 +942,7 @@ msgstr "建立库时未提供电话号码支持"
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:43
 msgid "The phone number parser reported a yet unknown error code."
-msgstr "电话号码解析报告了未知错误。"
+msgstr "电话号码解析程序报告了一个未知的错误代码。"
 
 #: ../addressbook/libebook-contacts/e-phone-number.c:45
 msgid "Not a phone number"
@@ -983,11 +984,11 @@ msgstr "无法更改地址簿属性“%s”的值"
 msgid "Unable to connect to '%s': "
 msgstr "无法连接到“%s”:"
 
-#: ../addressbook/libebook/e-book-client-view.c:868
+#: ../addressbook/libebook/e-book-client-view.c:870
 #: ../calendar/libecal/e-cal-client-view.c:681
 #, c-format
 msgid "Client disappeared"
-msgstr "客户端消失了"
+msgstr "客户端消失"
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:905
 #: ../addressbook/libedata-book/e-book-sqlite.c:2229
@@ -1022,32 +1023,32 @@ msgstr ""
 "列表类型。"
 
 #: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3073
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4169
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4176
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. vcards cannot be returned."
 msgstr "缓存中没有保存完整的 search_contacts,无法返回电子名片。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4300
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4393
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4307
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4400
 #: ../addressbook/libedata-book/e-book-sqlite.c:5807
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr "查询中包含不支持的元素"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4304
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4311
 #, c-format
 msgid "Invalid Query"
 msgstr "无效的查询"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4328
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4335
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
 "supported."
 msgstr "缓存中没有保存完整的 search_contacts,所以只支持概要查询。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4397
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4404
 #: ../addressbook/libedata-book/e-data-book.c:396
 #: ../addressbook/libedata-book/e-data-book.c:1146
 #: ../calendar/libedata-cal/e-data-cal.c:428
@@ -1056,39 +1057,39 @@ msgstr "缓存中没有保存完整的 search_contacts,所以只支持概要
 msgid "Invalid query"
 msgstr "无效的查询"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4440
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4447
 #, c-format
 msgid ""
 "Full vcards are not stored in cache. Hence only summary query is supported."
 msgstr "缓存中没有保存完整的电子名片,所以只支持概要查询。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5263
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5270
 #, c-format
 msgid "Unable to remove the db file: errno %d"
 msgstr "无法删除数据库文件:错误代码 %d"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6050
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6450
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6057
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6457
 #, c-format
 msgid "Only summary queries are supported by EbSdbCursor"
 msgstr "EbSdbCursor 只支持概要查询"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6057
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6064
 #, 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:6071
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
 #, c-format
 msgid "Cannot sort by a field that is not in the summary"
 msgstr "无法按不在概要中的字段排序"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6085
 #, c-format
 msgid "Cannot sort by a field which may have multiple values"
 msgstr "无法按可能有多个值的字段排序"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6218
 #: ../addressbook/libedata-book/e-book-sqlite.c:8106
 #, c-format
 msgid ""
@@ -1096,7 +1097,7 @@ msgid ""
 "the contact list"
 msgstr "尝试对 cursor 反向步进,但 cursor 已位于联系人列表的开头"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6219
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6226
 #: ../addressbook/libedata-book/e-book-sqlite.c:8114
 #, c-format
 msgid ""
@@ -1320,36 +1321,41 @@ msgstr "移动 cursor 时修订失去同步"
 msgid "Alphabetic index was set for incorrect locale"
 msgstr "对错误的区域设置了字母表索引"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:583
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:704
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "服务器不可用 (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:614
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:730
 #, c-format
-msgid "Failed to connect to a server using SSL: %s"
-msgstr "无法使用 SSL 连接到服务器:%s"
+msgid "Failed to login to the server: %s"
+msgstr "登录到此服务器失败:%s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:630
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:752
+#, c-format
+msgid "Failed to connect to a server using SSL/TLS: %s"
+msgstr "无法使用 SSL/TLS 连接到服务器:%s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:768
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
-msgstr "返回了意外的 HTTP 状态码 %d (%s),URI 为:%s"
+msgstr "如下 URI 返回了意外的 HTTP 状态代码 %d (%s):%s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:651
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:789
 msgid "CalDAV backend is not loaded yet"
 msgstr "CalDAV 后端尚未加载"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1100
-#: ../libedataserver/e-webdav-discover.c:146
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1231
+#: ../libedataserver/e-webdav-discover.c:147
 msgid "Invalid Redirect URL"
 msgstr "无效的重定向 URL"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2955
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2945
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "无法创建本地缓存文件夹“%s”"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3035
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3031
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1358,27 +1364,27 @@ msgstr ""
 "服务器不可用,日历将以只读模式打开。\n"
 "错误消息:%s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4123
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4136
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV 不支持批量添加"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4226
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4239
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV 不支持批量修改"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4507
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4520
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV 不支持批量删除"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5189
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5267
 msgid "Calendar doesn't support Free/Busy"
 msgstr "日历不支持空闲/繁忙"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5198
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5276
 msgid "Schedule outbox url not found"
 msgstr "未找到定时发件箱 url"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5295
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5373
 msgid "Unexpected result in schedule-response"
 msgstr "定时响应的结果异常"
 
@@ -1405,22 +1411,22 @@ msgstr "无法保存日历数据:URI 格式错误。"
 msgid "Cannot save calendar data"
 msgstr "无法保存日历数据"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:581
+#: ../calendar/backends/http/e-cal-backend-http.c:582
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "已重定向到无效 URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:640
+#: ../calendar/backends/http/e-cal-backend-http.c:641
 #, c-format
 msgid "Bad file format."
 msgstr "无效的文件格式。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:650
+#: ../calendar/backends/http/e-cal-backend-http.c:651
 #, c-format
 msgid "Not a calendar."
 msgstr "不是日历。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:954
+#: ../calendar/backends/http/e-cal-backend-http.c:955
 #: ../calendar/backends/weather/e-cal-backend-weather.c:709
 msgid "Could not create cache file"
 msgstr "无法创建缓存文件"
@@ -1533,6 +1539,7 @@ msgid "Protocol not supported"
 msgstr "不支持的协议"
 
 #: ../calendar/libecal/e-cal.c:2326
+#, fuzzy
 msgid "Operation has been canceled"
 msgstr "操作已取消"
 
@@ -1545,7 +1552,7 @@ msgid "Authentication failed"
 msgstr "认证失败"
 
 #: ../calendar/libecal/e-cal.c:2332
-#: ../camel/providers/smtp/camel-smtp-transport.c:1119
+#: ../camel/providers/smtp/camel-smtp-transport.c:1128
 #: ../libedataserver/e-client.c:152
 msgid "Authentication required"
 msgstr "必须认证"
@@ -1578,131 +1585,131 @@ msgstr "未知的日历属性“%s”"
 msgid "Cannot change value of calendar property '%s'"
 msgstr "无法更改日历属性的值“%s”"
 
-#: ../calendar/libecal/e-cal-component.c:1349
+#: ../calendar/libecal/e-cal-component.c:1357
 msgid "Untitled appointment"
 msgstr "无标题约会"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:4749
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:4750
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:4751
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:4752
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:4753
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:4754
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:4755
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:4756
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:4757
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4758
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4759
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4760
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4761
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4762
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4763
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4764
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4765
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4766
 msgid "18th"
 msgstr "18八日"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4767
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4768
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4769
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:4770
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:4771
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:4772
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:4773
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:4774
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/libecal/e-cal-recur.c:4072
+#: ../calendar/libecal/e-cal-recur.c:4775
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/libecal/e-cal-recur.c:4073
+#: ../calendar/libecal/e-cal-recur.c:4776
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/libecal/e-cal-recur.c:4074
+#: ../calendar/libecal/e-cal-recur.c:4777
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/libecal/e-cal-recur.c:4075
+#: ../calendar/libecal/e-cal-recur.c:4778
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/libecal/e-cal-recur.c:4076
+#: ../calendar/libecal/e-cal-recur.c:4779
 msgid "31st"
 msgstr "31日"
 
@@ -1746,7 +1753,6 @@ msgstr "“%s”需要第一个参数是字符串"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
 #, c-format
-#| msgid "\"%s\" expects two arguments"
 msgid "\"%s\" expects two or three arguments"
 msgstr "“%s”需要两个或三个参数"
 
@@ -1772,7 +1778,6 @@ msgstr "“%s”的第一个参数应该是 time_t"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:193
 #, c-format
-#| msgid "\"%s\" expects the first argument to be a string"
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "“%s”需要第三个参数是字符串"
 
@@ -1916,35 +1921,35 @@ msgstr "无法获取日历时区:"
 msgid "Could not add calendar time zone: "
 msgstr "无法添加日历时区:"
 
-#: ../camel/camel-cipher-context.c:199
+#: ../camel/camel-cipher-context.c:204
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "该密码不支持签名"
 
-#: ../camel/camel-cipher-context.c:212
+#: ../camel/camel-cipher-context.c:217
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "该密码不支持验证"
 
-#: ../camel/camel-cipher-context.c:228
+#: ../camel/camel-cipher-context.c:233
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "该密码不支持加密"
 
-#: ../camel/camel-cipher-context.c:242
+#: ../camel/camel-cipher-context.c:247
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "该密码不支持解密"
 
-#: ../camel/camel-cipher-context.c:358
+#: ../camel/camel-cipher-context.c:363
 msgid "Signing message"
 msgstr "签名消息"
 
-#: ../camel/camel-cipher-context.c:648
+#: ../camel/camel-cipher-context.c:653
 msgid "Encrypting message"
 msgstr "加密消息"
 
-#: ../camel/camel-cipher-context.c:820
+#: ../camel/camel-cipher-context.c:825
 msgid "Decrypting message"
 msgstr "解密消息"
 
@@ -1953,11 +1958,11 @@ msgstr "解密消息"
 msgid "Unable to create cache path"
 msgstr "无法创建缓存路径"
 
-#: ../camel/camel-data-cache.c:449
+#: ../camel/camel-data-cache.c:457
 msgid "Empty cache file"
 msgstr "清空缓存文件"
 
-#: ../camel/camel-data-cache.c:522
+#: ../camel/camel-data-cache.c:534
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "无法删除缓存条目:%s:%s"
@@ -1967,79 +1972,79 @@ msgstr "无法删除缓存条目:%s:%s"
 msgid "Could not rename '%s' to %s: %s"
 msgstr "无法将“%s”重命名为 %s:%s"
 
-#: ../camel/camel-filter-driver.c:914 ../camel/camel-filter-search.c:798
+#: ../camel/camel-filter-driver.c:934 ../camel/camel-filter-search.c:798
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "创建子进程“%s”失败:%s"
 
-#: ../camel/camel-filter-driver.c:962
+#: ../camel/camel-filter-driver.c:982
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "收到 %s 发来的无效消息流:%s"
 
-#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
+#: ../camel/camel-filter-driver.c:1189 ../camel/camel-filter-driver.c:1198
 msgid "Syncing folders"
 msgstr "同步文件夹"
 
-#: ../camel/camel-filter-driver.c:1276
+#: ../camel/camel-filter-driver.c:1296
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "解析过滤规则出错:%s:%s"
 
-#: ../camel/camel-filter-driver.c:1287
+#: ../camel/camel-filter-driver.c:1307
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "执行过滤规则错误:%s:%s"
 
-#: ../camel/camel-filter-driver.c:1383
+#: ../camel/camel-filter-driver.c:1403
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "无法打开离线文件夹"
 
-#: ../camel/camel-filter-driver.c:1395
+#: ../camel/camel-filter-driver.c:1415
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "无法处理离线文件夹"
 
-#: ../camel/camel-filter-driver.c:1418
+#: ../camel/camel-filter-driver.c:1438
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "获取第%d封信(%d%%)"
 
-#: ../camel/camel-filter-driver.c:1427 ../camel/camel-filter-driver.c:1449
+#: ../camel/camel-filter-driver.c:1447 ../camel/camel-filter-driver.c:1469
 #, c-format
 msgid "Failed on message %d"
 msgstr "在第%d封信失败"
 
-#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1582
+#: ../camel/camel-filter-driver.c:1488 ../camel/camel-filter-driver.c:1602
 msgid "Syncing folder"
 msgstr "同步文件夹"
 
-#: ../camel/camel-filter-driver.c:1473 ../camel/camel-filter-driver.c:1590
+#: ../camel/camel-filter-driver.c:1493 ../camel/camel-filter-driver.c:1610
 msgid "Complete"
 msgstr "完成"
 
-#: ../camel/camel-filter-driver.c:1536
+#: ../camel/camel-filter-driver.c:1556
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "获取第%d封信,共%d封"
 
-#: ../camel/camel-filter-driver.c:1554
+#: ../camel/camel-filter-driver.c:1574
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第%d封信失败,共%d封"
 
-#: ../camel/camel-filter-driver.c:1749 ../camel/camel-filter-driver.c:1776
+#: ../camel/camel-filter-driver.c:1769 ../camel/camel-filter-driver.c:1796
 #, c-format
 msgid "Execution of filter '%s' failed: "
 msgstr "执行过滤规则“%s”失败:"
 
-#: ../camel/camel-filter-driver.c:1766
+#: ../camel/camel-filter-driver.c:1786
 #, c-format
 msgid "Error parsing filter '%s': %s: %s"
 msgstr "解析过滤规则“%s”出错:%s:%s"
 
-#: ../camel/camel-filter-driver.c:1785
+#: ../camel/camel-filter-driver.c:1805
 #, c-format
 msgid "Error executing filter '%s': %s: %s"
 msgstr "执行过滤规则“%s”错误:%s:%s"
@@ -2065,62 +2070,62 @@ msgstr "(message-location)参数无效"
 msgid "Error executing filter search: %s: %s"
 msgstr "执行过滤规则搜索错误:%s:%s"
 
-#: ../camel/camel-folder.c:321
-#, c-format
+#: ../camel/camel-folder.c:326
+#, fuzzy, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
-msgstr[0] "在“%s”中学习新的垃圾邮件"
+msgstr[0] "在“%s : %s”中学习新的垃圾邮件"
 
-#: ../camel/camel-folder.c:361
-#, c-format
+#: ../camel/camel-folder.c:366
+#, fuzzy, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "在“%s”中学习新的有害邮件"
+msgstr[0] "在“%s : %s”中学习新的有害邮件"
 
-#: ../camel/camel-folder.c:409
-#, c-format
+#: ../camel/camel-folder.c:414
+#, fuzzy, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "在“%s”中过滤新消息"
+msgstr[0] "在“%s : %s”中过滤新消息"
 
-#: ../camel/camel-folder.c:1015
+#: ../camel/camel-folder.c:1020
 #: ../camel/providers/local/camel-maildir-folder.c:330
 msgid "Moving messages"
 msgstr "移动消息"
 
-#: ../camel/camel-folder.c:1018
+#: ../camel/camel-folder.c:1023
 msgid "Copying messages"
 msgstr "复制消息"
 
-#: ../camel/camel-folder.c:1060
-#, c-format
+#: ../camel/camel-folder.c:1065
+#, fuzzy, c-format
 msgid "Quota information not supported for folder '%s'"
-msgstr "文件夹“%s”不支持配额信息"
+msgstr "文件夹“%s : %s”不支持配额信息"
 
-#: ../camel/camel-folder.c:1152
-#, c-format
+#: ../camel/camel-folder.c:1160
+#, fuzzy, c-format
 msgid "Filtering folder '%s'"
-msgstr "过滤文件夹“%s”"
+msgstr "正在过滤文件夹“%s : %s”"
 
-#: ../camel/camel-folder.c:2878
-#, c-format
+#: ../camel/camel-folder.c:2897
+#, fuzzy, c-format
 msgid "Expunging folder '%s'"
-msgstr "正在销毁文件夹“%s”"
+msgstr "正在销毁文件夹“%s : %s”"
 
-#: ../camel/camel-folder.c:3009
-#, c-format
+#: ../camel/camel-folder.c:3028
+#, fuzzy, c-format
 msgid "Retrieving message '%s' in %s"
-msgstr "正在获取 %2$s 中的消息“%1$s”"
+msgstr "正在获取“%2$s : %3$s”中的消息“%1$s”"
 
-#: ../camel/camel-folder.c:3200
-#, c-format
+#: ../camel/camel-folder.c:3219
+#, fuzzy, c-format
 msgid "Retrieving quota information for '%s'"
-msgstr "正在获取“%s”的配额信息"
+msgstr "正在获取“%s : %s”的配额信息"
 
-#: ../camel/camel-folder.c:3497
-#, c-format
+#: ../camel/camel-folder.c:3516
+#, fuzzy, c-format
 msgid "Refreshing folder '%s'"
-msgstr "正在刷新文件夹“%s”"
+msgstr "正在刷新文件夹“%s : %s”"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
 #: ../camel/camel-folder-search.c:915 ../camel/camel-folder-search.c:957
@@ -2152,7 +2157,7 @@ msgstr "(%s) 需要一个数组结果"
 msgid "(%s) requires the folder set"
 msgstr "(%s) 需要文件夹集"
 
-#: ../camel/camel-folder-search.c:1962 ../camel/camel-folder-search.c:2131
+#: ../camel/camel-folder-search.c:1963 ../camel/camel-folder-search.c:2132
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2161,7 +2166,7 @@ msgstr ""
 "无法解析搜索表达式:%s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1974 ../camel/camel-folder-search.c:2143
+#: ../camel/camel-folder-search.c:1975 ../camel/camel-folder-search.c:2144
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2170,28 +2175,28 @@ msgstr ""
 "执行搜索表达式错误:%s:\n"
 "%s"
 
-#: ../camel/camel-folder-summary.c:2139
-#, c-format
+#: ../camel/camel-folder-summary.c:2168
+#, fuzzy, c-format
 msgid "Release unused memory for folder '%s'"
-msgstr "释放文件夹“%s”未使用的内存"
+msgstr "为文件夹“%s : %s”释放未使用的内存"
 
-#: ../camel/camel-folder-summary.c:2351
-#, c-format
+#: ../camel/camel-folder-summary.c:2382
+#, fuzzy, c-format
 msgid "Update preview data for folder '%s'"
-msgstr "更新 %s 文件夹的预览数据"
+msgstr "正在更新文件夹“%s : %s”的预览数据"
 
-#: ../camel/camel-gpg-context.c:728 ../camel/camel-gpg-context.c:733
-#: ../camel/camel-gpg-context.c:1400
+#: ../camel/camel-gpg-context.c:770 ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:1442
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "执行 gpg 失败:%s"
 
-#: ../camel/camel-gpg-context.c:733
-#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../camel/camel-gpg-context.c:775
+#: ../camel/providers/smtp/camel-smtp-transport.c:1131
 msgid "Unknown"
 msgstr "未知"
 
-#: ../camel/camel-gpg-context.c:798
+#: ../camel/camel-gpg-context.c:840
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2202,17 +2207,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:834
+#: ../camel/camel-gpg-context.c:876
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "解析 gpg userid 提示失败。"
 
-#: ../camel/camel-gpg-context.c:859 ../camel/camel-gpg-context.c:874
+#: ../camel/camel-gpg-context.c:901 ../camel/camel-gpg-context.c:916
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "解析 gpg 密码句请求失败。"
 
-#: ../camel/camel-gpg-context.c:895
+#: ../camel/camel-gpg-context.c:937
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2221,7 +2226,7 @@ msgstr ""
 "您需要一个 PIN 用来解锁您的智能卡:\n"
 "“%s”"
 
-#: ../camel/camel-gpg-context.c:899
+#: ../camel/camel-gpg-context.c:941
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2230,85 +2235,85 @@ msgstr ""
 "您需要一个密码句用来解锁以下用户:\n"
 "“%s”"
 
-#: ../camel/camel-gpg-context.c:905
+#: ../camel/camel-gpg-context.c:947
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG 对“%s”的意外响应"
 
-#: ../camel/camel-gpg-context.c:917
+#: ../camel/camel-gpg-context.c:959
 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:948 ../camel/camel-net-utils.c:524
+#: ../camel/camel-gpg-context.c:990 ../camel/camel-net-utils.c:524
 #: ../camel/providers/nntp/camel-nntp-summary.c:401
 #: ../libedataserver/e-client.c:163
 #, c-format
 msgid "Cancelled"
 msgstr "已取消"
 
-#: ../camel/camel-gpg-context.c:969
+#: ../camel/camel-gpg-context.c:1011
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "解锁密钥失败:给出了 3 个错误的密码句。"
 
-#: ../camel/camel-gpg-context.c:982
+#: ../camel/camel-gpg-context.c:1024
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "来自 GnuPG 的意外应答:%s"
 
-#: ../camel/camel-gpg-context.c:1120
+#: ../camel/camel-gpg-context.c:1162
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "加密失败:没有指定有效的收件人。"
 
-#: ../camel/camel-gpg-context.c:1675 ../camel/camel-smime-context.c:843
+#: ../camel/camel-gpg-context.c:1761 ../camel/camel-smime-context.c:843
 msgid "Could not generate signing data: "
 msgstr "无法生成签名数据:"
 
-#: ../camel/camel-gpg-context.c:1725 ../camel/camel-gpg-context.c:1937
-#: ../camel/camel-gpg-context.c:2047 ../camel/camel-gpg-context.c:2198
+#: ../camel/camel-gpg-context.c:1812 ../camel/camel-gpg-context.c:2047
+#: ../camel/camel-gpg-context.c:2163 ../camel/camel-gpg-context.c:2338
 msgid "Failed to execute gpg."
 msgstr "执行 gpg 失败。"
 
-#: ../camel/camel-gpg-context.c:1808 ../camel/camel-gpg-context.c:1816
-#: ../camel/camel-gpg-context.c:1824 ../camel/camel-gpg-context.c:1844
+#: ../camel/camel-gpg-context.c:1918 ../camel/camel-gpg-context.c:1926
+#: ../camel/camel-gpg-context.c:1934 ../camel/camel-gpg-context.c:1954
 #: ../camel/camel-smime-context.c:972 ../camel/camel-smime-context.c:986
 #: ../camel/camel-smime-context.c:995
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "无法校验消息签名:消息格式不对"
 
-#: ../camel/camel-gpg-context.c:1890
+#: ../camel/camel-gpg-context.c:2000
 msgid "Cannot verify message signature: "
 msgstr "无法校验消息签名:"
 
-#: ../camel/camel-gpg-context.c:2013
+#: ../camel/camel-gpg-context.c:2128
 msgid "Could not generate encrypting data: "
 msgstr "无法生成加密数据:"
 
-#: ../camel/camel-gpg-context.c:2066
+#: ../camel/camel-gpg-context.c:2203
 msgid "This is a digitally encrypted message part"
 msgstr "这是消息的数字加密部分"
 
-#: ../camel/camel-gpg-context.c:2122 ../camel/camel-gpg-context.c:2131
-#: ../camel/camel-gpg-context.c:2154
+#: ../camel/camel-gpg-context.c:2262 ../camel/camel-gpg-context.c:2271
+#: ../camel/camel-gpg-context.c:2294
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "无法解密消息:消息格式不对"
 
-#: ../camel/camel-gpg-context.c:2142
+#: ../camel/camel-gpg-context.c:2282
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "解密 MIME 部分失败:协议错误"
 
-#: ../camel/camel-gpg-context.c:2208
+#: ../camel/camel-gpg-context.c:2348
 #, c-format
 msgid "Failed to decrypt MIME part: Secret key not found"
-msgstr "解密 MIME 部分失败:没找到私钥"
+msgstr "解密 MIME 部分失败:未找到密钥"
 
-#: ../camel/camel-gpg-context.c:2244 ../camel/camel-smime-context.c:1288
+#: ../camel/camel-gpg-context.c:2384 ../camel/camel-smime-context.c:1288
 msgid "Encrypted content"
 msgstr "加密内容"
 
@@ -2425,46 +2430,46 @@ msgstr "没有可用的签名"
 msgid "parse error"
 msgstr "解析错误"
 
-#: ../camel/camel-net-utils.c:706
+#: ../camel/camel-net-utils.c:708
 #, c-format
 msgid "Resolving: %s"
 msgstr "解析:%s"
 
-#: ../camel/camel-net-utils.c:731
+#: ../camel/camel-net-utils.c:733
 msgid "Host lookup failed"
 msgstr "主机查阅失败"
 
-#: ../camel/camel-net-utils.c:737
+#: ../camel/camel-net-utils.c:739
 #, c-format
 msgid "Host lookup '%s' failed. Check your host name for spelling errors."
 msgstr "主机“%s”查找失败,请检查主机名是否存在拼写错误。"
 
-#: ../camel/camel-net-utils.c:741
+#: ../camel/camel-net-utils.c:743
 #, c-format
 msgid "Host lookup '%s' failed: %s"
 msgstr "查找主机“%s”失败:%s"
 
 #: ../camel/camel-offline-folder.c:93
-#, c-format
+#, fuzzy, c-format
 msgid "Downloading new messages for offline mode in '%s'"
-msgstr "正在为离线模式在 %s 中下载新消息"
+msgstr "下载“%s : %s”的新消息以便离线模式使用"
 
 #: ../camel/camel-offline-folder.c:160
-#, c-format
+#, fuzzy, c-format
 msgid "Storing changes in folder '%s'"
-msgstr "正在保存文件夹“%s”的更改"
+msgstr "正在将更改存储到文件夹“%s : %s”"
 
-#: ../camel/camel-offline-folder.c:259
-#, c-format
+#: ../camel/camel-offline-folder.c:262
+#, fuzzy, c-format
 msgid "Checking download of new messages for offline in '%s'"
-msgstr "正在为离线模式在 %s 中检查下载新消息"
+msgstr "正在检查“%s : %s”的新消息以便离线操作"
 
-#: ../camel/camel-offline-folder.c:372
-#, c-format
+#: ../camel/camel-offline-folder.c:375
+#, fuzzy, c-format
 msgid "Syncing messages in folder '%s' to disk"
-msgstr "正在将文件夹“%s”中的消息同步到磁盘"
+msgstr "正在将文件夹“%s : %s”中的消息同步到磁盘"
 
-#: ../camel/camel-offline-folder.c:435
+#: ../camel/camel-offline-folder.c:438
 msgid "Copy folder content locally for _offline operation"
 msgstr "将文件夹内容复制到本地以进行离线操作(_O)"
 
@@ -2598,7 +2603,7 @@ msgstr "该选项将用 Kerberos 5 认证连接到服务器。"
 #: ../camel/camel-sasl-gssapi.c:148
 #, c-format
 msgid "(Unknown GSSAPI mechanism code: %x)"
-msgstr "(未知的 GSSAPI 机制码: %x)"
+msgstr "(未知 GSSAPI 机制代码: %x)"
 
 #: ../camel/camel-sasl-gssapi.c:181
 msgid ""
@@ -2653,7 +2658,7 @@ msgstr "引用的证书已过期。"
 
 #: ../camel/camel-sasl-gssapi.c:222 ../camel/camel-sasl-gssapi.c:404
 #: ../camel/camel-sasl-gssapi.c:453 ../camel/camel-sasl-gssapi.c:470
-#: ../camel/providers/smtp/camel-smtp-transport.c:790
+#: ../camel/providers/smtp/camel-smtp-transport.c:799
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "来自服务器的无效认证应答。"
@@ -2698,18 +2703,17 @@ msgstr "在 SMTP 之前 POP"
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "该选项将在尝试 SMTP 之前允许 POP 连接"
 
-#: ../camel/camel-sasl-popb4smtp.c:81
+#: ../camel/camel-sasl-popb4smtp.c:83
 msgid "POP Source UID"
 msgstr "POP 源 UID"
 
-#: ../camel/camel-sasl-popb4smtp.c:95
+#: ../camel/camel-sasl-popb4smtp.c:97
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "以未知的传输进行 SMTP 认证授权之前的 POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:107 ../camel/camel-sasl-popb4smtp.c:116
+#: ../camel/camel-sasl-popb4smtp.c:109 ../camel/camel-sasl-popb4smtp.c:118
 #, c-format
-#| msgid "POP Before SMTP authentication using a non-POP source"
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "试图通过 %s 服务在 SMTP 认证之前进行 POP"
 
@@ -2724,10 +2728,10 @@ msgid "Invalid GType registered for protocol '%s'"
 msgstr "为协议“%s”注册的 GType 无效"
 
 #: ../camel/camel-session.c:499
-#: ../camel/providers/imapx/camel-imapx-server.c:2924
+#: ../camel/providers/imapx/camel-imapx-server.c:2992
 #: ../camel/providers/pop3/camel-pop3-store.c:308
-#: ../camel/providers/pop3/camel-pop3-store.c:786
-#: ../camel/providers/smtp/camel-smtp-transport.c:664
+#: ../camel/providers/pop3/camel-pop3-store.c:790
+#: ../camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "No support for %s authentication"
 msgstr "不支持 %s 认证"
@@ -2931,43 +2935,43 @@ msgstr "将数据添加到编码器失败"
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME 解密:没有找到加密内容"
 
-#: ../camel/camel-store.c:1248
+#: ../camel/camel-store.c:1280
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "打开文件夹“%s”"
 
-#: ../camel/camel-store.c:1539
+#: ../camel/camel-store.c:1571
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "扫描“%s”中的文件夹"
 
-#: ../camel/camel-store.c:1567 ../camel/camel-store.c:1612
+#: ../camel/camel-store.c:1599 ../camel/camel-store.c:1644
 #: ../camel/camel-vtrash-folder.c:45
 msgid "Trash"
 msgstr "回收站"
 
-#: ../camel/camel-store.c:1581 ../camel/camel-store.c:1629
+#: ../camel/camel-store.c:1613 ../camel/camel-store.c:1661
 #: ../camel/camel-vtrash-folder.c:47
 msgid "Junk"
 msgstr "垃圾"
 
-#: ../camel/camel-store.c:2230
+#: ../camel/camel-store.c:2262
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "无法创建文件夹:%s:文件夹已存在"
 
-#: ../camel/camel-store.c:2237
+#: ../camel/camel-store.c:2269
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "创建文件夹“%s”"
 
-#: ../camel/camel-store.c:2414 ../camel/camel-vee-store.c:410
+#: ../camel/camel-store.c:2446 ../camel/camel-vee-store.c:410
 #: ../camel/providers/local/camel-maildir-store.c:346
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "无法删除文件夹:%s:无效操作"
 
-#: ../camel/camel-store.c:2604 ../camel/camel-vee-store.c:461
+#: ../camel/camel-store.c:2636 ../camel/camel-vee-store.c:461
 #: ../camel/providers/local/camel-maildir-store.c:914
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -2975,7 +2979,7 @@ msgstr "无法重命名文件夹:%s:无效操作"
 
 #: ../camel/camel-stream.c:168
 msgid "Cannot write with no base stream"
-msgstr "无基础串流时不可写入"
+msgstr "无法在无基本流时写入"
 
 #: ../camel/camel-stream.c:288 ../camel/camel-stream.c:339
 #, c-format
@@ -2991,7 +2995,7 @@ msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "CamelHttpStream 只支持重设到开始"
 
 #: ../camel/camel-stream-process.c:278
-#: ../camel/providers/smtp/camel-smtp-transport.c:711
+#: ../camel/providers/smtp/camel-smtp-transport.c:719
 #, c-format
 msgid "Connection cancelled"
 msgstr "连接已取消"
@@ -3027,16 +3031,16 @@ msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "无法将消息移动或复制到虚拟文件夹中"
 
 #: ../camel/camel-vee-folder.c:902
-#, c-format
+#, fuzzy, c-format
 msgid "No such message %s in %s"
-msgstr "在 %2$s 中没有消息 %1$s"
+msgstr "在“%2$s : %3$s”中没有消息 %1$s"
 
 #: ../camel/camel-vee-folder.c:955
 #, c-format
 msgid "Error storing '%s': "
 msgstr "存储“%s”出错:"
 
-#: ../camel/camel-vee-folder.c:1191
+#: ../camel/camel-vee-folder.c:1193
 msgid "Automatically _update on change in source folders"
 msgstr "自动更新源文件夹中的更改(_U)"
 
@@ -3060,9 +3064,9 @@ msgstr "无法重命名文件夹:%s:没有该文件夹"
 msgid "Enable _Unmatched folder"
 msgstr "启用不匹配的文件夹(_U)"
 
-#: ../camel/camel-vee-store.c:1025
+#: ../camel/camel-vee-store.c:1030
 msgid "Updating Unmatched search folder"
-msgstr "更新未匹配搜索文件夹"
+msgstr "正在更新未匹配的搜索文件夹"
 
 #: ../camel/camel-vtrash-folder.c:46
 msgid "Cannot copy messages to the Trash folder"
@@ -3072,13 +3076,17 @@ msgstr "无法将消息复制到回收站文件夹"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "无法将消息复制到垃圾邮件文件夹"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:953
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:973
 #, c-format
 msgid "You must be working online to complete this operation (%s)"
-msgstr "必须联网才能完成此操作 (%s)"
-
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:961
-#: ../camel/providers/nntp/camel-nntp-store.c:1284
+msgstr "您必须在线工作以便完成该操作 (%s)"
+
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:981
+#: ../camel/providers/imapx/camel-imapx-server.c:3125
+#: ../camel/providers/nntp/camel-nntp-store.c:349
+#: ../camel/providers/nntp/camel-nntp-store.c:1291
+#: ../camel/providers/nntp/camel-nntp-store.c:2099
+#: ../camel/providers/nntp/camel-nntp-store.c:2243
 #: ../camel/providers/pop3/camel-pop3-folder.c:449
 #: ../camel/providers/pop3/camel-pop3-folder.c:632
 #: ../camel/providers/pop3/camel-pop3-folder.c:834
@@ -3087,29 +3095,30 @@ msgstr "必须联网才能完成此操作 (%s)"
 #: ../camel/providers/pop3/camel-pop3-store.c:529
 #: ../camel/providers/pop3/camel-pop3-store.c:577
 #: ../camel/providers/pop3/camel-pop3-store.c:672
-#: ../camel/providers/pop3/camel-pop3-store.c:1103
+#: ../camel/providers/pop3/camel-pop3-store.c:1107
+#: ../camel/providers/smtp/camel-smtp-transport.c:543
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "您必须在线工作以便完成该操作"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1533
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1621
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1561
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1649
 #, c-format
 msgid "No destination folder specified"
 msgstr "目标文件夹未指定"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1560
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1588
 msgid "Unable to move junk messages"
 msgstr "无法移动垃圾信息"
 
-#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1655
+#: ../camel/providers/imapx/camel-imapx-conn-manager.c:1683
 msgid "Unable to move deleted messages"
 msgstr "无法移动已删除信息"
 
 #: ../camel/providers/imapx/camel-imapx-folder.c:702
-#, c-format
+#, fuzzy, c-format
 msgid "No quota information available for folder '%s'"
-msgstr "文件夹“%s”配额信息未定义"
+msgstr "文件夹“%s : %s”没有可用的配额信息"
 
 #: ../camel/providers/imapx/camel-imapx-folder.c:964
 #: ../camel/providers/nntp/camel-nntp-folder.c:765
@@ -3131,9 +3140,9 @@ msgid "Could not create cache for %s: "
 msgstr "无法为 %s 创建缓存:"
 
 #: ../camel/providers/imapx/camel-imapx-folder.c:1295
-#, c-format
+#, fuzzy, c-format
 msgid "No IMAP mailbox available for folder '%s'"
-msgstr "文件夹“%s”没有可用的 IMAP 邮箱"
+msgstr "文件夹“%s : %s”没有可用的 IMAP 邮箱"
 
 #: ../camel/providers/imapx/camel-imapx-input-stream.c:101
 #, c-format
@@ -3161,12 +3170,10 @@ msgid "_Listen for server change notifications"
 msgstr "监听服务器变化提醒(_L)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:49
-#| msgid "Lost connection to IMAP server"
 msgid "Connection to Server"
 msgstr "到服务器的连接"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:51
-#| msgid "Numbe_r of cached connections to use"
 msgid "Numbe_r of concurrent connections to use"
 msgstr "使用的并发连接的数目(_R)"
 
@@ -3210,19 +3217,19 @@ msgstr "检查新消息的垃圾内容(_J)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:72
 msgid "Only check for Junk messages in the In_box folder"
-msgstr "只在收件箱检查垃圾邮件(_B)"
+msgstr "仅在收件箱中检查垃圾邮件(_B)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:74
 msgid "Synchroni_ze remote mail locally in all folders"
-msgstr "在所有本地文件夹中同步远程邮件"
+msgstr "将远程邮件同步到本地(_Z)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Default IMAP port"
 msgstr "默认的 IMAP 端口"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:81
-msgid "IMAP over SSL"
-msgstr "IMAP (SSL 加密)"
+msgid "IMAP over TLS"
+msgstr "IMAP(TLS 加密)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:88
 msgid "IMAP+"
@@ -3232,196 +3239,197 @@ msgstr "IMAP+"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP 服务器上的邮件的读写。"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1134
+#: ../camel/providers/imapx/camel-imapx-server.c:1167
 msgid "Error writing to cache stream"
 msgstr "写入缓存流错误"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2741
-#: ../camel/providers/imapx/camel-imapx-server.c:2828
-#: ../camel/providers/imapx/camel-imapx-server.c:3081
+#: ../camel/providers/imapx/camel-imapx-server.c:2808
+#: ../camel/providers/imapx/camel-imapx-server.c:2896
+#: ../camel/providers/imapx/camel-imapx-server.c:3158
 msgid "Failed to get capabilities"
-msgstr "无法取得功能"
+msgstr "无法获取可用性信息"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2760
+#: ../camel/providers/imapx/camel-imapx-server.c:2827
 #, 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:2761
+#: ../camel/providers/imapx/camel-imapx-server.c:2828
 #: ../camel/providers/smtp/camel-smtp-transport.c:281
 msgid "STARTTLS not supported"
 msgstr "不支持 STARTTLS"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2769
+#: ../camel/providers/imapx/camel-imapx-server.c:2837
 msgid "Failed to issue STARTTLS"
-msgstr "无法签发 STARTTLS"
+msgstr "无法提出 STARTTLS 请求"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2817
+#: ../camel/providers/imapx/camel-imapx-server.c:2885
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "以安全模式连接到 IMAP 服务器 %s 失败:"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2911
+#: ../camel/providers/imapx/camel-imapx-server.c:2979
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "IMAP 服务器 %s 不支持 %s 认证"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2942
-#: ../camel/providers/nntp/camel-nntp-store.c:393
-#: ../camel/providers/nntp/camel-nntp-store.c:535
+#: ../camel/providers/imapx/camel-imapx-server.c:3010
+#: ../camel/providers/nntp/camel-nntp-store.c:400
+#: ../camel/providers/nntp/camel-nntp-store.c:542
 msgid "Cannot authenticate without a username"
 msgstr "无法进行无用户名的认证"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2951
-#: ../camel/providers/nntp/camel-nntp-store.c:544
+#: ../camel/providers/imapx/camel-imapx-server.c:3019
+#: ../camel/providers/nntp/camel-nntp-store.c:551
 #: ../camel/providers/pop3/camel-pop3-store.c:690
 #: ../camel/providers/pop3/camel-pop3-store.c:728
 msgid "Authentication password not available"
 msgstr "密码认证不可用"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2959
+#: ../camel/providers/imapx/camel-imapx-server.c:3027
 msgid "Failed to authenticate"
 msgstr "认证失败"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3103
+#: ../camel/providers/imapx/camel-imapx-server.c:3180
 msgid "Failed to issue NAMESPACE"
-msgstr "无法签发 NAMESPACE"
+msgstr "无法提出 NAMESPACE 请求"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3121
+#: ../camel/providers/imapx/camel-imapx-server.c:3198
 msgid "Failed to enable QResync"
 msgstr "无法启用 QResync"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3153
+#: ../camel/providers/imapx/camel-imapx-server.c:3230
 msgid "Failed to issue NOTIFY"
-msgstr "无法发出 NOTIFY"
+msgstr "无法提出 NOTIFY 请求"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3612
+#: ../camel/providers/imapx/camel-imapx-server.c:3708
 msgid "Failed to select mailbox"
-msgstr "无法选择信箱"
+msgstr "无法选择邮箱"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3710
+#: ../camel/providers/imapx/camel-imapx-server.c:3811
 msgid "Cannot issue command, no stream available"
-msgstr "不能发出指令,没有可用的串流"
+msgstr "无法发出命令,没有流可用"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3972
+#: ../camel/providers/imapx/camel-imapx-server.c:4075
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "无法获取消息 ID %s:%s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3973
+#: ../camel/providers/imapx/camel-imapx-server.c:4076
 msgid "No such message available."
 msgstr "没有该消息。"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4007
-#: ../camel/providers/imapx/camel-imapx-server.c:4032
-#: ../camel/providers/imapx/camel-imapx-server.c:4051
+#: ../camel/providers/imapx/camel-imapx-server.c:4113
+#: ../camel/providers/imapx/camel-imapx-server.c:4138
+#: ../camel/providers/imapx/camel-imapx-server.c:4177
 msgid "Error fetching message"
 msgstr "取回消息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4044
+#: ../camel/providers/imapx/camel-imapx-server.c:4155
+#: ../camel/providers/imapx/camel-imapx-server.c:4762
+msgid "Error performing NOOP"
+msgstr "执行 NOOP 出错"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4170
 msgid "Failed to close the tmp stream"
 msgstr "无法关闭临时流"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4075
+#: ../camel/providers/imapx/camel-imapx-server.c:4201
 msgid "Failed to copy the tmp file"
 msgstr "无法复制临时文件"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4238
+#: ../camel/providers/imapx/camel-imapx-server.c:4364
 msgid "Error moving messages"
 msgstr "移动消息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4238
+#: ../camel/providers/imapx/camel-imapx-server.c:4364
 msgid "Error copying messages"
 msgstr "复制消息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4422
-#: ../camel/providers/imapx/camel-imapx-server.c:4443
+#: ../camel/providers/imapx/camel-imapx-server.c:4548
+#: ../camel/providers/imapx/camel-imapx-server.c:4569
 msgid "Cannot create spool file: "
 msgstr "无法创建离线文件:"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4534
+#: ../camel/providers/imapx/camel-imapx-server.c:4670
 msgid "Error appending message"
 msgstr "追加消息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4624
-msgid "Error performing NOOP"
-msgstr "执行 NOOP 出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4772
-#, c-format
+#: ../camel/providers/imapx/camel-imapx-server.c:4912
+#, fuzzy, c-format
 msgid "Scanning for changed messages in '%s'"
-msgstr "扫描“%s”中更改了的消息"
+msgstr "扫描 %s 中更改了的消息"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4775
+#: ../camel/providers/imapx/camel-imapx-server.c:4915
 msgid "Error scanning changes"
-msgstr "扫描变更时发生错误"
+msgstr "扫描更改时出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4793
-#, c-format
+#: ../camel/providers/imapx/camel-imapx-server.c:4933
+#, fuzzy, c-format
 msgid "Fetching summary information for new messages in '%s'"
-msgstr "获取“%s”中新消息的概要信息"
+msgstr "从 %s 中的新消息中获取概要信息"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4810
+#: ../camel/providers/imapx/camel-imapx-server.c:4950
 msgid "Error fetching message info"
-msgstr "获取消息信息失败"
+msgstr "取回消息信息时出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4872
+#: ../camel/providers/imapx/camel-imapx-server.c:5012
 msgid "Error running STATUS"
-msgstr "运行 STATUS 时发生错误"
+msgstr "运行 STATUS 命令时出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5355
-#: ../camel/providers/imapx/camel-imapx-server.c:5407
+#: ../camel/providers/imapx/camel-imapx-server.c:5504
+#: ../camel/providers/imapx/camel-imapx-server.c:5556
 msgid "Error syncing changes"
 msgstr "同步变更出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5518
+#: ../camel/providers/imapx/camel-imapx-server.c:5667
 msgid "Error expunging message"
 msgstr "销毁消息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5588
+#: ../camel/providers/imapx/camel-imapx-server.c:5737
 msgid "Error fetching folders"
 msgstr "取回文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5599
+#: ../camel/providers/imapx/camel-imapx-server.c:5748
 msgid "Error fetching subscribed folders"
-msgstr "收取订阅的文件夹出错"
+msgstr "取回订阅文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5621
+#: ../camel/providers/imapx/camel-imapx-server.c:5770
 msgid "Error creating folder"
 msgstr "创建文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5677
+#: ../camel/providers/imapx/camel-imapx-server.c:5826
 msgid "Error deleting folder"
 msgstr "删除文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5723
+#: ../camel/providers/imapx/camel-imapx-server.c:5872
 msgid "Error renaming folder"
 msgstr "重命名文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5755
+#: ../camel/providers/imapx/camel-imapx-server.c:5904
 msgid "Error subscribing to folder"
 msgstr "订阅文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5791
+#: ../camel/providers/imapx/camel-imapx-server.c:5940
 msgid "Error unsubscribing from folder"
 msgstr "取消订阅文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5831
+#: ../camel/providers/imapx/camel-imapx-server.c:5980
 msgid "IMAP server does not support quotas"
 msgstr "IMAP 服务器不支持配额"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5843
+#: ../camel/providers/imapx/camel-imapx-server.c:5992
 msgid "Error retrieving quota information"
 msgstr "获取配额信息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5890
+#: ../camel/providers/imapx/camel-imapx-server.c:6039
 msgid "Search failed"
 msgstr "搜索失败"
 
 #. Blocks, until the DONE is issued or on inactivity timeout, error, ...
-#: ../camel/providers/imapx/camel-imapx-server.c:6008
+#: ../camel/providers/imapx/camel-imapx-server.c:6157
 msgid "Error running IDLE"
-msgstr "运行 IDLE 出错"
+msgstr "运行 IDLE 命令时出错"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
 #: ../camel/providers/imapx/camel-imapx-store.c:224
@@ -3446,7 +3454,7 @@ msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
 
 #: ../camel/providers/imapx/camel-imapx-store.c:836
 msgid "No IMAPx connection object provided"
-msgstr "没有提供 IMAPx 连接对象"
+msgstr "未提供 IMAPx 连接对象"
 
 #: ../camel/providers/imapx/camel-imapx-store.c:853
 #: ../camel/providers/nntp/camel-nntp-provider.c:92
@@ -3463,44 +3471,129 @@ msgstr "该选项将使用纯文本密码连接到 IMAP 服务器。"
 msgid "No such folder %s"
 msgstr "没有文件夹 %s"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1353
+#: ../camel/providers/imapx/camel-imapx-store.c:1381
 #, c-format
 msgid "No IMAP namespace for folder path '%s'"
 msgstr "没有对应文件夹路径“%s”的 IMAP 名字空间"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1614
-#: ../camel/providers/imapx/camel-imapx-store.c:1847
+#: ../camel/providers/imapx/camel-imapx-store.c:1642
+#: ../camel/providers/imapx/camel-imapx-store.c:1876
 #, c-format
 msgid "Retrieving folder list for '%s'"
-msgstr "正在为 '%s' 获取文件夹列表"
+msgstr "正在获取“%s”的文件夹列表"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:2063
+#: ../camel/providers/imapx/camel-imapx-store.c:2093
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "文件夹名“%s”无效,原因是其中含有字符“%c”"
 
-#: ../camel/providers/local/camel-local-folder.c:194
+#: ../camel/providers/imapx/camel-imapx-store.c:2470
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Drafts"
+msgstr "[Gmail]/草稿"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2471
+msgctxt "IMAPDefaults"
+msgid "Drafts"
+msgstr "草稿"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2472
+msgctxt "IMAPDefaults"
+msgid "Draft"
+msgstr "草稿"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2475
+msgctxt "IMAPDefaults"
+msgid "Templates"
+msgstr "模板"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2478
+msgctxt "IMAPDefaults"
+msgid "Archive"
+msgstr "归档"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2481
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Sent Mail"
+msgstr "[Gmail]/已发送的邮件"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2482
+msgctxt "IMAPDefaults"
+msgid "Sent"
+msgstr "已发送"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2483
+msgctxt "IMAPDefaults"
+msgid "Sent Items"
+msgstr "已发送的项目"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2486
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Spam"
+msgstr "[Gmail]/垃圾邮件"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2487
+msgctxt "IMAPDefaults"
+msgid "Junk"
+msgstr "垃圾"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2488
+msgctxt "IMAPDefaults"
+msgid "Junk E-mail"
+msgstr "垃圾邮件"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2489
+msgctxt "IMAPDefaults"
+msgid "Junk Email"
+msgstr "垃圾邮件"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2490
+msgctxt "IMAPDefaults"
+msgid "Spam"
+msgstr "垃圾邮件"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2491
+msgctxt "IMAPDefaults"
+msgid "Bulk Mail"
+msgstr "群发邮件"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2494
+msgctxt "IMAPDefaults"
+msgid "[Gmail]/Trash"
+msgstr "[Gmail]/垃圾箱"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2495
+msgctxt "IMAPDefaults"
+msgid "Trash"
+msgstr "垃圾箱"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2496
+msgctxt "IMAPDefaults"
+msgid "Deleted Items"
+msgstr "已删除的项目"
+
+#: ../camel/providers/local/camel-local-folder.c:190
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:204
-#: ../camel/providers/local/camel-local-folder.c:213
+#: ../camel/providers/local/camel-local-folder.c:200
+#: ../camel/providers/local/camel-local-folder.c:209
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "邮件箱:%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:222
+#: ../camel/providers/local/camel-local-folder.c:218
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:499
+#: ../camel/providers/local/camel-local-folder.c:495
 msgid "_Index message body data"
 msgstr "索引消息正文(_I)"
 
-#: ../camel/providers/local/camel-local-folder.c:727
+#: ../camel/providers/local/camel-local-folder.c:723
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3652,7 +3745,7 @@ msgstr "无法将消息转移到目标文件夹:%s"
 #: ../camel/providers/local/camel-maildir-store.c:931
 #, c-format
 msgid "Cannot create folder containing '%s'"
-msgstr "创建包含 '%s' 的文件夹失败"
+msgstr "无法创建包含“%s”的文件夹"
 
 #: ../camel/providers/local/camel-maildir-store.c:139
 #: ../camel/providers/local/camel-maildir-store.c:158
@@ -4061,8 +4154,8 @@ msgid "Default NNTP port"
 msgstr "默认的 NNTP 端口"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:55
-msgid "NNTP over SSL"
-msgstr "NNTP (SSL 加密)"
+msgid "NNTP over TLS"
+msgstr "NNTP(TLS 加密)"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:61
 msgid "USENET news"
@@ -4084,22 +4177,22 @@ msgid ""
 "password."
 msgstr "该选项将以明文密码向进行 NNTP 服务器进行认证。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:370
+#: ../camel/providers/nntp/camel-nntp-store.c:377
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "无法阅读来自 %s 的欢迎信息:"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:378
+#: ../camel/providers/nntp/camel-nntp-store.c:385
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP 服务器 %s 返回错误码 %d:%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:448
+#: ../camel/providers/nntp/camel-nntp-store.c:455
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET 新闻 %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1185
+#: ../camel/providers/nntp/camel-nntp-store.c:1192
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4110,22 +4203,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1301
+#: ../camel/providers/nntp/camel-nntp-store.c:1308
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "您无法在新闻存储中创建文件夹:应该订阅。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1317
+#: ../camel/providers/nntp/camel-nntp-store.c:1324
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "您无法在新闻存储中重命名文件夹。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1340
+#: ../camel/providers/nntp/camel-nntp-store.c:1347
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "您无法在新闻存储中删除文件夹:应该退订。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1550
+#: ../camel/providers/nntp/camel-nntp-store.c:1557
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4136,7 +4229,7 @@ msgstr ""
 "\n"
 "没有这样的新闻组。选中项目可能是父文件夹。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1617
+#: ../camel/providers/nntp/camel-nntp-store.c:1624
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4147,16 +4240,16 @@ msgstr ""
 "\n"
 "新闻组不存在!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2043
+#: ../camel/providers/nntp/camel-nntp-store.c:2050
 msgid "NNTP Command failed: "
 msgstr "NNTP 命令失败:"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2141
+#: ../camel/providers/nntp/camel-nntp-store.c:2155
 #, c-format
 msgid "Not connected."
 msgstr "未连接。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2235
+#: ../camel/providers/nntp/camel-nntp-store.c:2257
 #, c-format
 msgid "No such folder: %s"
 msgstr "没有文件夹:%s"
@@ -4245,8 +4338,8 @@ msgid "Default POP3 port"
 msgstr "默认的 POP3 端口"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:53
-msgid "POP3 over SSL"
-msgstr "POP3 (SSL 加密)"
+msgid "POP3 over TLS"
+msgstr "POP3(TLS 加密)"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:60
 msgid "POP"
@@ -4326,7 +4419,7 @@ msgstr "%2$s 为 %1$s 提供的 POP 服务"
 
 #: ../camel/providers/pop3/camel-pop3-store.c:702
 #: ../camel/providers/pop3/camel-pop3-store.c:715
-#: ../camel/providers/pop3/camel-pop3-store.c:797
+#: ../camel/providers/pop3/camel-pop3-store.c:801
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4346,7 +4439,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:812
+#: ../camel/providers/pop3/camel-pop3-store.c:816
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4355,12 +4448,12 @@ msgstr ""
 "无法连接到 POP 服务器 %s。\n"
 "发送用户名错误%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:896
+#: ../camel/providers/pop3/camel-pop3-store.c:900
 #, c-format
 msgid "No such folder '%s'."
 msgstr "没有文件夹“%s”。"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:913
+#: ../camel/providers/pop3/camel-pop3-store.c:917
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 的存储没有文件夹结构"
@@ -4438,8 +4531,8 @@ msgid "Default SMTP port"
 msgstr "默认的 SMTP 端口"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:40
-msgid "SMTP over SSL"
-msgstr "SMTP (SSL 加密)"
+msgid "SMTP over TLS"
+msgstr "SMTP(TLS 加密)"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:41
 msgid "Message submission port"
@@ -4484,191 +4577,191 @@ msgstr "SMTP 服务器 %s"
 msgid "SMTP mail delivery via %s"
 msgstr "通过 %s 发送 SMTP 邮件"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:574
+#: ../camel/providers/smtp/camel-smtp-transport.c:582
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP 服务器 %s 不支持 %s 认证。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:655
+#: ../camel/providers/smtp/camel-smtp-transport.c:663
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr "未指定 SASL 机制"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:691
+#: ../camel/providers/smtp/camel-smtp-transport.c:699
 msgid "AUTH command failed: Not connected."
-msgstr "认证(AUTH)命令失败:没有连接。"
+msgstr "AUTH 命令失败:未连接。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:698
-#: ../camel/providers/smtp/camel-smtp-transport.c:712
-#: ../camel/providers/smtp/camel-smtp-transport.c:724
+#: ../camel/providers/smtp/camel-smtp-transport.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
 msgid "AUTH command failed: "
 msgstr "AUTH 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:880
+#: ../camel/providers/smtp/camel-smtp-transport.c:889
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "无法发送消息:服务未连接。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:889
+#: ../camel/providers/smtp/camel-smtp-transport.c:898
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "无法发送消息:发件人地址不合法。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:893
+#: ../camel/providers/smtp/camel-smtp-transport.c:902
 msgid "Sending message"
 msgstr "正在发送消息"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:922
+#: ../camel/providers/smtp/camel-smtp-transport.c:931
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "无法发送消息:没有定义收件人。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:937
+#: ../camel/providers/smtp/camel-smtp-transport.c:946
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "无法发送消息:一个或多个非法收件人"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1069
+#: ../camel/providers/smtp/camel-smtp-transport.c:1078
 msgid "Syntax error, command unrecognized"
 msgstr "语法错误,命令无法识别"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1071
+#: ../camel/providers/smtp/camel-smtp-transport.c:1080
 msgid "Syntax error in parameters or arguments"
 msgstr "参数语法错误"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1073
+#: ../camel/providers/smtp/camel-smtp-transport.c:1082
 msgid "Command not implemented"
 msgstr "命令尚未实现"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1075
+#: ../camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Command parameter not implemented"
 msgstr "命令参数尚未实现"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1077
+#: ../camel/providers/smtp/camel-smtp-transport.c:1086
 msgid "System status, or system help reply"
 msgstr "系统状态,或系统求助就绪"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1079
+#: ../camel/providers/smtp/camel-smtp-transport.c:1088
 msgid "Help message"
 msgstr "帮助消息"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1081
+#: ../camel/providers/smtp/camel-smtp-transport.c:1090
 msgid "Service ready"
 msgstr "服务就绪"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1083
+#: ../camel/providers/smtp/camel-smtp-transport.c:1092
 msgid "Service closing transmission channel"
 msgstr "服务正在关闭传输通道"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1085
+#: ../camel/providers/smtp/camel-smtp-transport.c:1094
 msgid "Service not available, closing transmission channel"
 msgstr "服务不可用,正在关闭传输通道"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1087
+#: ../camel/providers/smtp/camel-smtp-transport.c:1096
 msgid "Requested mail action okay, completed"
 msgstr "邮件动作请求确认,已完成"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1089
+#: ../camel/providers/smtp/camel-smtp-transport.c:1098
 msgid "User not local; will forward to <forward-path>"
 msgstr "用户不在本地;将转发到 <转发路径>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1091
+#: ../camel/providers/smtp/camel-smtp-transport.c:1100
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "邮件动作请求未发生:邮箱无效"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1102
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "动作请求未发生:邮箱无效"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../camel/providers/smtp/camel-smtp-transport.c:1104
 msgid "Requested action aborted: error in processing"
 msgstr "动作请求已放弃:处理出错"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1097
+#: ../camel/providers/smtp/camel-smtp-transport.c:1106
 msgid "User not local; please try <forward-path>"
 msgstr "用户不在本地;请尝试 <转发路径>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../camel/providers/smtp/camel-smtp-transport.c:1108
 msgid "Requested action not taken: insufficient system storage"
 msgstr "动作请求未发生:系统存储空间不足"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1101
+#: ../camel/providers/smtp/camel-smtp-transport.c:1110
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "邮件动作请求已放弃:存储分配超额"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1103
+#: ../camel/providers/smtp/camel-smtp-transport.c:1112
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "动作请求未发生:不允许的邮件箱名称"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1105
+#: ../camel/providers/smtp/camel-smtp-transport.c:1114
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "开始输入邮件;以 <CRLF>.<CRLF> 结束"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1107
+#: ../camel/providers/smtp/camel-smtp-transport.c:1116
 msgid "Transaction failed"
 msgstr "传送失败"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1111
+#: ../camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "A password transition is needed"
 msgstr "必须传输密码"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1113
+#: ../camel/providers/smtp/camel-smtp-transport.c:1122
 msgid "Authentication mechanism is too weak"
 msgstr "认证机制太弱"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1115
+#: ../camel/providers/smtp/camel-smtp-transport.c:1124
 msgid "Encryption required for requested authentication mechanism"
 msgstr "请求的认证机制必须加密"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
+#: ../camel/providers/smtp/camel-smtp-transport.c:1126
 msgid "Temporary authentication failure"
 msgstr "临时认证失败"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1407
+#: ../camel/providers/smtp/camel-smtp-transport.c:1416
 msgid "SMTP Greeting"
 msgstr "SMTP 欢迎"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1416
-#: ../camel/providers/smtp/camel-smtp-transport.c:1429
-#: ../camel/providers/smtp/camel-smtp-transport.c:1436
+#: ../camel/providers/smtp/camel-smtp-transport.c:1425
+#: ../camel/providers/smtp/camel-smtp-transport.c:1438
+#: ../camel/providers/smtp/camel-smtp-transport.c:1445
 msgid "HELO command failed: "
 msgstr "HELO 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1512
-#: ../camel/providers/smtp/camel-smtp-transport.c:1526
+#: ../camel/providers/smtp/camel-smtp-transport.c:1521
 #: ../camel/providers/smtp/camel-smtp-transport.c:1535
+#: ../camel/providers/smtp/camel-smtp-transport.c:1544
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1563
+#: ../camel/providers/smtp/camel-smtp-transport.c:1572
 msgid "RCPT TO command failed: "
 msgstr "RSET 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1579
 #: ../camel/providers/smtp/camel-smtp-transport.c:1588
+#: ../camel/providers/smtp/camel-smtp-transport.c:1597
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> 失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1660
-#: ../camel/providers/smtp/camel-smtp-transport.c:1671
-#: ../camel/providers/smtp/camel-smtp-transport.c:1682
-#: ../camel/providers/smtp/camel-smtp-transport.c:1744
-#: ../camel/providers/smtp/camel-smtp-transport.c:1762
-#: ../camel/providers/smtp/camel-smtp-transport.c:1775
-#: ../camel/providers/smtp/camel-smtp-transport.c:1783
+#: ../camel/providers/smtp/camel-smtp-transport.c:1669
+#: ../camel/providers/smtp/camel-smtp-transport.c:1680
+#: ../camel/providers/smtp/camel-smtp-transport.c:1691
+#: ../camel/providers/smtp/camel-smtp-transport.c:1753
+#: ../camel/providers/smtp/camel-smtp-transport.c:1771
+#: ../camel/providers/smtp/camel-smtp-transport.c:1784
+#: ../camel/providers/smtp/camel-smtp-transport.c:1792
 msgid "DATA command failed: "
 msgstr "DATP 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1809
-#: ../camel/providers/smtp/camel-smtp-transport.c:1823
-#: ../camel/providers/smtp/camel-smtp-transport.c:1831
+#: ../camel/providers/smtp/camel-smtp-transport.c:1818
+#: ../camel/providers/smtp/camel-smtp-transport.c:1832
+#: ../camel/providers/smtp/camel-smtp-transport.c:1840
 msgid "RSET command failed: "
 msgstr "RSET 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1857
-#: ../camel/providers/smtp/camel-smtp-transport.c:1869
-#: ../camel/providers/smtp/camel-smtp-transport.c:1875
+#: ../camel/providers/smtp/camel-smtp-transport.c:1866
+#: ../camel/providers/smtp/camel-smtp-transport.c:1878
+#: ../camel/providers/smtp/camel-smtp-transport.c:1884
 msgid "QUIT command failed: "
 msgstr "QUIT 命令失败:"
 
@@ -4704,7 +4797,19 @@ msgstr "生日/周年纪念日提醒单位,“分钟”、“小时”或“
 
 #: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:1
 msgid "Whether the migration of old setting was already done"
-msgstr "旧设置值是否已经转移完成"
+msgstr "是否已完成老旧设置迁移"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:2
+msgid "An absolute path where the gpg (or gpg2) binary is"
+msgstr "gpg(或 gpg2)二进制的绝对路径"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:3
+msgid ""
+"An example is '/usr/bin/gpg'; if it is not filled, or doesn't exist, then it "
+"is searched for it. Change requires restart of the application."
+msgstr ""
+"例如“/usr/bin/gpg”;如此项未填入或不存在,则将搜索此二进制。更改此项需要重启"
+"应用程序。"
 
 #: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
 msgid "(Deprecated) Proxy type to use"
@@ -4777,10 +4882,10 @@ msgstr "%s 不支持创建远程资源"
 msgid "%s does not support deleting remote resources"
 msgstr "%s 不支持删除远程资源"
 
-#: ../libebackend/e-data-factory.c:1292
+#: ../libebackend/e-data-factory.c:1294
 #, c-format
 msgid "Backend factory for source '%s' and extension '%s' cannot be found."
-msgstr "找不到来源“%s”与拓展功能“%s”的后端工厂。"
+msgstr "未找到源“%s”和扩展“%s”的后端工厂。"
 
 #: ../libebackend/e-server-side-source.c:141
 #, c-format
@@ -4789,9 +4894,10 @@ msgstr "数据源缺少一个 [%s] 组"
 
 #: ../libebackend/e-server-side-source.c:466
 msgid "Failed to lookup credentials: "
-msgstr "查找证书失败:"
+msgstr "无法查找凭据:"
 
-#: ../libebackend/e-server-side-source.c:1391 ../libedataserver/e-source.c:1595
+#: ../libebackend/e-server-side-source.c:1391
+#: ../libedataserver/e-source.c:1595
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
 msgstr "数据源“%s”不支持创建远程资源"
@@ -4803,7 +4909,8 @@ msgid ""
 "Data source '%s' has no collection backend to create the remote resource"
 msgstr "数据源“%s”没有合集后端(collection backend)来创建远程资源"
 
-#: ../libebackend/e-server-side-source.c:1433 ../libedataserver/e-source.c:1708
+#: ../libebackend/e-server-side-source.c:1433
+#: ../libedataserver/e-source.c:1708
 #, c-format
 msgid "Data source '%s' does not support deleting remote resources"
 msgstr "数据源“%s”不支持删除远程资源"
@@ -4814,7 +4921,8 @@ msgid ""
 "Data source '%s' has no collection backend to delete the remote resource"
 msgstr "数据源“%s”没有合集后端(collection backend)来删除远程资源"
 
-#: ../libebackend/e-server-side-source.c:1478 ../libedataserver/e-source.c:1804
+#: ../libebackend/e-server-side-source.c:1478
+#: ../libedataserver/e-source.c:1804
 #: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1079
 #, c-format
 msgid "Data source '%s' does not support OAuth 2.0 authentication"
@@ -4996,15 +5104,58 @@ msgstr "未命名"
 
 #: ../libedataserver/e-source-credentials-provider-impl.c:41
 msgid "Credentials lookup is not supported"
-msgstr "不支持证书查找"
+msgstr "不支持查找凭据"
 
 #: ../libedataserver/e-source-credentials-provider-impl.c:54
 msgid "Credentials store is not supported"
-msgstr "不支持证书存储"
+msgstr "不支持存储凭据"
 
 #: ../libedataserver/e-source-credentials-provider-impl.c:65
 msgid "Credentials delete is not supported"
-msgstr "不支持证书删除"
+msgstr "不支持删除凭据"
+
+#. Translators: The first %s is a display name of the source, the second is its UID.
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:81
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:145
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:242
+#, c-format
+msgid "Source '%s' (%s) is not a valid Google source"
+msgstr "“%s” (%s) 不是有效的 Google 源"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:159
+msgid "Google secret not found"
+msgstr "未找到 Google 密文"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:190
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:212
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:235
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:525
+msgid "Google authentication is not supported"
+msgstr "不支持 Google 认证"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:401
+msgid "Failed to get Google secret from credentials"
+msgstr "从证书里获取 Google secret 失败"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:408
+msgid "Refresh token not found in Google secret"
+msgstr "在 Google secret 不能找到刷新令牌"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:416
+msgid "Failed to construct refresh_token request"
+msgstr "不能构造 refresh_token 请求"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:449
+msgid "Failed to encode new access token to Google secret"
+msgstr "编码 Google secret 的新访问令牌失败"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:459
+msgid "Failed to get access token from refresh_token server response"
+msgstr "从 refresh_token 服务器回应中获取访问令牌失败"
+
+#: ../libedataserver/e-source-credentials-provider-impl-google.c:465
+msgid "Failed to refresh token"
+msgstr "获取刷新令牌失败"
 
 #: ../libedataserver/e-source-credentials-provider-impl-password.c:81
 msgid "Password not found"
@@ -5149,115 +5300,199 @@ msgstr "%H%M"
 msgid "%I %p"
 msgstr "%p%I"
 
-#: ../libedataserver/e-webdav-discover.c:468
-#: ../libedataserver/e-webdav-discover.c:477
+#: ../libedataserver/e-webdav-discover.c:484
+#: ../libedataserver/e-webdav-discover.c:493
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP 错误:%s"
 
-#: ../libedataserver/e-webdav-discover.c:507
+#: ../libedataserver/e-webdav-discover.c:523
 msgid "Could not parse response"
 msgstr "无法解析响应"
 
-#: ../libedataserver/e-webdav-discover.c:516
+#: ../libedataserver/e-webdav-discover.c:532
 msgid "Empty response"
 msgstr "空响应"
 
-#: ../libedataserver/e-webdav-discover.c:524
+#: ../libedataserver/e-webdav-discover.c:540
 msgid "Unexpected reply from server"
-msgstr "服务器给出意外回复"
+msgstr "服务器返回意外回复"
 
-#: ../libedataserverui/e-credentials-prompter.c:259
-#: ../libedataserverui/e-credentials-prompter.c:1561
-#: ../libedataserverui/e-credentials-prompter.c:1605
+#: ../libedataserverui/e-credentials-prompter.c:260
+#: ../libedataserverui/e-credentials-prompter.c:1573
+#: ../libedataserverui/e-credentials-prompter.c:1617
 msgid "Credentials prompt was cancelled"
-msgstr "凭证提示已取消"
+msgstr "提示请求凭据失败"
 
-#: ../libedataserverui/e-credentials-prompter.c:663
+#: ../libedataserverui/e-credentials-prompter.c:664
 #, c-format
 msgid "Source '%s' doesn't support prompt for credentials"
-msgstr "来源“%s”不支持凭证提示"
+msgstr "源“%s”不支持提示请求凭据"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:446
+#, c-format
+msgid "Failed to obtain access token from address '%s'. Error code %d (%s)"
+msgstr "无法从地址“%s”获取令牌。错误代码 %d (%s)"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:494
+msgid "Requesting access token, please wait..."
+msgstr "正在请求访问令牌,请稍候…"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:133
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:596
+msgid "Google Address book authentication request"
+msgstr "Google 地址簿认证请求"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:599
+msgid "Google Calendar authentication request"
+msgstr "Google 日历认证请求"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:602
+msgid "Google Memo List authentication request"
+msgstr "Google 留言簿认证请求"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:605
+msgid "Google Task List authentication request"
+msgstr "Google 任务列表认证请求"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:609
+msgid "Google Mail authentication request"
+msgstr "Google 邮件认证请求"
+
+#. generic account prompt
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:612
+msgid "Google account authentication request"
+msgstr "Google 帐号认证请求"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:623
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"address book \"%s\"."
+msgstr "登录到你的 Google 帐号并接受许可以访问你的地址簿“%s”。"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:627
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"calendar \"%s\"."
+msgstr "登录到你的 Google 帐号并接受许可以访问你的日历“%s”。"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:631
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"mail account \"%s\"."
+msgstr "登录到你的 Google 帐号并接受许可以访问你的邮件帐号“%s”。"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:635
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"mail transport \"%s\"."
+msgstr "登录到你的 Google 帐号并接受许可以访问你的邮件传输“%s”。"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:639
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"memo list \"%s\"."
+msgstr "登录到你的 Google 帐号并接受许可以访问你的留言簿“%s”。"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:643
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"task list \"%s\"."
+msgstr "登录到你的 Google 帐号并接受许可以访问你的任务列表“%s”。"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:647
+#, c-format
+msgid ""
+"Login to your Google account and accept conditions in order to access your "
+"account \"%s\"."
+msgstr "登录到你的 Google 帐号并接受许可以访问你的帐号“%s”。"
+
+#: ../libedataserverui/e-credentials-prompter-impl-google.c:691
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:232
+#: ../libedataserverui/e-trust-prompt.c:114
+#: ../libedataserverui/e-webdav-discover-widget.c:1063
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:134
 msgid "Address book authentication request"
 msgstr "地址簿认证请求"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:138
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:139
 msgid "Calendar authentication request"
 msgstr "日历认证请求"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:142
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:143
 msgid "Mail authentication request"
 msgstr "邮件认证请求"
 
 #. generic account prompt
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:145
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:146
 msgid "Authentication request"
 msgstr "认证请求"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:156
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:157
 #, c-format
 msgid "Please enter the password for address book \"%s\"."
 msgstr "请输入地址簿“%s”的密码。"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:160
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:161
 #, c-format
 msgid "Please enter the password for calendar \"%s\"."
 msgstr "请输入日历“%s”的密码。"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:164
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:165
 #, c-format
 msgid "Please enter the password for mail account \"%s\"."
 msgstr "请输入邮件帐号“%s”的密码。"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:168
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:169
 #, c-format
 msgid "Please enter the password for mail transport \"%s\"."
 msgstr "请输入邮件传输“%s”的密码。"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:172
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:173
 #, c-format
 msgid "Please enter the password for memo list \"%s\"."
 msgstr "请输入备忘录列表“%s”的密码。"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:176
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:177
 #, c-format
 msgid "Please enter the password for task list \"%s\"."
 msgstr "请输入任务列表“%s”的密码。"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:180
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:181
 #, c-format
 msgid "Please enter the password for account \"%s\"."
 msgstr "请输入帐号“%s”的密码。"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:229
-#: ../libedataserverui/e-trust-prompt.c:114
-#: ../libedataserverui/e-webdav-discover-widget.c:1063
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:230
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:233
 #: ../libedataserverui/e-webdav-discover-widget.c:1064
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:340
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:343
 msgid "_User Name:"
 msgstr "用户名(_U):"
 
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:352
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:355
 msgid "_Password:"
 msgstr "密码(_P):"
 
 #. Remember password check
-#: ../libedataserverui/e-credentials-prompter-impl-password.c:368
+#: ../libedataserverui/e-credentials-prompter-impl-password.c:371
 msgid "_Add this password to your keyring"
-msgstr "将此密码添加到您的密码串(_A)"
+msgstr "将该密码添加到您的密钥环(_A)"
 
 #: ../libedataserverui/e-trust-prompt.c:113
 #: ../modules/trust-prompt/trust-prompt-gtk.c:119
 msgid "Certificate trust..."
-msgstr "证书信任..."
+msgstr "证书信任…"
 
 #: ../libedataserverui/e-trust-prompt.c:115
 #: ../modules/trust-prompt/trust-prompt-gtk.c:120
@@ -5277,8 +5512,8 @@ msgstr "永久接受(_A)"
 #: ../libedataserverui/e-trust-prompt.c:188
 #: ../modules/trust-prompt/trust-prompt-gtk.c:159
 #, c-format
-msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
-msgstr "“%s” 的 SSL 证书不受信任。您是否想要接受它?"
+msgid "SSL/TLS certificate for '%s' is not trusted. Do you wish to accept it?"
+msgstr "“%s” 的 TLS/SSL 证书不受信任。您是否想要接受它?"
 
 #: ../libedataserverui/e-trust-prompt.c:210
 #: ../modules/trust-prompt/trust-prompt-gtk.c:174
@@ -5287,7 +5522,7 @@ msgstr "原因:"
 
 #: ../libedataserverui/e-trust-prompt.c:213
 msgid "Detailed error:"
-msgstr "错误细节:"
+msgstr "详细错误:"
 
 #: ../libedataserverui/e-trust-prompt.c:275
 #: ../modules/trust-prompt/module-trust-prompt.c:82
@@ -5329,7 +5564,7 @@ msgstr "支持"
 
 #: ../libedataserverui/e-webdav-discover-widget.c:177
 msgid "_User mail:"
-msgstr "用户邮件(_U)"
+msgstr "用户邮件(_U):"
 
 #: ../libedataserverui/e-webdav-discover-widget.c:523
 msgctxt "WebDAVDiscover"
@@ -5357,7 +5592,7 @@ msgstr "无效的 URL"
 
 #: ../libedataserverui/e-webdav-discover-widget.c:839
 msgid "User name not filled"
-msgstr "用户名未填写"
+msgstr "未填入用户名"
 
 #: ../libedataserverui/e-webdav-discover-widget.c:880
 msgid "Cancel"
@@ -5365,7 +5600,7 @@ msgstr "取消"
 
 #: ../libedataserverui/e-webdav-discover-widget.c:883
 msgid "Searching server sources..."
-msgstr "正在搜索服务器来源…"
+msgstr "正在搜索服务器源…"
 
 #: ../modules/gnome-online-accounts/e-goa-password-based.c:210
 #, c-format
@@ -5376,7 +5611,7 @@ msgstr "通过 org.gnome.OnlineAccounts 服务无法找到“%s”对应的帐
 
 #: ../modules/gnome-online-accounts/e-goa-password-based.c:273
 msgid "Failed to get password from GOA: "
-msgstr "从 GOA 获取密码失败: "
+msgstr "无法从 GOA 获取密码:"
 
 #. TODO: more specific
 #: ../modules/gnome-online-accounts/goaewsclient.c:219
@@ -5426,12 +5661,12 @@ msgstr "通过 org.gnome.OnlineAccounts 服务无法找到“%s”对应的帐
 msgid "Failed to obtain an access token for '%s': "
 msgstr "无法获取“%s”的访问令牌:"
 
-#: ../modules/google-backend/module-google-backend.c:461
+#: ../modules/google-backend/module-google-backend.c:602
 #: ../modules/yahoo-backend/module-yahoo-backend.c:226
 msgid "Tasks"
 msgstr "任务"
 
-#: ../modules/google-backend/module-google-backend.c:515
+#: ../modules/google-backend/module-google-backend.c:659
 #: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
 #: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
 msgid "Contacts"
@@ -5581,11 +5816,93 @@ msgstr "不从先前版本的 Evolution 迁移用户数据"
 msgid "_Dismiss"
 msgstr "解除(_D)"
 
+#~ msgid "Scanning for changed messages in '%s : %s'"
+#~ msgstr "正在扫描“%s : %s”中已更改的消息"
+
+#~ msgid "Fetching summary information for new messages in '%s : %s'"
+#~ msgstr "正在获取“%s : %s”中新消息的概要信息"
+
+#~ msgctxt "IMAPDefaults"
+#~ msgid "Sent Messages"
+#~ msgstr "已发送消息"
+
+#~ msgctxt "IMAPDefaults"
+#~ msgid "Deleted Messages"
+#~ msgstr "已删除的消息"
+
+#~ msgid "Failed to issue STARTTLS for NNTP server %s: "
+#~ msgstr "无法为 NNTP 服务器 %s 提出 STARTTLS 请求:"
+
+#~ msgid "NNTP server %s doesn't support STARTTLS: %s"
+#~ msgstr "NNTP 服务器 %s 不支持 STARTTLS: %s"
+
+#~ msgid "Failed to connect to NNTP server %s in secure mode: "
+#~ msgstr "以安全模式连接 NNTP 服务器 %s 失败:"
+
+#~ msgid "Whether to load photos of signers/encrypters"
+#~ msgstr "是否载入签名者或加密者的照片"
+
+#~ msgid ""
+#~ "When set to 'true', tries to load also photo of the signers/encrypters, "
+#~ "if available in the key/certificate."
+#~ msgstr ""
+#~ "设置为“true”时则尝试载入签名者或加密者的照片,前提是已经存在密钥或证书里。"
+
+#~ msgid ""
+#~ "GIO name of the GNetworkMonitor to use for an ENetworkMonitor instance"
+#~ msgstr "GNetworkMonitor 的 GIO 名字以便为 ENetworkMonitor 实例所使用"
+
+#~ msgid ""
+#~ "When set to an unknown value, then the default GNetworkMonitor is used in "
+#~ "the background. A special value 'always-online' is used for no network "
+#~ "monitoring."
+#~ msgstr ""
+#~ "当设置为未知的值时,后台使用默认的 GNetworkMonitor。没有网络监控时设置特殊"
+#~ "的值“always-online”。"
+
+#~ msgid "Module '%s' for source UID '%s' cannot be loaded"
+#~ msgstr "不能为 UID 是“%2$s”的源载入模块“%1$s”"
+
+#~ msgid "Failed to create backend of type '%s' for source UID '%s'"
+#~ msgstr "为源 UID “%2$s” 创建的后端类型 “%1$s” 失败"
+
+#~ msgid "Can not open file"
+#~ msgstr "不能打开文件"
+
+#~ msgid "Failed to open client '%s': %s"
+#~ msgstr "打开客户端“%s”失败:%s"
+
+#~ msgid "Unhandled error"
+#~ msgstr "未处理的错误"
+
+#~ msgid "Specify the output file instead of standard output"
+#~ msgstr "指定输出文件而不是标准输出"
+
+#~ msgid "OUTPUTFILE"
+#~ msgstr "OUTPUTFILE"
+
+#~ msgid "List local address book folders"
+#~ msgstr "列出本地地址簿文件夹"
+
+#~ msgid "Show cards as vcard or csv file"
+#~ msgstr "显示卡片为 vcard 或 csv 文件"
+
+#~ msgid "[vcard|csv]"
+#~ msgstr "[vcard|csv]"
+
+#~ msgid ""
+#~ "Command line arguments error, please use --help option to see the usage."
+#~ msgstr "命令行参数错误,请使用 --help 选项查看使用方法。"
+
+#~ msgid "Only support csv or vcard format."
+#~ msgstr "仅支持 csv 或 vcard 格式。"
+
 #~ msgid "Server disconnected"
 #~ msgstr "服务器断开连接"
 
+#, fuzzy
 #~ msgid "Error performing IDLE"
-#~ msgstr "执行 IDLE 命令出错"
+#~ msgstr "执行 NOOP 出错"
 
 #~ msgid "Error fetching message headers"
 #~ msgstr "取回消息头出错"
@@ -5599,5 +5916,874 @@ msgstr "解除(_D)"
 #~ msgid "Error refreshing folder"
 #~ msgstr "刷新文件夹出错"
 
+#, fuzzy
 #~ msgid "Not authenticated"
-#~ msgstr "没有验证"
+#~ msgstr "认证失败"
+
+#~ msgid "Bus name vanished (client terminated?)"
+#~ msgstr "Bus 名称消失(客户端终止了?)"
+
+#~ msgid "No response from client"
+#~ msgstr "客户端无响应"
+
+#~ msgid "Client cancelled the operation"
+#~ msgstr "客户端已取消操作"
+
+#~ msgid "Client reports password was rejected"
+#~ msgstr "客户端报告密码被拒绝"
+
+#~ msgid "Password was incorrect"
+#~ msgstr "密码错误"
+
+#~ msgid "%s does not support authentication"
+#~ msgstr "%s 不支持认证"
+
+#~ msgid "The user declined to authenticate"
+#~ msgstr "用户拒绝认证"
+
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by address book '%s', is not trusted. "
+#~ "Do you wish to accept it?"
+#~ msgstr ""
+#~ "地址簿“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任,您是否想要接受它?"
+
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do "
+#~ "you wish to accept it?"
+#~ msgstr "日历“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任,您是否想要接受它?"
+
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
+#~ "you wish to accept it?"
+#~ msgstr ""
+#~ "备忘录“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任,您是否想要接受它?"
+
+#~ msgid ""
+#~ "SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
+#~ "you wish to accept it?"
+#~ msgstr ""
+#~ "任务列表“%2$s”所使用的主机“%1$s” 的 SSL 证书不受信任,您是否想要接受它?"
+
+#~ msgid "No such data source for UID '%s'"
+#~ msgstr "没有 UID 为“%s”的数据源"
+
+#~ msgid "Invalid password for '%s'"
+#~ msgstr "“%s”的密码错误"
+
+#~ msgid "No backend name in source '%s'"
+#~ msgstr "源文件“%s”中无后端名称"
+
+#~ msgid "Missing source UID"
+#~ msgstr "缺少源 UID"
+
+#~ msgid "No backend factory for hash key '%s'"
+#~ msgstr "散列键“%s”没有对应的后端工厂"
+
+#~ msgid "No host information available"
+#~ msgstr "无可用的主机信息"
+
+#~ msgid "Cannot create folder '%s': folder exists"
+#~ msgstr "无法创建文件夹“%s”文件夹已存在"
+
+#~ msgid "Cannot create folder '%s': folder exists."
+#~ msgstr "无法创建文件夹“%s”:文件夹已存在。"
+
+#~ 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 ""
+#~ "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 "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 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 创建摘要失败"
+
+#~ msgid "Creating new contact…"
+#~ msgstr "创建新的联系人..."
+
+#~ msgid "Deleting contact…"
+#~ msgstr "删除联系人..."
+
+#~ msgid "Modifying contact…"
+#~ msgstr "修改联系人..."
+
+#~ msgid "Using Distinguished Name (DN)"
+#~ msgstr "使用已识别的姓名 (DN)"
+
+#~ msgid "Using Email Address"
+#~ msgstr "使用电子邮件地址"
+
+#~ msgid "Failed to run book factory"
+#~ msgstr "运行地址簿工厂失败"
+
+#~ msgid "Cannot get connection to view"
+#~ msgstr "无法获取到视图的连接"
+
+#~ msgid "Cannot process, book backend is opening"
+#~ msgstr "无法进行,地址簿后端正在打开"
+
+#~ msgid "Empty query: "
+#~ msgstr "空的查询:"
+
+#~ msgid "Cannot remove book: "
+#~ msgstr "无法删除地址簿:"
+
+#~ msgid "Cannot get backend property: "
+#~ msgstr "无法获取后端属性:"
+
+#~ msgid "Cannot set backend property: "
+#~ msgstr "无法发送后端属性:"
+
+#~ msgid "Invalid backend name '%s' in source '%s'"
+#~ msgstr "在源文件“%2$s”中的后端名称“%1$s”无效"
+
+#~ msgid ""
+#~ "Failed to connect to a server using SSL. One possible reason is an "
+#~ "invalid certificate being used by the server. If this is expected, like "
+#~ "self-signed certificate being used on the server, then disable "
+#~ "certificate validity tests by selecting 'Ignore invalid SSL certificate' "
+#~ "option in Properties"
+#~ msgstr ""
+#~ "无法使用 SSL 连接到服务器。一个可能的原因是服务器使用了无效的证书。如果这"
+#~ "在您意料之中,如服务器使用了自我签名的证书,可选择属性里的“忽略无效 SSL 证"
+#~ "书”选项来禁用证书有效性测试"
+
+#~ msgid "Cannot create local store"
+#~ msgstr "无法创建本地存储"
+
+#~ msgid "Could not create synch slave thread"
+#~ msgstr "无法创建同步从属线程"
+
+#~ msgid "Failed to run calendar factory"
+#~ msgstr "运行日历工厂失败"
+
+#~ msgid "Cannot process, calendar backend is opening"
+#~ msgstr "无法进行,日历后端正在打开"
+
+#~ msgid "Cannot remove calendar: "
+#~ msgstr "无法移除日历:"
+
+#~ msgid "Cannot retrieve backend property: "
+#~ msgstr "无法获取后端属性:"
+
+#~ msgid "Could not get calendar view path: "
+#~ msgstr "无法获取日历视图路径:"
+
+#~ msgid "Invalid call"
+#~ msgstr "无效调用"
+
+#~ msgid ""
+#~ "   Issuer:       %s\n"
+#~ "   Subject:      %s\n"
+#~ "   Fingerprint:  %s\n"
+#~ "   Signature:    %s"
+#~ msgstr ""
+#~ "   提交者:        %s\n"
+#~ "   主题:          %s\n"
+#~ "   指纹:          %s\n"
+#~ "   签名:          %s"
+
+#~ msgid "GOOD"
+#~ msgstr "好"
+
+#~ msgid "BAD"
+#~ msgstr "坏"
+
+#~ msgid ""
+#~ "Certificate problem: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "证书问题:%s\n"
+#~ "发行者:%s"
+
+#~ msgid ""
+#~ "Bad certificate domain: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "无效的证书域名:%s\n"
+#~ "发行者:%s"
+
+#~ msgid ""
+#~ "Certificate expired: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "证书过期:%s\n"
+#~ "发行者:%s"
+
+#~ msgid ""
+#~ "Certificate revocation list expired: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "证书撤销列表已过期:%s\n"
+#~ "发行者:%s"
+
+#~ msgid "No output stream"
+#~ msgstr "没有输出流"
+
+#~ msgid "No input stream"
+#~ msgstr "没有输入流"
+
+#~ msgid "Server unexpectedly disconnected: %s"
+#~ msgstr "服务器意外地中止了连接:%s"
+
+#~ msgid ""
+#~ "Alert from IMAP server %s@%s in folder %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "来自 IMAP 服务器 %s@%s 的提醒(%s 文件夹):\n"
+#~ "%s"
+
+#~ msgid "IMAP command failed: %s"
+#~ msgstr "IMAP 命令失败:%s"
+
+#~ msgid "Server response ended too soon."
+#~ msgstr "服务器应答结束太快。"
+
+#~ msgid "IMAP server response did not contain %s information"
+#~ msgstr "IMAP 服务器应答不含有 %s 信息"
+
+#~ msgid "Unexpected OK response from IMAP server: %s"
+#~ msgstr "来自 IMAP 服务器意外的 OK 应答:%s"
+
+#~ msgid "Could not create directory %s: %s"
+#~ msgstr "无法创建目录 %s:%s"
+
+#~ msgid "Could not load summary for %s"
+#~ msgstr "无法为 %s 载入概要"
+
+#~ msgid "Incomplete server response: no information provided for message %d"
+#~ msgstr "不完整的服务器响应:没有为第 %d 封信提供信息"
+
+#~ msgid "Incomplete server response: no UID provided for message %d"
+#~ msgstr "不完整的服务器响应:没有为第 %d 封信提供 UID"
+
+#~ msgid "Could not find message body in FETCH response."
+#~ msgstr "无法在 FETCH 应答中找到信体。"
+
+#~ msgid "Could not open cache directory: "
+#~ msgstr "无法打开缓存目录:"
+
+#~ msgid "Failed to cache message %s: %s"
+#~ msgstr "缓存消息 %s 失败:%s"
+
+#~ msgid "Failed to cache message %s: "
+#~ msgstr "缓存消息 %s 失败:"
+
+#~ msgid "Names_pace:"
+#~ msgstr "命名空间(_P):"
+
+#~ msgid "IMAP default port"
+#~ msgstr "IMAP 默认端口"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "Retrieving list of folders at '%s'"
+#~ msgstr "正在获取“%s”的文件夹列表"
+
+#~ msgid "Server unexpectedly disconnected"
+#~ msgstr "服务器意外断开 "
+
+#~ msgid "Server unexpectedly disconnected: "
+#~ msgstr "服务器意外断开:"
+
+#~ msgid "Cannot create folder: %s: Folder name cannot contain a dot"
+#~ msgstr "无法创建文件夹:%s:文件夹名称不能包含点"
+
+#~ msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+#~ msgstr "无法重命名文件夹:%s:文件夹名称不能包含点"
+
+#~ msgid "Could not connect to POP server %s"
+#~ msgstr "无法连接到 POP 服务器 %s"
+
+#~ msgid "Currently _used categories:"
+#~ msgstr "当前使用的分类(_U):"
+
+#~ msgid "_Available Categories:"
+#~ msgstr "可用类别(_A):"
+
+#~ msgid "Icon"
+#~ msgstr "图标"
+
+#~ msgid "Category"
+#~ msgstr "类别"
+
+#~ msgid "Create category \"%s\""
+#~ msgstr "创建分类“%s”"
+
+#~ msgid "Category Icon"
+#~ msgstr "类别图标"
+
+#~ msgid "_No Image"
+#~ msgstr "没有图像(_N)"
+
+#~ msgid "Category _Name"
+#~ msgstr "类别名称(_N)"
+
+#~ msgid "Category _Icon"
+#~ msgstr "类别图标(_I)"
+
+#~ msgid "Category Properties"
+#~ msgstr "类别属性"
+
+#~ msgid ""
+#~ "There is already a category '%s' in the configuration. Please use another "
+#~ "name"
+#~ msgstr "配置中已有类别“%s”了。请使用另外一个名称"
+
+#~ msgid "Show Contacts"
+#~ msgstr "显示联系人"
+
+#~ msgid "Address B_ook:"
+#~ msgstr "地址簿(_O):"
+
+#~ msgid "Cat_egory:"
+#~ msgstr "类别(_E):"
+
+#~ msgid "_Search:"
+#~ msgstr "搜索(_S):"
+
+#~ msgid "Any Category"
+#~ msgstr "任何类别"
+
+#~ msgid "Co_ntacts"
+#~ msgstr "联系人(_N)"
+
+#~ msgid "Search"
+#~ msgstr "搜索"
+
+#~ msgid "Address Book"
+#~ msgstr "地址簿"
+
+#~ msgid "Select Contacts from Address Book"
+#~ msgstr "从地址簿中选择联系人"
+
+#~ msgid "_Add"
+#~ msgstr "添加(_A)"
+
+#~ msgid "_Remove"
+#~ msgstr "删除(_R)"
+
+#~ msgid "E_xpand %s Inline"
+#~ msgstr "嵌入式展开 %s(_X)"
+
+#~ msgid "Cop_y %s"
+#~ msgstr "复制 %s(_Y)"
+
+#~ msgid "C_ut %s"
+#~ msgstr "剪切 %s(_U)"
+
+#~ msgid "_Edit %s"
+#~ msgstr "编辑 %s(_E)"
+
+#~ msgid "Keyring key is unusable: no user or host name"
+#~ msgstr "密钥环不可用:没有用户或主机名"
+
+#~ msgid "You have the Caps Lock key on."
+#~ msgstr "您打开了 Caps Lock。"
+
+#~ msgid "_Remember this passphrase"
+#~ msgstr "记住此密码句(_R)"
+
+#~ msgid "_Remember this passphrase for the remainder of this session"
+#~ msgstr "本次会话记住此密码句(_R)"
+
+#~ msgid "_Remember this password"
+#~ msgstr "记住此密码(_R)"
+
+#~ msgid "_Remember this password for the remainder of this session"
+#~ msgstr "本次会话记住此密码(_R)"
+
+#~ msgid "_Destination"
+#~ msgstr "目的(_D)"
+
+#~ msgid "Select destination"
+#~ msgstr "选择目的地"
+
+#~ msgid "Evolution Source Viewer"
+#~ msgstr "Evolution 源码查看器"
+
+#~ msgid "Display Name"
+#~ msgstr "显示名称"
+
+#~ msgid "Flags"
+#~ msgstr "标志"
+
+#~ msgid "Identity"
+#~ msgstr "身份"
+
+#~ msgid "Authenticating with the server…"
+#~ msgstr "正在与服务器进行认证..."
+
+#~ msgid "%s: there was no source for UID '%s' stored in GConf."
+#~ msgstr "%s:GConf 中没有存储 UID“%s”的源。"
+
+#~ msgid "Invalid source"
+#~ msgstr "无效的源"
+
+#~ msgid "Incorrect uri '%s'"
+#~ msgstr "不正确的 URI “%s”"
+
+#~ msgid "There was no source for UID '%s' stored in a source list."
+#~ msgstr "源列表中没有存储对应 UID “%s”的源。"
+
+#~ msgid "Cannot authenticate user: "
+#~ msgstr "无法认证用户:"
+
+#~ msgid "Empty URI"
+#~ msgstr "空的 URI"
+
+#~ msgid ""
+#~ "Enter password for address book %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "输入地址簿 %s 的密码(用户 %s)\n"
+#~ "原因:%s"
+
+#~ msgid "Enter password for address book %s (user %s)"
+#~ msgstr "输入地址簿 %s 的密码(用户 %s)"
+
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "输入 %s 的密码 (用户 %s)"
+
+#~ msgid "Enter password for %s to enable proxy for user %s"
+#~ msgstr "输入 %s 的密码,以便为用户 %s 启用代理服务器"
+
+#~ msgid "Invalid source type"
+#~ msgstr "无效的源类型"
+
+#~ msgid "_Use custom command to connect to server"
+#~ msgstr "使用自定义命令连接到服务器(_U)"
+
+#~ msgid "Co_mmand:"
+#~ msgstr "命令(_M):"
+
+#~ msgid "Command:"
+#~ msgstr "命令:"
+
+#~ msgid "Closing tmp stream failed: "
+#~ msgstr "关闭临时流失败:"
+
+#~ msgid "SMTP Authentication"
+#~ msgstr "SMTP 认证"
+
+#~ msgid "Accessing LDAP Server anonymously"
+#~ msgstr "匿名访问 LDAP 服务器"
+
+#~ msgid ""
+#~ "Enter password for calendar %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "输入日历 %s 的密码(用户 %s)\n"
+#~ "原因:%s"
+
+#~ msgid "Enter password for calendar %s (user %s)"
+#~ msgstr "输入日历 %s 的密码(用户 %s)"
+
+#~ msgid ""
+#~ "Enter password for task list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "输入任务列表 %s 的密码(用户 %s)\n"
+#~ "原因:%s"
+
+#~ msgid "Enter password for task list %s (user %s)"
+#~ msgstr "输入任务列表 %s 的密码(用户 %s)"
+
+#~ msgid ""
+#~ "Enter password for memo list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "输入备忘 %s 的密码(用户 %s)\n"
+#~ "原因:%s"
+
+#~ msgid "Enter password for memo list %s (user %s)"
+#~ msgstr "输入备忘 %s 的密码(用户 %s)"
+
+#~ msgid "Enter Passphrase"
+#~ msgstr "输入口令"
+
+#~ msgid "Enter Password"
+#~ msgstr "输入密码"


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