[evolution-data-server] Update Chinese (China) translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Update Chinese (China) translation
- Date: Sat, 11 Jul 2020 03:12:30 +0000 (UTC)
commit 3f52889b0f3be81c802533205e5fcbfa566049f5
Author: Boyuan Yang <073plan gmail com>
Date: Sat Jul 11 03:12:21 2020 +0000
Update Chinese (China) translation
po/zh_CN.po | 5845 +++++++++++++++++++++++++++++++++++++++--------------------
1 file changed, 3836 insertions(+), 2009 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 92099c380..685d7b6be 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,15 +16,15 @@
# 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.
+# Tong Hui <tonghuix gmail com> 2016, 2017.
#
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=general\n"
-"POT-Creation-Date: 2017-02-16 13:10+0000\n"
-"PO-Revision-Date: 2017-02-15 21:22+0800\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution-data-server/";
+"issues\n"
+"POT-Creation-Date: 2020-07-02 12:45+0000\n"
+"PO-Revision-Date: 2020-07-10 23:09-0400\n"
"Last-Translator: Tong Hui <tonghuix gmail com>\n"
"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
"Language: zh_CN\n"
@@ -32,162 +32,178 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 2.3.1\n"
-#: ../src/addressbook/backends/file/e-book-backend-file.c:120
-#, fuzzy, c-format
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:231
+#, c-format
+msgid "Given URL “%s” doesn’t reference CardDAV address book"
+msgstr "给定的 URL“%s”未引用 CardDAV 地址簿"
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:290
+#: ../src/addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1154
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4397
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:51
+#: ../src/addressbook/libebook-contacts/e-phone-number.c:54
+#: ../src/addressbook/libebook/e-book.c:1070
+#: ../src/addressbook/libebook/e-book-client.c:2127
+#: ../src/addressbook/libebook/e-book-client.c:2305
+#: ../src/addressbook/libebook/e-book-client.c:2524
+#: ../src/addressbook/libebook/e-book-client.c:2661
+#: ../src/addressbook/libebook/e-book-client.c:2826
+#: ../src/addressbook/libebook/e-book-client.c:2966
+#: ../src/addressbook/libebook/e-book-client.c:3103
+#: ../src/addressbook/libebook/e-book-client.c:3266
+#: ../src/addressbook/libebook/e-book-client.c:3461
+#: ../src/addressbook/libebook/e-book-client.c:3679
+#: ../src/addressbook/libedata-book/e-book-backend-sexp.c:873
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:275
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:288
+#: ../src/calendar/backends/http/e-cal-backend-http.c:313
+#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:197
+#: ../src/calendar/libecal/e-cal-client.c:257
+#: ../src/calendar/libecal/e-cal-client.c:3230
+#: ../src/calendar/libecal/e-cal-client.c:3403
+#: ../src/calendar/libecal/e-cal-client.c:3676
+#: ../src/calendar/libecal/e-cal-client.c:3914
+#: ../src/calendar/libecal/e-cal-client.c:4106
+#: ../src/calendar/libecal/e-cal-client.c:4289
+#: ../src/calendar/libecal/e-cal-client.c:4497
+#: ../src/calendar/libecal/e-cal-client.c:4674
+#: ../src/calendar/libecal/e-cal-client.c:4885
+#: ../src/calendar/libecal/e-cal-client.c:5041
+#: ../src/calendar/libecal/e-cal-client.c:5241
+#: ../src/calendar/libecal/e-cal-client.c:5407
+#: ../src/calendar/libecal/e-cal-client.c:5634
+#: ../src/calendar/libecal/e-cal-client.c:5794
+#: ../src/calendar/libecal/e-cal-client.c:6025
+#: ../src/calendar/libecal/e-cal-client.c:6224
+#: ../src/calendar/libecal/e-cal-client.c:6592
+#: ../src/calendar/libecal/e-cal-client.c:6816
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1799
+#: ../src/camel/camel-filter-driver.c:1715
+#: ../src/camel/camel-filter-driver.c:1847
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3300
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3306
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3316
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3328
+#: ../src/camel/providers/nntp/camel-nntp-store.c:419
+#: ../src/libebackend/e-server-side-source.c:498
+#: ../src/libedataserver/e-client.c:183
+#: ../src/libedataserver/e-soup-session.c:1222
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:204
+#: ../src/libedataserverui/e-reminders-widget.c:1931
+#: ../src/tools/list-sources/list-sources.c:429
+msgid "Unknown error"
+msgstr "未知的错误"
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1095
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1373
+#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:930
+msgid "Server didn’t return object’s href"
+msgstr "服务器未返回对象的超链接（href）"
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1097
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1375
+#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:932
+msgid "Server didn’t return object’s ETag"
+msgstr "服务器未返回对象的 ETag"
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1099
+msgid "Received object is not a valid vCard"
+msgstr "接收到的目标不是有效的 vCard"
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1216
+msgid ""
+"Missing information about vCard URL, local cache is possibly incomplete or "
+"broken. Remove it, please."
+msgstr "缺少有关 vCard URL 的信息，本地缓存可能不完整或已损坏。请将其移除。"
+
+#: ../src/addressbook/backends/carddav/e-book-backend-carddav.c:1219
+#: ../src/addressbook/backends/google/e-book-backend-google.c:990
+msgid "Object to save is not a valid vCard"
+msgstr "要存储的目标不是有效的 vCard"
+
+#: ../src/addressbook/backends/file/e-book-backend-file.c:117
+#, c-format
msgid "Failed to remove file “%s”: %s"
msgstr "删除文件“%s”失败：%s"
-#: ../src/addressbook/backends/file/e-book-backend-file.c:148
+#: ../src/addressbook/backends/file/e-book-backend-file.c:145
#, c-format
msgid "Failed to make directory %s: %s"
-msgstr "创建目录“%s”失败：%s"
+msgstr "创建目录 %s 失败：%s"
-#: ../src/addressbook/backends/file/e-book-backend-file.c:419
-#, fuzzy, c-format
+#: ../src/addressbook/backends/file/e-book-backend-file.c:416
+#, c-format
msgid "Failed to create hardlink for resource “%s”: %s"
msgstr "创建资源“%s”的硬链接失败：%s"
-#: ../src/addressbook/backends/file/e-book-backend-file.c:524
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1256
+#: ../src/addressbook/backends/file/e-book-backend-file.c:521
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1265
msgid "No UID in the contact"
msgstr "联系人没有 UID"
-#: ../src/addressbook/backends/file/e-book-backend-file.c:851
+#: ../src/addressbook/backends/file/e-book-backend-file.c:858
#, c-format
msgid "Conflicting UIDs found in added contacts"
msgstr "增加的联系人有 UID 冲突"
-#: ../src/addressbook/backends/file/e-book-backend-file.c:990
+#: ../src/addressbook/backends/file/e-book-backend-file.c:988
msgid "Loading..."
msgstr "正在载入..."
-#: ../src/addressbook/backends/file/e-book-backend-file.c:992
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4353
+#: ../src/addressbook/backends/file/e-book-backend-file.c:990
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4512
msgid "Searching..."
msgstr "正在搜索..."
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1284
-#, fuzzy, c-format
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1293
+#, c-format
msgid "Tried to modify contact “%s” with out of sync revision"
-msgstr "试图修改失去同步的联系人“%s”"
+msgstr "试图修改没有同步的联系人“%s”"
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1475
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1474
#: ../src/addressbook/backends/file/e-book-backend-file.c:1560
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3085
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7342
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7411
-#, fuzzy, c-format
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3080
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7370
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7439
+#, c-format
msgid "Contact “%s” not found"
msgstr "未找到联系人“%s”"
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1620
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1701
-#, fuzzy, c-format
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1624
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1707
+#, c-format
msgid "Query “%s” not supported"
msgstr "不支持查询“%s”"
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1629
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1710
-#, fuzzy, c-format
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1633
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1716
+#, c-format
msgid "Invalid Query “%s”"
-msgstr "无效的查询：“%s”"
+msgstr "无效的查询 “%s”"
-#: ../src/addressbook/backends/file/e-book-backend-file.c:1975
+#: ../src/addressbook/backends/file/e-book-backend-file.c:1965
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:2041
msgid "Requested to delete an unrelated cursor"
-msgstr "请求删除一个无关的 cursor"
+msgstr "请求删除一个无关的光标"
-#: ../src/addressbook/backends/file/e-book-backend-file.c:2046
-#, fuzzy, c-format
+#: ../src/addressbook/backends/file/e-book-backend-file.c:2036
+#, c-format
msgid "Failed to rename old database from “%s” to “%s”: %s"
-msgstr "无法将旧数据库“ %s” 改名为 “%s”：%s"
-
-#: ../src/addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1162
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4243
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:384
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:867
-#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:49
-#: ../src/addressbook/libebook-contacts/e-phone-number.c:54
-#: ../src/addressbook/libebook/e-book.c:1079
-#: ../src/addressbook/libebook/e-book-client.c:2129
-#: ../src/addressbook/libebook/e-book-client.c:2301
-#: ../src/addressbook/libebook/e-book-client.c:2514
-#: ../src/addressbook/libebook/e-book-client.c:2645
-#: ../src/addressbook/libebook/e-book-client.c:2804
-#: ../src/addressbook/libebook/e-book-client.c:2938
-#: ../src/addressbook/libebook/e-book-client.c:3069
-#: ../src/addressbook/libebook/e-book-client.c:3227
-#: ../src/addressbook/libebook/e-book-client.c:3422
-#: ../src/addressbook/libebook/e-book-client.c:3640
-#: ../src/addressbook/libedata-book/e-book-backend-sexp.c:877
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:707
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:755
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:772
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:272
-#: ../src/calendar/libecal/e-cal.c:2334
-#: ../src/calendar/libecal/e-cal-client.c:277
-#: ../src/calendar/libecal/e-cal-client.c:3518
-#: ../src/calendar/libecal/e-cal-client.c:3691
-#: ../src/calendar/libecal/e-cal-client.c:3955
-#: ../src/calendar/libecal/e-cal-client.c:4196
-#: ../src/calendar/libecal/e-cal-client.c:4386
-#: ../src/calendar/libecal/e-cal-client.c:4579
-#: ../src/calendar/libecal/e-cal-client.c:4788
-#: ../src/calendar/libecal/e-cal-client.c:4957
-#: ../src/calendar/libecal/e-cal-client.c:5160
-#: ../src/calendar/libecal/e-cal-client.c:5310
-#: ../src/calendar/libecal/e-cal-client.c:5504
-#: ../src/calendar/libecal/e-cal-client.c:5657
-#: ../src/calendar/libecal/e-cal-client.c:5874
-#: ../src/calendar/libecal/e-cal-client.c:6028
-#: ../src/calendar/libecal/e-cal-client.c:6254
-#: ../src/calendar/libecal/e-cal-client.c:6450
-#: ../src/calendar/libecal/e-cal-client.c:6813
-#: ../src/calendar/libecal/e-cal-client.c:7035
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3048
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3058
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3070
-#: ../src/camel/providers/nntp/camel-nntp-store.c:422
-#: ../src/libebackend/e-server-side-source.c:498
-#: ../src/libedataserver/e-client.c:188
-msgid "Unknown error"
-msgstr "未知的错误"
-
-#. Query for new contacts asynchronously
-#: ../src/addressbook/backends/google/e-book-backend-google.c:782
-msgid "Querying for updated contacts…"
-msgstr "查询更新的联系人..."
-
-#. Run the query asynchronously
-#: ../src/addressbook/backends/google/e-book-backend-google.c:966
-msgid "Querying for updated groups…"
-msgstr "查询更新的组..."
-
-#: ../src/addressbook/backends/google/e-book-backend-google.c:1749
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4995
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1504
-msgid "The backend does not support bulk additions"
-msgstr "后端不支持批量添加"
-
-#: ../src/addressbook/backends/google/e-book-backend-google.c:1906
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5131
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1626
-msgid "The backend does not support bulk modifications"
-msgstr "后端不支持批量修改"
+msgstr "将旧数据库“%s”改名为“%s”失败：%s"
-#: ../src/addressbook/backends/google/e-book-backend-google.c:2115
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1726
-msgid "The backend does not support bulk removals"
-msgstr "后端不支持批量删除"
+#: ../src/addressbook/backends/google/e-book-backend-google.c:1046
+msgid "Failed to create contact from returned server data"
+msgstr "无法从返回的服务器数据创建联系人"
-#: ../src/addressbook/backends/google/e-book-backend-google.c:2237
-msgid "Loading…"
-msgstr "正在载入..."
+#: ../src/addressbook/backends/google/e-book-backend-google.c:1062
+msgid "Server returned contact without UID"
+msgstr "服务器返回的联系人未包含 UID"
#. System Group: My Contacts
-#: ../src/addressbook/backends/google/e-book-google-utils.c:1670
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1656
#: ../src/services/evolution-source-registry/builtin/system-address-book.source.in.h:1
#: ../src/services/evolution-source-registry/builtin/system-calendar.source.in.h:1
#: ../src/services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
@@ -196,165 +212,143 @@ msgid "Personal"
msgstr "个人"
#. System Group: Friends
-#: ../src/addressbook/backends/google/e-book-google-utils.c:1672
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1658
msgid "Friends"
msgstr "朋友"
#. System Group: Family
-#: ../src/addressbook/backends/google/e-book-google-utils.c:1674
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1660
msgid "Family"
msgstr "家人"
#. System Group: Coworkers
-#: ../src/addressbook/backends/google/e-book-google-utils.c:1676
+#: ../src/addressbook/backends/google/e-book-google-utils.c:1662
msgid "Coworkers"
msgstr "同事"
#. Translators: An error message shown to a user when trying to do an
#. * operation on the LDAP address book which is not connected to the server
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:110
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:109
msgid "Not connected"
-msgstr "未连接。"
+msgstr "未连接"
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:888
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:876
msgid "Failed to bind using either v3 or v2 binds"
msgstr "无法使用 v3 或 v2 绑定"
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1012
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1000
msgid "Reconnecting to LDAP server..."
msgstr "正在重新连接 LDAP 服务器..."
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1143
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1135
msgid "Invalid DN syntax"
msgstr "无效 DN 语法"
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1159
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4242
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1151
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4396
#, c-format
msgid "LDAP error 0x%x (%s)"
msgstr "LDAP 错误 0x%x (%s)"
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1771
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2094
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:1794
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2143
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2156
#, c-format
msgid "%s: NULL returned from ldap_first_entry"
msgstr "%s：ldap_first_entry 返回 NULL"
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2024
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2152
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2071
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2215
#, c-format
msgid "%s: Unhandled result type %d returned"
msgstr "%s：返回了未处理的结果类型 %d"
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2285
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2412
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2358
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2496
#, c-format
msgid "%s: Unhandled search result type %d returned"
msgstr "%s：返回了未处理的搜索结果类型 %d"
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4191
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2646
+msgid "LDAP contact lists cannot be empty."
+msgstr "LDAP 联系人列表不能为空。"
+
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:2684
+#, c-format
+msgid ""
+"Contact lists in LDAP address books require each member to be from the same "
+"LDAP address book, but one member could not be recognized."
+msgid_plural ""
+"Contact lists in LDAP address books require each member to be from the same "
+"LDAP address book, but %d members could not be recognized."
+msgstr[0] ""
+
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4335
msgid "Receiving LDAP search results..."
msgstr "正在接收 LDAP 的搜索结果..."
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4375
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4538
msgid "Error performing search"
msgstr "执行搜索错误"
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4508
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4678
#, c-format
msgid "Downloading contacts (%d)..."
-msgstr "正在下载联系人(%d)..."
+msgstr "正在下载联系人（%d 个）..."
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5078
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:4779
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:788
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:691
+msgid "Refreshing…"
+msgstr "正在刷新…"
+
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5172
+msgid "The backend does not support bulk additions"
+msgstr "后端不支持批量添加"
+
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5263
msgid "Adding contact to LDAP server..."
msgstr "正在将联系人添加到 LDAP 服务器..."
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5153
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5325
+msgid "The backend does not support bulk modifications"
+msgstr "后端不支持批量修改"
+
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5347
msgid "Modifying contact from LDAP server..."
msgstr "正在修改 LDAP 服务器上的联系人..."
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5219
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5419
msgid "Removing contact from LDAP server..."
msgstr "正在从 LDAP 服务器删除联系人..."
-#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5614
-#, fuzzy, c-format
+#: ../src/addressbook/backends/ldap/e-book-backend-ldap.c:5829
+#, c-format
msgid "Failed to get the DN for user “%s”"
msgstr "无法获取用户“%s”的 DN"
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:588
-#: ../src/calendar/backends/http/e-cal-backend-http.c:514
-#, c-format
-msgid "Malformed URI: %s"
-msgstr "URI 格式错误：%s"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:836
-msgid "Loading Addressbook summary..."
-msgstr "正在加载地址簿概要..."
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:864
-#, c-format
-msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
-msgstr "webdav 上的 PROPFIND 失败，HTTP 状态码：%d (%s)"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:883
-msgid "No response body in webdav PROPFIND result"
-msgstr "在 webdav PROPFIND 结果中无应答主体"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:944
-#, c-format
-msgid "Loading Contacts (%d%%)"
-msgstr "正在加载联系人(%d%%)"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1358
-msgid "Cannot transform SoupURI to string"
-msgstr "无法将 SoupURI 转为字符串"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1555
-#, fuzzy, c-format
-msgid "Create resource “%s” failed with HTTP status %d (%s)"
-msgstr "创建资源“%s”失败，HTTP 状态码为: %d (%s)"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1657
-msgid "Contact on server changed -> not modifying"
-msgstr "服务器上的联系人已更改 -> 将不做更改"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1665
-#, c-format
-msgid "Modify contact failed with HTTP status %d (%s)"
-msgstr "修改联系人失败，HTTP 状态码：%d (%s)"
-
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1758
-#: ../src/addressbook/backends/webdav/e-book-backend-webdav.c:1774
-#, c-format
-msgid "DELETE failed with HTTP status %d"
-msgstr "DELETE 失败，HTTP 状态码：%d"
-
-#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:38
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:40
msgid "No such book"
msgstr "没有该地址簿"
-#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:40
-#: ../src/addressbook/libedata-book/e-data-book.c:382
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:42
msgid "Contact not found"
msgstr "找不到联系人"
-#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:42
-#: ../src/addressbook/libedata-book/e-data-book.c:383
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:44
msgid "Contact ID already exists"
msgstr "联系人 ID 已经存在"
-#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:44
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:46
msgid "No such source"
msgstr "没有该源"
-#: ../src/addressbook/libebook-contacts/e-book-contacts-types.c:46
-#: ../src/addressbook/libedata-book/e-data-book.c:399
+#: ../src/addressbook/libebook-contacts/e-book-contacts-utils.c:48
msgid "No space"
msgstr "没有空间"
#. Dummy row as EContactField starts from 1
-#: ../src/addressbook/libebook-contacts/e-contact.c:128
+#: ../src/addressbook/libebook-contacts/e-contact.c:148
msgid "Unique ID"
msgstr "唯一的 ID"
@@ -362,12 +356,12 @@ msgstr "唯一的 ID"
#. * so we can generate its value if necessary in the getter
#. Translators: This is an EContact field description, in this case it's a
#. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
-#: ../src/addressbook/libebook-contacts/e-contact.c:133
+#: ../src/addressbook/libebook-contacts/e-contact.c:153
msgid "File Under"
msgstr "存档于"
#. URI of the book to which the contact belongs to
-#: ../src/addressbook/libebook-contacts/e-contact.c:135
+#: ../src/addressbook/libebook-contacts/e-contact.c:155
msgid "Book UID"
msgstr "地址簿 UID"
@@ -375,436 +369,435 @@ msgstr "地址簿 UID"
#. FN isn't really a structured field - we use a getter/setter
#. * so we can set the N property (since evo 1.4 works fine with
#. * vcards that don't even have a N attribute. *sigh*)
-#: ../src/addressbook/libebook-contacts/e-contact.c:141
+#: ../src/addressbook/libebook-contacts/e-contact.c:161
msgid "Full Name"
msgstr "全名"
-#: ../src/addressbook/libebook-contacts/e-contact.c:142
+#: ../src/addressbook/libebook-contacts/e-contact.c:162
msgid "Given Name"
-msgstr "名"
+msgstr "名称"
-#: ../src/addressbook/libebook-contacts/e-contact.c:143
+#: ../src/addressbook/libebook-contacts/e-contact.c:163
msgid "Family Name"
-msgstr "姓"
+msgstr "姓氏"
-#: ../src/addressbook/libebook-contacts/e-contact.c:144
+#: ../src/addressbook/libebook-contacts/e-contact.c:164
msgid "Nickname"
msgstr "昵称"
#. Email fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:147
+#: ../src/addressbook/libebook-contacts/e-contact.c:167
msgid "Email 1"
msgstr "电子邮件 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:148
+#: ../src/addressbook/libebook-contacts/e-contact.c:168
msgid "Email 2"
msgstr "电子邮件 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:149
+#: ../src/addressbook/libebook-contacts/e-contact.c:169
msgid "Email 3"
msgstr "电子邮件 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:150
+#: ../src/addressbook/libebook-contacts/e-contact.c:170
msgid "Email 4"
msgstr "电子邮件 4"
-#: ../src/addressbook/libebook-contacts/e-contact.c:152
+#: ../src/addressbook/libebook-contacts/e-contact.c:172
msgid "Mailer"
msgstr "邮件程序"
#. Address Labels
-#: ../src/addressbook/libebook-contacts/e-contact.c:155
+#: ../src/addressbook/libebook-contacts/e-contact.c:175
msgid "Home Address Label"
msgstr "家庭地址标签"
-#: ../src/addressbook/libebook-contacts/e-contact.c:156
+#: ../src/addressbook/libebook-contacts/e-contact.c:176
msgid "Work Address Label"
msgstr "工作地址标签"
-#: ../src/addressbook/libebook-contacts/e-contact.c:157
+#: ../src/addressbook/libebook-contacts/e-contact.c:177
msgid "Other Address Label"
msgstr "其它地址标签"
#. Phone fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:160
+#: ../src/addressbook/libebook-contacts/e-contact.c:180
msgid "Assistant Phone"
msgstr "助手电话"
-#: ../src/addressbook/libebook-contacts/e-contact.c:161
+#: ../src/addressbook/libebook-contacts/e-contact.c:181
msgid "Business Phone"
msgstr "商务电话"
-#: ../src/addressbook/libebook-contacts/e-contact.c:162
+#: ../src/addressbook/libebook-contacts/e-contact.c:182
msgid "Business Phone 2"
msgstr "商务电话 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:163
+#: ../src/addressbook/libebook-contacts/e-contact.c:183
msgid "Business Fax"
msgstr "商务传真"
-#: ../src/addressbook/libebook-contacts/e-contact.c:164
+#: ../src/addressbook/libebook-contacts/e-contact.c:184
msgid "Callback Phone"
msgstr "回拨电话"
-#: ../src/addressbook/libebook-contacts/e-contact.c:165
+#: ../src/addressbook/libebook-contacts/e-contact.c:185
msgid "Car Phone"
msgstr "车载电话"
-#: ../src/addressbook/libebook-contacts/e-contact.c:166
+#: ../src/addressbook/libebook-contacts/e-contact.c:186
msgid "Company Phone"
msgstr "公司电话"
-#: ../src/addressbook/libebook-contacts/e-contact.c:167
+#: ../src/addressbook/libebook-contacts/e-contact.c:187
msgid "Home Phone"
msgstr "家庭电话"
-#: ../src/addressbook/libebook-contacts/e-contact.c:168
+#: ../src/addressbook/libebook-contacts/e-contact.c:188
msgid "Home Phone 2"
msgstr "家庭电话 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:169
+#: ../src/addressbook/libebook-contacts/e-contact.c:189
msgid "Home Fax"
msgstr "家庭传真"
-#: ../src/addressbook/libebook-contacts/e-contact.c:170
+#: ../src/addressbook/libebook-contacts/e-contact.c:190
msgid "ISDN"
msgstr "ISDN"
-#: ../src/addressbook/libebook-contacts/e-contact.c:171
+#: ../src/addressbook/libebook-contacts/e-contact.c:191
msgid "Mobile Phone"
msgstr "移动电话"
-#: ../src/addressbook/libebook-contacts/e-contact.c:172
+#: ../src/addressbook/libebook-contacts/e-contact.c:192
msgid "Other Phone"
msgstr "其它电话"
-#: ../src/addressbook/libebook-contacts/e-contact.c:173
+#: ../src/addressbook/libebook-contacts/e-contact.c:193
msgid "Other Fax"
msgstr "其它传真"
-#: ../src/addressbook/libebook-contacts/e-contact.c:174
+#: ../src/addressbook/libebook-contacts/e-contact.c:194
msgid "Pager"
msgstr "寻呼机"
-#: ../src/addressbook/libebook-contacts/e-contact.c:175
+#: ../src/addressbook/libebook-contacts/e-contact.c:195
msgid "Primary Phone"
msgstr "主要电话"
-#: ../src/addressbook/libebook-contacts/e-contact.c:176
+#: ../src/addressbook/libebook-contacts/e-contact.c:196
msgid "Radio"
-msgstr "收音机"
+msgstr "无线电"
-#: ../src/addressbook/libebook-contacts/e-contact.c:177
+#: ../src/addressbook/libebook-contacts/e-contact.c:197
msgid "Telex"
msgstr "电传"
#. To translators: TTY is Teletypewriter
-#: ../src/addressbook/libebook-contacts/e-contact.c:179
+#: ../src/addressbook/libebook-contacts/e-contact.c:199
msgid "TTY"
msgstr "TTY"
#. Organizational fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:182
+#: ../src/addressbook/libebook-contacts/e-contact.c:202
msgid "Organization"
msgstr "组织"
-#: ../src/addressbook/libebook-contacts/e-contact.c:183
+#: ../src/addressbook/libebook-contacts/e-contact.c:203
msgid "Organizational Unit"
msgstr "组织单元"
-#: ../src/addressbook/libebook-contacts/e-contact.c:184
+#: ../src/addressbook/libebook-contacts/e-contact.c:204
msgid "Office"
msgstr "办公室"
-#: ../src/addressbook/libebook-contacts/e-contact.c:185
+#: ../src/addressbook/libebook-contacts/e-contact.c:205
msgid "Title"
msgstr "头衔"
-#: ../src/addressbook/libebook-contacts/e-contact.c:186
+#: ../src/addressbook/libebook-contacts/e-contact.c:206
msgid "Role"
msgstr "角色"
-#: ../src/addressbook/libebook-contacts/e-contact.c:187
+#: ../src/addressbook/libebook-contacts/e-contact.c:207
msgid "Manager"
msgstr "经理"
-#: ../src/addressbook/libebook-contacts/e-contact.c:188
+#: ../src/addressbook/libebook-contacts/e-contact.c:208
msgid "Assistant"
msgstr "助手"
#. Web fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:191
+#: ../src/addressbook/libebook-contacts/e-contact.c:211
msgid "Homepage URL"
msgstr "个人主页 URL"
-#: ../src/addressbook/libebook-contacts/e-contact.c:192
+#: ../src/addressbook/libebook-contacts/e-contact.c:212
msgid "Weblog URL"
-msgstr "网络日记 URL"
+msgstr "博客 URL"
#. Contact categories
-#: ../src/addressbook/libebook-contacts/e-contact.c:195
+#: ../src/addressbook/libebook-contacts/e-contact.c:215
msgid "Categories"
msgstr "类别"
#. Collaboration fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:198
+#: ../src/addressbook/libebook-contacts/e-contact.c:218
msgid "Calendar URI"
msgstr "日历 URI"
-#: ../src/addressbook/libebook-contacts/e-contact.c:199
+#: ../src/addressbook/libebook-contacts/e-contact.c:219
msgid "Free/Busy URL"
msgstr "空闲/繁忙 URL"
-#: ../src/addressbook/libebook-contacts/e-contact.c:200
+#: ../src/addressbook/libebook-contacts/e-contact.c:220
msgid "ICS Calendar"
msgstr "ICS 日历"
-#: ../src/addressbook/libebook-contacts/e-contact.c:201
+#: ../src/addressbook/libebook-contacts/e-contact.c:221
msgid "Video Conferencing URL"
msgstr "视频会议 URL"
#. Misc fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:204
-#, fuzzy
+#: ../src/addressbook/libebook-contacts/e-contact.c:224
msgid "Spouse’s Name"
msgstr "配偶姓名"
-#: ../src/addressbook/libebook-contacts/e-contact.c:205
+#: ../src/addressbook/libebook-contacts/e-contact.c:225
msgid "Note"
msgstr "注释"
#. Instant messaging fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:208
+#: ../src/addressbook/libebook-contacts/e-contact.c:228
msgid "AIM Home Screen Name 1"
msgstr "AIM 家庭屏幕名 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:209
+#: ../src/addressbook/libebook-contacts/e-contact.c:229
msgid "AIM Home Screen Name 2"
msgstr "AIM 家庭屏幕名 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:210
+#: ../src/addressbook/libebook-contacts/e-contact.c:230
msgid "AIM Home Screen Name 3"
msgstr "AIM 家庭屏幕名 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:211
+#: ../src/addressbook/libebook-contacts/e-contact.c:231
msgid "AIM Work Screen Name 1"
msgstr "AIM 工作屏幕名 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:212
+#: ../src/addressbook/libebook-contacts/e-contact.c:232
msgid "AIM Work Screen Name 2"
msgstr "AIM 工作屏幕名 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:213
+#: ../src/addressbook/libebook-contacts/e-contact.c:233
msgid "AIM Work Screen Name 3"
msgstr "AIM 工作屏幕名 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:214
+#: ../src/addressbook/libebook-contacts/e-contact.c:234
msgid "GroupWise Home Screen Name 1"
msgstr "GroupWise 家庭屏幕名 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:215
+#: ../src/addressbook/libebook-contacts/e-contact.c:235
msgid "GroupWise Home Screen Name 2"
msgstr "GroupWise 家庭屏幕名 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:216
+#: ../src/addressbook/libebook-contacts/e-contact.c:236
msgid "GroupWise Home Screen Name 3"
msgstr "GroupWise 家庭屏幕名 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:217
+#: ../src/addressbook/libebook-contacts/e-contact.c:237
msgid "GroupWise Work Screen Name 1"
msgstr "GroupWise 工作屏幕名 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:218
+#: ../src/addressbook/libebook-contacts/e-contact.c:238
msgid "GroupWise Work Screen Name 2"
msgstr "GroupWise 工作屏幕名 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:219
+#: ../src/addressbook/libebook-contacts/e-contact.c:239
msgid "GroupWise Work Screen Name 3"
msgstr "GroupWise 工作屏幕名 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:220
+#: ../src/addressbook/libebook-contacts/e-contact.c:240
msgid "Jabber Home ID 1"
msgstr "Jabber 家庭 ID 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:221
+#: ../src/addressbook/libebook-contacts/e-contact.c:241
msgid "Jabber Home ID 2"
msgstr "Jabber 家庭 ID 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:222
+#: ../src/addressbook/libebook-contacts/e-contact.c:242
msgid "Jabber Home ID 3"
msgstr "Jabber 家庭 ID 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:223
+#: ../src/addressbook/libebook-contacts/e-contact.c:243
msgid "Jabber Work ID 1"
msgstr "Jabber 工作 ID 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:224
+#: ../src/addressbook/libebook-contacts/e-contact.c:244
msgid "Jabber Work ID 2"
msgstr "Jabber 工作 ID 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:225
+#: ../src/addressbook/libebook-contacts/e-contact.c:245
msgid "Jabber Work ID 3"
msgstr "Jabber 工作 ID 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:226
+#: ../src/addressbook/libebook-contacts/e-contact.c:246
msgid "Yahoo! Home Screen Name 1"
msgstr "Yahoo! 家庭屏幕名 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:227
+#: ../src/addressbook/libebook-contacts/e-contact.c:247
msgid "Yahoo! Home Screen Name 2"
msgstr "Yahoo! 家庭屏幕名 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:228
+#: ../src/addressbook/libebook-contacts/e-contact.c:248
msgid "Yahoo! Home Screen Name 3"
msgstr "Yahoo! 家庭屏幕名 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:229
+#: ../src/addressbook/libebook-contacts/e-contact.c:249
msgid "Yahoo! Work Screen Name 1"
msgstr "Yahoo! 工作屏幕名 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:230
+#: ../src/addressbook/libebook-contacts/e-contact.c:250
msgid "Yahoo! Work Screen Name 2"
msgstr "Yahoo! 工作屏幕名 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:231
+#: ../src/addressbook/libebook-contacts/e-contact.c:251
msgid "Yahoo! Work Screen Name 3"
msgstr "Yahoo! 工作屏幕名 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:232
+#: ../src/addressbook/libebook-contacts/e-contact.c:252
msgid "MSN Home Screen Name 1"
msgstr "MSN 家庭屏幕名 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:233
+#: ../src/addressbook/libebook-contacts/e-contact.c:253
msgid "MSN Home Screen Name 2"
msgstr "MSN 家庭屏幕名 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:234
+#: ../src/addressbook/libebook-contacts/e-contact.c:254
msgid "MSN Home Screen Name 3"
msgstr "MSN 家庭屏幕名 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:235
+#: ../src/addressbook/libebook-contacts/e-contact.c:255
msgid "MSN Work Screen Name 1"
msgstr "MSN 工作屏幕名 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:236
+#: ../src/addressbook/libebook-contacts/e-contact.c:256
msgid "MSN Work Screen Name 2"
msgstr "MSN 工作屏幕名 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:237
+#: ../src/addressbook/libebook-contacts/e-contact.c:257
msgid "MSN Work Screen Name 3"
msgstr "MSN 工作屏幕名 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:238
+#: ../src/addressbook/libebook-contacts/e-contact.c:258
msgid "ICQ Home ID 1"
msgstr "ICQ 家庭 ID 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:239
+#: ../src/addressbook/libebook-contacts/e-contact.c:259
msgid "ICQ Home ID 2"
msgstr "ICQ 家庭 ID 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:240
+#: ../src/addressbook/libebook-contacts/e-contact.c:260
msgid "ICQ Home ID 3"
msgstr "ICQ 家庭 ID 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:241
+#: ../src/addressbook/libebook-contacts/e-contact.c:261
msgid "ICQ Work ID 1"
msgstr "ICQ 工作 ID 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:242
+#: ../src/addressbook/libebook-contacts/e-contact.c:262
msgid "ICQ Work ID 2"
msgstr "ICQ 工作 ID 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:243
+#: ../src/addressbook/libebook-contacts/e-contact.c:263
msgid "ICQ Work ID 3"
msgstr "ICQ 工作 ID 3"
#. Last modified time
-#: ../src/addressbook/libebook-contacts/e-contact.c:246
+#: ../src/addressbook/libebook-contacts/e-contact.c:266
msgid "Last Revision"
msgstr "上次修订"
#. Translators: This is an EContact field description, in this case it's a
#. * virtual field, which returns either name of the contact or the organization
#. * name, recognized by multiple other fields, where the first filled is used.
-#: ../src/addressbook/libebook-contacts/e-contact.c:250
+#: ../src/addressbook/libebook-contacts/e-contact.c:270
msgid "Name or Org"
msgstr "名称或组织"
#. Address fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:253
+#: ../src/addressbook/libebook-contacts/e-contact.c:273
msgid "Address List"
msgstr "地址列表"
-#: ../src/addressbook/libebook-contacts/e-contact.c:254
+#: ../src/addressbook/libebook-contacts/e-contact.c:274
msgid "Home Address"
msgstr "家庭地址"
-#: ../src/addressbook/libebook-contacts/e-contact.c:255
+#: ../src/addressbook/libebook-contacts/e-contact.c:275
msgid "Work Address"
msgstr "办公地址"
-#: ../src/addressbook/libebook-contacts/e-contact.c:256
+#: ../src/addressbook/libebook-contacts/e-contact.c:276
msgid "Other Address"
msgstr "其它地址"
#. Contact categories
-#: ../src/addressbook/libebook-contacts/e-contact.c:259
+#: ../src/addressbook/libebook-contacts/e-contact.c:279
msgid "Category List"
msgstr "类别列表"
#. Photo/Logo
-#: ../src/addressbook/libebook-contacts/e-contact.c:262
+#: ../src/addressbook/libebook-contacts/e-contact.c:282
msgid "Photo"
msgstr "照片"
-#: ../src/addressbook/libebook-contacts/e-contact.c:263
+#: ../src/addressbook/libebook-contacts/e-contact.c:283
msgid "Logo"
-msgstr "标志"
+msgstr "标志/商标"
#. Translators: This is an EContact field description, in this case it's a name
#. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
-#: ../src/addressbook/libebook-contacts/e-contact.c:267
+#: ../src/addressbook/libebook-contacts/e-contact.c:287
#: ../src/libedataserverui/e-webdav-discover-widget.c:151
msgid "Name"
msgstr "姓名"
-#: ../src/addressbook/libebook-contacts/e-contact.c:268
+#: ../src/addressbook/libebook-contacts/e-contact.c:288
msgid "Email List"
msgstr "邮件列表"
#. Instant messaging fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:271
+#: ../src/addressbook/libebook-contacts/e-contact.c:291
msgid "AIM Screen Name List"
msgstr "AIM 屏幕名列表"
-#: ../src/addressbook/libebook-contacts/e-contact.c:272
+#: ../src/addressbook/libebook-contacts/e-contact.c:292
msgid "GroupWise ID List"
msgstr "GroupWise ID 列表"
-#: ../src/addressbook/libebook-contacts/e-contact.c:273
+#: ../src/addressbook/libebook-contacts/e-contact.c:293
msgid "Jabber ID List"
msgstr "Jabber ID 列表"
-#: ../src/addressbook/libebook-contacts/e-contact.c:274
+#: ../src/addressbook/libebook-contacts/e-contact.c:294
msgid "Yahoo! Screen Name List"
msgstr "Yahoo! 屏幕名列表"
-#: ../src/addressbook/libebook-contacts/e-contact.c:275
+#: ../src/addressbook/libebook-contacts/e-contact.c:295
msgid "MSN Screen Name List"
msgstr "MSN 屏幕名列表"
-#: ../src/addressbook/libebook-contacts/e-contact.c:276
+#: ../src/addressbook/libebook-contacts/e-contact.c:296
msgid "ICQ ID List"
msgstr "ICQ ID 列表"
-#: ../src/addressbook/libebook-contacts/e-contact.c:278
+#: ../src/addressbook/libebook-contacts/e-contact.c:298
msgid "Wants HTML Mail"
msgstr "想要 HTML 邮件"
#. Translators: This is an EContact field description, in this case it's a
#. * field describing whether it's a Contact list (list of email addresses) or a
#. * regular contact for one person/organization/...
-#: ../src/addressbook/libebook-contacts/e-contact.c:283
+#: ../src/addressbook/libebook-contacts/e-contact.c:303
msgid "List"
msgstr "列表"
@@ -812,137 +805,137 @@ msgstr "列表"
#. * used to determine whether when sending to Contact lists the addresses should be
#. * shown or not to other recipients - basically whether to use BCC field or CC
#. * message header when sending messages to this Contact list.
-#: ../src/addressbook/libebook-contacts/e-contact.c:288
+#: ../src/addressbook/libebook-contacts/e-contact.c:308
msgid "List Shows Addresses"
msgstr "列表显示地址"
-#: ../src/addressbook/libebook-contacts/e-contact.c:290
+#: ../src/addressbook/libebook-contacts/e-contact.c:310
msgid "Birth Date"
msgstr "生日"
-#: ../src/addressbook/libebook-contacts/e-contact.c:291
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:946
+#: ../src/addressbook/libebook-contacts/e-contact.c:311
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:957
msgid "Anniversary"
msgstr "周年纪念日"
#. Security fields
-#: ../src/addressbook/libebook-contacts/e-contact.c:294
+#: ../src/addressbook/libebook-contacts/e-contact.c:314
msgid "X.509 Certificate"
msgstr "X.509 证书"
-#: ../src/addressbook/libebook-contacts/e-contact.c:295
+#: ../src/addressbook/libebook-contacts/e-contact.c:315
msgid "PGP Certificate"
msgstr "PGP 证书"
-#: ../src/addressbook/libebook-contacts/e-contact.c:297
+#: ../src/addressbook/libebook-contacts/e-contact.c:317
msgid "Gadu-Gadu Home ID 1"
msgstr "Gadu-Gadu 家庭 ID 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:298
+#: ../src/addressbook/libebook-contacts/e-contact.c:318
msgid "Gadu-Gadu Home ID 2"
msgstr "Gadu-Gadu 家庭 ID 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:299
+#: ../src/addressbook/libebook-contacts/e-contact.c:319
msgid "Gadu-Gadu Home ID 3"
msgstr "Gadu-Gadu 家庭 ID 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:300
+#: ../src/addressbook/libebook-contacts/e-contact.c:320
msgid "Gadu-Gadu Work ID 1"
msgstr "Gadu-Gadu 工作 ID 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:301
+#: ../src/addressbook/libebook-contacts/e-contact.c:321
msgid "Gadu-Gadu Work ID 2"
msgstr "Gadu-Gadu 工作 ID 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:302
+#: ../src/addressbook/libebook-contacts/e-contact.c:322
msgid "Gadu-Gadu Work ID 3"
msgstr "Gadu-Gadu 工作 ID 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:303
+#: ../src/addressbook/libebook-contacts/e-contact.c:323
msgid "Gadu-Gadu ID List"
msgstr "Gadu-Gadu ID 列表"
#. Geo information
-#: ../src/addressbook/libebook-contacts/e-contact.c:306
+#: ../src/addressbook/libebook-contacts/e-contact.c:326
msgid "Geographic Information"
msgstr "地理信息"
-#: ../src/addressbook/libebook-contacts/e-contact.c:308
+#: ../src/addressbook/libebook-contacts/e-contact.c:328
msgid "Telephone"
msgstr "电话"
-#: ../src/addressbook/libebook-contacts/e-contact.c:310
+#: ../src/addressbook/libebook-contacts/e-contact.c:330
msgid "Skype Home Name 1"
msgstr "Skype 家庭屏幕名 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:311
+#: ../src/addressbook/libebook-contacts/e-contact.c:331
msgid "Skype Home Name 2"
msgstr "Skype 家庭屏幕名 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:312
+#: ../src/addressbook/libebook-contacts/e-contact.c:332
msgid "Skype Home Name 3"
msgstr "Skype 家庭屏幕名 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:313
+#: ../src/addressbook/libebook-contacts/e-contact.c:333
msgid "Skype Work Name 1"
msgstr "Skype 工作屏幕名 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:314
+#: ../src/addressbook/libebook-contacts/e-contact.c:334
msgid "Skype Work Name 2"
msgstr "Skype 工作屏幕名 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:315
+#: ../src/addressbook/libebook-contacts/e-contact.c:335
msgid "Skype Work Name 3"
msgstr "Skype 工作屏幕名 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:316
+#: ../src/addressbook/libebook-contacts/e-contact.c:336
msgid "Skype Name List"
msgstr "Skype 屏幕名列表"
-#: ../src/addressbook/libebook-contacts/e-contact.c:318
+#: ../src/addressbook/libebook-contacts/e-contact.c:338
msgid "SIP address"
msgstr "SIP 地址"
-#: ../src/addressbook/libebook-contacts/e-contact.c:320
+#: ../src/addressbook/libebook-contacts/e-contact.c:340
msgid "Google Talk Home Name 1"
msgstr "Google Talk 家庭屏幕名 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:321
+#: ../src/addressbook/libebook-contacts/e-contact.c:341
msgid "Google Talk Home Name 2"
msgstr "Google Talk 家庭屏幕名 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:322
+#: ../src/addressbook/libebook-contacts/e-contact.c:342
msgid "Google Talk Home Name 3"
msgstr "Google Talk 家庭屏幕名 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:323
+#: ../src/addressbook/libebook-contacts/e-contact.c:343
msgid "Google Talk Work Name 1"
msgstr "Google Talk 工作屏幕名 1"
-#: ../src/addressbook/libebook-contacts/e-contact.c:324
+#: ../src/addressbook/libebook-contacts/e-contact.c:344
msgid "Google Talk Work Name 2"
msgstr "Google Talk 工作屏幕名 2"
-#: ../src/addressbook/libebook-contacts/e-contact.c:325
+#: ../src/addressbook/libebook-contacts/e-contact.c:345
msgid "Google Talk Work Name 3"
msgstr "Google Talk 工作屏幕名 3"
-#: ../src/addressbook/libebook-contacts/e-contact.c:326
+#: ../src/addressbook/libebook-contacts/e-contact.c:346
msgid "Google Talk Name List"
msgstr "Google Talk 姓名列表"
-#: ../src/addressbook/libebook-contacts/e-contact.c:328
+#: ../src/addressbook/libebook-contacts/e-contact.c:348
msgid "Twitter Name List"
msgstr "Twitter 姓名列表"
-#: ../src/addressbook/libebook-contacts/e-contact.c:1658
-#: ../src/addressbook/libebook/e-destination.c:919
+#: ../src/addressbook/libebook-contacts/e-contact.c:1915
+#: ../src/addressbook/libebook/e-destination.c:914
msgid "Unnamed List"
msgstr "未命名的列表"
#: ../src/addressbook/libebook-contacts/e-phone-number.c:39
msgid "The library was built without phone number support."
-msgstr "建立库时未提供电话号码支持"
+msgstr "构建库时未启用电话号码支持。"
#: ../src/addressbook/libebook-contacts/e-phone-number.c:41
msgid "The phone number parser reported a yet unknown error code."
@@ -969,57 +962,66 @@ msgstr "电话号码太短"
msgid "Text is too long for a phone number"
msgstr "电话号码太长"
-#: ../src/addressbook/libebook/e-book-client.c:929
-#, fuzzy, c-format
+#: ../src/addressbook/libebook/e-book-client.c:927
+#, c-format
msgid "Unknown book property “%s”"
msgstr "未知的地址簿属性“%s”"
-#: ../src/addressbook/libebook/e-book-client.c:944
-#, fuzzy, c-format
+#: ../src/addressbook/libebook/e-book-client.c:942
+#, c-format
msgid "Cannot change value of book property “%s”"
msgstr "无法更改地址簿属性“%s”的值"
-#: ../src/addressbook/libebook/e-book-client.c:1388
-#: ../src/addressbook/libebook/e-book-client.c:1619
-#: ../src/addressbook/libebook/e-book-client.c:1896
-#: ../src/calendar/libecal/e-cal-client.c:1715
-#: ../src/calendar/libecal/e-cal-client.c:1953
-#, fuzzy, c-format
+#: ../src/addressbook/libebook/e-book-client.c:1384
+#: ../src/addressbook/libebook/e-book-client.c:1615
+#: ../src/addressbook/libebook/e-book-client.c:1892
+#: ../src/calendar/libecal/e-cal-client.c:1709
+#: ../src/calendar/libecal/e-cal-client.c:1947
+#, c-format
msgid "Unable to connect to “%s”: "
msgstr "无法连接到“%s”："
-#: ../src/addressbook/libebook/e-book-client-view.c:868
-#: ../src/calendar/libecal/e-cal-client-view.c:679
+#: ../src/addressbook/libebook/e-book-client-view.c:869
+#: ../src/calendar/libecal/e-cal-client-view.c:675
#, c-format
msgid "Client disappeared"
msgstr "客户端消失"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:905
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:2254
+#: ../src/addressbook/libedata-book/e-book-backend.c:3253
#, fuzzy, c-format
+#| msgid "The backend does not support bulk removals"
+msgid "Addressbook backend does not support cursors"
+msgstr "后端不支持批量删除"
+
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:899
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:2253
+#, c-format
msgid "Error introspecting unknown summary field “%s”"
msgstr "检查未知概要信息字段“%s”出错"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1515
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:1393
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1508
+#: ../src/addressbook/libedata-book/e-book-cache.c:549
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1392
msgid "Error parsing regular expression"
-msgstr "执行搜索表达式错误"
+msgstr "解析正则表达式出错"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1560
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:1877
-#: ../src/camel/camel-db.c:802
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1553
+#: ../src/addressbook/libedata-book/e-book-cache.c:4586
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1876
+#: ../src/camel/camel-db.c:818
#, c-format
msgid "Insufficient memory"
msgstr "内存不足"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1697
-#, fuzzy, c-format
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1690
+#, c-format
msgid "Invalid contact field “%d” specified in summary"
-msgstr "概要中的联系人字段“%d”无效"
+msgstr "概要中指定的联系人字段“%d”无效"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1731
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:604
-#, fuzzy, c-format
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:1724
+#: ../src/addressbook/libedata-book/e-book-cache.c:372
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:603
+#, c-format
msgid ""
"Contact field “%s” of type “%s” specified in summary, but only boolean, "
"string and string list field types are supported"
@@ -1027,402 +1029,292 @@ msgstr ""
"概要中定义了“%2$s”类型的联系人字段“%1$s”，但是程序只持布尔值、字符串和字符串"
"列表类型。"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3073
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4176
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:3068
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4169
#, c-format
msgid ""
"Full search_contacts are not stored in cache. vcards cannot be returned."
msgstr "缓存中没有保存完整的 search_contacts，无法返回电子名片。"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4307
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4400
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:5817
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4300
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4393
+#: ../src/addressbook/libedata-book/e-book-cache.c:3468
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5847
#, c-format
msgid "Query contained unsupported elements"
msgstr "查询中包含不支持的元素"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4311
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4304
#, c-format
msgid "Invalid Query"
msgstr "无效的查询"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4335
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4328
#, c-format
msgid ""
"Full search_contacts are not stored in cache. Hence only summary query is "
"supported."
msgstr "缓存中没有保存完整的 search_contacts，所以只支持概要查询。"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4404
-#: ../src/addressbook/libedata-book/e-data-book.c:394
-#: ../src/addressbook/libedata-book/e-data-book.c:1144
-#: ../src/calendar/libedata-cal/e-data-cal.c:429
-#: ../src/calendar/libedata-cal/e-data-cal.c:1436
-#: ../src/libedataserver/e-client.c:175
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4397
+#: ../src/addressbook/libedata-book/e-data-book.c:868
+#: ../src/calendar/libedata-cal/e-data-cal.c:1143
+#: ../src/libedataserver/e-client.c:170
#, c-format
msgid "Invalid query"
msgstr "无效的查询"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4447
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:4440
#, c-format
msgid ""
"Full vcards are not stored in cache. Hence only summary query is supported."
msgstr "缓存中没有保存完整的电子名片，所以只支持概要查询。"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:5270
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:5263
#, c-format
msgid "Unable to remove the db file: errno %d"
msgstr "无法删除数据库文件：错误代码 %d"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6057
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6457
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6050
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6450
#, c-format
msgid "Only summary queries are supported by EbSdbCursor"
msgstr "EbSdbCursor 只支持概要查询"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6064
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6057
#, c-format
msgid "At least one sort field must be specified to use an EbSdbCursor"
msgstr "使用 EbSdbCursor 时必须指定至少一个排序字段"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6071
#, c-format
msgid "Cannot sort by a field that is not in the summary"
msgstr "无法按不在概要中的字段排序"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6085
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6078
#, c-format
msgid "Cannot sort by a field which may have multiple values"
msgstr "无法按可能有多个值的字段排序"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6218
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:8116
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
+#: ../src/addressbook/libedata-book/e-book-cache.c:5797
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:8144
#, c-format
msgid ""
"Tried to step a cursor in reverse, but cursor is already at the beginning of "
"the contact list"
-msgstr "尝试对 cursor 反向步进，但 cursor 已位于联系人列表的开头"
+msgstr "试图向前移动光标，但光标已经在联系人列表的最前端"
-#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6226
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:8124
+#: ../src/addressbook/libedata-book/e-book-backend-sqlitedb.c:6219
+#: ../src/addressbook/libedata-book/e-book-cache.c:5804
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:8152
#, c-format
msgid ""
"Tried to step a cursor forwards, but cursor is already at the end of the "
"contact list"
-msgstr "尝试向前步进 cursor，但 cursor 已位于联系人列表的末尾"
+msgstr "试图向前移动光标，但光标已经在联系人列表的末尾"
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:570
-#, fuzzy, c-format
+#: ../src/addressbook/libedata-book/e-book-cache.c:337
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:569
+#, c-format
msgid "Unsupported contact field “%d” specified in summary"
msgstr "不支持概要中指定的联系人字段“%d”"
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:1950
-#, fuzzy
-msgid ""
-"Cannot upgrade contacts database from a legacy database with more than one "
-"addressbook. Delete one of the entries in the “folders” table first."
-msgstr ""
-"无法从包含多于一个地址簿的旧数据库升级联系人数据库。请先删除“folders”表中的一"
-"条记录。"
-
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:5810
+#: ../src/addressbook/libedata-book/e-book-cache.c:3463
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:5840
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1654
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3518
#, c-format
msgid "Invalid query: %s"
msgstr "无效的查询：%s"
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:5985
-msgid "Invalid query for EbSqlCursor"
+#: ../src/addressbook/libedata-book/e-book-cache.c:3648
+#, fuzzy
+#| msgid "Invalid query for EbSqlCursor"
+msgid "Invalid query for a book cursor"
msgstr "无效的 EbSqlCursor 查询"
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7938
-msgid "At least one sort field must be specified to use an EbSqlCursor"
-msgstr "要使用 EbSqlCursor 至少要指定一个排序字段"
+#: ../src/addressbook/libedata-book/e-book-cache.c:4590
+#: ../src/libebackend/e-cache.c:759
+#, c-format
+msgid "Can’t open database %s: %s"
+msgstr "无法打开数据库 %s：%s"
+
+#: ../src/addressbook/libedata-book/e-book-cache.c:5224
+#: ../src/addressbook/libedata-book/e-book-cache.c:5271
+#: ../src/addressbook/libedata-book/e-book-cache.c:5318
+#: ../src/addressbook/libedata-book/e-book-cache.c:5370
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2800
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2858
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2917
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2980
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3151
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1370
+#: ../src/libebackend/e-cache.c:1374 ../src/libebackend/e-cache.c:2352
+#: ../src/libebackend/e-cache.c:2392
+#, c-format
+msgid "Object “%s” not found"
+msgstr "未找到对象“%s”"
+
+#: ../src/addressbook/libedata-book/e-book-cache.c:5430
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3042
+#, fuzzy, c-format
+#| msgid "Contact “%s” not found"
+msgid "Object with extra “%s” not found"
+msgstr "未找到联系人“%s”"
+
+#: ../src/addressbook/libedata-book/e-book-cache.c:5584
+#, fuzzy
+#| msgid "At least one sort field must be specified to use an EbSdbCursor"
+msgid "At least one sort field must be specified to use a cursor"
+msgstr "使用 EbSdbCursor 时必须指定至少一个排序字段"
-#: ../src/addressbook/libedata-book/e-book-sqlite.c:7956
+#: ../src/addressbook/libedata-book/e-book-cache.c:5593
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7984
msgid "Cannot sort by a field that is not a string type"
msgstr "无法按非字符串类型的字段排序"
-#: ../src/addressbook/libedata-book/e-data-book.c:378
-#: ../src/calendar/libedata-cal/e-data-cal.c:410
-msgid "Success"
-msgstr "成功"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:379
-#: ../src/calendar/libecal/e-cal.c:2302
-#: ../src/calendar/libedata-cal/e-data-cal.c:411
-#: ../src/libedataserver/e-client.c:142
-msgid "Backend is busy"
-msgstr "后端繁忙"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:380
-#: ../src/calendar/libedata-cal/e-data-cal.c:412
-#: ../src/libedataserver/e-client.c:152
-msgid "Repository offline"
-msgstr "仓库离线"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:381
-#: ../src/calendar/libecal/e-cal.c:2316
-#: ../src/calendar/libedata-cal/e-data-cal.c:413
-#: ../src/libedataserver/e-client.c:159
-msgid "Permission denied"
-msgstr "没有权限"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:384
-#: ../src/calendar/libedata-cal/e-data-cal.c:418
-msgid "Authentication Failed"
-msgstr "认证失败"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:385
-#: ../src/calendar/libedata-cal/e-data-cal.c:419
-msgid "Authentication Required"
-msgstr "需要认证"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:386
-#: ../src/calendar/libedata-cal/e-data-cal.c:420
-msgid "Unsupported field"
-msgstr "不支持的字段"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:387
-#: ../src/calendar/libedata-cal/e-data-cal.c:422
-#: ../src/libedataserver/e-client.c:167
-msgid "Unsupported authentication method"
-msgstr "不支持的身份认证方式"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:388
-#: ../src/calendar/libedata-cal/e-data-cal.c:423
-#: ../src/libedataserver/e-client.c:169
-msgid "TLS not available"
-msgstr "TLS 不可用"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:389
-msgid "Address book does not exist"
-msgstr "地址簿不存在"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:390
-msgid "Book removed"
-msgstr "地址簿已删除"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:391
-#: ../src/calendar/libedata-cal/e-data-cal.c:426
-msgid "Not available in offline mode"
-msgstr "在离线模式中无法使用"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:392
-#: ../src/calendar/libedata-cal/e-data-cal.c:427
-#: ../src/libedataserver/e-client.c:171
-msgid "Search size limit exceeded"
-msgstr "超过搜索大小限制"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:393
-#: ../src/calendar/libedata-cal/e-data-cal.c:428
-#: ../src/libedataserver/e-client.c:173
-msgid "Search time limit exceeded"
-msgstr "超过搜索时间限制"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:395
-#: ../src/calendar/libedata-cal/e-data-cal.c:430
-#: ../src/libedataserver/e-client.c:177
-msgid "Query refused"
-msgstr "查询被拒绝"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:396
-#: ../src/calendar/libedata-cal/e-data-cal.c:431
-#: ../src/libedataserver/e-client.c:163
-msgid "Could not cancel"
-msgstr "无法取消"
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1081
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1093
+#, c-format
+msgid "Preloaded object for UID “%s” is invalid"
+msgstr ""
-#. { E_DATA_BOOK_STATUS_OTHER_ERROR, N_("Other error") },
-#. { OtherError, N_("Other error") },
-#: ../src/addressbook/libedata-book/e-data-book.c:398
-#: ../src/calendar/libedata-cal/e-data-cal.c:433
-msgid "Invalid server version"
-msgstr "无效的服务器版本"
-
-#: ../src/addressbook/libedata-book/e-data-book.c:400
-#: ../src/calendar/libecal/e-cal.c:2300
-#: ../src/calendar/libedata-cal/e-data-cal.c:434
-#: ../src/libedataserver/e-client.c:140
-msgid "Invalid argument"
-msgstr "无效参数"
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1089
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1101
+#, c-format
+msgid "Received object for UID “%s” is invalid"
+msgstr ""
-#. Translators: The string for NOT_SUPPORTED error
-#: ../src/addressbook/libedata-book/e-data-book.c:402
-#: ../src/calendar/libecal/e-cal.c:1057 ../src/calendar/libecal/e-cal.c:1425
-#: ../src/calendar/libecal/e-cal.c:1907 ../src/calendar/libecal/e-cal.c:2339
-#: ../src/calendar/libedata-cal/e-data-cal.c:436
-#: ../src/libedataserver/e-client.c:165
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:1911
+#: ../src/addressbook/libedata-book/e-book-meta-backend.c:2367
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:3314
#, c-format
-msgid "Not supported"
-msgstr "不支持"
+msgid "Failed to create cache “%s”:"
+msgstr "创建缓存“%s”失败："
-#: ../src/addressbook/libedata-book/e-data-book.c:403
-#: ../src/calendar/libedata-cal/e-data-cal.c:437
-#: ../src/libedataserver/e-client.c:183
-msgid "Backend is not opened yet"
-msgstr "后端尚未打开"
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:1949
+msgid ""
+"Cannot upgrade contacts database from a legacy database with more than one "
+"addressbook. Delete one of the entries in the “folders” table first."
+msgstr ""
+"无法从包含多于一个地址簿的旧数据库升级联系人数据库。请先删除“folders”表中的一"
+"条记录。"
-#: ../src/addressbook/libedata-book/e-data-book.c:404
-#: ../src/libedataserver/e-client.c:185
-msgid "Object is out of sync"
-msgstr "目标尚未同步"
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:6015
+msgid "Invalid query for EbSqlCursor"
+msgstr "无效的 EbSqlCursor 查询"
-#: ../src/addressbook/libedata-book/e-data-book.c:412
-#: ../src/calendar/libedata-cal/e-data-cal.c:445
-#: ../src/libedataserver/e-client.c:181
-msgid "Other error"
-msgstr "其他错误"
+#: ../src/addressbook/libedata-book/e-book-sqlite.c:7966
+msgid "At least one sort field must be specified to use an EbSqlCursor"
+msgstr "要使用 EbSqlCursor 至少要指定一个排序字段"
-#: ../src/addressbook/libedata-book/e-data-book.c:1169
-#: ../src/calendar/libedata-cal/e-data-cal.c:1461
+#: ../src/addressbook/libedata-book/e-data-book.c:893
+#: ../src/calendar/libedata-cal/e-data-cal.c:1168
msgid "Invalid query: "
msgstr "无效的查询："
#. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1418
+#: ../src/addressbook/libedata-book/e-data-book.c:1142
msgid "Cannot open book: "
msgstr "无法打开地址簿："
#. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1456
+#: ../src/addressbook/libedata-book/e-data-book.c:1180
msgid "Cannot refresh address book: "
msgstr "无法刷新地址薄："
#. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1497
+#: ../src/addressbook/libedata-book/e-data-book.c:1221
msgid "Cannot get contact: "
msgstr "无法获取联系人："
#. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1546
+#: ../src/addressbook/libedata-book/e-data-book.c:1266
msgid "Cannot get contact list: "
msgstr "无法获取联系人列表："
#. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1602
+#: ../src/addressbook/libedata-book/e-data-book.c:1318
msgid "Cannot get contact list uids: "
msgstr "无法获取联系人列表 UID："
#. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1653
+#: ../src/addressbook/libedata-book/e-data-book.c:1369
msgid "Cannot add contact: "
msgstr "无法添加联系人："
#. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1706
+#: ../src/addressbook/libedata-book/e-data-book.c:1420
msgid "Cannot modify contacts: "
msgstr "无法修改联系人："
#. Translators: This is prefix to a detailed error message
-#: ../src/addressbook/libedata-book/e-data-book.c:1759
+#: ../src/addressbook/libedata-book/e-data-book.c:1472
msgid "Cannot remove contacts: "
msgstr "无法移除联系人："
-#: ../src/addressbook/libedata-book/e-data-book-cursor.c:774
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:771
msgid "Cursor does not support setting the search expression"
msgstr "Cursor 不支持设置搜索表达式"
-#: ../src/addressbook/libedata-book/e-data-book-cursor.c:857
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:858
msgid "Cursor does not support step"
msgstr "Cursor 不支持步进"
-#: ../src/addressbook/libedata-book/e-data-book-cursor.c:940
+#: ../src/addressbook/libedata-book/e-data-book-cursor.c:934
msgid "Cursor does not support alphabetic indexes"
msgstr "Cursor 不支持字母表索引"
-#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:266
+#: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:92
+#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:260
msgid "Unrecognized cursor origin"
-msgstr "无法识别 cursor 原点"
+msgstr "无法识别光标原点"
-#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:334
+#: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:151
+#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:328
msgid "Out of sync revision while moving cursor"
-msgstr "移动 cursor 时修订失去同步"
+msgstr "移动光标时没有同步修改"
-#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:428
+#: ../src/addressbook/libedata-book/e-data-book-cursor-cache.c:222
+#: ../src/addressbook/libedata-book/e-data-book-cursor-sqlite.c:422
msgid "Alphabetic index was set for incorrect locale"
msgstr "对错误的区域设置了字母表索引"
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:705
-#, c-format
-msgid "Server is unreachable (%s)"
-msgstr "服务器不可用 (%s)"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:731
-#, c-format
-msgid "Failed to login to the server: %s"
-msgstr "登录到此服务器失败：%s"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:753
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:218
#, c-format
-msgid "Failed to connect to a server using SSL/TLS: %s"
-msgstr "无法使用 SSL/TLS 连接到服务器：%s"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:769
-#, c-format
-msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
-msgstr "如下 URI 返回了意外的 HTTP 状态代码 %d (%s)：%s"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:790
-msgid "CalDAV backend is not loaded yet"
-msgstr "CalDAV 后端尚未加载"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1232
-#: ../src/libedataserver/e-webdav-discover.c:145
-msgid "Invalid Redirect URL"
-msgstr "无效的重定向 URL"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:2946
-#, fuzzy, c-format
-msgid "Cannot create local cache folder “%s”"
-msgstr "无法创建本地缓存文件夹“%s”"
+msgid "Given URL “%s” doesn’t reference CalDAV calendar"
+msgstr ""
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:3032
-#, c-format
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:1510
+#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:1164
msgid ""
-"Server is unreachable, calendar is opened in read-only mode.\n"
-"Error message: %s"
+"Missing information about component URL, local cache is possibly incomplete "
+"or broken. Remove it, please."
msgstr ""
-"服务器不可用，日历将以只读模式打开。\n"
-"错误消息：%s"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:4137
-msgid "CalDAV does not support bulk additions"
-msgstr "CalDAV 不支持批量添加"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:4240
-msgid "CalDAV does not support bulk modifications"
-msgstr "CalDAV 不支持批量修改"
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:4521
-msgid "CalDAV does not support bulk removals"
-msgstr "CalDAV 不支持批量删除"
+#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:2010
+msgid "Failed to parse response data"
+msgstr "解析响应数据失败"
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:5268
-#, fuzzy
-msgid "Calendar doesn’t support Free/Busy"
-msgstr "日历不支持空闲/繁忙"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:5277
-msgid "Schedule outbox url not found"
-msgstr "未找到定时发件箱 url"
-
-#: ../src/calendar/backends/caldav/e-cal-backend-caldav.c:5374
-msgid "Unexpected result in schedule-response"
-msgstr "定时响应的结果异常"
-
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:948
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:959
msgid "Birthday"
msgstr "生日"
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:984
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:995
#, c-format
msgid "Birthday: %s"
msgstr "生日：%s"
-#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:1015
+#: ../src/calendar/backends/contacts/e-cal-backend-contacts.c:1026
#, c-format
msgid "Anniversary: %s"
msgstr "周年：%s"
+#: ../src/calendar/backends/file/e-cal-backend-file.c:43
+msgid "Cannot get URI"
+msgstr "无法获取 URI"
+
#: ../src/calendar/backends/file/e-cal-backend-file.c:243
msgid "Cannot save calendar data: Malformed URI."
msgstr "无法保存日历数据：URI 格式错误。"
@@ -1432,413 +1324,1152 @@ msgstr "无法保存日历数据：URI 格式错误。"
msgid "Cannot save calendar data"
msgstr "无法保存日历数据"
-#: ../src/calendar/backends/http/e-cal-backend-http.c:583
+#: ../src/calendar/backends/file/e-cal-backend-file.c:1185
+#: ../src/calendar/backends/file/e-cal-backend-file.c:1314
#, c-format
-msgid "Redirected to Invalid URI"
-msgstr "已重定向到无效 URI"
+msgid "Cannot parse ISC file “%s”"
+msgstr "无法解析 ISC 文件“%s”"
-#: ../src/calendar/backends/http/e-cal-backend-http.c:642
+#: ../src/calendar/backends/file/e-cal-backend-file.c:1196
+#: ../src/calendar/backends/file/e-cal-backend-file.c:1325
+#, c-format
+msgid "File “%s” is not a VCALENDAR component"
+msgstr ""
+
+#. FIXME This should be doable once all the recurid stuff is done
+#: ../src/calendar/backends/file/e-cal-backend-file.c:3642
+#: ../src/calendar/backends/file/e-cal-backend-file.c:3648
+#: ../src/calendar/backends/file/e-cal-backend-file.c:3654
+#: ../src/calendar/backends/file/e-cal-backend-file.c:3681
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:2541
+msgid "Unsupported method"
+msgstr "不支持的方式"
+
+#: ../src/calendar/backends/http/e-cal-backend-http.c:227
+msgid "URI not set"
+msgstr "URI 未设置"
+
+#: ../src/calendar/backends/http/e-cal-backend-http.c:312
+#, c-format
+msgid "Malformed URI “%s”: %s"
+msgstr "格式错误的 URI“%s”：%s"
+
+#: ../src/calendar/backends/http/e-cal-backend-http.c:463
#, c-format
msgid "Bad file format."
msgstr "无效的文件格式。"
-#: ../src/calendar/backends/http/e-cal-backend-http.c:652
+#: ../src/calendar/backends/http/e-cal-backend-http.c:472
#, c-format
msgid "Not a calendar."
msgstr "不是日历。"
-#: ../src/calendar/backends/http/e-cal-backend-http.c:956
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:710
-msgid "Could not create cache file"
-msgstr "无法创建缓存文件"
-
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:196
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:171
msgid "Could not retrieve weather data"
msgstr "无法获取天气数据"
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:379
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:349
msgid "Weather: Fog"
msgstr "天气：雾"
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:380
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:350
msgid "Weather: Cloudy Night"
msgstr "天气：多云夜晚"
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:381
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:351
msgid "Weather: Cloudy"
msgstr "天气：多云"
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:382
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:352
msgid "Weather: Overcast"
msgstr "天气：阴天"
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:383
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:353
msgid "Weather: Showers"
msgstr "天气：阵雨"
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:384
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:354
msgid "Weather: Snow"
msgstr "天气：雪"
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:385
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:355
msgid "Weather: Clear Night"
msgstr "天气：晴朗夜晚"
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:386
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:356
msgid "Weather: Sunny"
msgstr "天气：晴"
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:387
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:357
msgid "Weather: Thunderstorms"
-msgstr "天气：暴风雨"
+msgstr "天气：雷暴"
#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:413
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:383
#, c-format
msgid "%.1f °F"
msgstr "%.1f °F"
#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:416
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:386
#, c-format
msgid "%.1f °C"
msgstr "%.1f °C"
#. TRANSLATOR: This is the temperature in kelvin
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:419
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:389
#, c-format
msgid "%.1f K"
msgstr "%.1f K"
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:425
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:395
#, c-format
msgid "%.1f"
msgstr "%.1f"
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:590
-#: ../src/calendar/backends/weather/e-cal-backend-weather.c:618
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:558
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:586
msgid "Forecast"
msgstr "天气预报"
-#: ../src/calendar/libecal/e-cal.c:2304
-msgid "Repository is offline"
-msgstr "仓库离线"
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:682
+msgid "Could not create cache file"
+msgstr "无法创建缓存文件"
+
+#: ../src/calendar/backends/weather/e-cal-backend-weather.c:684
+msgid "Could not create cache file: "
+msgstr "无法创建缓存文件："
-#: ../src/calendar/libecal/e-cal.c:2306
-#: ../src/calendar/libecal/e-cal-client.c:264
+#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:973
+#: ../src/calendar/backends/webdav-notes/e-cal-backend-webdav-notes.c:1002
+msgid "New note"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-client.c:244
msgid "No such calendar"
msgstr "没有这样的日历"
-#: ../src/calendar/libecal/e-cal.c:2308
-#: ../src/calendar/libecal/e-cal-client.c:266
-#: ../src/calendar/libedata-cal/e-data-cal.c:415
+#: ../src/calendar/libecal/e-cal-client.c:246
msgid "Object not found"
msgstr "找不到对象"
-#: ../src/calendar/libecal/e-cal.c:2310
-#: ../src/calendar/libecal/e-cal-client.c:268
-#: ../src/calendar/libedata-cal/e-data-cal.c:416
+#: ../src/calendar/libecal/e-cal-client.c:248
msgid "Invalid object"
msgstr "无效对象"
-#: ../src/calendar/libecal/e-cal.c:2312
-msgid "URI not loaded"
-msgstr "URI 未载入"
-
-#: ../src/calendar/libecal/e-cal.c:2314
-msgid "URI already loaded"
-msgstr "URI 已经载入"
-
-#: ../src/calendar/libecal/e-cal.c:2318
-msgid "Unknown User"
+#: ../src/calendar/libecal/e-cal-client.c:250
+msgid "Unknown user"
msgstr "未知用户"
-#: ../src/calendar/libecal/e-cal.c:2320
-#: ../src/calendar/libecal/e-cal-client.c:272
-#: ../src/calendar/libedata-cal/e-data-cal.c:417
+#: ../src/calendar/libecal/e-cal-client.c:252
msgid "Object ID already exists"
msgstr "对象 ID 已经存在"
-#: ../src/calendar/libecal/e-cal.c:2322
-msgid "Protocol not supported"
-msgstr "不支持的协议"
-
-#: ../src/calendar/libecal/e-cal.c:2324
-msgid "Operation has been cancelled"
-msgstr "操作已取消"
-
-#: ../src/calendar/libecal/e-cal.c:2326
-msgid "Could not cancel operation"
-msgstr "无法取消操作"
-
-#: ../src/calendar/libecal/e-cal.c:2328 ../src/libedataserver/e-client.c:148
-msgid "Authentication failed"
-msgstr "认证失败"
-
-#: ../src/calendar/libecal/e-cal.c:2330
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1126
-#: ../src/libedataserver/e-client.c:150
-msgid "Authentication required"
-msgstr "必须认证"
-
-#: ../src/calendar/libecal/e-cal.c:2332
-msgid "A D-Bus exception has occurred"
-msgstr "发生了一个 D-Bus 异常"
-
-#: ../src/calendar/libecal/e-cal.c:2336
-msgid "No error"
-msgstr "无错误"
-
-#: ../src/calendar/libecal/e-cal-client.c:270
-#: ../src/calendar/libedata-cal/e-data-cal.c:425
-msgid "Unknown user"
-msgstr "未知用户"
-
-#: ../src/calendar/libecal/e-cal-client.c:274
-#: ../src/calendar/libedata-cal/e-data-cal.c:414
+#: ../src/calendar/libecal/e-cal-client.c:254
msgid "Invalid range"
msgstr "无效范围"
-#: ../src/calendar/libecal/e-cal-client.c:1063
-#, fuzzy, c-format
+#: ../src/calendar/libecal/e-cal-client.c:1073
+#, c-format
msgid "Unknown calendar property “%s”"
msgstr "未知的日历属性“%s”"
-#: ../src/calendar/libecal/e-cal-client.c:1078
-#, fuzzy, c-format
+#: ../src/calendar/libecal/e-cal-client.c:1088
+#, c-format
msgid "Cannot change value of calendar property “%s”"
msgstr "无法更改日历属性的值“%s”"
-#: ../src/calendar/libecal/e-cal-component.c:1358
+#: ../src/calendar/libecal/e-cal-component.c:716
msgid "Untitled appointment"
msgstr "无标题约会"
-#: ../src/calendar/libecal/e-cal-recur.c:4739
+#: ../src/calendar/libecal/e-cal-recur.c:4889
msgid "1st"
msgstr "1日"
-#: ../src/calendar/libecal/e-cal-recur.c:4740
+#: ../src/calendar/libecal/e-cal-recur.c:4890
msgid "2nd"
msgstr "2日"
-#: ../src/calendar/libecal/e-cal-recur.c:4741
+#: ../src/calendar/libecal/e-cal-recur.c:4891
msgid "3rd"
msgstr "3日"
-#: ../src/calendar/libecal/e-cal-recur.c:4742
+#: ../src/calendar/libecal/e-cal-recur.c:4892
msgid "4th"
msgstr "4日"
-#: ../src/calendar/libecal/e-cal-recur.c:4743
+#: ../src/calendar/libecal/e-cal-recur.c:4893
msgid "5th"
msgstr "5日"
-#: ../src/calendar/libecal/e-cal-recur.c:4744
+#: ../src/calendar/libecal/e-cal-recur.c:4894
msgid "6th"
msgstr "6日"
-#: ../src/calendar/libecal/e-cal-recur.c:4745
+#: ../src/calendar/libecal/e-cal-recur.c:4895
msgid "7th"
msgstr "7日"
-#: ../src/calendar/libecal/e-cal-recur.c:4746
+#: ../src/calendar/libecal/e-cal-recur.c:4896
msgid "8th"
msgstr "8日"
-#: ../src/calendar/libecal/e-cal-recur.c:4747
+#: ../src/calendar/libecal/e-cal-recur.c:4897
msgid "9th"
msgstr "9日"
-#: ../src/calendar/libecal/e-cal-recur.c:4748
+#: ../src/calendar/libecal/e-cal-recur.c:4898
msgid "10th"
msgstr "10日"
-#: ../src/calendar/libecal/e-cal-recur.c:4749
+#: ../src/calendar/libecal/e-cal-recur.c:4899
msgid "11th"
msgstr "11日"
-#: ../src/calendar/libecal/e-cal-recur.c:4750
+#: ../src/calendar/libecal/e-cal-recur.c:4900
msgid "12th"
msgstr "12日"
-#: ../src/calendar/libecal/e-cal-recur.c:4751
+#: ../src/calendar/libecal/e-cal-recur.c:4901
msgid "13th"
msgstr "13日"
-#: ../src/calendar/libecal/e-cal-recur.c:4752
+#: ../src/calendar/libecal/e-cal-recur.c:4902
msgid "14th"
msgstr "14日"
-#: ../src/calendar/libecal/e-cal-recur.c:4753
+#: ../src/calendar/libecal/e-cal-recur.c:4903
msgid "15th"
msgstr "15日"
-#: ../src/calendar/libecal/e-cal-recur.c:4754
+#: ../src/calendar/libecal/e-cal-recur.c:4904
msgid "16th"
msgstr "16日"
-#: ../src/calendar/libecal/e-cal-recur.c:4755
+#: ../src/calendar/libecal/e-cal-recur.c:4905
msgid "17th"
msgstr "17日"
-#: ../src/calendar/libecal/e-cal-recur.c:4756
+#: ../src/calendar/libecal/e-cal-recur.c:4906
msgid "18th"
-msgstr "18八日"
+msgstr "18日"
-#: ../src/calendar/libecal/e-cal-recur.c:4757
+#: ../src/calendar/libecal/e-cal-recur.c:4907
msgid "19th"
msgstr "19日"
-#: ../src/calendar/libecal/e-cal-recur.c:4758
+#: ../src/calendar/libecal/e-cal-recur.c:4908
msgid "20th"
msgstr "20日"
-#: ../src/calendar/libecal/e-cal-recur.c:4759
-msgid "21st"
-msgstr "21日"
+#: ../src/calendar/libecal/e-cal-recur.c:4909
+msgid "21st"
+msgstr "21日"
+
+#: ../src/calendar/libecal/e-cal-recur.c:4910
+msgid "22nd"
+msgstr "22日"
+
+#: ../src/calendar/libecal/e-cal-recur.c:4911
+msgid "23rd"
+msgstr "23日"
+
+#: ../src/calendar/libecal/e-cal-recur.c:4912
+msgid "24th"
+msgstr "24日"
+
+#: ../src/calendar/libecal/e-cal-recur.c:4913
+msgid "25th"
+msgstr "25日"
+
+#: ../src/calendar/libecal/e-cal-recur.c:4914
+msgid "26th"
+msgstr "26日"
+
+#: ../src/calendar/libecal/e-cal-recur.c:4915
+msgid "27th"
+msgstr "27日"
+
+#: ../src/calendar/libecal/e-cal-recur.c:4916
+msgid "28th"
+msgstr "28日"
+
+#: ../src/calendar/libecal/e-cal-recur.c:4917
+msgid "29th"
+msgstr "29日"
+
+#: ../src/calendar/libecal/e-cal-recur.c:4918
+msgid "30th"
+msgstr "30日"
+
+#: ../src/calendar/libecal/e-cal-recur.c:4919
+msgid "31st"
+msgstr "31日"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5064
+#, c-format
+msgid "every day forever"
+msgid_plural "every %d days forever"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5070
+#, c-format
+msgid "Every day forever"
+msgid_plural "Every %d days forever"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5078
+#, c-format
+msgid "every day"
+msgid_plural "every %d days"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5084
+#, c-format
+msgid "Every day"
+msgid_plural "Every %d days"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5170
+#, c-format
+msgid "every week"
+msgid_plural "every %d weeks"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5176
+#, c-format
+msgid "Every week"
+msgid_plural "Every %d weeks"
+msgstr[0] ""
+
+#. Translators: This is used to merge set of week day names in a recurrence, which can contain any
+#. of the week day names. The string always starts with "on DAYNAME", then it can continue either
+#. with ", DAYNAME" or " and DAYNAME", thus it can be something like "on Monday and Tuesday"
+#. or "on Monday, Wednesday and Friday" or simply "on Saturday". The '%1$s' is replaced with
+#. the previously gathered text, while the '%2$s' is replaced with the text to append.
+#: ../src/calendar/libecal/e-cal-recur.c:5190
+#, c-format
+msgctxt "recur-description-dayname"
+msgid "%1$s%2$s"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5207
+msgctxt "recur-description"
+msgid "on Sunday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5208
+msgctxt "recur-description"
+msgid ", Sunday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5209
+msgctxt "recur-description"
+msgid " and Sunday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5212
+msgctxt "recur-description"
+msgid "on Monday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5213
+msgctxt "recur-description"
+msgid ", Monday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5214
+msgctxt "recur-description"
+msgid " and Monday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5217
+msgctxt "recur-description"
+msgid "on Tuesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5218
+msgctxt "recur-description"
+msgid ", Tuesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5219
+msgctxt "recur-description"
+msgid " and Tuesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5222
+msgctxt "recur-description"
+msgid "on Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5223
+msgctxt "recur-description"
+msgid ", Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5224
+msgctxt "recur-description"
+msgid " and Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5227
+msgctxt "recur-description"
+msgid "on Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5228
+msgctxt "recur-description"
+msgid ", Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5229
+msgctxt "recur-description"
+msgid " and Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5232
+#, fuzzy
+#| msgctxt "CategoryName"
+#| msgid "Holiday"
+msgctxt "recur-description"
+msgid "on Friday"
+msgstr "假日"
+
+#: ../src/calendar/libecal/e-cal-recur.c:5233
+msgctxt "recur-description"
+msgid ", Friday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5234
+msgctxt "recur-description"
+msgid " and Friday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5237
+msgctxt "recur-description"
+msgid "on Saturday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5238
+msgctxt "recur-description"
+msgid ", Saturday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5239
+msgctxt "recur-description"
+msgid " and Saturday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5368
+#, c-format
+msgid "every month"
+msgid_plural "every %d months"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5374
+#, c-format
+msgid "Every month"
+msgid_plural "Every %d months"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5384
+#: ../src/calendar/libecal/e-cal-recur.c:5705
+msgctxt "recur-description"
+msgid "on the last Sunday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5387
+#: ../src/calendar/libecal/e-cal-recur.c:5555
+msgctxt "recur-description"
+msgid "on the last Monday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5390
+#: ../src/calendar/libecal/e-cal-recur.c:5580
+msgctxt "recur-description"
+msgid "on the last Tuesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5393
+#: ../src/calendar/libecal/e-cal-recur.c:5605
+msgctxt "recur-description"
+msgid "on the last Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5396
+#: ../src/calendar/libecal/e-cal-recur.c:5630
+msgctxt "recur-description"
+msgid "on the last Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5399
+#: ../src/calendar/libecal/e-cal-recur.c:5655
+msgctxt "recur-description"
+msgid "on the last Friday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5402
+#: ../src/calendar/libecal/e-cal-recur.c:5680
+msgctxt "recur-description"
+msgid "on the last Saturday"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5412
+msgctxt "recur-description"
+msgid "on the 1st day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5416
+msgctxt "recur-description"
+msgid "on the 2nd day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5420
+msgctxt "recur-description"
+msgid "on the 3rd day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5424
+msgctxt "recur-description"
+msgid "on the 4th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5428
+msgctxt "recur-description"
+msgid "on the 5th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5432
+msgctxt "recur-description"
+msgid "on the 6th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5436
+msgctxt "recur-description"
+msgid "on the 7th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5440
+msgctxt "recur-description"
+msgid "on the 8th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5444
+msgctxt "recur-description"
+msgid "on the 9th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5448
+msgctxt "recur-description"
+msgid "on the 10th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5452
+msgctxt "recur-description"
+msgid "on the 11th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5456
+msgctxt "recur-description"
+msgid "on the 12th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5460
+msgctxt "recur-description"
+msgid "on the 13th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5464
+msgctxt "recur-description"
+msgid "on the 14th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5468
+msgctxt "recur-description"
+msgid "on the 15th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5472
+msgctxt "recur-description"
+msgid "on the 16th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5476
+msgctxt "recur-description"
+msgid "on the 17th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5480
+msgctxt "recur-description"
+msgid "on the 18th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5484
+msgctxt "recur-description"
+msgid "on the 19th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5488
+msgctxt "recur-description"
+msgid "on the 20th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5492
+msgctxt "recur-description"
+msgid "on the 21st day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5496
+msgctxt "recur-description"
+msgid "on the 22nd day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5500
+msgctxt "recur-description"
+msgid "on the 23rd day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5504
+msgctxt "recur-description"
+msgid "on the 24th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5508
+msgctxt "recur-description"
+msgid "on the 25th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5512
+msgctxt "recur-description"
+msgid "on the 26th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5516
+msgctxt "recur-description"
+msgid "on the 27th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5520
+msgctxt "recur-description"
+msgid "on the 28th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5524
+msgctxt "recur-description"
+msgid "on the 29th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5528
+msgctxt "recur-description"
+msgid "on the 30th day"
+msgstr ""
+
+#. Translators: This is added to a monthly recurrence, forming something like "Every month on the Xth day"
+#: ../src/calendar/libecal/e-cal-recur.c:5532
+msgctxt "recur-description"
+msgid "on the 31st day"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5540
+msgctxt "recur-description"
+msgid "on the first Monday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5543
+msgctxt "recur-description"
+msgid "on the second Monday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5546
+msgctxt "recur-description"
+msgid "on the third Monday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5549
+msgctxt "recur-description"
+msgid "on the fourth Monday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5552
+msgctxt "recur-description"
+msgid "on the fifth Monday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5565
+msgctxt "recur-description"
+msgid "on the first Tuesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5568
+msgctxt "recur-description"
+msgid "on the second Tuesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5571
+msgctxt "recur-description"
+msgid "on the third Tuesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5574
+msgctxt "recur-description"
+msgid "on the fourth Tuesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5577
+msgctxt "recur-description"
+msgid "on the fifth Tuesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5590
+msgctxt "recur-description"
+msgid "on the first Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5593
+msgctxt "recur-description"
+msgid "on the second Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5596
+msgctxt "recur-description"
+msgid "on the third Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5599
+msgctxt "recur-description"
+msgid "on the fourth Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5602
+msgctxt "recur-description"
+msgid "on the fifth Wednesday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5615
+msgctxt "recur-description"
+msgid "on the first Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5618
+msgctxt "recur-description"
+msgid "on the second Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5621
+msgctxt "recur-description"
+msgid "on the third Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5624
+msgctxt "recur-description"
+msgid "on the fourth Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5627
+msgctxt "recur-description"
+msgid "on the fifth Thursday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5640
+msgctxt "recur-description"
+msgid "on the first Friday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5643
+msgctxt "recur-description"
+msgid "on the second Friday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5646
+msgctxt "recur-description"
+msgid "on the third Friday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5649
+msgctxt "recur-description"
+msgid "on the fourth Friday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5652
+msgctxt "recur-description"
+msgid "on the fifth Friday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5665
+msgctxt "recur-description"
+msgid "on the first Saturday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5668
+msgctxt "recur-description"
+msgid "on the second Saturday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5671
+msgctxt "recur-description"
+msgid "on the third Saturday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5674
+msgctxt "recur-description"
+msgid "on the fourth Saturday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5677
+msgctxt "recur-description"
+msgid "on the fifth Saturday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5690
+msgctxt "recur-description"
+msgid "on the first Sunday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5693
+msgctxt "recur-description"
+msgid "on the second Sunday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5696
+msgctxt "recur-description"
+msgid "on the third Sunday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5699
+msgctxt "recur-description"
+msgid "on the fourth Sunday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5702
+msgctxt "recur-description"
+msgid "on the fifth Sunday"
+msgstr ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5731
+#, c-format
+msgid "every year forever"
+msgid_plural "every %d years forever"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5737
+#, c-format
+msgid "Every year forever"
+msgid_plural "Every %d years forever"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5745
+#, c-format
+msgid "every year"
+msgid_plural "every %d years"
+msgstr[0] ""
+
+#: ../src/calendar/libecal/e-cal-recur.c:5751
+#, c-format
+msgid "Every year"
+msgid_plural "Every %d years"
+msgstr[0] ""
+
+#. Translators: This is one of the last possible parts of a recurrence description.
+#. The text is appended at the end of the complete recurrence description, making it
+#. for example: "Every 3 days for 10 occurrences"
+#: ../src/calendar/libecal/e-cal-recur.c:5770
+#, c-format
+msgid "for one occurrence"
+msgid_plural "for %d occurrences"
+msgstr[0] ""
+
+#. Translators: This is one of the last possible parts of a recurrence description.
+#. The '%s' is replaced with actual date, thus it can create something like
+#. "until Mon 15.1.2018". The text is appended at the end of the complete
+#. recurrence description, making it for example: "Every 3 days until Mon 15.1.2018"
+#: ../src/calendar/libecal/e-cal-recur.c:5801
+#, c-format
+msgctxt "recur-description"
+msgid "until %s"
+msgstr ""
-#: ../src/calendar/libecal/e-cal-recur.c:4760
-msgid "22nd"
-msgstr "22日"
+#. Translators: This is one of the last possible parts of a recurrence description.
+#. The text is appended at the end of the complete recurrence description, making it
+#. for example: "Every 2 months on Tuesday, Thursday and Friday forever"
+#: ../src/calendar/libecal/e-cal-recur.c:5807
+msgctxt "recur-description"
+msgid "forever"
+msgstr ""
-#: ../src/calendar/libecal/e-cal-recur.c:4761
-msgid "23rd"
-msgstr "23日"
+#. Translators: This constructs a complete recurrence description; the '%1$s' is like "Every 2 weeks",
+#. the '%2$s' is like "on Tuesday and Friday" and the '%3$s' is like "for 10 occurrences", constructing
+#. together one sentence: "Every 2 weeks on Tuesday and Friday for 10 occurrences".
+#: ../src/calendar/libecal/e-cal-recur.c:5817
+#, c-format
+msgctxt "recur-description"
+msgid "%1$s %2$s %3$s"
+msgstr ""
-#: ../src/calendar/libecal/e-cal-recur.c:4762
-msgid "24th"
-msgstr "24日"
+#. Translators: This constructs a complete recurrence description; the '%1$s' is like "Every 2 days",
+#. the '%2$s' is like "for 10 occurrences", constructing together one sentence:
+#. "Every 2 days for 10 occurrences".
+#: ../src/calendar/libecal/e-cal-recur.c:5822
+#, c-format
+msgctxt "recur-description"
+msgid "%1$s %2$s"
+msgstr ""
-#: ../src/calendar/libecal/e-cal-recur.c:4763
-msgid "25th"
-msgstr "25日"
+#. Translators: This text is appended at the end of complete recur description using "%s%s" in
+#. context "recur-description"
+#: ../src/calendar/libecal/e-cal-recur.c:5838
+#, c-format
+msgid ", with one exception"
+msgid_plural ", with %d exceptions"
+msgstr[0] ""
-#: ../src/calendar/libecal/e-cal-recur.c:4764
-msgid "26th"
-msgstr "26日"
+#. Translators: This appends text like ", with 3 exceptions" at the end of complete recurrence description.
+#. The "%1$s" is replaced with the recurrence description, the "%2$s" with the text about exceptions.
+#. It will form something like: "Every 2 weeks on Tuesday and Friday for 10 occurrences, with 3 exceptions"
+#: ../src/calendar/libecal/e-cal-recur.c:5845
+#, c-format
+msgctxt "recur-description"
+msgid "%1$s%2$s"
+msgstr ""
-#: ../src/calendar/libecal/e-cal-recur.c:4765
-msgid "27th"
-msgstr "27日"
+#: ../src/calendar/libecal/e-cal-recur.c:5858
+#: ../src/calendar/libecal/e-cal-recur.c:5881
+msgctxt "recur-description"
+msgid "The meeting recurs"
+msgstr ""
-#: ../src/calendar/libecal/e-cal-recur.c:4766
-msgid "28th"
-msgstr "28日"
+#: ../src/calendar/libecal/e-cal-recur.c:5860
+#: ../src/calendar/libecal/e-cal-recur.c:5883
+#, fuzzy
+#| msgid "Untitled appointment"
+msgctxt "recur-description"
+msgid "The appointment recurs"
+msgstr "无标题约会"
-#: ../src/calendar/libecal/e-cal-recur.c:4767
-msgid "29th"
-msgstr "29日"
+#: ../src/calendar/libecal/e-cal-recur.c:5863
+#: ../src/calendar/libecal/e-cal-recur.c:5886
+msgctxt "recur-description"
+msgid "The task recurs"
+msgstr ""
-#: ../src/calendar/libecal/e-cal-recur.c:4768
-msgid "30th"
-msgstr "30日"
+#. if (i_cal_component_isa (comp) == I_CAL_VJOURNAL_COMPONENT)
+#: ../src/calendar/libecal/e-cal-recur.c:5865
+#: ../src/calendar/libecal/e-cal-recur.c:5888
+msgctxt "recur-description"
+msgid "The memo recurs"
+msgstr ""
-#: ../src/calendar/libecal/e-cal-recur.c:4769
-msgid "31st"
-msgstr "31日"
+#. Translators: This adds a prefix in front of the complete recurrence description.
+#. The '%1$s' is replaced with something like "The meeting recurs" and
+#. the '%2$s' with something like "every 2 days forever", thus forming
+#. sentence like "This meeting recurs every 2 days forever"
+#: ../src/calendar/libecal/e-cal-recur.c:5872
+#, c-format
+msgctxt "recur-description-prefix"
+msgid "%1$s %2$s"
+msgstr ""
-#: ../src/calendar/libecal/e-cal-util.c:707
-#: ../src/calendar/libecal/e-cal-util.c:734
+#: ../src/calendar/libecal/e-cal-util.c:818
+#: ../src/calendar/libecal/e-cal-util.c:845
msgctxt "Priority"
msgid "High"
msgstr "高"
-#: ../src/calendar/libecal/e-cal-util.c:709
-#: ../src/calendar/libecal/e-cal-util.c:736
+#: ../src/calendar/libecal/e-cal-util.c:820
+#: ../src/calendar/libecal/e-cal-util.c:847
msgctxt "Priority"
msgid "Normal"
msgstr "中"
-#: ../src/calendar/libecal/e-cal-util.c:711
-#: ../src/calendar/libecal/e-cal-util.c:738
+#: ../src/calendar/libecal/e-cal-util.c:822
+#: ../src/calendar/libecal/e-cal-util.c:849
msgctxt "Priority"
msgid "Low"
msgstr "低"
#. An empty string is the same as 'None'.
-#: ../src/calendar/libecal/e-cal-util.c:732
+#: ../src/calendar/libecal/e-cal-util.c:843
msgctxt "Priority"
msgid "Undefined"
msgstr "未定义"
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:83
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1061
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1377
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1504
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1553
+#: ../src/calendar/libecal/e-cal-util.c:885
+#: ../src/libedataserverui/e-reminders-widget.c:296
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d 周"
+
+#: ../src/calendar/libecal/e-cal-util.c:894
+#: ../src/libedataserverui/e-reminders-widget.c:292
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d 天"
+
+#: ../src/calendar/libecal/e-cal-util.c:903
+#: ../src/libedataserverui/e-reminders-widget.c:288
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 小时"
+
+#: ../src/calendar/libecal/e-cal-util.c:912
+#: ../src/libedataserverui/e-reminders-widget.c:284
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分钟"
+
+#. Translators: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../src/calendar/libecal/e-cal-util.c:917
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 秒"
+
+#: ../src/calendar/libecal/e-reminder-watcher.c:2704
+msgid "No Summary"
+msgstr "无摘要"
+
+#. Translators: The first %s is replaced with the time string,
+#. the second %s with a duration, and the third %s with an event location,
+#. making it something like: "24.1.2018 10:30 (30 minutes) Meeting room A1"
+#: ../src/calendar/libecal/e-reminder-watcher.c:2720
+#, fuzzy, c-format
+#| msgid "%s (%s)"
+msgctxt "overdue"
+msgid "%s (%s) %s"
+msgstr "%s (%s)"
+
+#. Translators: The first %s is replaced with the time string,
+#. the second %s with a duration, making is something like:
+#. "24.1.2018 10:30 (30 minutes)"
+#: ../src/calendar/libecal/e-reminder-watcher.c:2725
#, fuzzy, c-format
+#| msgid "%s (%s)"
+msgctxt "overdue"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#. Translators: The first %s is replaced with the time string,
+#. the second %s with an event location, making it something like:
+#. "24.1.2018 10:30 Meeting room A1"
+#: ../src/calendar/libecal/e-reminder-watcher.c:2730
+#, c-format
+msgctxt "overdue"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:77
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1104
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1443
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1570
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1619
+#, c-format
msgid "“%s” expects one argument"
msgstr "“%s”需要一个参数"
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:90
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:672
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1384
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1392
-#, fuzzy, c-format
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:84
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:707
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1450
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1458
+#, c-format
msgid "“%s” expects the first argument to be a string"
msgstr "“%s”需要第一个参数是字符串"
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:165
-#, fuzzy, c-format
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:164
+#, c-format
msgid "“%s” expects two or three arguments"
msgstr "“%s”需要两个或三个参数"
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:172
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:261
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:323
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:822
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1068
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1453
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1511
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1560
-#, fuzzy, c-format
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:171
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:272
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:340
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:857
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1111
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1519
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1577
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1626
+#, c-format
msgid "“%s” expects the first argument to be a time_t"
-msgstr "“%s”的第一个参数应该是 time_t"
+msgstr "“%s”的第一个参数应该是 time_t 类型"
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:181
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:269
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:333
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:831
-#, fuzzy, c-format
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:180
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:280
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:350
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:866
+#, c-format
msgid "“%s” expects the second argument to be a time_t"
-msgstr "“%s”的第一个参数应该是 time_t"
+msgstr "“%s”的第二个参数应该是 time_t 类型"
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:191
-#, fuzzy, c-format
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:190
+#, c-format
msgid "“%s” expects the third argument to be a string"
msgstr "“%s”需要第三个参数是字符串"
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:253
-#, fuzzy, c-format
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:264
+#, c-format
msgid "“%s” expects none or two arguments"
msgstr "“%s”需要零个或两个参数"
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:316
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:665
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:815
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1446
-#, fuzzy, c-format
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:333
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:700
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:850
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1512
+#, c-format
msgid "“%s” expects two arguments"
msgstr "“%s”需要两个参数"
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:601
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:624
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:747
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:779
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:986
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1019
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1338
-#, fuzzy, c-format
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:639
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:662
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:782
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:814
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1023
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1056
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1404
+#, c-format
msgid "“%s” expects no arguments"
msgstr "“%s”不需要参数"
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:681
-#, fuzzy, c-format
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:716
+#, c-format
msgid "“%s” expects the second argument to be a string"
msgstr "“%s”的第二个参数应该是字符串"
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:712
-#, fuzzy, c-format
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:747
+#, c-format
msgid ""
"“%s” expects the first argument to be either “any”, “summary”, or "
"“description”, or “location”, or “attendee”, or “organizer”, or "
@@ -1848,259 +2479,307 @@ msgstr ""
"是“any”、“summary”、“description”、“location”、“attendee”、“organizer”、“classification”之"
"一"
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:883
-#, fuzzy, c-format
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:918
+#, c-format
msgid "“%s” expects at least one argument"
msgstr "“%s”至少需要一个参数"
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:898
-#, fuzzy, c-format
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:933
+#, c-format
msgid ""
"“%s” expects all arguments to be strings or one and only one argument to be "
"a boolean false (#f)"
msgstr "“%s”的所有参数都应该为字符串或者它唯一的参数为布尔假 (#f)"
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1401
-#, fuzzy, c-format
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1467
+#, c-format
msgid "“%s” expects the first argument to be an ISO 8601 date/time string"
msgstr "“%s”的第一个参数必须是 ISO 8601 日期/时间字符串"
-#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1462
-#, fuzzy, c-format
+#: ../src/calendar/libedata-cal/e-cal-backend-sexp.c:1528
+#, c-format
msgid "“%s” expects the second argument to be an integer"
msgstr "“%s”的第二个参数应该是整数"
-#: ../src/calendar/libedata-cal/e-data-cal.c:421
-msgid "Unsupported method"
-msgstr "不支持的方式"
+#: ../src/calendar/libedata-cal/e-cal-cache.c:1798
+#, c-format
+msgid "Failed to create SQLite function, error code “%d”: %s"
+msgstr "创建 SQLite 函数失败，错误代码“%d”：%s"
-#: ../src/calendar/libedata-cal/e-data-cal.c:424
-msgid "Calendar does not exist"
-msgstr "日历不存在"
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2798
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2856
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2915
+#: ../src/calendar/libedata-cal/e-cal-cache.c:2978
+#, c-format
+msgid "Object “%s”, “%s” not found"
+msgstr "对象“%s”，“%s”未找到"
+
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3757
+#, fuzzy
+#| msgid "Cannot add contact: "
+msgid "Cannot add timezone without tzid"
+msgstr "无法添加联系人："
+
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3766
+#, fuzzy
+#| msgid "Cannot authenticate without a username"
+msgid "Cannot add timezone without component"
+msgstr "没有用户名无法进行验证"
+
+#: ../src/calendar/libedata-cal/e-cal-cache.c:3774
+#, fuzzy
+#| msgid "Cannot send message: one or more invalid recipients"
+msgid "Cannot add timezone with invalid component"
+msgstr "无法发送消息：一个或多个无效的收件人"
+
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:1148
+#, c-format
+msgid "Received object for UID “%s” doesn’t contain any expected component"
+msgstr ""
+
+#: ../src/calendar/libedata-cal/e-cal-meta-backend.c:4181
+msgid "attachment.dat"
+msgstr ""
#. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1655
+#: ../src/calendar/libedata-cal/e-data-cal.c:1362
msgid "Cannot open calendar: "
msgstr "无法打开日历："
#. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1693
+#: ../src/calendar/libedata-cal/e-data-cal.c:1400
msgid "Cannot refresh calendar: "
msgstr "无法刷新日历："
#. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1735
+#: ../src/calendar/libedata-cal/e-data-cal.c:1442
msgid "Cannot retrieve calendar object path: "
msgstr "无法获取日历对象的路径："
#. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1788
+#: ../src/calendar/libedata-cal/e-data-cal.c:1495
msgid "Cannot retrieve calendar object list: "
msgstr "无法获取日历对象的列表："
#. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1846
+#: ../src/calendar/libedata-cal/e-data-cal.c:1553
msgid "Cannot retrieve calendar free/busy list: "
msgstr "无法获取日历空闲/繁忙列表："
#. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1897
+#: ../src/calendar/libedata-cal/e-data-cal.c:1604
msgid "Cannot create calendar object: "
msgstr "无法创建日历对象："
#. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:1966
+#: ../src/calendar/libedata-cal/e-data-cal.c:1673
msgid "Cannot modify calendar object: "
msgstr "无法修改日历对象："
#. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:2045
+#: ../src/calendar/libedata-cal/e-data-cal.c:1752
msgid "Cannot remove calendar object: "
msgstr "无法移除日历对象："
#. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:2132
+#: ../src/calendar/libedata-cal/e-data-cal.c:1839
msgid "Cannot receive calendar objects: "
msgstr "无法接收日历对象："
#. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:2176
+#: ../src/calendar/libedata-cal/e-data-cal.c:1883
msgid "Cannot send calendar objects: "
msgstr "无法发送日历对象："
#. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:2229
+#: ../src/calendar/libedata-cal/e-data-cal.c:1936
msgid "Could not retrieve attachment uris: "
msgstr "无法获取附件 URI："
#. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:2275
+#: ../src/calendar/libedata-cal/e-data-cal.c:1982
msgid "Could not discard reminder: "
msgstr "无法取消提醒："
#. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:2317
+#: ../src/calendar/libedata-cal/e-data-cal.c:2024
msgid "Could not retrieve calendar time zone: "
msgstr "无法获取日历时区："
#. Translators: This is prefix to a detailed error message
-#: ../src/calendar/libedata-cal/e-data-cal.c:2358
+#: ../src/calendar/libedata-cal/e-data-cal.c:2065
msgid "Could not add calendar time zone: "
msgstr "无法添加日历时区："
-#: ../src/camel/camel-cipher-context.c:202
+#: ../src/camel/camel-cipher-context.c:198
#, c-format
msgid "Signing is not supported by this cipher"
msgstr "该密码不支持签名"
-#: ../src/camel/camel-cipher-context.c:215
+#: ../src/camel/camel-cipher-context.c:211
#, c-format
msgid "Verifying is not supported by this cipher"
msgstr "该密码不支持验证"
-#: ../src/camel/camel-cipher-context.c:231
+#: ../src/camel/camel-cipher-context.c:227
#, c-format
msgid "Encryption is not supported by this cipher"
msgstr "该密码不支持加密"
-#: ../src/camel/camel-cipher-context.c:245
+#: ../src/camel/camel-cipher-context.c:241
#, c-format
msgid "Decryption is not supported by this cipher"
msgstr "该密码不支持解密"
-#: ../src/camel/camel-cipher-context.c:361
+#: ../src/camel/camel-cipher-context.c:356
msgid "Signing message"
msgstr "签名消息"
-#: ../src/camel/camel-cipher-context.c:651
+#: ../src/camel/camel-cipher-context.c:648
msgid "Encrypting message"
msgstr "加密消息"
-#: ../src/camel/camel-cipher-context.c:823
+#: ../src/camel/camel-cipher-context.c:821
msgid "Decrypting message"
msgstr "解密消息"
-#: ../src/camel/camel-data-cache.c:203
+#: ../src/camel/camel-data-cache.c:199
#, c-format
msgid "Unable to create cache path"
msgstr "无法创建缓存路径"
-#: ../src/camel/camel-data-cache.c:532
+#: ../src/camel/camel-data-cache.c:528
msgid "Empty cache file"
msgstr "清空缓存文件"
-#: ../src/camel/camel-data-cache.c:609
+#: ../src/camel/camel-data-cache.c:605
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "无法删除缓存条目：%s：%s"
-#: ../src/camel/camel-db.c:855
-#: ../src/camel/providers/local/camel-mbox-store.c:904
-#, fuzzy, c-format
+#: ../src/camel/camel-db.c:872
+#: ../src/camel/providers/local/camel-mbox-store.c:913
+#, c-format
msgid "Could not rename “%s” to %s: %s"
msgstr "无法将“%s”重命名为 %s：%s"
-#: ../src/camel/camel-filter-driver.c:990
-#: ../src/camel/camel-filter-search.c:779
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-filter-driver.c:264
#, fuzzy, c-format
+#| msgid "Scanning for changed messages in “%s : %s”"
+msgid "Transferring filtered messages in “%s : %s”"
+msgstr "正在扫描“%s : %s”中已更改的消息"
+
+#: ../src/camel/camel-filter-driver.c:1120
+#: ../src/camel/camel-filter-search.c:934
+#, c-format
msgid "Failed to create child process “%s”: %s"
msgstr "创建子进程“%s”失败：%s"
-#: ../src/camel/camel-filter-driver.c:1038
+#: ../src/camel/camel-filter-driver.c:1168
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "收到 %s 发来的无效消息流：%s"
-#: ../src/camel/camel-filter-driver.c:1245
-#: ../src/camel/camel-filter-driver.c:1254
+#: ../src/camel/camel-filter-driver.c:1392
+#: ../src/camel/camel-filter-driver.c:1405
msgid "Syncing folders"
msgstr "同步文件夹"
-#: ../src/camel/camel-filter-driver.c:1352
+#: ../src/camel/camel-filter-driver.c:1513
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "解析过滤规则出错：%s：%s"
-#: ../src/camel/camel-filter-driver.c:1363
+#: ../src/camel/camel-filter-driver.c:1524
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "执行过滤规则错误：%s：%s"
-#: ../src/camel/camel-filter-driver.c:1460
+#: ../src/camel/camel-filter-driver.c:1622
#, c-format
msgid "Unable to open spool folder"
msgstr "无法打开离线文件夹"
-#: ../src/camel/camel-filter-driver.c:1472
+#: ../src/camel/camel-filter-driver.c:1634
#, c-format
msgid "Unable to process spool folder"
msgstr "无法处理离线文件夹"
-#: ../src/camel/camel-filter-driver.c:1496
+#: ../src/camel/camel-filter-driver.c:1665
#, c-format
msgid "Getting message %d (%d%%)"
-msgstr "获取第%d封信(%d%%)"
+msgstr "正在获取第 %d 封信 (%d%%)"
-#: ../src/camel/camel-filter-driver.c:1505
-#: ../src/camel/camel-filter-driver.c:1528
+#: ../src/camel/camel-filter-driver.c:1674
+#: ../src/camel/camel-filter-driver.c:1697
#, c-format
msgid "Failed on message %d"
-msgstr "在第%d封信失败"
+msgstr "在第 %d 封信时失败"
+
+#: ../src/camel/camel-filter-driver.c:1715
+#: ../src/camel/camel-filter-driver.c:1847
+#, fuzzy, c-format
+#| msgid "Failed to cache message %s: %s"
+msgid "Failed to transfer messages: %s"
+msgstr "缓存消息 %s 失败：%s"
-#: ../src/camel/camel-filter-driver.c:1547
-#: ../src/camel/camel-filter-driver.c:1661
+#: ../src/camel/camel-filter-driver.c:1725
+#: ../src/camel/camel-filter-driver.c:1861
msgid "Syncing folder"
msgstr "同步文件夹"
-#: ../src/camel/camel-filter-driver.c:1552
-#: ../src/camel/camel-filter-driver.c:1669
+#: ../src/camel/camel-filter-driver.c:1730
+#: ../src/camel/camel-filter-driver.c:1869
msgid "Complete"
msgstr "完成"
-#: ../src/camel/camel-filter-driver.c:1615
+#: ../src/camel/camel-filter-driver.c:1801
#, c-format
msgid "Getting message %d of %d"
-msgstr "获取第%d封信，共%d封"
+msgstr "获取第 %d 封信，共 %d 封"
-#: ../src/camel/camel-filter-driver.c:1633
+#: ../src/camel/camel-filter-driver.c:1819
#, c-format
msgid "Failed at message %d of %d"
-msgstr "在第%d封信失败，共%d封"
+msgstr "在第 %d 封信时失败，共 %d 封"
-#: ../src/camel/camel-filter-driver.c:1828
-#: ../src/camel/camel-filter-driver.c:1855
-#, fuzzy, c-format
+#: ../src/camel/camel-filter-driver.c:2029
+#: ../src/camel/camel-filter-driver.c:2053
+#, c-format
msgid "Execution of filter “%s” failed: "
msgstr "执行过滤规则“%s”失败："
-#: ../src/camel/camel-filter-driver.c:1845
-#, fuzzy, c-format
+#: ../src/camel/camel-filter-driver.c:2043
+#, c-format
msgid "Error parsing filter “%s”: %s: %s"
msgstr "解析过滤规则“%s”出错：%s：%s"
-#: ../src/camel/camel-filter-driver.c:1864
-#, fuzzy, c-format
+#: ../src/camel/camel-filter-driver.c:2062
+#, c-format
msgid "Error executing filter “%s”: %s: %s"
msgstr "执行过滤规则“%s”错误：%s：%s"
-#: ../src/camel/camel-filter-search.c:137
+#: ../src/camel/camel-filter-search.c:171
msgid "Failed to retrieve message"
msgstr "获取消息失败"
-#: ../src/camel/camel-filter-search.c:519
+#: ../src/camel/camel-filter-search.c:635
msgid "Invalid arguments to (system-flag)"
-msgstr "(system-flag)参数无效"
+msgstr "(system-flag) 参数无效"
-#: ../src/camel/camel-filter-search.c:537
+#: ../src/camel/camel-filter-search.c:654
msgid "Invalid arguments to (user-tag)"
-msgstr "(user-tag)参数无效"
+msgstr "(user-tag) 参数无效"
-#: ../src/camel/camel-filter-search.c:1066
+#: ../src/camel/camel-filter-search.c:1236
msgid "Invalid arguments to (message-location)"
-msgstr "(message-location)参数无效"
+msgstr "(message-location) 参数无效"
-#: ../src/camel/camel-filter-search.c:1147
-#: ../src/camel/camel-filter-search.c:1158
+#: ../src/camel/camel-filter-search.c:1391
+#: ../src/camel/camel-filter-search.c:1402
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "执行过滤规则搜索错误：%s：%s"
@@ -2108,8 +2787,8 @@ msgstr "执行过滤规则搜索错误：%s：%s"
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:311
-#, fuzzy, c-format
+#: ../src/camel/camel-folder.c:329
+#, c-format
msgid "Learning new spam message in “%s : %s”"
msgid_plural "Learning new spam messages in “%s : %s”"
msgstr[0] "在“%s : %s”中学习新的垃圾邮件"
@@ -2117,8 +2796,8 @@ msgstr[0] "在“%s : %s”中学习新的垃圾邮件"
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:354
-#, fuzzy, c-format
+#: ../src/camel/camel-folder.c:372
+#, c-format
msgid "Learning new ham message in “%s : %s”"
msgid_plural "Learning new ham messages in “%s : %s”"
msgstr[0] "在“%s : %s”中学习新的有害邮件"
@@ -2126,103 +2805,103 @@ msgstr[0] "在“%s : %s”中学习新的有害邮件"
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:405
-#, fuzzy, c-format
+#: ../src/camel/camel-folder.c:420
+#, c-format
msgid "Filtering new message in “%s : %s”"
msgid_plural "Filtering new messages in “%s : %s”"
msgstr[0] "在“%s : %s”中过滤新消息"
-#: ../src/camel/camel-folder.c:1016
-#: ../src/camel/providers/local/camel-maildir-folder.c:330
+#: ../src/camel/camel-folder.c:1064
+#: ../src/camel/providers/local/camel-maildir-folder.c:331
msgid "Moving messages"
msgstr "移动消息"
-#: ../src/camel/camel-folder.c:1019
+#: ../src/camel/camel-folder.c:1067
msgid "Copying messages"
msgstr "复制消息"
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:1064
-#, fuzzy, c-format
+#: ../src/camel/camel-folder.c:1112
+#, c-format
msgid "Quota information not supported for folder “%s : %s”"
msgstr "文件夹“%s : %s”不支持配额信息"
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:1166
-#, fuzzy, c-format
+#: ../src/camel/camel-folder.c:1214
+#, c-format
msgid "Filtering folder “%s : %s”"
msgstr "正在过滤文件夹“%s : %s”"
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:2971
-#, fuzzy, c-format
+#: ../src/camel/camel-folder.c:3176
+#, c-format
msgid "Expunging folder “%s : %s”"
msgstr "正在销毁文件夹“%s : %s”"
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:3105
-#, fuzzy, c-format
+#: ../src/camel/camel-folder.c:3311
+#, c-format
msgid "Retrieving message “%s” in “%s : %s”"
msgstr "正在获取“%2$s : %3$s”中的消息“%1$s”"
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:3327
-#, fuzzy, c-format
+#: ../src/camel/camel-folder.c:3536
+#, c-format
msgid "Retrieving quota information for “%s : %s”"
msgstr "正在获取“%s : %s”的配额信息"
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder.c:3625
-#, fuzzy, c-format
+#: ../src/camel/camel-folder.c:3836
+#, c-format
msgid "Refreshing folder “%s : %s”"
msgstr "正在刷新文件夹“%s : %s”"
#. Translators: The '%s' is an element type name, part of an expressing language
-#: ../src/camel/camel-folder-search.c:898
-#: ../src/camel/camel-folder-search.c:940
+#: ../src/camel/camel-folder-search.c:918
+#: ../src/camel/camel-folder-search.c:961
#, c-format
msgid "(%s) requires a single bool result"
msgstr "(%s) 需要一个布尔结果"
#. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../src/camel/camel-folder-search.c:975
+#: ../src/camel/camel-folder-search.c:999
#, c-format
msgid "(%s) not allowed inside %s"
msgstr "(%s) 不允许在 %s 中使用"
#. Translators: The '%s' is an element type name, part of an expressing language
-#: ../src/camel/camel-folder-search.c:982
-#: ../src/camel/camel-folder-search.c:990
+#: ../src/camel/camel-folder-search.c:1006
+#: ../src/camel/camel-folder-search.c:1014
#, c-format
msgid "(%s) requires a match type string"
msgstr "(%s) 需要一个匹配类型字符串"
#. Translators: The '%s' is an element type name, part of an expressing language
-#: ../src/camel/camel-folder-search.c:1018
+#: ../src/camel/camel-folder-search.c:1042
#, c-format
msgid "(%s) expects an array result"
msgstr "(%s) 需要一个数组结果"
#. Translators: The '%s' is an element type name, part of an expressing language
-#: ../src/camel/camel-folder-search.c:1028
+#: ../src/camel/camel-folder-search.c:1052
#, c-format
msgid "(%s) requires the folder set"
msgstr "(%s) 需要文件夹集"
-#: ../src/camel/camel-folder-search.c:2106
-#: ../src/camel/camel-folder-search.c:2280
+#: ../src/camel/camel-folder-search.c:2210
+#: ../src/camel/camel-folder-search.c:2384
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -2231,8 +2910,8 @@ msgstr ""
"无法解析搜索表达式：%s：\n"
"%s"
-#: ../src/camel/camel-folder-search.c:2118
-#: ../src/camel/camel-folder-search.c:2292
+#: ../src/camel/camel-folder-search.c:2222
+#: ../src/camel/camel-folder-search.c:2396
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -2244,29 +2923,29 @@ msgstr ""
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-folder-summary.c:1612
-#, fuzzy, c-format
+#: ../src/camel/camel-folder-summary.c:1661
+#, c-format
msgid "Release unused memory for folder “%s : %s”"
msgstr "为文件夹“%s : %s”释放未使用的内存"
#. Translators: The '%s' is replaced with the actual path and filename of the used gpg, like '/usr/bin/gpg2'
-#: ../src/camel/camel-gpg-context.c:417
+#: ../src/camel/camel-gpg-context.c:447
#, c-format
msgid "Output from %s:"
-msgstr ""
+msgstr "来自 %s 的输出："
-#: ../src/camel/camel-gpg-context.c:834 ../src/camel/camel-gpg-context.c:839
-#: ../src/camel/camel-gpg-context.c:1543
+#: ../src/camel/camel-gpg-context.c:912 ../src/camel/camel-gpg-context.c:917
+#: ../src/camel/camel-gpg-context.c:1658
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "执行 gpg 失败：%s"
-#: ../src/camel/camel-gpg-context.c:839
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1129
+#: ../src/camel/camel-gpg-context.c:917
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1205
msgid "Unknown"
msgstr "未知"
-#: ../src/camel/camel-gpg-context.c:951
+#: ../src/camel/camel-gpg-context.c:1029
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -2277,126 +2956,133 @@ msgstr ""
"\n"
"%s"
-#: ../src/camel/camel-gpg-context.c:987
+#: ../src/camel/camel-gpg-context.c:1065
#, c-format
msgid "Failed to parse gpg userid hint."
msgstr "解析 gpg userid 提示失败。"
-#: ../src/camel/camel-gpg-context.c:1012 ../src/camel/camel-gpg-context.c:1027
+#: ../src/camel/camel-gpg-context.c:1090 ../src/camel/camel-gpg-context.c:1105
#, c-format
msgid "Failed to parse gpg passphrase request."
-msgstr "解析 gpg 密码句请求失败。"
+msgstr "解析 gpg 口令请求失败。"
-#: ../src/camel/camel-gpg-context.c:1048
-#, fuzzy, c-format
+#: ../src/camel/camel-gpg-context.c:1126
+#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
"SmartCard: “%s”"
msgstr ""
-"您需要一个 PIN 用来解锁您的智能卡：\n"
+"您需要一个 PIN 来解锁智能卡：\n"
"“%s”"
-#: ../src/camel/camel-gpg-context.c:1052
-#, fuzzy, c-format
+#: ../src/camel/camel-gpg-context.c:1130
+#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
"user: “%s”"
msgstr ""
-"您需要一个密码句用来解锁以下用户：\n"
+"您需要一个口令用来解锁以下用户：\n"
"“%s”"
-#: ../src/camel/camel-gpg-context.c:1058
-#, fuzzy, c-format
+#: ../src/camel/camel-gpg-context.c:1136
+#, c-format
msgid "Unexpected request from GnuPG for “%s”"
-msgstr "GnuPG 对“%s”的意外响应"
+msgstr "GnuPG 对“%s”的意外请求"
-#: ../src/camel/camel-gpg-context.c:1070
-#, fuzzy
+#: ../src/camel/camel-gpg-context.c:1148
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 "请注意加密的内容里不包含收件人信息，因此可能会请求输出每个私钥的口令。"
+msgstr ""
+"请注意加密的内容里不包含收件人信息，因此每一个存储的私钥都需要在出现的口令输"
+"入框里输入口令。"
-#: ../src/camel/camel-gpg-context.c:1101 ../src/camel/camel-net-utils.c:522
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:398
-#: ../src/libedataserver/e-client.c:161
+#: ../src/camel/camel-gpg-context.c:1179 ../src/camel/camel-net-utils.c:522
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:399
+#: ../src/libedataserver/e-client.c:156
#, c-format
msgid "Cancelled"
msgstr "已取消"
-#: ../src/camel/camel-gpg-context.c:1122
+#: ../src/camel/camel-gpg-context.c:1200
#, c-format
msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "解锁密钥失败：给出了 3 个错误的密码句。"
+msgstr "解锁密钥失败：3 次口令输入错误。"
-#: ../src/camel/camel-gpg-context.c:1135
+#: ../src/camel/camel-gpg-context.c:1213
#, c-format
msgid "Unexpected response from GnuPG: %s"
-msgstr "来自 GnuPG 的意外应答：%s"
+msgstr "来自 GnuPG 的意外响应：%s"
-#: ../src/camel/camel-gpg-context.c:1249
+#: ../src/camel/camel-gpg-context.c:1330
#, c-format
msgid "Failed to encrypt: No valid recipients specified."
msgstr "加密失败：没有指定有效的收件人。"
#. Translators: The first '%s' is replaced with the e-mail address, like '<user example com>';
#. the second '%s' is replaced with the actual path and filename of the used gpg, like '/usr/bin/gpg2'
-#: ../src/camel/camel-gpg-context.c:1262
+#: ../src/camel/camel-gpg-context.c:1343
#, c-format
msgid ""
"Failed to encrypt: Invalid recipient %s specified. A common issue is that "
"the %s doesn’t have imported public key for this recipient."
msgstr ""
+"、加密失败：指定的收件人 %s 无效。一个常见问题是在 %s 中没有导入这个收件人的"
+"公钥。"
-#: ../src/camel/camel-gpg-context.c:1972
-#: ../src/camel/camel-smime-context.c:841
+#: ../src/camel/camel-gpg-context.c:2169 ../src/camel/camel-smime-context.c:869
msgid "Could not generate signing data: "
msgstr "无法生成签名数据："
-#: ../src/camel/camel-gpg-context.c:2023 ../src/camel/camel-gpg-context.c:2259
-#: ../src/camel/camel-gpg-context.c:2375 ../src/camel/camel-gpg-context.c:2551
+#: ../src/camel/camel-gpg-context.c:2220 ../src/camel/camel-gpg-context.c:2459
+#: ../src/camel/camel-gpg-context.c:2598 ../src/camel/camel-gpg-context.c:2775
msgid "Failed to execute gpg."
msgstr "执行 gpg 失败。"
-#: ../src/camel/camel-gpg-context.c:2129 ../src/camel/camel-gpg-context.c:2137
-#: ../src/camel/camel-gpg-context.c:2145 ../src/camel/camel-gpg-context.c:2165
-#: ../src/camel/camel-smime-context.c:970
-#: ../src/camel/camel-smime-context.c:984
-#: ../src/camel/camel-smime-context.c:993
+#: ../src/camel/camel-gpg-context.c:2327 ../src/camel/camel-gpg-context.c:2335
+#: ../src/camel/camel-gpg-context.c:2343 ../src/camel/camel-gpg-context.c:2363
+#: ../src/camel/camel-smime-context.c:1000
+#: ../src/camel/camel-smime-context.c:1014
+#: ../src/camel/camel-smime-context.c:1026
#, c-format
msgid "Cannot verify message signature: Incorrect message format"
msgstr "无法校验消息签名：消息格式不对"
-#: ../src/camel/camel-gpg-context.c:2211
+#: ../src/camel/camel-gpg-context.c:2409
msgid "Cannot verify message signature: "
msgstr "无法校验消息签名："
-#: ../src/camel/camel-gpg-context.c:2340
+#: ../src/camel/camel-gpg-context.c:2557
msgid "Could not generate encrypting data: "
msgstr "无法生成加密数据："
-#: ../src/camel/camel-gpg-context.c:2415
+#: ../src/camel/camel-gpg-context.c:2638
msgid "This is a digitally encrypted message part"
msgstr "这是消息的数字加密部分"
-#: ../src/camel/camel-gpg-context.c:2474 ../src/camel/camel-gpg-context.c:2483
-#: ../src/camel/camel-gpg-context.c:2506
+#: ../src/camel/camel-gpg-context.c:2698 ../src/camel/camel-gpg-context.c:2707
+#: ../src/camel/camel-gpg-context.c:2730
#, c-format
msgid "Cannot decrypt message: Incorrect message format"
msgstr "无法解密消息：消息格式不对"
-#: ../src/camel/camel-gpg-context.c:2494
+#: ../src/camel/camel-gpg-context.c:2718
#, c-format
msgid "Failed to decrypt MIME part: protocol error"
msgstr "解密 MIME 部分失败：协议错误"
-#: ../src/camel/camel-gpg-context.c:2561
+#: ../src/camel/camel-gpg-context.c:2790
#, c-format
msgid "Failed to decrypt MIME part: Secret key not found"
msgstr "解密 MIME 部分失败：未找到密钥"
-#: ../src/camel/camel-gpg-context.c:2597
-#: ../src/camel/camel-smime-context.c:1286
+#: ../src/camel/camel-gpg-context.c:2827
+#, c-format
+msgid "GPG blob contains unencrypted text: %s"
+msgstr ""
+
+#: ../src/camel/camel-gpg-context.c:2829
+#: ../src/camel/camel-smime-context.c:1546
msgid "Encrypted content"
msgstr "加密内容"
@@ -2435,12 +3121,12 @@ msgid "Cannot fork locking helper: %s"
msgstr "无法创建锁定助手进程：%s"
#: ../src/camel/camel-lock-client.c:216 ../src/camel/camel-lock-client.c:244
-#, fuzzy, c-format
+#, c-format
msgid "Could not lock “%s”: protocol error with lock-helper"
msgstr "无法锁定“%s”：lock-helper 协议错误"
#: ../src/camel/camel-lock-client.c:232
-#, fuzzy, c-format
+#, c-format
msgid "Could not lock “%s”"
msgstr "无法锁定“%s”"
@@ -2481,7 +3167,7 @@ msgstr "移动邮件程序失败：%s"
#: ../src/camel/camel-movemail.c:251
msgid "(Unknown error)"
-msgstr "(未知的错误)"
+msgstr "（未知错误）"
#: ../src/camel/camel-movemail.c:278
#, c-format
@@ -2498,19 +3184,19 @@ msgstr "写入邮件临时文件错误：%s"
msgid "Error copying mail temp file: %s"
msgstr "复制邮件临时文件错误：%s"
-#: ../src/camel/camel-multipart-signed.c:277
-#: ../src/camel/camel-multipart-signed.c:430
+#: ../src/camel/camel-multipart-signed.c:273
+#: ../src/camel/camel-multipart-signed.c:426
#, c-format
msgid "No content available"
msgstr "没有可用的内容"
-#: ../src/camel/camel-multipart-signed.c:285
-#: ../src/camel/camel-multipart-signed.c:438
+#: ../src/camel/camel-multipart-signed.c:281
+#: ../src/camel/camel-multipart-signed.c:434
#, c-format
msgid "No signature available"
msgstr "没有可用的签名"
-#: ../src/camel/camel-multipart-signed.c:804
+#: ../src/camel/camel-multipart-signed.c:798
#, c-format
msgid "parse error"
msgstr "解析错误"
@@ -2518,58 +3204,80 @@ msgstr "解析错误"
#: ../src/camel/camel-net-utils.c:714
#, c-format
msgid "Resolving: %s"
-msgstr "解析：%s"
+msgstr "正在解析：%s"
#: ../src/camel/camel-net-utils.c:739
msgid "Host lookup failed"
msgstr "主机查阅失败"
#: ../src/camel/camel-net-utils.c:745
-#, fuzzy, c-format
+#, c-format
msgid "Host lookup “%s” failed. Check your host name for spelling errors."
msgstr "主机“%s”查找失败，请检查主机名是否存在拼写错误。"
#: ../src/camel/camel-net-utils.c:749
-#, fuzzy, c-format
+#, c-format
msgid "Host lookup “%s” failed: %s"
msgstr "查找主机“%s”失败：%s"
+#: ../src/camel/camel-network-service.c:1128
+#, c-format
+msgid "Checking reachability of account “%s”"
+msgstr ""
+
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-offline-folder.c:125
-#, fuzzy, c-format
+#: ../src/camel/camel-offline-folder.c:179
+#, c-format
msgid "Downloading new messages for offline mode in “%s : %s”"
-msgstr "下载“%s : %s”的新消息以便离线模式使用"
+msgstr "正在下载“%s : %s”的新消息以便离线模式使用"
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-offline-folder.c:221
-#, fuzzy, c-format
+#: ../src/camel/camel-offline-folder.c:277
+#, c-format
msgid "Storing changes in folder “%s : %s”"
msgstr "正在将更改存储到文件夹“%s : %s”"
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-offline-folder.c:311
-#, fuzzy, c-format
+#: ../src/camel/camel-offline-folder.c:370
+#, c-format
msgid "Checking download of new messages for offline in “%s : %s”"
msgstr "正在检查“%s : %s”的新消息以便离线操作"
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/camel-offline-folder.c:428
-#, fuzzy, c-format
+#: ../src/camel/camel-offline-folder.c:490
+#, c-format
msgid "Syncing messages in folder “%s : %s” to disk"
msgstr "正在将文件夹“%s : %s”中的消息同步到磁盘"
-#: ../src/camel/camel-offline-folder.c:513
+#. Translators: The first “%d” is the sequence number of the message, the second “%d”
+#. is the total number of messages to synchronize.
+#. The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/camel-offline-folder.c:584
+#, fuzzy, c-format
+#| msgid "Syncing messages in folder “%s : %s” to disk"
+msgid "Syncing message %d of %d in folder “%s : %s” to disk"
+msgstr "正在将文件夹“%s : %s”中的消息同步到磁盘"
+
+#: ../src/camel/camel-offline-folder.c:643
msgid "Copy folder content locally for _offline operation"
msgstr "将文件夹内容复制到本地以进行离线操作(_O)"
+#: ../src/camel/camel-offline-store.c:304
+#, fuzzy, c-format
+#| msgid "Syncing messages in folder “%s : %s” to disk"
+msgid "Syncing messages in account “%s” to disk"
+msgstr "正在将文件夹“%s : %s”中的消息同步到磁盘"
+
#: ../src/camel/camel-provider.c:89
msgid "Virtual folder email provider"
msgstr "虚拟文件夹电子邮件提供者"
@@ -2578,28 +3286,28 @@ msgstr "虚拟文件夹电子邮件提供者"
msgid "For reading mail as a query of another set of folders"
msgstr "关于将读入邮件作为对另一组文件夹的查询"
-#: ../src/camel/camel-provider.c:294
+#: ../src/camel/camel-provider.c:299
#, c-format
msgid "Could not load %s: Module loading not supported on this system."
msgstr "无法载入 %s：本系统不支持模块载入。"
-#: ../src/camel/camel-provider.c:303
+#: ../src/camel/camel-provider.c:308
#, c-format
msgid "Could not load %s: %s"
msgstr "无法载入 %s：%s"
-#: ../src/camel/camel-provider.c:312
+#: ../src/camel/camel-provider.c:317
#, c-format
msgid "Could not load %s: No initialization code in module."
msgstr "无法载入 %s：模块中没有初始化代码。"
-#: ../src/camel/camel-provider.c:458 ../src/camel/camel-session.c:434
-#, fuzzy, c-format
+#: ../src/camel/camel-provider.c:463 ../src/camel/camel-session.c:430
+#, c-format
msgid "No provider available for protocol “%s”"
msgstr "协议“%s”没有可用的提供者"
#: ../src/camel/camel-sasl-anonymous.c:35
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:82
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:85
msgid "Anonymous"
msgstr "匿名"
@@ -2612,7 +3320,10 @@ msgstr "该选项将连接到匿名登录的服务器上。"
msgid "Authentication failed."
msgstr "认证失败。"
-#: ../src/camel/camel-sasl-anonymous.c:81
+#. Translators: the 'trace information' term comes from https://tools.ietf.org/html/rfc4505
+#. In this case the user set to use an email address as the trace information,
+#. but the provided value is not a valid email address.
+#: ../src/camel/camel-sasl-anonymous.c:84
#, c-format
msgid ""
"Invalid email address trace information:\n"
@@ -2621,517 +3332,569 @@ msgstr ""
"无效的电子邮件跟踪信息：\n"
"%s"
-#: ../src/camel/camel-sasl-anonymous.c:95
+#. Translators: the 'trace information' term comes from https://tools.ietf.org/html/rfc4505
+#. In this case the user set to use an opaque trace information,
+#. but the provided value looks like an email address.
+#: ../src/camel/camel-sasl-anonymous.c:101
#, c-format
msgid ""
"Invalid opaque trace information:\n"
"%s"
msgstr ""
-"无效的诲涩跟踪信息：\n"
+"无效的非透明跟踪信息：\n"
"%s"
-#: ../src/camel/camel-sasl-anonymous.c:109
-#, c-format
-msgid ""
-"Invalid trace information:\n"
-"%s"
-msgstr ""
-"无效的跟踪信息：\n"
-"%s"
+#: ../src/camel/camel-sasl-anonymous.c:115 ../src/libedataserver/e-client.c:135
+msgid "Invalid argument"
+msgstr "无效参数"
-#: ../src/camel/camel-sasl-cram-md5.c:41
+#: ../src/camel/camel-sasl-cram-md5.c:37
msgid "CRAM-MD5"
msgstr "CRAM-MD5"
-#: ../src/camel/camel-sasl-cram-md5.c:43
+#: ../src/camel/camel-sasl-cram-md5.c:39
msgid ""
"This option will connect to the server using a secure CRAM-MD5 password, if "
"the server supports it."
msgstr "如果服务器支持的话，该选项将用安全 CRAM-MD5 密码连接到服务器。"
-#: ../src/camel/camel-sasl-digest-md5.c:54
+#: ../src/camel/camel-sasl-digest-md5.c:50
msgid "DIGEST-MD5"
msgstr "DIGEST-MD5"
-#: ../src/camel/camel-sasl-digest-md5.c:56
+#: ../src/camel/camel-sasl-digest-md5.c:52
msgid ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
msgstr "如果服务器支持的话，该选项将用安全 DIGEST-MD5 密码连接到服务器。"
-#: ../src/camel/camel-sasl-digest-md5.c:852
+#: ../src/camel/camel-sasl-digest-md5.c:848
#, c-format
msgid "Server challenge too long (>2048 octets)"
-msgstr "服务器质询过长 (>2048 字节)"
+msgstr "服务器质询过长（>2048 字节）"
-#: ../src/camel/camel-sasl-digest-md5.c:863
+#: ../src/camel/camel-sasl-digest-md5.c:859
#, c-format
msgid "Server challenge invalid\n"
msgstr "服务器质询无效\n"
-#: ../src/camel/camel-sasl-digest-md5.c:871
+#: ../src/camel/camel-sasl-digest-md5.c:867
#, fuzzy, c-format
msgid "Server challenge contained invalid “Quality of Protection” token"
-msgstr "服务器质询含有无效的“品质保护”标志"
+msgstr "服务器质询含有无效的“品质保护”令牌"
-#: ../src/camel/camel-sasl-digest-md5.c:904
+#: ../src/camel/camel-sasl-digest-md5.c:900
#, c-format
msgid "Server response did not contain authorization data"
msgstr "服务器应答不含有认证数据"
-#: ../src/camel/camel-sasl-digest-md5.c:925
+#: ../src/camel/camel-sasl-digest-md5.c:921
#, c-format
msgid "Server response contained incomplete authorization data"
-msgstr "服务器应达含有不完整的认证数据"
+msgstr "服务器应答含有不完整的认证数据"
-#: ../src/camel/camel-sasl-digest-md5.c:938
+#: ../src/camel/camel-sasl-digest-md5.c:934
#, c-format
msgid "Server response does not match"
msgstr "服务器应答不匹配"
-#: ../src/camel/camel-sasl-gssapi.c:92
+#: ../src/camel/camel-sasl-gssapi.c:88
msgid "GSSAPI"
msgstr "GSSAPI"
-#: ../src/camel/camel-sasl-gssapi.c:94
+#: ../src/camel/camel-sasl-gssapi.c:90
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr "该选项将用 Kerberos 5 认证连接到服务器。"
-#: ../src/camel/camel-sasl-gssapi.c:146
+#: ../src/camel/camel-sasl-gssapi.c:151
#, c-format
msgid "(Unknown GSSAPI mechanism code: %x)"
-msgstr "(未知 GSSAPI 机制代码: %x)"
+msgstr "（未知 GSSAPI 机制代码: %x）"
+
+#. Translators: the first '%s' is replaced with a generic error message,
+#. the second '%s' is replaced with additional error information.
+#: ../src/camel/camel-sasl-gssapi.c:174 ../src/camel/camel-sasl-gssapi.c:246
+#, c-format
+msgctxt "gssapi_error"
+msgid "%s (%s)"
+msgstr "%s (%s)"
-#: ../src/camel/camel-sasl-gssapi.c:179
+#: ../src/camel/camel-sasl-gssapi.c:196
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
-msgstr "所提供的证书不支持指定的机制，或者无法被实现所识别。"
+msgstr "所提供的凭据不支持指定的机制，或者无法被实现所识别。"
-#: ../src/camel/camel-sasl-gssapi.c:184
+#: ../src/camel/camel-sasl-gssapi.c:201
msgid "The provided target_name parameter was ill-formed."
msgstr "提供的 target_name 参数格式不对。"
-#: ../src/camel/camel-sasl-gssapi.c:187
+#: ../src/camel/camel-sasl-gssapi.c:204
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
msgstr "提供的 target_name 参数包含无效或不支持的名称类型。"
-#: ../src/camel/camel-sasl-gssapi.c:191
+#: ../src/camel/camel-sasl-gssapi.c:208
msgid ""
"The input_token contains different channel bindings to those specified via "
"the input_chan_bindings parameter."
msgstr ""
"input_token 包含的通道绑定与通过 input_chan_bindings 参数指定的通道不同。"
-#: ../src/camel/camel-sasl-gssapi.c:196
+#: ../src/camel/camel-sasl-gssapi.c:213
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
msgstr "input_token 包含无效的签名，或者无法验证签名。"
-#: ../src/camel/camel-sasl-gssapi.c:200
+#: ../src/camel/camel-sasl-gssapi.c:217
msgid ""
"The supplied credentials were not valid for context initiation, or the "
"credential handle did not reference any credentials."
-msgstr "提供的证书由于上下文的原因无效，或者证书句柄没有引用证书。"
+msgstr "提供的凭据由于上下文的原因无效，或者凭据句柄没有被任何凭据引用。"
-#: ../src/camel/camel-sasl-gssapi.c:205
+#: ../src/camel/camel-sasl-gssapi.c:222
msgid "The supplied context handle did not refer to a valid context."
msgstr "提供的上下文句柄所引用的上下文无效。"
-#: ../src/camel/camel-sasl-gssapi.c:208
+#: ../src/camel/camel-sasl-gssapi.c:225
msgid "The consistency checks performed on the input_token failed."
msgstr "对 input_token 执行完整性检查失败。"
-#: ../src/camel/camel-sasl-gssapi.c:211
+#: ../src/camel/camel-sasl-gssapi.c:228
msgid "The consistency checks performed on the credential failed."
-msgstr "对证书执行完整性检查失败。"
+msgstr "对凭据执行完整性检查失败。"
-#: ../src/camel/camel-sasl-gssapi.c:214
+#: ../src/camel/camel-sasl-gssapi.c:231
msgid "The referenced credentials have expired."
-msgstr "引用的证书已过期。"
+msgstr "引用的凭据已过期。"
-#: ../src/camel/camel-sasl-gssapi.c:220 ../src/camel/camel-sasl-gssapi.c:402
-#: ../src/camel/camel-sasl-gssapi.c:451 ../src/camel/camel-sasl-gssapi.c:468
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:797
+#: ../src/camel/camel-sasl-gssapi.c:237 ../src/camel/camel-sasl-gssapi.c:441
+#: ../src/camel/camel-sasl-gssapi.c:491 ../src/camel/camel-sasl-gssapi.c:508
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:856
#, c-format
msgid "Bad authentication response from server."
msgstr "来自服务器的无效认证应答。"
-#: ../src/camel/camel-sasl-gssapi.c:480
+#: ../src/camel/camel-sasl-gssapi.c:288
+#, fuzzy
+#| msgid "Could not parse response"
+msgid "Could not get session bus:"
+msgstr "无法解析响应"
+
+#: ../src/camel/camel-sasl-gssapi.c:322
+#, c-format
+msgid ""
+"Cannot ask for Kerberos ticket. Obtain the ticket manually, like on command "
+"line with “kinit” or open “Online Accounts” in “Settings” and add the "
+"Kerberos account there. Reported error was: %s"
+msgstr ""
+
+#: ../src/camel/camel-sasl-gssapi.c:520
#, c-format
msgid "Unsupported security layer."
msgstr "不支持的安全层。"
-#: ../src/camel/camel-sasl-login.c:35
+#: ../src/camel/camel-sasl-login.c:31
msgid "Login"
-msgstr "Login"
+msgstr "登录"
-#: ../src/camel/camel-sasl-login.c:37 ../src/camel/camel-sasl-plain.c:41
+#: ../src/camel/camel-sasl-login.c:33 ../src/camel/camel-sasl-plain.c:37
msgid "This option will connect to the server using a simple password."
msgstr "该选项将以普通密码连接到服务器。"
-#: ../src/camel/camel-sasl-login.c:105
+#: ../src/camel/camel-sasl-login.c:101
#, c-format
msgid "Unknown authentication state."
msgstr "未知的认证状态。"
-#: ../src/camel/camel-sasl-ntlm.c:44
+#: ../src/camel/camel-sasl-ntlm.c:40
msgid "NTLM / SPA"
msgstr "NTLM / SPA"
-#: ../src/camel/camel-sasl-ntlm.c:46
+#: ../src/camel/camel-sasl-ntlm.c:42
msgid ""
"This option will connect to a Windows-based server using NTLM / Secure "
"Password Authentication."
-msgstr "该选项将使用 NTLM / Secure 口令认证连接到基于 Windows 的服务器。"
+msgstr "该选项将使用 NTLM 或安全口令认证连接到基于 Windows 的服务器。"
-#: ../src/camel/camel-sasl-plain.c:39
+#: ../src/camel/camel-sasl-plain.c:35
msgid "PLAIN"
msgstr "PLAIN"
-#: ../src/camel/camel-sasl-popb4smtp.c:41
+#: ../src/camel/camel-sasl-popb4smtp.c:37
msgid "POP before SMTP"
msgstr "在 SMTP 之前 POP"
-#: ../src/camel/camel-sasl-popb4smtp.c:43
+#: ../src/camel/camel-sasl-popb4smtp.c:39
msgid "This option will authorise a POP connection before attempting SMTP"
msgstr "该选项将在尝试 SMTP 之前允许 POP 连接"
-#: ../src/camel/camel-sasl-popb4smtp.c:81
+#: ../src/camel/camel-sasl-popb4smtp.c:77
msgid "POP Source UID"
msgstr "POP 源 UID"
-#: ../src/camel/camel-sasl-popb4smtp.c:95
+#: ../src/camel/camel-sasl-popb4smtp.c:91
#, c-format
msgid "POP Before SMTP authentication using an unknown transport"
-msgstr "以未知的传输进行 SMTP 认证授权之前的 POP"
+msgstr "在 SMTP 认证授权之前以未知方式传输 POP"
-#: ../src/camel/camel-sasl-popb4smtp.c:107
-#: ../src/camel/camel-sasl-popb4smtp.c:116
+#: ../src/camel/camel-sasl-popb4smtp.c:103
+#: ../src/camel/camel-sasl-popb4smtp.c:112
#, c-format
msgid "POP Before SMTP authentication attempted with a %s service"
-msgstr "试图通过 %s 服务在 SMTP 认证之前进行 POP"
+msgstr "在 SMTP 认证之前尝试通过 %s 服务传输 POP"
+
+#: ../src/camel/camel-sasl-xoauth2.c:26
+msgid "OAuth2"
+msgstr "OAuth2"
+
+#: ../src/camel/camel-sasl-xoauth2.c:27
+msgid "This option will use an OAuth 2.0 access token to connect to the server"
+msgstr ""
+
+#: ../src/camel/camel-sasl-xoauth2-google.c:23
+msgid "OAuth2 (Google)"
+msgstr "OAuth2（谷歌）"
+
+#: ../src/camel/camel-sasl-xoauth2-google.c:24
+msgid ""
+"This option will use an OAuth 2.0 access token to connect to the Google "
+"server"
+msgstr ""
+
+#: ../src/camel/camel-sasl-xoauth2-outlook.c:23
+msgid "OAuth2 (Outlook)"
+msgstr "OAuth2 (Outlook）"
+
+#: ../src/camel/camel-sasl-xoauth2-outlook.c:24
+msgid ""
+"This option will use an OAuth 2.0 access token to connect to the Outlook.com "
+"server"
+msgstr ""
#: ../src/camel/camel-search-private.c:114
#, c-format
msgid "Regular expression compilation failed: %s: %s"
-msgstr "常规表达式编译失败：%s：%s"
+msgstr "正则表达式编译失败：%s：%s"
-#: ../src/camel/camel-session.c:443
-#, fuzzy, c-format
+#: ../src/camel/camel-session.c:439
+#, c-format
msgid "Invalid GType registered for protocol “%s”"
msgstr "为协议“%s”注册的 GType 无效"
-#: ../src/camel/camel-session.c:512
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2997
-#: ../src/camel/providers/pop3/camel-pop3-store.c:306
-#: ../src/camel/providers/pop3/camel-pop3-store.c:788
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:670
+#: ../src/camel/camel-session.c:508
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3219
+#: ../src/camel/providers/pop3/camel-pop3-store.c:305
+#: ../src/camel/providers/pop3/camel-pop3-store.c:809
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:696
#, c-format
msgid "No support for %s authentication"
msgstr "不支持 %s 认证"
-#: ../src/camel/camel-session.c:527
+#: ../src/camel/camel-session.c:523
#, c-format
msgid "%s authentication failed"
msgstr "%s 认证失败"
-#: ../src/camel/camel-session.c:596
+#: ../src/camel/camel-session.c:592
msgid "Forwarding messages is not supported"
msgstr "不支持转发消息"
-#: ../src/camel/camel-smime-context.c:346
-#: ../src/camel/camel-smime-context.c:1073
-#, fuzzy, c-format
+#: ../src/camel/camel-smime-context.c:343
+#, c-format
msgid "Cannot find certificate for “%s”"
-msgstr "无法找到‘%s’的证书"
+msgstr "无法找到“%s”的证书"
-#: ../src/camel/camel-smime-context.c:374
+#: ../src/camel/camel-smime-context.c:371
msgid "Cannot create CMS message"
msgstr "无法创建 CMS 消息"
-#: ../src/camel/camel-smime-context.c:379
+#: ../src/camel/camel-smime-context.c:376
msgid "Cannot create CMS signed data"
msgstr "无法创建 CMS 签名数据"
-#: ../src/camel/camel-smime-context.c:385
+#: ../src/camel/camel-smime-context.c:382
msgid "Cannot attach CMS signed data"
msgstr "无法附加 CMS 签名数据"
-#: ../src/camel/camel-smime-context.c:392
+#: ../src/camel/camel-smime-context.c:389
msgid "Cannot attach CMS data"
msgstr "无法附加 CMS 数据"
-#: ../src/camel/camel-smime-context.c:398
+#: ../src/camel/camel-smime-context.c:395
msgid "Cannot create CMS Signer information"
msgstr "无法创建 CMS 签名者信息"
-#: ../src/camel/camel-smime-context.c:404
+#: ../src/camel/camel-smime-context.c:401
msgid "Cannot find certificate chain"
msgstr "找不到证书链"
-#: ../src/camel/camel-smime-context.c:410
+#: ../src/camel/camel-smime-context.c:407
msgid "Cannot add CMS Signing time"
msgstr "无法添加 CMS 签名时间"
-#: ../src/camel/camel-smime-context.c:434
-#: ../src/camel/camel-smime-context.c:449
-#, fuzzy, c-format
+#: ../src/camel/camel-smime-context.c:431
+#: ../src/camel/camel-smime-context.c:446
+#, c-format
msgid "Encryption certificate for “%s” does not exist"
msgstr "“%s”的加密证书不存在"
-#: ../src/camel/camel-smime-context.c:456
+#: ../src/camel/camel-smime-context.c:453
msgid "Cannot add SMIMEEncKeyPrefs attribute"
msgstr "无法添加 SMIMEEncKeyPrefs 属性"
-#: ../src/camel/camel-smime-context.c:461
+#: ../src/camel/camel-smime-context.c:458
msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
msgstr "无法添加 MS SMIMEEncKeyPrefs 属性"
-#: ../src/camel/camel-smime-context.c:466
+#: ../src/camel/camel-smime-context.c:463
msgid "Cannot add encryption certificate"
msgstr "无法添加加密证书"
-#: ../src/camel/camel-smime-context.c:472
+#: ../src/camel/camel-smime-context.c:469
msgid "Cannot add CMS Signer information"
msgstr "无法添加 CMS 签名者信息"
#. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../src/camel/camel-smime-context.c:505
+#: ../src/camel/camel-smime-context.c:502
msgid "Unverified"
msgstr "未校验"
-#: ../src/camel/camel-smime-context.c:507
+#: ../src/camel/camel-smime-context.c:504
msgid "Good signature"
msgstr "完好签名"
-#: ../src/camel/camel-smime-context.c:509
+#: ../src/camel/camel-smime-context.c:506
msgid "Bad signature"
msgstr "无效签名"
-#: ../src/camel/camel-smime-context.c:511
+#: ../src/camel/camel-smime-context.c:508
msgid "Content tampered with or altered in transit"
msgstr "内容在传送过程中被篡改"
-#: ../src/camel/camel-smime-context.c:513
+#: ../src/camel/camel-smime-context.c:510
msgid "Signing certificate not found"
msgstr "签名证书找不到"
-#: ../src/camel/camel-smime-context.c:515
+#: ../src/camel/camel-smime-context.c:512
msgid "Signing certificate not trusted"
msgstr "签名证书不可信"
-#: ../src/camel/camel-smime-context.c:517
+#: ../src/camel/camel-smime-context.c:514
msgid "Signature algorithm unknown"
msgstr "签名算法未知"
-#: ../src/camel/camel-smime-context.c:519
+#: ../src/camel/camel-smime-context.c:516
msgid "Signature algorithm unsupported"
msgstr "签名算法不支持"
-#: ../src/camel/camel-smime-context.c:521
+#: ../src/camel/camel-smime-context.c:518
msgid "Malformed signature"
msgstr "签名格式不对"
-#: ../src/camel/camel-smime-context.c:523
+#: ../src/camel/camel-smime-context.c:520
msgid "Processing error"
msgstr "处理错误"
-#: ../src/camel/camel-smime-context.c:568
+#: ../src/camel/camel-smime-context.c:565
msgid "No signed data in signature"
msgstr "签名中没有签名数据"
-#: ../src/camel/camel-smime-context.c:573
+#: ../src/camel/camel-smime-context.c:570
msgid "Digests missing from enveloped data"
msgstr "信封数据缺少摘要"
-#: ../src/camel/camel-smime-context.c:586
-#: ../src/camel/camel-smime-context.c:597
+#: ../src/camel/camel-smime-context.c:583
+#: ../src/camel/camel-smime-context.c:594
msgid "Cannot calculate digests"
msgstr "无法计算摘要"
-#: ../src/camel/camel-smime-context.c:604
-#: ../src/camel/camel-smime-context.c:608
+#: ../src/camel/camel-smime-context.c:601
+#: ../src/camel/camel-smime-context.c:605
msgid "Cannot set message digests"
msgstr "无法设置消息摘要"
-#: ../src/camel/camel-smime-context.c:618
-#: ../src/camel/camel-smime-context.c:623
+#: ../src/camel/camel-smime-context.c:615
+#: ../src/camel/camel-smime-context.c:620
msgid "Certificate import failed"
msgstr "证书导入失败"
-#: ../src/camel/camel-smime-context.c:633
+#: ../src/camel/camel-smime-context.c:630
#, c-format
msgid "Certificate is the only message, cannot verify certificates"
msgstr "只有证书的消息，无法校验证书"
-#: ../src/camel/camel-smime-context.c:636
+#: ../src/camel/camel-smime-context.c:633
#, c-format
msgid "Certificate is the only message, certificates imported and verified"
msgstr "只有证书的消息，证书已导入并校验"
-#: ../src/camel/camel-smime-context.c:640
+#: ../src/camel/camel-smime-context.c:637
msgid "Cannot find signature digests"
msgstr "找不到签名摘要"
-#: ../src/camel/camel-smime-context.c:657
+#: ../src/camel/camel-smime-context.c:656
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "签名者：%s <%s>：%s\n"
-#: ../src/camel/camel-smime-context.c:853
-#: ../src/camel/camel-smime-context.c:1147
+#: ../src/camel/camel-smime-context.c:881
+#: ../src/camel/camel-smime-context.c:1403
msgid "Cannot create encoder context"
msgstr "无法创建编码器上下文"
-#: ../src/camel/camel-smime-context.c:859
+#: ../src/camel/camel-smime-context.c:887
msgid "Failed to add data to CMS encoder"
msgstr "将数据添加到 CMS 编码器失败"
-#: ../src/camel/camel-smime-context.c:864
-#: ../src/camel/camel-smime-context.c:1164
+#: ../src/camel/camel-smime-context.c:892
+#: ../src/camel/camel-smime-context.c:1420
msgid "Failed to encode data"
msgstr "编码数据失败"
-#: ../src/camel/camel-smime-context.c:1012
-#: ../src/camel/camel-smime-context.c:1261
+#: ../src/camel/camel-smime-context.c:1045
+#: ../src/camel/camel-smime-context.c:1521
msgid "Decoder failed"
msgstr "解码器失败"
-#: ../src/camel/camel-smime-context.c:1081
+#: ../src/camel/camel-smime-context.c:1297
+#, c-format
+msgid "No valid or appropriate certificate for “%s” was found"
+msgstr "无法为“%s”找到有效或合适的证书"
+
+#: ../src/camel/camel-smime-context.c:1337
msgid "Cannot find common bulk encryption algorithm"
msgstr "找不到公共批量加密算法"
-#: ../src/camel/camel-smime-context.c:1089
+#: ../src/camel/camel-smime-context.c:1345
msgid "Cannot allocate slot for encryption bulk key"
msgstr "无法为加密批量密钥分配密钥槽"
-#: ../src/camel/camel-smime-context.c:1100
+#: ../src/camel/camel-smime-context.c:1356
msgid "Cannot create CMS Message"
msgstr "无法创建 CMS 消息"
-#: ../src/camel/camel-smime-context.c:1106
+#: ../src/camel/camel-smime-context.c:1362
msgid "Cannot create CMS Enveloped data"
msgstr "无法创建 CMS 信封数据"
-#: ../src/camel/camel-smime-context.c:1112
+#: ../src/camel/camel-smime-context.c:1368
msgid "Cannot attach CMS Enveloped data"
msgstr "无法附加 CMS 信封数据"
-#: ../src/camel/camel-smime-context.c:1118
+#: ../src/camel/camel-smime-context.c:1374
msgid "Cannot attach CMS data object"
msgstr "无法附加 CMS 数据对象"
-#: ../src/camel/camel-smime-context.c:1127
+#: ../src/camel/camel-smime-context.c:1383
msgid "Cannot create CMS Recipient information"
msgstr "无法创建 CMS 收件人信息"
-#: ../src/camel/camel-smime-context.c:1132
+#: ../src/camel/camel-smime-context.c:1388
msgid "Cannot add CMS Recipient information"
msgstr "无法添加 CMS 收件人信息"
-#: ../src/camel/camel-smime-context.c:1158
+#: ../src/camel/camel-smime-context.c:1414
msgid "Failed to add data to encoder"
msgstr "将数据添加到编码器失败"
-#: ../src/camel/camel-smime-context.c:1268
+#: ../src/camel/camel-smime-context.c:1528
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME 解密：没有找到加密内容"
-#: ../src/camel/camel-store.c:1370
-#, fuzzy, c-format
+#: ../src/camel/camel-store.c:1412
+#, c-format
msgid "Opening folder “%s”"
msgstr "打开文件夹“%s”"
-#: ../src/camel/camel-store.c:1665
-#, fuzzy, c-format
+#: ../src/camel/camel-store.c:1709
+#, c-format
msgid "Scanning folders in “%s”"
msgstr "扫描“%s”中的文件夹"
-#: ../src/camel/camel-store.c:1693 ../src/camel/camel-store.c:1738
+#: ../src/camel/camel-store.c:1737 ../src/camel/camel-store.c:1782
#: ../src/camel/camel-vtrash-folder.c:48
msgid "Trash"
msgstr "回收站"
-#: ../src/camel/camel-store.c:1707 ../src/camel/camel-store.c:1755
+#: ../src/camel/camel-store.c:1751 ../src/camel/camel-store.c:1799
#: ../src/camel/camel-vtrash-folder.c:50
msgid "Junk"
msgstr "垃圾"
-#: ../src/camel/camel-store.c:2356
+#: ../src/camel/camel-store.c:2404
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "无法创建文件夹：%s：文件夹已存在"
-#: ../src/camel/camel-store.c:2363
-#, fuzzy, c-format
+#: ../src/camel/camel-store.c:2411
+#, c-format
msgid "Creating folder “%s”"
-msgstr "创建文件夹“%s”"
+msgstr "正在创建文件夹“%s”"
-#: ../src/camel/camel-store.c:2540 ../src/camel/camel-vee-store.c:420
-#: ../src/camel/providers/local/camel-maildir-store.c:344
+#: ../src/camel/camel-store.c:2589 ../src/camel/camel-vee-store.c:426
+#: ../src/camel/providers/local/camel-maildir-store.c:340
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "无法删除文件夹：%s：无效操作"
-#: ../src/camel/camel-store.c:2730 ../src/camel/camel-vee-store.c:471
-#: ../src/camel/providers/local/camel-maildir-store.c:912
+#: ../src/camel/camel-store.c:2780 ../src/camel/camel-vee-store.c:477
+#: ../src/camel/providers/local/camel-maildir-store.c:908
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "无法重命名文件夹：%s：无效操作"
-#: ../src/camel/camel-stream.c:170
+#: ../src/camel/camel-stream.c:167
msgid "Cannot write with no base stream"
msgstr "无法在无基本流时写入"
-#: ../src/camel/camel-stream.c:290 ../src/camel/camel-stream.c:341
-#, fuzzy, c-format
+#: ../src/camel/camel-stream.c:287 ../src/camel/camel-stream.c:338
+#, c-format
msgid "Stream type “%s” is not seekable"
msgstr "流类型“%s”是无法定位的"
-#: ../src/camel/camel-stream-filter.c:342
+#: ../src/camel/camel-stream-filter.c:339
msgid "Only reset to beginning is supported with CamelStreamFilter"
msgstr "CamelStreamFilter 只支持重设到开始"
-#: ../src/camel/camel-stream-null.c:76
+#: ../src/camel/camel-stream-null.c:89
msgid "Only reset to beginning is supported with CamelHttpStream"
msgstr "CamelHttpStream 只支持重设到开始"
-#: ../src/camel/camel-stream-process.c:284
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:717
+#: ../src/camel/camel-stream-process.c:282
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:743
#, c-format
msgid "Connection cancelled"
msgstr "连接已取消"
-#: ../src/camel/camel-stream-process.c:289
-#, fuzzy, c-format
+#: ../src/camel/camel-stream-process.c:287
+#, c-format
msgid "Could not connect with command “%s”: %s"
msgstr "无法使用命令“%s”连接：%s"
#: ../src/camel/camel-subscribable.c:234
-#, fuzzy, c-format
+#, c-format
msgid "Subscribing to folder “%s”"
msgstr "正在订阅文件夹“%s”"
#: ../src/camel/camel-subscribable.c:403
-#, fuzzy, c-format
+#, c-format
msgid "Unsubscribing from folder “%s”"
msgstr "正在取消订阅文件夹“%s”"
#: ../src/camel/camel-url.c:325
-#, fuzzy, c-format
+#, c-format
msgid "Could not parse URL “%s”"
msgstr "无法解析 URL“%s”"
-#: ../src/camel/camel-vee-folder.c:498
-#, fuzzy, c-format
+#: ../src/camel/camel-vee-folder.c:558
+#, c-format
msgid "Updating folder “%s”"
msgstr "正在更新文件夹“%s”"
-#: ../src/camel/camel-vee-folder.c:898 ../src/camel/camel-vee-folder.c:1013
+#: ../src/camel/camel-vee-folder.c:1275 ../src/camel/camel-vee-folder.c:1411
#, c-format
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "无法将消息移动或复制到虚拟文件夹中"
@@ -3140,41 +3903,46 @@ msgstr "无法将消息移动或复制到虚拟文件夹中"
#. is replaced with an account name and the third “%s” is replaced with a full
#. path name. The spaces around “:” are intentional, as the whole “%s : %s” is
#. meant as an absolute identification of the folder.
-#: ../src/camel/camel-vee-folder.c:935
-#, fuzzy, c-format
+#: ../src/camel/camel-vee-folder.c:1312
+#, c-format
msgid "No such message %s in “%s : %s”"
msgstr "在“%2$s : %3$s”中没有消息 %1$s"
-#: ../src/camel/camel-vee-folder.c:989
-#, fuzzy, c-format
+#: ../src/camel/camel-vee-folder.c:1387
+#, c-format
msgid "Error storing “%s”: "
msgstr "存储“%s”出错："
-#: ../src/camel/camel-vee-folder.c:1236
+#: ../src/camel/camel-vee-folder.c:1577
+#, c-format
+msgid "Updating search folder “%s”"
+msgstr "正在更新搜索文件夹“%s”"
+
+#: ../src/camel/camel-vee-folder.c:1635
msgid "Automatically _update on change in source folders"
msgstr "自动更新源文件夹中的更改(_U)"
#. Translators: 'Unmatched' is a folder name under Search folders where are shown
#. * all messages not belonging into any other configured search folder
-#: ../src/camel/camel-vee-store.c:38
+#: ../src/camel/camel-vee-store.c:34
msgid "Unmatched"
msgstr "无匹配"
-#: ../src/camel/camel-vee-store.c:446
+#: ../src/camel/camel-vee-store.c:452
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "无法删除文件夹：%s：没有该文件夹"
-#: ../src/camel/camel-vee-store.c:481
+#: ../src/camel/camel-vee-store.c:487
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "无法重命名文件夹：%s：没有该文件夹"
-#: ../src/camel/camel-vee-store.c:544
+#: ../src/camel/camel-vee-store.c:548
msgid "Enable _Unmatched folder"
msgstr "启用不匹配的文件夹(_U)"
-#: ../src/camel/camel-vee-store.c:1067
+#: ../src/camel/camel-vee-store.c:1104
msgid "Updating Unmatched search folder"
msgstr "正在更新未匹配的搜索文件夹"
@@ -3186,68 +3954,81 @@ msgstr "无法将消息复制到回收站文件夹"
msgid "Cannot copy messages to the Junk folder"
msgstr "无法将消息复制到垃圾邮件文件夹"
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:967
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:979
#, c-format
msgid "You must be working online to complete this operation (%s)"
msgstr "您必须在线工作以便完成该操作 (%s)"
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:975
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3130
-#: ../src/camel/providers/nntp/camel-nntp-store.c:351
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1348
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2160
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2304
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:987
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3388
+#: ../src/camel/providers/nntp/camel-nntp-store.c:348
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1343
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2153
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2308
#: ../src/camel/providers/pop3/camel-pop3-folder.c:450
#: ../src/camel/providers/pop3/camel-pop3-folder.c:633
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:835
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:1047
-#: ../src/camel/providers/pop3/camel-pop3-store.c:294
-#: ../src/camel/providers/pop3/camel-pop3-store.c:527
-#: ../src/camel/providers/pop3/camel-pop3-store.c:575
-#: ../src/camel/providers/pop3/camel-pop3-store.c:670
-#: ../src/camel/providers/pop3/camel-pop3-store.c:1105
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:541
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:922
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:1136
+#: ../src/camel/providers/pop3/camel-pop3-store.c:293
+#: ../src/camel/providers/pop3/camel-pop3-store.c:528
+#: ../src/camel/providers/pop3/camel-pop3-store.c:576
+#: ../src/camel/providers/pop3/camel-pop3-store.c:673
+#: ../src/camel/providers/pop3/camel-pop3-store.c:1124
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:547
#, c-format
msgid "You must be working online to complete this operation"
msgstr "您必须在线工作以便完成该操作"
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1555
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1643
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1611
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1707
#, c-format
msgid "No destination folder specified"
msgstr "目标文件夹未指定"
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1582
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1638
msgid "Unable to move junk messages"
msgstr "无法移动垃圾信息"
-#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1677
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1741
msgid "Unable to move deleted messages"
msgstr "无法移动已删除信息"
+#: ../src/camel/providers/imapx/camel-imapx-conn-manager.c:1809
+msgid "Unable to move messages to Inbox"
+msgstr "无法将信息移动至收件箱"
+
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:705
-#, fuzzy, c-format
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:772
+#, c-format
msgid "No quota information available for folder “%s : %s”"
msgstr "文件夹“%s : %s”没有可用的配额信息"
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:980
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:754
+#. transfer ownership to 'rcf'
+#. Translators: The first “%s” is replaced with an account name and the second “%s”
+#. is replaced with a full path name. The spaces around “:” are intentional, as
+#. the whole “%s : %s” is meant as an absolute identification of the folder.
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1039
+#, c-format
+msgid "Removing stale cache files in folder “%s : %s”"
+msgstr "正在移除文件夹“%s : %s”中过时的缓存文件"
+
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1131
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:835
msgid "Apply message _filters to this folder"
msgstr "对这个文件夹应用消息过滤器(_F)"
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:991
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1143
msgid "Always check for _new mail in this folder"
msgstr "总是检查此文件夹中的新邮件(_N)"
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1102
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1258
#, c-format
msgid "Could not create folder summary for %s"
msgstr "无法为 %s 创建文件夹概要"
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1114
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1270
#, c-format
msgid "Could not create cache for %s: "
msgstr "无法为 %s 创建缓存："
@@ -3255,19 +4036,19 @@ msgstr "无法为 %s 创建缓存："
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/providers/imapx/camel-imapx-folder.c:1330
-#, fuzzy, c-format
+#: ../src/camel/providers/imapx/camel-imapx-folder.c:1470
+#, c-format
msgid "No IMAP mailbox available for folder “%s : %s”"
msgstr "文件夹“%s : %s”没有可用的 IMAP 邮箱"
-#: ../src/camel/providers/imapx/camel-imapx-input-stream.c:102
+#: ../src/camel/providers/imapx/camel-imapx-input-stream.c:101
#, c-format
msgid "Source stream returned no data"
msgstr "源流没返回数据"
#: ../src/camel/providers/imapx/camel-imapx-provider.c:36
msgid "Checking for New Mail"
-msgstr "检查新邮件"
+msgstr "正在检查新邮件"
#: ../src/camel/providers/imapx/camel-imapx-provider.c:38
msgid "C_heck for new messages in all folders"
@@ -3283,7 +4064,7 @@ msgstr "如果服务器支持则使用快速重新同步(_Q)"
#: ../src/camel/providers/imapx/camel-imapx-provider.c:44
msgid "_Listen for server change notifications"
-msgstr "监听服务器变化提醒(_L)"
+msgstr "监听服务器变化通知(_L)"
#: ../src/camel/providers/imapx/camel-imapx-provider.c:47
msgid "Connection to Server"
@@ -3291,26 +4072,30 @@ msgstr "到服务器的连接"
#: ../src/camel/providers/imapx/camel-imapx-provider.c:49
msgid "Numbe_r of concurrent connections to use"
-msgstr "使用的并发连接的数目(_R)"
+msgstr "要使用的并发连接数(_R)"
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:52
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:51
+msgid "Enable full folder update on _metered network"
+msgstr "在使用按流量计费的网络时启用完整文件夹更新(_M)"
+
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:54
#: ../src/camel/providers/nntp/camel-nntp-provider.c:43
msgid "Folders"
msgstr "文件夹"
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:54
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:56
msgid "_Show only subscribed folders"
-msgstr "只显示订阅了的文件夹(_S)"
+msgstr "只显示已订阅的文件夹(_S)"
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:57
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:59
msgid "O_verride server-supplied folder namespace"
msgstr "覆盖服务器提供的文件夹命名空间(_V)"
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:59
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:61
msgid "Namespace:"
msgstr "命名空间："
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:62
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:64
#: ../src/camel/providers/local/camel-local-provider.c:37
#: ../src/camel/providers/local/camel-local-provider.c:63
#: ../src/camel/providers/local/camel-local-provider.c:84
@@ -3319,17 +4104,17 @@ msgstr "命名空间："
msgid "Options"
msgstr "选项"
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:64
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:66
#: ../src/camel/providers/local/camel-local-provider.c:39
#: ../src/camel/providers/nntp/camel-nntp-provider.c:38
msgid "Apply _filters to new messages in all folders"
msgstr "对所有文件夹中的新消息应用过滤规则(_F)"
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:66
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:68
msgid "_Apply filters to new messages in Inbox on this server"
msgstr "应用过滤规则到此服务器上收件箱中的新消息(_A)"
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:68
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:70
#: ../src/camel/providers/local/camel-local-provider.c:41
#: ../src/camel/providers/local/camel-local-provider.c:67
#: ../src/camel/providers/local/camel-local-provider.c:88
@@ -3338,282 +4123,299 @@ msgstr "应用过滤规则到此服务器上收件箱中的新消息(_A)"
msgid "Check new messages for _Junk contents"
msgstr "检查新消息的垃圾内容(_J)"
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:70
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:72
msgid "Only check for Junk messages in the In_box folder"
msgstr "仅在收件箱中检查垃圾邮件(_B)"
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:72
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:74
msgid "Synchroni_ze remote mail locally in all folders"
-msgstr "将远程邮件同步到本地(_Z)"
+msgstr "将远程所有邮件文件夹同步到本地(_Z)"
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:79
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:81
msgid "Default IMAP port"
msgstr "默认的 IMAP 端口"
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:80
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:82
msgid "IMAP over TLS"
-msgstr "IMAP(TLS 加密)"
-
-#: ../src/camel/providers/imapx/camel-imapx-provider.c:87
-msgid "IMAP+"
-msgstr "IMAP+"
+msgstr "TLS 加密的 IMAP"
#: ../src/camel/providers/imapx/camel-imapx-provider.c:89
+msgid "IMAP"
+msgstr "IMAP"
+
+#: ../src/camel/providers/imapx/camel-imapx-provider.c:91
msgid "For reading and storing mail on IMAP servers."
msgstr "IMAP 服务器上的邮件的读写。"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:1166
+#: ../src/camel/providers/imapx/camel-imapx-server.c:1164
msgid "Error writing to cache stream"
msgstr "写入缓存流错误"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2813
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2901
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3163
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3012
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3101
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3421
msgid "Failed to get capabilities"
msgstr "无法获取可用性信息"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2832
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3031
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2833
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:279
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3032
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:283
msgid "STARTTLS not supported"
msgstr "不支持 STARTTLS"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2842
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3041
msgid "Failed to issue STARTTLS"
msgstr "无法提出 STARTTLS 请求"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2890
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3090
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: "
msgstr "以安全模式连接到 IMAP 服务器 %s 失败："
-#: ../src/camel/providers/imapx/camel-imapx-server.c:2984
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3206
#, c-format
msgid "IMAP server %s does not support %s authentication"
msgstr "IMAP 服务器 %s 不支持 %s 认证"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3015
-#: ../src/camel/providers/nntp/camel-nntp-store.c:457
-#: ../src/camel/providers/nntp/camel-nntp-store.c:599
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3232
+#, c-format
+msgid ""
+"Plaintext authentication disallowed on insecure connections. Change "
+"encryption to STARTTLS or TLS for account “%s”."
+msgstr ""
+"不允许在不安全的连接上进行纯文本认证。请将帐号“%s”的加密方式设置为 STARTTLS "
+"或 TLS。"
+
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3245
+#: ../src/camel/providers/nntp/camel-nntp-store.c:454
+#: ../src/camel/providers/nntp/camel-nntp-store.c:596
msgid "Cannot authenticate without a username"
-msgstr "无法进行无用户名的认证"
+msgstr "没有用户名无法进行认证"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3024
-#: ../src/camel/providers/nntp/camel-nntp-store.c:608
-#: ../src/camel/providers/pop3/camel-pop3-store.c:688
-#: ../src/camel/providers/pop3/camel-pop3-store.c:726
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3254
+#: ../src/camel/providers/nntp/camel-nntp-store.c:605
+#: ../src/camel/providers/pop3/camel-pop3-store.c:709
+#: ../src/camel/providers/pop3/camel-pop3-store.c:747
msgid "Authentication password not available"
msgstr "密码认证不可用"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3032
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3264
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3279
msgid "Failed to authenticate"
msgstr "认证失败"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3185
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3448
+msgid "Failed to issue ENABLE UTF8=ACCEPT"
+msgstr "无法提出 ENABLE UTF8=ACCEPT 请求"
+
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3470
msgid "Failed to issue NAMESPACE"
msgstr "无法提出 NAMESPACE 请求"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3203
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3488
msgid "Failed to enable QResync"
msgstr "无法启用 QResync"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3235
+#: ../src/camel/providers/imapx/camel-imapx-server.c:3525
msgid "Failed to issue NOTIFY"
msgstr "无法提出 NOTIFY 请求"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3713
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4004
msgid "Failed to select mailbox"
msgstr "无法选择邮箱"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:3816
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4107
msgid "Cannot issue command, no stream available"
msgstr "无法发出命令，没有流可用"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4080
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4373
#, c-format
msgid "Cannot get message with message ID %s: %s"
msgstr "无法获取消息 ID %s：%s"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4081
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4374
msgid "No such message available."
msgstr "没有该消息。"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4118
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4143
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4182
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4423
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4448
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4487
msgid "Error fetching message"
msgstr "取回消息出错"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4160
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4759
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4465
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5232
msgid "Error performing NOOP"
msgstr "执行 NOOP 出错"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4175
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4480
msgid "Failed to close the tmp stream"
msgstr "无法关闭临时流"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4206
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4511
msgid "Failed to copy the tmp file"
msgstr "无法复制临时文件"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4369
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4749
msgid "Error moving messages"
msgstr "移动消息出错"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4369
+#: ../src/camel/providers/imapx/camel-imapx-server.c:4749
msgid "Error copying messages"
msgstr "复制消息出错"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4554
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4575
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5022
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5043
msgid "Cannot create spool file: "
msgstr "无法创建离线文件："
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4661
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5129
msgid "Error appending message"
msgstr "追加消息出错"
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4912
-#, fuzzy, c-format
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5385
+#, c-format
msgid "Scanning for changed messages in “%s : %s”"
msgstr "正在扫描“%s : %s”中已更改的消息"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4916
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5389
msgid "Error scanning changes"
msgstr "扫描更改时出错"
#. Translators: The first “%s” is replaced with an account name and the second “%s”
#. is replaced with a full path name. The spaces around “:” are intentional, as
#. the whole “%s : %s” is meant as an absolute identification of the folder.
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4937
-#, fuzzy, c-format
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5410
+#, c-format
msgid "Fetching summary information for new messages in “%s : %s”"
msgstr "正在获取“%s : %s”中新消息的概要信息"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:4955
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5438
msgid "Error fetching message info"
msgstr "取回消息信息时出错"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5037
+#: ../src/camel/providers/imapx/camel-imapx-server.c:5571
msgid "Error running STATUS"
msgstr "运行 STATUS 命令时出错"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5544
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5574
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5609
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6145
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6200
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6264
msgid "Error syncing changes"
msgstr "同步变更出错"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5747
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6158
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6210
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6283
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6427
msgid "Error expunging message"
msgstr "销毁消息出错"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5819
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6509
msgid "Error fetching folders"
msgstr "取回文件夹出错"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5830
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6517
msgid "Error fetching subscribed folders"
msgstr "取回订阅文件夹出错"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5852
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6574
msgid "Error creating folder"
msgstr "创建文件夹出错"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5908
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6624
msgid "Error deleting folder"
msgstr "删除文件夹出错"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5954
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6670
msgid "Error renaming folder"
msgstr "重命名文件夹出错"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:5986
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6702
msgid "Error subscribing to folder"
msgstr "订阅文件夹出错"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6022
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6738
msgid "Error unsubscribing from folder"
msgstr "取消订阅文件夹出错"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6062
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6778
msgid "IMAP server does not support quotas"
msgstr "IMAP 服务器不支持配额"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6074
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6790
msgid "Error retrieving quota information"
msgstr "获取配额信息出错"
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6121
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6855
msgid "Search failed"
msgstr "搜索失败"
#. Blocks, until the DONE is issued or on inactivity timeout, error, ...
-#: ../src/camel/providers/imapx/camel-imapx-server.c:6239
+#: ../src/camel/providers/imapx/camel-imapx-server.c:6983
msgid "Error running IDLE"
msgstr "运行 IDLE 命令时出错"
#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../src/camel/providers/imapx/camel-imapx-store.c:232
-#: ../src/camel/providers/local/camel-maildir-folder.c:478
-#: ../src/camel/providers/local/camel-maildir-store.c:345
-#: ../src/camel/providers/local/camel-maildir-store.c:824
-#: ../src/camel/providers/local/camel-maildir-store.c:830
-#: ../src/camel/providers/local/camel-maildir-store.c:913
-#: ../src/camel/providers/local/camel-spool-store.c:390
+#: ../src/camel/providers/imapx/camel-imapx-store.c:353
+#: ../src/camel/providers/local/camel-maildir-folder.c:476
+#: ../src/camel/providers/local/camel-maildir-store.c:341
+#: ../src/camel/providers/local/camel-maildir-store.c:820
+#: ../src/camel/providers/local/camel-maildir-store.c:826
+#: ../src/camel/providers/local/camel-maildir-store.c:909
+#: ../src/camel/providers/local/camel-spool-store.c:386
msgid "Inbox"
msgstr "收件箱"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:802
+#: ../src/camel/providers/imapx/camel-imapx-store.c:956
#, c-format
msgid "IMAP server %s"
msgstr "IMAP 服务器 %s"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:805
+#: ../src/camel/providers/imapx/camel-imapx-store.c:959
#, c-format
msgid "IMAP service for %s on %s"
msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:873
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1050
msgid "No IMAPx connection object provided"
msgstr "未提供 IMAPx 连接对象"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:890
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:92
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:80
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1067
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:95
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:82
msgid "Password"
msgstr "密码"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:892
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1069
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr "该选项将使用纯文本密码连接到 IMAP 服务器。"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:975
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1156
#, c-format
msgid "No such folder %s"
msgstr "没有文件夹 %s"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1425
-#, fuzzy, c-format
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1620
+#, c-format
msgid "No IMAP namespace for folder path “%s”"
-msgstr "没有对应文件夹路径“%s”的 IMAP 名字空间"
+msgstr "没有对应文件夹路径“%s”的 IMAP 命名空间"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1686
-#: ../src/camel/providers/imapx/camel-imapx-store.c:1920
-#, fuzzy, c-format
+#: ../src/camel/providers/imapx/camel-imapx-store.c:1887
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2081
+#, c-format
msgid "Retrieving folder list for “%s”"
msgstr "正在获取“%s”的文件夹列表"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2137
-#, fuzzy, c-format
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2349
+#, c-format
msgid "The folder name “%s” is invalid because it contains the character “%c”"
msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”"
@@ -3622,106 +4424,106 @@ msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”"
#. version as well. It's always the folder name (eventually path) as provided by the server,
#. when returned in given localization. it can be checked semi-easily in the case of
#. the GMail variants, by changing the GMail interface language in the GMail Preferences.
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2514
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2744
msgctxt "IMAPDefaults"
msgid "[Gmail]/Drafts"
msgstr "[Gmail]/草稿"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2515
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2745
msgctxt "IMAPDefaults"
msgid "Drafts"
msgstr "草稿"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2516
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2746
msgctxt "IMAPDefaults"
msgid "Draft"
msgstr "草稿"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2519
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2749
msgctxt "IMAPDefaults"
msgid "Templates"
msgstr "模板"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2522
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2752
msgctxt "IMAPDefaults"
msgid "Archive"
msgstr "归档"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2525
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2755
msgctxt "IMAPDefaults"
msgid "[Gmail]/Sent Mail"
-msgstr "[Gmail]/已发送的邮件"
+msgstr "[Gmail]/已发送邮件"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2526
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2756
msgctxt "IMAPDefaults"
msgid "Sent"
msgstr "已发送"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2527
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2757
msgctxt "IMAPDefaults"
msgid "Sent Items"
-msgstr "已发送的项目"
+msgstr "已发送项目"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2528
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2758
msgctxt "IMAPDefaults"
msgid "Sent Messages"
msgstr "已发送消息"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2531
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2761
msgctxt "IMAPDefaults"
msgid "[Gmail]/Spam"
msgstr "[Gmail]/垃圾邮件"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2532
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2762
msgctxt "IMAPDefaults"
msgid "Junk"
msgstr "垃圾"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2533
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2763
msgctxt "IMAPDefaults"
msgid "Junk E-mail"
msgstr "垃圾邮件"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2534
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2764
msgctxt "IMAPDefaults"
msgid "Junk Email"
msgstr "垃圾邮件"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2535
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2765
msgctxt "IMAPDefaults"
msgid "Spam"
msgstr "垃圾邮件"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2536
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2766
msgctxt "IMAPDefaults"
msgid "Bulk Mail"
msgstr "群发邮件"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2539
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2769
msgctxt "IMAPDefaults"
msgid "[Gmail]/Trash"
msgstr "[Gmail]/垃圾箱"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2540
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2770
msgctxt "IMAPDefaults"
msgid "Trash"
msgstr "垃圾箱"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2541
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2771
msgctxt "IMAPDefaults"
msgid "Deleted Items"
-msgstr "已删除的项目"
+msgstr "已删除项目"
-#: ../src/camel/providers/imapx/camel-imapx-store.c:2542
+#: ../src/camel/providers/imapx/camel-imapx-store.c:2772
msgctxt "IMAPDefaults"
msgid "Deleted Messages"
-msgstr "已删除的消息"
+msgstr "已删除消息"
#. Translators: This is used for a folder description,
#. * for folders being under $HOME. The first %s is replaced
#. * with a relative path under $HOME, the second %s is
#. * replaced with a protocol name, like mbox/maldir/...
-#: ../src/camel/providers/local/camel-local-folder.c:187
+#: ../src/camel/providers/local/camel-local-folder.c:186
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
@@ -3735,8 +4537,8 @@ msgstr "~%s (%s)"
#. * folders being under /var/mail. The first %s is replaced
#. * with a relative path under /var/mail, the second %s is
#. * replaced with a protocol name, like mbox/maldir/...
-#: ../src/camel/providers/local/camel-local-folder.c:197
-#: ../src/camel/providers/local/camel-local-folder.c:206
+#: ../src/camel/providers/local/camel-local-folder.c:196
+#: ../src/camel/providers/local/camel-local-folder.c:205
#, c-format
msgid "mailbox: %s (%s)"
msgstr "邮件箱：%s (%s)"
@@ -3745,19 +4547,19 @@ msgstr "邮件箱：%s (%s)"
#. * The first %s is replaced with a folder's full path,
#. * the second %s is replaced with a protocol name, like
#. * mbox/maldir/...
-#: ../src/camel/providers/local/camel-local-folder.c:215
+#: ../src/camel/providers/local/camel-local-folder.c:214
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
#: ../src/camel/providers/local/camel-local-folder.c:505
msgid "_Index message body data"
-msgstr "索引消息正文(_I)"
+msgstr "索引消息正文数据(_I)"
#. Translators: The first %s is replaced with a message ID,
#. * the second %s is replaced with the folder path,
#. * the third %s is replaced with a detailed error string
-#: ../src/camel/providers/local/camel-local-folder.c:737
+#: ../src/camel/providers/local/camel-local-folder.c:744
#, c-format
msgid ""
"Cannot get message %s from folder %s\n"
@@ -3767,22 +4569,20 @@ msgstr ""
"%3$s"
#: ../src/camel/providers/local/camel-local-provider.c:43
-#, fuzzy
msgid "_Use the “.folders” folder summary file (exmh)"
-msgstr "使用“.folders”文件夹概览文件(exmh)(_U)"
+msgstr "使用“.folders”文件夹概览文件 (exmh)(_U)"
#: ../src/camel/providers/local/camel-local-provider.c:50
msgid "MH-format mail directories"
-msgstr "MH-格式的邮件目录"
+msgstr "MH 格式的邮件目录"
#: ../src/camel/providers/local/camel-local-provider.c:51
msgid "For storing local mail in MH-like mail directories."
msgstr "在类似于 MH 的邮件目录中存储本地邮件。"
#: ../src/camel/providers/local/camel-local-provider.c:65
-#, fuzzy
msgid "Apply _filters to new messages"
-msgstr "对收件箱中的新消息应用过滤规则(_A)"
+msgstr "对收件箱中的新消息应用过滤规则(_F)"
#: ../src/camel/providers/local/camel-local-provider.c:73
msgid "Local delivery"
@@ -3793,7 +4593,7 @@ msgid ""
"For retrieving (moving) local mail from standard mbox-formatted spools into "
"folders managed by Evolution."
msgstr ""
-"对于将本地邮件从标准 mbox 格式离线文件夹获取(移动)到由 Evolution 管理的文件"
+"对于将本地邮件从标准 mbox 格式离线文件夹获取（移动）到由 Evolution 管理的文件"
"夹。"
#: ../src/camel/providers/local/camel-local-provider.c:86
@@ -3830,147 +4630,147 @@ msgstr ""
msgid "Standard Unix mbox spool directory"
msgstr "标准 Unix mbox 离线目录"
-#: ../src/camel/providers/local/camel-local-store.c:86
+#: ../src/camel/providers/local/camel-local-store.c:82
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "无法将文件夹 %s 改名为 %s：%s"
-#: ../src/camel/providers/local/camel-local-store.c:168
+#: ../src/camel/providers/local/camel-local-store.c:164
#, c-format
msgid "Local mail file %s"
msgstr "本地邮件文件 %s"
-#: ../src/camel/providers/local/camel-local-store.c:211
-#: ../src/camel/providers/local/camel-local-store.c:371
-#: ../src/camel/providers/local/camel-maildir-store.c:121
-#: ../src/camel/providers/local/camel-mbox-store.c:570
-#: ../src/camel/providers/local/camel-spool-store.c:85
+#: ../src/camel/providers/local/camel-local-store.c:207
+#: ../src/camel/providers/local/camel-local-store.c:367
+#: ../src/camel/providers/local/camel-maildir-store.c:117
+#: ../src/camel/providers/local/camel-mbox-store.c:579
+#: ../src/camel/providers/local/camel-spool-store.c:81
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "存储根目录 %s 不是绝对路径"
-#: ../src/camel/providers/local/camel-local-store.c:220
+#: ../src/camel/providers/local/camel-local-store.c:216
#, c-format
msgid "Store root %s is not a regular directory"
msgstr "存储根目录 %s 不是普通目录"
-#: ../src/camel/providers/local/camel-local-store.c:232
-#: ../src/camel/providers/local/camel-local-store.c:242
-#: ../src/camel/providers/local/camel-local-store.c:384
-#: ../src/camel/providers/local/camel-maildir-store.c:163
+#: ../src/camel/providers/local/camel-local-store.c:228
+#: ../src/camel/providers/local/camel-local-store.c:238
+#: ../src/camel/providers/local/camel-local-store.c:380
+#: ../src/camel/providers/local/camel-maildir-store.c:159
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "无法获取文件夹：%s：%s"
-#: ../src/camel/providers/local/camel-local-store.c:279
+#: ../src/camel/providers/local/camel-local-store.c:275
#, c-format
msgid "Local stores do not have an inbox"
msgstr "本地存储没有收件箱"
-#: ../src/camel/providers/local/camel-local-store.c:444
-#: ../src/camel/providers/local/camel-mbox-store.c:737
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-local-store.c:440
+#: ../src/camel/providers/local/camel-mbox-store.c:746
+#, c-format
msgid "Could not delete folder index file “%s”: %s"
msgstr "无法删除文件夹索引文件“%s”：%s"
-#: ../src/camel/providers/local/camel-local-store.c:472
-#: ../src/camel/providers/local/camel-mbox-store.c:767
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-local-store.c:468
+#: ../src/camel/providers/local/camel-mbox-store.c:776
+#, c-format
msgid "Could not delete folder meta file “%s”: %s"
msgstr "无法删除文件夹元文件“%s”：%s"
-#: ../src/camel/providers/local/camel-local-store.c:585
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-local-store.c:581
+#, c-format
msgid "Could not rename “%s”: %s"
msgstr "无法重命名“%s”：%s"
#: ../src/camel/providers/local/camel-maildir-folder.c:107
-#: ../src/camel/providers/local/camel-maildir-folder.c:344
-#: ../src/camel/providers/local/camel-mbox-folder.c:128
-#: ../src/camel/providers/local/camel-mbox-folder.c:336
-#: ../src/camel/providers/local/camel-mh-folder.c:157
+#: ../src/camel/providers/local/camel-maildir-folder.c:345
+#: ../src/camel/providers/local/camel-mbox-folder.c:133
+#: ../src/camel/providers/local/camel-mbox-folder.c:348
+#: ../src/camel/providers/local/camel-mh-folder.c:159
msgid "No such message"
msgstr "没有该消息"
-#: ../src/camel/providers/local/camel-maildir-folder.c:232
+#: ../src/camel/providers/local/camel-maildir-folder.c:239
#, c-format
msgid "Cannot append message to maildir folder: %s: "
msgstr "无法将消息附加到邮件目录文件夹：%s："
-#: ../src/camel/providers/local/camel-maildir-folder.c:282
-#: ../src/camel/providers/local/camel-maildir-folder.c:292
-#: ../src/camel/providers/local/camel-mbox-folder.c:395
-#: ../src/camel/providers/local/camel-mh-folder.c:169
-#: ../src/camel/providers/local/camel-mh-folder.c:179
+#: ../src/camel/providers/local/camel-maildir-folder.c:286
+#: ../src/camel/providers/local/camel-maildir-folder.c:296
+#: ../src/camel/providers/local/camel-mbox-folder.c:407
+#: ../src/camel/providers/local/camel-mh-folder.c:171
+#: ../src/camel/providers/local/camel-mh-folder.c:181
#, c-format
msgid "Cannot get message %s from folder %s: "
msgstr "无法从文件夹 %2$s 获取消息 %1$s："
-#: ../src/camel/providers/local/camel-maildir-folder.c:362
+#: ../src/camel/providers/local/camel-maildir-folder.c:363
#, c-format
msgid "Cannot transfer message to destination folder: %s"
msgstr "无法将消息转移到目标文件夹：%s"
-#: ../src/camel/providers/local/camel-maildir-store.c:129
-#: ../src/camel/providers/local/camel-maildir-store.c:929
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-maildir-store.c:125
+#: ../src/camel/providers/local/camel-maildir-store.c:925
+#, c-format
msgid "Cannot create folder containing “%s”"
msgstr "无法创建包含“%s”的文件夹"
-#: ../src/camel/providers/local/camel-maildir-store.c:137
-#: ../src/camel/providers/local/camel-maildir-store.c:156
-#: ../src/camel/providers/local/camel-maildir-store.c:921
+#: ../src/camel/providers/local/camel-maildir-store.c:133
+#: ../src/camel/providers/local/camel-maildir-store.c:152
+#: ../src/camel/providers/local/camel-maildir-store.c:917
#, c-format
msgid "Folder %s already exists"
msgstr "文件夹 %s 已经存在"
-#: ../src/camel/providers/local/camel-maildir-store.c:264
-#: ../src/camel/providers/local/camel-maildir-store.c:295
-#: ../src/camel/providers/local/camel-mbox-store.c:399
-#: ../src/camel/providers/local/camel-mbox-store.c:420
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-maildir-store.c:260
+#: ../src/camel/providers/local/camel-maildir-store.c:291
+#: ../src/camel/providers/local/camel-mbox-store.c:410
+#: ../src/camel/providers/local/camel-mbox-store.c:431
+#, c-format
msgid "Cannot create folder “%s”: %s"
-msgstr "无法创建文件夹：%s：%s"
+msgstr "无法创建文件夹：“%s”：%s"
-#: ../src/camel/providers/local/camel-maildir-store.c:279
-#: ../src/camel/providers/local/camel-mbox-store.c:365
+#: ../src/camel/providers/local/camel-maildir-store.c:275
+#: ../src/camel/providers/local/camel-mbox-store.c:376
#: ../src/camel/providers/local/camel-mh-store.c:519
-#, fuzzy, c-format
+#, c-format
msgid "Cannot get folder “%s”: %s"
-msgstr "无法获取文件夹：%s：%s"
+msgstr "无法获取文件夹：“%s”：%s"
-#: ../src/camel/providers/local/camel-maildir-store.c:285
-#: ../src/camel/providers/local/camel-mbox-store.c:375
+#: ../src/camel/providers/local/camel-maildir-store.c:281
+#: ../src/camel/providers/local/camel-mbox-store.c:386
#: ../src/camel/providers/local/camel-mh-store.c:528
-#, fuzzy, c-format
+#, c-format
msgid "Cannot get folder “%s”: folder does not exist."
msgstr "无法获得文件夹“%s”：文件夹不存在。"
-#: ../src/camel/providers/local/camel-maildir-store.c:312
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-maildir-store.c:308
+#, c-format
msgid "Cannot get folder “%s”: not a maildir directory."
msgstr "无法获取文件夹“%s”：不是 maildir 目录。"
-#: ../src/camel/providers/local/camel-maildir-store.c:376
-#: ../src/camel/providers/local/camel-maildir-store.c:416
+#: ../src/camel/providers/local/camel-maildir-store.c:372
+#: ../src/camel/providers/local/camel-maildir-store.c:412
#: ../src/camel/providers/local/camel-mh-store.c:672
-#, fuzzy, c-format
+#, c-format
msgid "Could not delete folder “%s”: %s"
msgstr "无法删除文件夹“%s”：%s"
-#: ../src/camel/providers/local/camel-maildir-store.c:378
+#: ../src/camel/providers/local/camel-maildir-store.c:374
msgid "not a maildir directory"
msgstr "不是 maildir 目录"
-#: ../src/camel/providers/local/camel-maildir-store.c:664
-#: ../src/camel/providers/local/camel-maildir-store.c:1144
-#: ../src/camel/providers/local/camel-spool-store.c:210
-#: ../src/camel/providers/local/camel-spool-store.c:229
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-maildir-store.c:660
+#: ../src/camel/providers/local/camel-maildir-store.c:1138
+#: ../src/camel/providers/local/camel-spool-store.c:206
+#: ../src/camel/providers/local/camel-spool-store.c:225
+#, c-format
msgid "Could not scan folder “%s”: %s"
msgstr "无法扫描文件夹“%s”：%s"
-#: ../src/camel/providers/local/camel-maildir-summary.c:448
+#: ../src/camel/providers/local/camel-maildir-summary.c:450
#: ../src/camel/providers/local/camel-maildir-summary.c:589
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
@@ -3980,11 +4780,11 @@ msgstr "无法打开邮件目录路径：%s：%s"
msgid "Checking folder consistency"
msgstr "检查文件夹一致性"
-#: ../src/camel/providers/local/camel-maildir-summary.c:679
+#: ../src/camel/providers/local/camel-maildir-summary.c:702
msgid "Checking for new messages"
-msgstr "检查新消息"
+msgstr "正在检查新消息"
-#: ../src/camel/providers/local/camel-maildir-summary.c:782
+#: ../src/camel/providers/local/camel-maildir-summary.c:806
#: ../src/camel/providers/local/camel-mbox-summary.c:367
#: ../src/camel/providers/local/camel-mbox-summary.c:585
#: ../src/camel/providers/local/camel-mbox-summary.c:739
@@ -3992,55 +4792,55 @@ msgstr "检查新消息"
msgid "Storing folder"
msgstr "存储文件夹"
-#: ../src/camel/providers/local/camel-mbox-folder.c:194
+#: ../src/camel/providers/local/camel-mbox-folder.c:205
#, c-format
msgid "Cannot open mailbox: %s: "
msgstr "无法打开邮件箱：%s："
-#: ../src/camel/providers/local/camel-mbox-folder.c:257
+#: ../src/camel/providers/local/camel-mbox-folder.c:266
#, c-format
msgid "Cannot append message to mbox file: %s: "
msgstr "无法将消息附加到邮件箱文件：%s："
-#: ../src/camel/providers/local/camel-mbox-folder.c:387
+#: ../src/camel/providers/local/camel-mbox-folder.c:399
msgid "The folder appears to be irrecoverably corrupted."
msgstr "文件夹好像已经被不可恢复地破坏了。"
-#: ../src/camel/providers/local/camel-mbox-folder.c:444
+#: ../src/camel/providers/local/camel-mbox-folder.c:454
#: ../src/camel/providers/local/camel-spool-folder.c:65
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr "无法在 %s 创建文件夹锁：%s"
-#: ../src/camel/providers/local/camel-mbox-store.c:387
-#: ../src/camel/providers/local/camel-mbox-store.c:578
+#: ../src/camel/providers/local/camel-mbox-store.c:398
+#: ../src/camel/providers/local/camel-mbox-store.c:587
#, c-format
msgid "Cannot create a folder by this name."
msgstr "无法以此名称创建文件夹。"
-#: ../src/camel/providers/local/camel-mbox-store.c:431
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-mbox-store.c:442
+#, c-format
msgid "Cannot get folder “%s”: not a regular file."
msgstr "无法获取文件夹“%s”：不是普通文件"
-#: ../src/camel/providers/local/camel-mbox-store.c:594
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-mbox-store.c:603
+#, c-format
msgid "Cannot create directory “%s”: %s."
msgstr "无法创建目录“%s”：%s"
-#: ../src/camel/providers/local/camel-mbox-store.c:606
+#: ../src/camel/providers/local/camel-mbox-store.c:615
#, c-format
msgid "Cannot create folder: %s: %s"
msgstr "无法创建文件夹：%s：%s"
-#: ../src/camel/providers/local/camel-mbox-store.c:608
+#: ../src/camel/providers/local/camel-mbox-store.c:617
msgid "Folder already exists"
msgstr "文件夹已经存在"
-#: ../src/camel/providers/local/camel-mbox-store.c:648
-#: ../src/camel/providers/local/camel-mbox-store.c:661
-#: ../src/camel/providers/local/camel-mbox-store.c:690
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-mbox-store.c:657
+#: ../src/camel/providers/local/camel-mbox-store.c:670
+#: ../src/camel/providers/local/camel-mbox-store.c:699
+#, c-format
msgid ""
"Could not delete folder “%s”:\n"
"%s"
@@ -4048,29 +4848,29 @@ msgstr ""
"无法删除文件夹“%s”：\n"
"%s"
-#: ../src/camel/providers/local/camel-mbox-store.c:671
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-mbox-store.c:680
+#, c-format
msgid "“%s” is not a regular file."
-msgstr "“%s”并不是普通文件。"
+msgstr "“%s”不是普通文件。"
-#: ../src/camel/providers/local/camel-mbox-store.c:680
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-mbox-store.c:689
+#, c-format
msgid "Folder “%s” is not empty. Not deleted."
msgstr "文件夹“%s”非空。没有删除。"
-#: ../src/camel/providers/local/camel-mbox-store.c:707
-#: ../src/camel/providers/local/camel-mbox-store.c:722
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-mbox-store.c:716
+#: ../src/camel/providers/local/camel-mbox-store.c:731
+#, c-format
msgid "Could not delete folder summary file “%s”: %s"
msgstr "无法删除文件夹概要文件“%s”：%s"
-#: ../src/camel/providers/local/camel-mbox-store.c:804
+#: ../src/camel/providers/local/camel-mbox-store.c:813
#, c-format
msgid "The new folder name is illegal."
msgstr "指定的文件夹名称不合法。"
-#: ../src/camel/providers/local/camel-mbox-store.c:820
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-mbox-store.c:829
+#, c-format
msgid "Could not rename “%s”: “%s”: %s"
msgstr "无法重命名“%s”：“%s”：%s"
@@ -4121,11 +4921,11 @@ msgstr "无法存储文件夹：%s"
#: ../src/camel/providers/local/camel-mbox-summary.c:803
#: ../src/camel/providers/local/camel-mbox-summary.c:1076
-#, fuzzy, c-format
+#, c-format
msgid ""
"MBOX file is corrupted, please fix it. (Expected a From line, but didn’t get "
"it.)"
-msgstr "MBOX 文件损坏，请修复。(应该有 From 行，但未找到。)"
+msgstr "MBOX 文件损坏，请修复。（应该有 From 行，但未找到。）"
#: ../src/camel/providers/local/camel-mbox-summary.c:813
#: ../src/camel/providers/local/camel-mbox-summary.c:1088
@@ -4150,57 +4950,57 @@ msgstr "写入临时 mailbox 失败：%s"
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "写入临时 mailbox 失败：%s：%s"
-#: ../src/camel/providers/local/camel-mh-folder.c:114
+#: ../src/camel/providers/local/camel-mh-folder.c:119
#, c-format
msgid "Cannot append message to mh folder: %s: "
msgstr "无法将消息附加到 mh 文件夹：%s："
#: ../src/camel/providers/local/camel-mh-store.c:538
-#, fuzzy, c-format
+#, c-format
msgid "Could not create folder “%s”: %s"
msgstr "无法创建文件夹“%s”：%s"
#: ../src/camel/providers/local/camel-mh-store.c:554
-#, fuzzy, c-format
+#, c-format
msgid "Cannot get folder “%s”: not a directory."
msgstr "无法获取文件夹“%s”：不是目录。"
-#: ../src/camel/providers/local/camel-mh-summary.c:238
+#: ../src/camel/providers/local/camel-mh-summary.c:232
#, c-format
msgid "Cannot open MH directory path: %s: %s"
msgstr "无法打开 MH 目录：%s：%s"
-#: ../src/camel/providers/local/camel-spool-store.c:93
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-spool-store.c:89
+#, c-format
msgid "Spool “%s” cannot be opened: %s"
msgstr "无法打开离线文件“%s”：%s"
-#: ../src/camel/providers/local/camel-spool-store.c:107
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-spool-store.c:103
+#, c-format
msgid "Spool “%s” is not a regular file or directory"
msgstr "离线文件“%s”不是普通文件或目录"
-#: ../src/camel/providers/local/camel-spool-store.c:422
+#: ../src/camel/providers/local/camel-spool-store.c:418
#, c-format
msgid "Spool mail file %s"
msgstr "离线邮件文件 %s"
-#: ../src/camel/providers/local/camel-spool-store.c:426
+#: ../src/camel/providers/local/camel-spool-store.c:422
#, c-format
msgid "Spool folder tree %s"
msgstr "离线文件夹树 %s"
-#: ../src/camel/providers/local/camel-spool-store.c:429
+#: ../src/camel/providers/local/camel-spool-store.c:425
msgid "Invalid spool"
msgstr "无效的本地文件"
-#: ../src/camel/providers/local/camel-spool-store.c:478
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-spool-store.c:474
+#, c-format
msgid "Folder “%s/%s” does not exist."
msgstr "文件夹“%s/%s”不存在。"
-#: ../src/camel/providers/local/camel-spool-store.c:491
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-spool-store.c:487
+#, c-format
msgid ""
"Could not open folder “%s”:\n"
"%s"
@@ -4208,13 +5008,13 @@ msgstr ""
"无法打开文件夹“%s”：\n"
"%s"
-#: ../src/camel/providers/local/camel-spool-store.c:497
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-spool-store.c:493
+#, c-format
msgid "Folder “%s” does not exist."
msgstr "文件夹“%s”不存在。"
-#: ../src/camel/providers/local/camel-spool-store.c:505
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-spool-store.c:501
+#, c-format
msgid ""
"Could not create folder “%s”:\n"
"%s"
@@ -4222,22 +5022,22 @@ msgstr ""
"无法创建文件夹“%s”：\n"
"%s"
-#: ../src/camel/providers/local/camel-spool-store.c:518
-#, fuzzy, c-format
+#: ../src/camel/providers/local/camel-spool-store.c:514
+#, c-format
msgid "“%s” is not a mailbox file."
msgstr "“%s”不是邮件箱文件。"
-#: ../src/camel/providers/local/camel-spool-store.c:582
+#: ../src/camel/providers/local/camel-spool-store.c:578
#, c-format
msgid "Store does not support an INBOX"
msgstr "存储并不支持收件箱"
-#: ../src/camel/providers/local/camel-spool-store.c:601
+#: ../src/camel/providers/local/camel-spool-store.c:597
#, c-format
msgid "Spool folders cannot be deleted"
msgstr "离线文件夹无法删除"
-#: ../src/camel/providers/local/camel-spool-store.c:616
+#: ../src/camel/providers/local/camel-spool-store.c:612
#, c-format
msgid "Spool folders cannot be renamed"
msgstr "离线文件夹无法改名"
@@ -4257,7 +5057,7 @@ msgstr "无法同步离线文件夹 %s: %s"
#: ../src/camel/providers/local/camel-spool-summary.c:255
#: ../src/camel/providers/local/camel-spool-summary.c:274
#: ../src/camel/providers/local/camel-spool-summary.c:287
-#, fuzzy, c-format
+#, c-format
msgid ""
"Could not synchronize spool folder %s: %s\n"
"Folder may be corrupt, copy saved in “%s”"
@@ -4265,22 +5065,22 @@ msgstr ""
"无法同步离线文件夹 %s: %s\n"
"文件夹可能已损坏，副本已存放在 '%s'"
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:219
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:584
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:215
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:632
#, c-format
msgid "Internal error: UID in invalid format: %s"
msgstr "内部错误：UID 的格式无效：%s"
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:289
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:294
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:283
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:288
#: ../src/camel/providers/pop3/camel-pop3-folder.c:575
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:1003
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:1092
#, c-format
msgid "Cannot get message %s: %s"
msgstr "无法获取消息 %s：%s"
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:301
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:618
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:295
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:666
#: ../src/camel/providers/pop3/camel-pop3-folder.c:479
#: ../src/camel/providers/pop3/camel-pop3-folder.c:511
#: ../src/camel/providers/pop3/camel-pop3-folder.c:543
@@ -4290,22 +5090,22 @@ msgstr "无法获取消息 %s：%s"
msgid "Cannot get message %s: "
msgstr "无法获取消息 %s："
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:428
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:434
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:424
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:430
#, c-format
msgid "Posting failed: %s"
msgstr "发送失败：%s"
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:488
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:482
msgid "Posting failed: "
msgstr "发送失败："
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:607
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:655
#, c-format
msgid "This message is not currently available"
msgstr "该消息目前不可用"
-#: ../src/camel/providers/nntp/camel-nntp-folder.c:716
+#: ../src/camel/providers/nntp/camel-nntp-folder.c:764
#, c-format
msgid "You cannot copy messages from a NNTP folder"
msgstr "您不能从 NNTP 文件夹复制信息"
@@ -4313,71 +5113,77 @@ msgstr "您不能从 NNTP 文件夹复制信息"
#: ../src/camel/providers/nntp/camel-nntp-provider.c:45
msgid ""
"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "以短格式显示文件夹(如 c.o.linux 而不是 comp.os.linux)(_S)"
+msgstr "以短格式显示文件夹（如 c.o.linux 而不是 comp.os.linux）(_S)"
#: ../src/camel/providers/nntp/camel-nntp-provider.c:48
msgid "In the subscription _dialog, show relative folder names"
msgstr "在订阅对话框中显示相对文件夹名称(_D)"
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:54
+#. Translators: The '%s' is replaced with a spin button with the actual value to use
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:51
+#, c-format
+msgid "Download only up to %s latest messages"
+msgstr "只下载最多 %s 封新信息"
+
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:57
msgid "Default NNTP port"
msgstr "默认的 NNTP 端口"
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:55
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:58
msgid "NNTP over TLS"
-msgstr "NNTP(TLS 加密)"
+msgstr "TLS 加密的 NNTP"
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:61
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:64
msgid "USENET news"
msgstr "USENET 新闻"
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:63
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:66
msgid "This is a provider for reading from and posting to USENET newsgroups."
msgstr "这是一个读取 USENET 新闻组和向 USENET 新闻组发布邮件的提供者。"
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:84
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:87
msgid ""
"This option will connect to the NNTP server anonymously, without "
"authentication."
msgstr "该选项将放弃认证，匿名连接 NNTP 服务器。"
-#: ../src/camel/providers/nntp/camel-nntp-provider.c:94
+#: ../src/camel/providers/nntp/camel-nntp-provider.c:97
msgid ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
-msgstr "该选项将以明文密码向进行 NNTP 服务器进行认证。"
+msgstr "该选项将以明文密码向 NNTP 服务器进行认证。"
-#: ../src/camel/providers/nntp/camel-nntp-store.c:379
+#: ../src/camel/providers/nntp/camel-nntp-store.c:376
#, c-format
msgid "Could not read greeting from %s: "
msgstr "无法阅读来自 %s 的欢迎信息："
-#: ../src/camel/providers/nntp/camel-nntp-store.c:391
+#: ../src/camel/providers/nntp/camel-nntp-store.c:388
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "NNTP 服务器 %s 返回错误码 %d：%s"
-#: ../src/camel/providers/nntp/camel-nntp-store.c:410
+#: ../src/camel/providers/nntp/camel-nntp-store.c:407
#, c-format
msgid "Failed to issue STARTTLS for NNTP server %s: "
msgstr "无法为 NNTP 服务器 %s 提出 STARTTLS 请求："
-#: ../src/camel/providers/nntp/camel-nntp-store.c:421
-#, fuzzy, c-format
+#: ../src/camel/providers/nntp/camel-nntp-store.c:418
+#, c-format
msgid "NNTP server %s doesn’t support STARTTLS: %s"
-msgstr "NNTP 服务器 %s 不支持 STARTTLS： %s"
+msgstr "NNTP 服务器 %s 不支持 STARTTLS：%s"
-#: ../src/camel/providers/nntp/camel-nntp-store.c:441
+#: ../src/camel/providers/nntp/camel-nntp-store.c:438
#, c-format
msgid "Failed to connect to NNTP server %s in secure mode: "
msgstr "以安全模式连接 NNTP 服务器 %s 失败："
-#: ../src/camel/providers/nntp/camel-nntp-store.c:512
+#: ../src/camel/providers/nntp/camel-nntp-store.c:509
#, c-format
msgid "USENET News via %s"
msgstr "USENET 新闻 %s"
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1250
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1245
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -4388,22 +5194,22 @@ msgstr ""
"\n"
"%s"
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1365
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1360
#, c-format
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr "您无法在新闻存储中创建文件夹：应该订阅。"
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1381
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1376
#, c-format
msgid "You cannot rename a folder in a News store."
msgstr "您无法在新闻存储中重命名文件夹。"
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1404
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1399
#, c-format
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr "您无法在新闻存储中删除文件夹：应该退订。"
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1618
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1613
#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
@@ -4414,7 +5220,7 @@ msgstr ""
"\n"
"没有这样的新闻组。选中项目可能是父文件夹。"
-#: ../src/camel/providers/nntp/camel-nntp-store.c:1685
+#: ../src/camel/providers/nntp/camel-nntp-store.c:1680
#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
@@ -4425,41 +5231,53 @@ msgstr ""
"\n"
"新闻组不存在！"
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2111
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2104
msgid "NNTP Command failed: "
msgstr "NNTP 命令失败："
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2216
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2210
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2245
#, c-format
msgid "Not connected."
msgstr "未连接。"
-#: ../src/camel/providers/nntp/camel-nntp-store.c:2318
+#: ../src/camel/providers/nntp/camel-nntp-store.c:2322
#, c-format
msgid "No such folder: %s"
msgstr "没有文件夹：%s"
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:190
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:333
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:189
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:334
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s：正在扫描新消息"
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:212
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:211
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "来自 xover 的意外服务器应答：%s"
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:354
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:355
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "来自 head 的意外服务器应答：%s"
-#: ../src/camel/providers/nntp/camel-nntp-summary.c:403
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:404
#, c-format
msgid "Operation failed: %s"
msgstr "操作失败：%s"
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:451
+#, c-format
+msgid "%s: Scanning existing messages"
+msgstr "%s：正在扫描已有消息"
+
+#: ../src/camel/providers/nntp/camel-nntp-summary.c:464
+#, fuzzy, c-format
+#| msgid "Unexpected server response from xover: %s"
+msgid "Unexpected server response from listgroup: %s"
+msgstr "来自 xover 的意外服务器应答：%s"
+
#: ../src/camel/providers/pop3/camel-pop3-folder.c:358
#: ../src/camel/providers/pop3/camel-pop3-folder.c:442
#, c-format
@@ -4487,11 +5305,11 @@ msgstr "正在获取 POP 概要"
msgid "Cannot get POP summary: "
msgstr "无法获取 POP 概要："
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:812
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:895
msgid "Expunging old messages"
msgstr "销毁旧消息"
-#: ../src/camel/providers/pop3/camel-pop3-folder.c:840
+#: ../src/camel/providers/pop3/camel-pop3-folder.c:927
msgid "Expunging deleted messages"
msgstr "彻底销毁已删除的消息"
@@ -4512,7 +5330,7 @@ msgstr "%s 天之后删除(_D)"
#: ../src/camel/providers/pop3/camel-pop3-provider.c:42
msgid "Hint: Use 0 days to keep messages on the server indefinitely."
-msgstr ""
+msgstr "提示：若使用 0 天则表示无限期在服务器上保存消息。"
#: ../src/camel/providers/pop3/camel-pop3-provider.c:44
msgid "Delete _expunged from local Inbox"
@@ -4522,23 +5340,27 @@ msgstr "从本地的收件箱中删除已在远端清除的邮件(_E)"
msgid "Disable _support for all POP3 extensions"
msgstr "禁用所有 POP3 扩展的支持(_S)"
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:52
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:48
+msgid "Enable _UTF-8 extension, when the server supports it"
+msgstr "如果服务器支持则启用 _UTF-8 扩展"
+
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:54
msgid "Default POP3 port"
msgstr "默认的 POP3 端口"
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:53
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:55
msgid "POP3 over TLS"
-msgstr "POP3(TLS 加密)"
+msgstr "TLS 加密的 POP3"
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:60
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:62
msgid "POP"
msgstr "POP"
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:62
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:64
msgid "For connecting to and downloading mail from POP servers."
-msgstr "关于连接到 POP 服务器和从 POP 服务器下载邮件。"
+msgstr "用来连接到 POP 服务器并从 POP 服务器下载邮件。"
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:82
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:84
msgid ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
@@ -4546,7 +5368,7 @@ msgstr ""
"该选项使 Evolution 在连接到 POP 服务器时使用明文密码。这是许多 POP 服务器唯一"
"支持的选项。"
-#: ../src/camel/providers/pop3/camel-pop3-provider.c:92
+#: ../src/camel/providers/pop3/camel-pop3-provider.c:94
msgid ""
"This option will connect to the POP server using an encrypted password via "
"the APOP protocol. This may not work for all users even on servers that "
@@ -4556,59 +5378,68 @@ msgstr ""
"能的服务器，也不一定能使所有用户工作。"
#. Translators: This is the separator between an error and an explanation
-#: ../src/camel/providers/pop3/camel-pop3-store.c:93
+#: ../src/camel/providers/pop3/camel-pop3-store.c:90
msgid ": "
msgstr "："
-#: ../src/camel/providers/pop3/camel-pop3-store.c:160
+#: ../src/camel/providers/pop3/camel-pop3-store.c:157
#, c-format
msgid "Failed to read a valid greeting from POP server %s"
-msgstr "从 POP 服务器 %s 读取欢迎词失败"
+msgstr "从 POP 服务器 %s 读取有效的问候语失败"
-#: ../src/camel/providers/pop3/camel-pop3-store.c:175
+#: ../src/camel/providers/pop3/camel-pop3-store.c:172
#, c-format
msgid "Failed to connect to POP server %s in secure mode: %s"
msgstr "以安全模式连接到 POP 服务器 %s 失败：%s"
-#: ../src/camel/providers/pop3/camel-pop3-store.c:176
+#: ../src/camel/providers/pop3/camel-pop3-store.c:173
msgid "STLS not supported by server"
msgstr "服务器不支持 STLS"
#. Translators: Last %s is an optional
#. * explanation beginning with ": " separator.
-#: ../src/camel/providers/pop3/camel-pop3-store.c:197
+#: ../src/camel/providers/pop3/camel-pop3-store.c:194
#, c-format
msgid "Failed to connect to POP server %s in secure mode%s"
msgstr "以安全模式连接到 POP 服务器 %s 失败%s"
-#: ../src/camel/providers/pop3/camel-pop3-store.c:215
+#: ../src/camel/providers/pop3/camel-pop3-store.c:214
#, c-format
msgid "Failed to connect to POP server %s in secure mode: "
msgstr "以安全模式连接到 POP 服务器 %s 失败："
-#: ../src/camel/providers/pop3/camel-pop3-store.c:355
+#: ../src/camel/providers/pop3/camel-pop3-store.c:356
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "无法登录到 POP 服务器 %s：SASL 协议错误"
-#: ../src/camel/providers/pop3/camel-pop3-store.c:377
+#: ../src/camel/providers/pop3/camel-pop3-store.c:378
#, c-format
msgid "Failed to authenticate on POP server %s: "
-msgstr "无法认证 POP 服务器 %s："
+msgstr "无法通过 POP 服务器 %s 认证："
-#: ../src/camel/providers/pop3/camel-pop3-store.c:485
+#: ../src/camel/providers/pop3/camel-pop3-store.c:486
#, c-format
msgid "POP3 server %s"
msgstr "POP3 服务器 %s"
-#: ../src/camel/providers/pop3/camel-pop3-store.c:488
+#: ../src/camel/providers/pop3/camel-pop3-store.c:489
#, c-format
msgid "POP3 server for %s on %s"
msgstr "%2$s 为 %1$s 提供的 POP 服务"
-#: ../src/camel/providers/pop3/camel-pop3-store.c:700
-#: ../src/camel/providers/pop3/camel-pop3-store.c:713
-#: ../src/camel/providers/pop3/camel-pop3-store.c:799
+#: ../src/camel/providers/pop3/camel-pop3-store.c:693
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error enabling UTF-8 mode: "
+msgstr ""
+"无法连接到 POP 服务器 %s。\n"
+"启用 UTF-8 模式出错："
+
+#: ../src/camel/providers/pop3/camel-pop3-store.c:721
+#: ../src/camel/providers/pop3/camel-pop3-store.c:734
+#: ../src/camel/providers/pop3/camel-pop3-store.c:820
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4618,7 +5449,7 @@ msgstr ""
"发送密码错误："
#. Translators: Do not translate APOP.
-#: ../src/camel/providers/pop3/camel-pop3-store.c:740
+#: ../src/camel/providers/pop3/camel-pop3-store.c:761
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4629,7 +5460,7 @@ msgstr ""
#. Translators: Last %s is an optional explanation
#. * beginning with ": " separator.
-#: ../src/camel/providers/pop3/camel-pop3-store.c:814
+#: ../src/camel/providers/pop3/camel-pop3-store.c:835
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4638,12 +5469,12 @@ msgstr ""
"无法连接到 POP 服务器 %s。\n"
"发送用户名错误%s"
-#: ../src/camel/providers/pop3/camel-pop3-store.c:898
-#, fuzzy, c-format
+#: ../src/camel/providers/pop3/camel-pop3-store.c:919
+#, c-format
msgid "No such folder “%s”."
-msgstr "没有文件夹 %s"
+msgstr "没有文件夹 %s。"
-#: ../src/camel/providers/pop3/camel-pop3-store.c:915
+#: ../src/camel/providers/pop3/camel-pop3-store.c:936
#, c-format
msgid "POP3 stores have no folder hierarchy"
msgstr "POP3 的存储没有文件夹结构"
@@ -4654,11 +5485,10 @@ msgid "Sendmail"
msgstr "Sendmail"
#: ../src/camel/providers/sendmail/camel-sendmail-provider.c:33
-#, fuzzy
msgid ""
"For delivering mail by passing it to the “sendmail” program on the local "
"system."
-msgstr "将邮件传递到本地系统的“sendmail”来发送邮件。"
+msgstr "将邮件传递到本地系统的“sendmail”程序来发送邮件。"
#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:44
msgid "sendmail"
@@ -4671,7 +5501,7 @@ msgstr "通过 sendmail 程序发送邮件"
#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:137
#, c-format
msgid "Failed to read From address"
-msgstr "读取 From(来自) 地址失败"
+msgstr "读取 From 地址失败"
#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:154
#, c-format
@@ -4689,31 +5519,31 @@ msgid "Could not parse arguments"
msgstr "无法解析参数"
#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:215
-#, fuzzy, c-format
+#, c-format
msgid "Could not create pipe to “%s”: %s: mail not sent"
msgstr "无法创建到“%s”的管道：%s：邮件未发送"
#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:246
-#, fuzzy, c-format
+#, c-format
msgid "Could not fork “%s”: %s: mail not sent"
-msgstr "无法 fork “%s”进程：%s：邮件未发送"
+msgstr "无法创建“%s”进程：%s：邮件未发送"
#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:301
msgid "Could not send message: "
msgstr "无法发送消息："
#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:343
-#, fuzzy, c-format
+#, c-format
msgid "“%s” exited with signal %s: mail not sent."
msgstr "“%s”以信号 %s 退出：邮件未发送。"
#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:353
-#, fuzzy, c-format
+#, c-format
msgid "Could not execute “%s”: mail not sent."
msgstr "无法执行“%s”：邮件未发送。"
#: ../src/camel/providers/sendmail/camel-sendmail-transport.c:358
-#, fuzzy, c-format
+#, c-format
msgid "“%s” exited with status %d: mail not sent."
msgstr "“%s”以状态码 %d 退出：邮件未发送。"
@@ -4723,7 +5553,7 @@ msgstr "默认的 SMTP 端口"
#: ../src/camel/providers/smtp/camel-smtp-provider.c:38
msgid "SMTP over TLS"
-msgstr "SMTP(TLS 加密)"
+msgstr "TLS 加密的 SMTP"
#: ../src/camel/providers/smtp/camel-smtp-provider.c:39
msgid "Message submission port"
@@ -4737,222 +5567,227 @@ msgstr "SMTP"
msgid "For delivering mail by connecting to a remote mailhub using SMTP."
msgstr "要投递邮件，应该使用 SMTP 连接到远程的邮件交换服务器。"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:235
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:242
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:237
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:244
msgid "Welcome response error: "
-msgstr "欢迎应答错误："
+msgstr "问候应答错误："
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:278
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:282
#, c-format
msgid "Failed to connect to SMTP server %s in secure mode: %s"
msgstr "以安全模式连接 SMTP 服务器 %s 失败：%s"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:287
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:300
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:307
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:291
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:304
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:311
msgid "STARTTLS command failed: "
msgstr "STARTTLS 命令失败："
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:326
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:332
#, c-format
msgid "Failed to connect to SMTP server %s in secure mode: "
msgstr "以安全模式连接 SMTP 服务器 %s 失败："
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:437
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:443
#, c-format
msgid "SMTP server %s"
msgstr "SMTP 服务器 %s"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:440
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:446
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "通过 %s 发送 SMTP 邮件"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:580
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:586
#, c-format
msgid "SMTP server %s does not support %s authentication"
-msgstr "SMTP 服务器 %s 不支持 %s 认证。"
+msgstr "SMTP 服务器 %s 不支持 %s 认证"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:661
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:686
#, c-format
msgid "No SASL mechanism was specified"
msgstr "未指定 SASL 机制"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:697
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:723
msgid "AUTH command failed: Not connected."
msgstr "AUTH 命令失败：未连接。"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:704
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:718
#: ../src/camel/providers/smtp/camel-smtp-transport.c:730
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:744
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:760
msgid "AUTH command failed: "
msgstr "AUTH 命令失败："
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:887
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:963
#, c-format
msgid "Cannot send message: service not connected."
msgstr "无法发送消息：服务未连接。"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:896
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:972
#, c-format
msgid "Cannot send message: sender address not valid."
msgstr "无法发送消息：发件人地址不合法。"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:900
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:976
msgid "Sending message"
msgstr "正在发送消息"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:929
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1005
#, c-format
msgid "Cannot send message: no recipients defined."
msgstr "无法发送消息：没有定义收件人。"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:944
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1020
#, c-format
msgid "Cannot send message: one or more invalid recipients"
-msgstr "无法发送消息：一个或多个非法收件人"
+msgstr "无法发送消息：一个或多个无效的收件人"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1076
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1152
msgid "Syntax error, command unrecognized"
msgstr "语法错误，命令无法识别"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1078
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1154
msgid "Syntax error in parameters or arguments"
msgstr "参数语法错误"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1080
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1156
msgid "Command not implemented"
msgstr "命令尚未实现"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1082
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1158
msgid "Command parameter not implemented"
msgstr "命令参数尚未实现"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1084
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1160
msgid "System status, or system help reply"
-msgstr "系统状态，或系统求助就绪"
+msgstr "系统状态，或系统帮助回复"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1086
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1162
msgid "Help message"
msgstr "帮助消息"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1088
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1164
msgid "Service ready"
msgstr "服务就绪"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1090
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1166
msgid "Service closing transmission channel"
msgstr "服务正在关闭传输通道"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1092
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1168
msgid "Service not available, closing transmission channel"
msgstr "服务不可用，正在关闭传输通道"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1170
msgid "Requested mail action okay, completed"
msgstr "邮件动作请求确认，已完成"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1096
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1172
msgid "User not local; will forward to <forward-path>"
-msgstr "用户不在本地；将转发到 <转发路径>"
+msgstr "用户不在本地；将转发到 <forward-path>"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1098
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1174
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "邮件动作请求未发生：邮箱无效"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1100
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1176
msgid "Requested action not taken: mailbox unavailable"
msgstr "动作请求未发生：邮箱无效"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1102
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1178
msgid "Requested action aborted: error in processing"
msgstr "动作请求已放弃：处理出错"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1104
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1180
msgid "User not local; please try <forward-path>"
-msgstr "用户不在本地；请尝试 <转发路径>"
+msgstr "用户不在本地；请尝试 <forward-path>"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1106
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1182
msgid "Requested action not taken: insufficient system storage"
msgstr "动作请求未发生：系统存储空间不足"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1108
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1184
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "邮件动作请求已放弃：存储分配超额"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1110
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1186
msgid "Requested action not taken: mailbox name not allowed"
msgstr "动作请求未发生：不允许的邮件箱名称"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1112
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1188
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "开始输入邮件；以 <CRLF>.<CRLF> 结束"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1114
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1190
msgid "Transaction failed"
msgstr "传送失败"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1118
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1194
msgid "A password transition is needed"
-msgstr "必须传输密码"
+msgstr "需要密码转换"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1120
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1196
msgid "Authentication mechanism is too weak"
msgstr "认证机制太弱"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1198
msgid "Encryption required for requested authentication mechanism"
msgstr "请求的认证机制必须加密"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1124
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1200
msgid "Temporary authentication failure"
msgstr "临时认证失败"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1414
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1202
+#: ../src/libedataserver/e-client.c:145
+msgid "Authentication required"
+msgstr "必须认证"
+
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1492
msgid "SMTP Greeting"
-msgstr "SMTP 欢迎"
+msgstr "SMTP 问候"
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1423
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1436
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1443
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1501
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1514
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1521
msgid "HELO command failed: "
msgstr "HELO 命令失败："
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1519
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1533
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1542
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1605
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1619
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1628
msgid "MAIL FROM command failed: "
msgstr "MAIL FROM 命令失败："
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1570
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1656
msgid "RCPT TO command failed: "
-msgstr "RSET 命令失败："
+msgstr "RCTP TO 命令失败："
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1586
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1595
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1672
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1681
#, c-format
msgid "RCPT TO <%s> failed: "
msgstr "RCPT TO <%s> 失败："
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1669
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1680
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1691
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1740
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1758
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1771
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1779
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1755
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1766
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1777
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1860
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1878
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1891
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1899
msgid "DATA command failed: "
msgstr "DATP 命令失败："
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1805
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1819
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1827
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1925
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1939
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1947
msgid "RSET command failed: "
msgstr "RSET 命令失败："
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1853
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1865
-#: ../src/camel/providers/smtp/camel-smtp-transport.c:1871
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1973
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1985
+#: ../src/camel/providers/smtp/camel-smtp-transport.c:1991
msgid "QUIT command failed: "
msgstr "QUIT 命令失败："
@@ -4981,21 +5816,93 @@ msgid "Birthday and anniversary reminder units"
msgstr "生日与周年纪念日提醒单位"
#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
-#, fuzzy
msgid ""
"Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
msgstr "生日/周年纪念日提醒单位，“分钟”、“小时”或“天”"
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:7
+msgid "Past reminders for EReminderWatcher"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:8
+msgid "Snoozed reminders for EReminderWatcher"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:9
+msgid "Reminder programs"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:10
+msgid "Programs that are allowed to be run by reminders"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:11
+msgid "Show reminders in notification tray only"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:12
+msgid ""
+"When set to true, the reminders are shown only in the notification tray, "
+"otherwise the reminders dialog is shown immediately"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:13
+msgid "Show reminder notification dialog always on top"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:14
+msgid ""
+"Whether or not to show reminder notification dialog always on top. Note this "
+"works only as a hint for the window manager, which may or may not obey it."
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:15
+msgid "X position of the reminder notification dialog"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:16
+msgid "Y position of the reminder notification dialog"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:17
+msgid "Width of the reminder notification dialog"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:18
+msgid "Height of the reminder notification dialog"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:19
+msgid ""
+"Paned position in the reminder notification dialog, the split size between "
+"list of the events and the description"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:20
+msgid "Show reminder notification for completed tasks"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:21
+msgid "Show reminder notification for past events"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:22
+msgid "The last used snooze time, in minutes"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:23
+msgid "User-defined snooze times, in minutes"
+msgstr ""
+
#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:1
msgid "Whether the migration of old setting was already done"
msgstr "是否已完成老旧设置迁移"
#: ../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)二进制的绝对路径"
+msgstr "gpg（或 gpg2）二进制文件的绝对路径"
#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:3
-#, fuzzy
msgid ""
"An example is “/usr/bin/gpg”; when it is left empty, or an incorrect value "
"is set, then it will be searched for. Change requires restart of the "
@@ -5009,19 +5916,17 @@ msgid "Whether to load photos of signers/encrypters"
msgstr "是否载入签名者或加密者的照片"
#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:5
-#, fuzzy
msgid ""
"When set to “true”, tries to load also photo of the signers/encrypters, if "
"available in the key/certificate."
msgstr ""
-"设置为“true”时则尝试载入签名者或加密者的照片，前提是已经存在密钥或证书里。"
+"如果在密钥或证书中可用，当设置为“true”时则尝试载入签名者或加密者的照片。"
#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:6
msgid "GIO name of the GNetworkMonitor to use for an ENetworkMonitor instance"
msgstr "GNetworkMonitor 的 GIO 名字以便为 ENetworkMonitor 实例所使用"
#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:7
-#, fuzzy
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 "
@@ -5034,17 +5939,18 @@ msgstr ""
msgid ""
"A full path to a directory where .source files with preconfigured options "
"can be stored"
-msgstr ""
+msgstr "存有预先配置好选项的 .source 文件所在目录的完整路径"
#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:9
msgid ""
"This directory, if filled with an existing path, is checked additionally to "
"XDG configure directories."
msgstr ""
+"这个目录，如果填入一个已经存在的路径，额外还会检查存有 XDG 配置的目录。"
#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:10
msgid "A list of variables which can be part of the autoconfig .source files"
-msgstr ""
+msgstr "可以与自动配置的 .source 文件分离的变量列表"
#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:11
msgid ""
@@ -5052,13 +5958,84 @@ msgid ""
"variables are checked before environment variables, but after the predefined "
"USER, REALNAME and HOST variables."
msgstr ""
+"数组的每一项需要按照格式：名字=值。会在检查环境变量检查这些变量，但会在预定义"
+"的 USER、REALNAME 和 HOST 变量之后。"
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:12
+msgid "A list of hints for OAuth2 services"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:13
+msgid ""
+"Users can extend the list of supported protocols and hostnames for defined "
+"OAuth2 services, in addition to those hard-coded. Each line can be of the "
+"form: servicename[-protocol]:hostname1,hostname2,... where “servicename” is "
+"the actual service name; the “-protocol” is optional, and if written, then "
+"the service can be used only if both “protocol” and “hostnameX” match; the "
+"“hostnameX” is the actual host name to compare with, case insensitively. "
+"Each line can contain multiple values, separated by comma. There can be "
+"provided multiple lines for one OAuth2 service. Note that the actual URL "
+"where the token is requested and refreshed cannot be changed here, the "
+"hostname is to allow other servers, where the OAuth2 service can be used. "
+"Examples: Company:mail.company.com — enables “Company” OAuth2 authentication "
+"for “mail.company.com” host Company-CalDAV:caldav.company.com — enables "
+"“Company” OAuth2 authentication for any “CalDAV” source, which reads data "
+"from “caldav.company.com” host"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:14
+msgid ""
+"An OAuth2 client ID to use to connect to Google servers, instead of the one "
+"provided during build time"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:15
+msgid ""
+"User-specified OAuth2 client ID for Google servers. Empty string means to "
+"use the one provided during build time. Change of this requires restart."
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:16
+msgid ""
+"An OAuth2 client secret to use to connect to Google servers, instead of the "
+"one provided during build time"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:17
+msgid ""
+"User-specified OAuth2 client secret for Google servers. Empty string means "
+"to use the one provided during build time. Change of this requires restart."
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:18
+msgid ""
+"An OAuth2 client ID to use to connect to Outlook servers, instead of the one "
+"provided during build time"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:19
+msgid ""
+"User-specified OAuth2 client ID for Outlook servers. Empty string means to "
+"use the one provided during build time. Change of this requires restart."
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:20
+msgid ""
+"An OAuth2 client secret to use to connect to Outlook servers, instead of the "
+"one provided during build time"
+msgstr ""
+
+#: ../data/org.gnome.evolution-data-server.gschema.xml.in.h:21
+msgid ""
+"User-specified OAuth2 client secret for Outlook servers. Empty string means "
+"to use the one provided during build time. Change of this requires restart."
+msgstr ""
#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
msgid "(Deprecated) Proxy type to use"
-msgstr "(已废弃)要使用的代理类型"
+msgstr "（已废弃）要使用的代理类型"
#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
-#, fuzzy
msgid ""
"This key was deprecated in version 3.12 and should no longer be used. Proxy "
"settings are now integrated into Evolution-Data-Server’s account system. See "
@@ -5069,68 +6046,91 @@ msgstr ""
#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
msgid "(Deprecated) Whether to use http-proxy"
-msgstr "(已废弃)是否使用 HTTP 代理"
+msgstr "（已废弃）是否使用 HTTP 代理"
#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
msgid "(Deprecated) Whether proxy server requires authentication"
-msgstr "(已废弃)代理服务器是否需要认证"
+msgstr "（已废弃）代理服务器是否需要认证"
#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
msgid "(Deprecated) Host name for HTTP requests"
-msgstr "(已废弃) HTTP 请求的主机名"
+msgstr "（已废弃） HTTP 请求的主机名"
#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
msgid "(Deprecated) Port number for HTTP requests"
-msgstr "(已废弃) HTTP 请求端口"
+msgstr "（已废弃） HTTP 请求端口"
#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
msgid "(Deprecated) Proxy authentication user name"
-msgstr "(已废弃)代理认证用户名"
+msgstr "（已废弃）代理认证用户名"
#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
msgid "(Deprecated) Proxy authentication password"
-msgstr "(已废弃)代理认证密码"
+msgstr "（已废弃）代理认证密码"
#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
msgid "(Deprecated) List of hosts to connect to without proxy"
-msgstr "(已废弃)不使用代理连接的主机列表"
+msgstr "（已废弃）不使用代理连接的主机列表"
#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
msgid "(Deprecated) Host name for HTTPS requests"
-msgstr "(已废弃) HTTPS 请求的主机名"
+msgstr "（已废弃） HTTPS 请求的主机名"
#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
msgid "(Deprecated) Port number for HTTPS requests"
-msgstr "(已废弃) HTTPS 请求端口"
+msgstr "（已废弃） HTTPS 请求端口"
#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
msgid "(Deprecated) Host name for SOCKS requests"
-msgstr "(已废弃) SOCKS 请求的主机名"
+msgstr "（已废弃） SOCKS 请求的主机名"
#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
msgid "(Deprecated) Port number for SOCKS requests"
-msgstr "(已废弃) SOCKS 请求端口"
+msgstr "（已废弃） SOCKS 请求端口"
#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
msgid "(Deprecated) Automatic proxy configuration URL"
-msgstr "(已废弃) 自动代理配置 URL"
+msgstr "（已废弃） 自动代理配置 URL"
+
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:1
+msgid "Evolution Alarm Notify"
+msgstr ""
+
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:2
+msgid "Calendar event notifications"
+msgstr "日历时间通知"
+
+#: ../src/libebackend/e-cache.c:754
+msgid "Out of memory"
+msgstr "内存不足"
-#: ../src/libebackend/e-collection-backend.c:977
+#: ../src/libebackend/e-cache.c:946
+#, c-format
+msgid "Can not make parent directory: %s"
+msgstr "无法创建父目录：%s"
+
+#: ../src/libebackend/e-collection-backend.c:1105
#, c-format
msgid "%s does not support creating remote resources"
msgstr "%s 不支持创建远程资源"
-#: ../src/libebackend/e-collection-backend.c:1036
+#: ../src/libebackend/e-collection-backend.c:1164
#, c-format
msgid "%s does not support deleting remote resources"
msgstr "%s 不支持删除远程资源"
-#: ../src/libebackend/e-data-factory.c:1295
-#, fuzzy, c-format
+#: ../src/libebackend/e-data-factory.c:1428
+#: ../src/libebackend/e-subprocess-factory.c:288
+#, c-format
+msgid "No such source for UID “%s”"
+msgstr "没有 UID 为“%s”的源"
+
+#: ../src/libebackend/e-data-factory.c:1588
+#, c-format
msgid "Backend factory for source “%s” and extension “%s” cannot be found."
msgstr "未找到源“%s”和扩展“%s”的后端工厂。"
-#: ../src/libebackend/e-server-side-source.c:142
+#: ../src/libebackend/e-server-side-source.c:139
#, c-format
msgid "Data source is missing a [%s] group"
msgstr "数据源缺少一个 [%s] 组"
@@ -5140,64 +6140,76 @@ msgid "Failed to lookup credentials: "
msgstr "无法查找凭据："
#: ../src/libebackend/e-server-side-source.c:1392
-#: ../src/libedataserver/e-source.c:1599
-#, fuzzy, c-format
+#: ../src/libedataserver/e-source.c:1591
+#, c-format
msgid "Data source “%s” does not support creating remote resources"
msgstr "数据源“%s”不支持创建远程资源"
# collection backend，如何翻译更好？
#: ../src/libebackend/e-server-side-source.c:1406
-#, fuzzy, c-format
+#, c-format
msgid ""
"Data source “%s” has no collection backend to create the remote resource"
-msgstr "数据源“%s”没有合集后端(collection backend)来创建远程资源"
+msgstr "数据源“%s”没有 collection 后端来创建远程资源"
#: ../src/libebackend/e-server-side-source.c:1434
-#: ../src/libedataserver/e-source.c:1712
-#, fuzzy, c-format
+#: ../src/libedataserver/e-source.c:1704
+#, c-format
msgid "Data source “%s” does not support deleting remote resources"
msgstr "数据源“%s”不支持删除远程资源"
#: ../src/libebackend/e-server-side-source.c:1448
-#, fuzzy, c-format
+#, c-format
msgid ""
"Data source “%s” has no collection backend to delete the remote resource"
-msgstr "数据源“%s”没有合集后端(collection backend)来删除远程资源"
+msgstr "数据源“%s”没有 collection 后端来删除远程资源"
#: ../src/libebackend/e-server-side-source.c:1479
-#: ../src/libedataserver/e-source.c:1808
-#: ../src/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1080
-#, fuzzy, c-format
+#: ../src/libedataserver/e-source.c:1800
+#, c-format
msgid "Data source “%s” does not support OAuth 2.0 authentication"
msgstr "数据源“%s”不支持 OAuth 2.0 认证"
-#: ../src/libebackend/e-server-side-source.c:1857
-#, fuzzy, c-format
+#: ../src/libebackend/e-server-side-source.c:1861
+#, c-format
msgid "File must have a “.source” extension"
msgstr "文件扩展名必须为“.source”"
-#: ../src/libebackend/e-source-registry-server.c:320
-#, fuzzy, c-format
+#: ../src/libebackend/e-source-registry-server.c:318
+#, c-format
msgid "UID “%s” is already in use"
-msgstr "UID“%s” 已在使用"
+msgstr "UID “%s” 已在使用"
+
+#: ../src/libebackend/e-source-registry-server.c:443
+#, fuzzy, c-format
+#| msgid "Cannot find certificate for “%s”"
+msgid "Cannot find corresponding collection backend for source “%s”"
+msgstr "无法找到“%s”的证书"
+
+#: ../src/libebackend/e-source-registry-server.c:447
+#, fuzzy, c-format
+#| msgid "Source “%s” (%s) is not a valid Google source"
+msgid "Source “%s” is not a collection source"
+msgstr "“%s” (%s) 不是有效的 Google 源"
-#: ../src/libebackend/e-subprocess-factory.c:277
+#: ../src/libebackend/e-source-registry-server.c:453
#, fuzzy, c-format
+#| msgid "Cannot find certificate for “%s”"
+msgid "Cannot find source “%s”"
+msgstr "无法找到“%s”的证书"
+
+#: ../src/libebackend/e-subprocess-factory.c:276
+#, c-format
msgid "Module “%s” for source UID “%s” cannot be loaded"
msgstr "不能为 UID 是“%2$s”的源载入模块“%1$s”"
-#: ../src/libebackend/e-subprocess-factory.c:289
-#, fuzzy, c-format
-msgid "No such source for UID “%s”"
-msgstr "没有 UID “%s”的源"
-
-#: ../src/libebackend/e-subprocess-factory.c:300
-#, fuzzy, c-format
+#: ../src/libebackend/e-subprocess-factory.c:297
+#, c-format
msgid "Failed to create backend of type “%s” for source UID “%s”"
-msgstr "为源 UID “%2$s” 创建的后端类型 “%1$s” 失败"
+msgstr "为源 UID “%2$s” 创建的后端类型“%1$s”失败"
-#: ../src/libebackend/e-user-prompter-server.c:303
-#, fuzzy, c-format
+#: ../src/libebackend/e-user-prompter-server.c:301
+#, c-format
msgid "Extension dialog “%s” not found."
msgstr "扩展对话框“%s”未找到。"
@@ -5313,45 +6325,164 @@ msgctxt "CategoryName"
msgid "Waiting"
msgstr "等候"
-#: ../src/libedataserver/e-client.c:144
+#: ../src/libedataserver/e-client.c:137
+msgid "Backend is busy"
+msgstr "后端繁忙"
+
+#: ../src/libedataserver/e-client.c:139
msgid "Source not loaded"
msgstr "源尚未加载"
-#: ../src/libedataserver/e-client.c:146
+#: ../src/libedataserver/e-client.c:141
msgid "Source already loaded"
msgstr "源已经加载"
+#: ../src/libedataserver/e-client.c:143
+msgid "Authentication failed"
+msgstr "认证失败"
+
+#: ../src/libedataserver/e-client.c:147
+msgid "Repository offline"
+msgstr "仓库离线"
+
#. Translators: This means that the EClient does not
#. * support offline mode, or it's not set to by a user,
#. * thus it is unavailable while user is not connected.
-#: ../src/libedataserver/e-client.c:157
+#: ../src/libedataserver/e-client.c:152
msgid "Offline unavailable"
msgstr "离线不可用"
-#: ../src/libedataserver/e-client.c:179
+#: ../src/libedataserver/e-client.c:154
+msgid "Permission denied"
+msgstr "没有权限"
+
+#: ../src/libedataserver/e-client.c:158
+msgid "Could not cancel"
+msgstr "无法取消"
+
+#: ../src/libedataserver/e-client.c:160
+msgid "Not supported"
+msgstr "不支持"
+
+#: ../src/libedataserver/e-client.c:162
+msgid "Unsupported authentication method"
+msgstr "不支持的身份认证方式"
+
+#: ../src/libedataserver/e-client.c:164
+msgid "TLS not available"
+msgstr "TLS 不可用"
+
+#: ../src/libedataserver/e-client.c:166
+msgid "Search size limit exceeded"
+msgstr "超过搜索大小限制"
+
+#: ../src/libedataserver/e-client.c:168
+msgid "Search time limit exceeded"
+msgstr "超过搜索时间限制"
+
+#: ../src/libedataserver/e-client.c:172
+msgid "Query refused"
+msgstr "查询被拒绝"
+
+#: ../src/libedataserver/e-client.c:174
msgid "D-Bus error"
msgstr "D-Bus 错误"
-#: ../src/libedataserver/e-client.c:2021
+#: ../src/libedataserver/e-client.c:176
+msgid "Other error"
+msgstr "其他错误"
+
+#: ../src/libedataserver/e-client.c:178
+msgid "Backend is not opened yet"
+msgstr "后端尚未打开"
+
+#: ../src/libedataserver/e-client.c:180
+msgid "Object is out of sync"
+msgstr "目标尚未同步"
+
+#: ../src/libedataserver/e-client.c:2042
msgid "Timeout was reached"
msgstr "已到超时限制"
-#: ../src/libedataserver/e-source.c:775
+#: ../src/libedataserver/e-oauth2-service.c:919
+#, fuzzy
+#| msgid "Failed on message %d"
+msgid "Malformed, no message body set"
+msgstr "在第 %d 封信时失败"
+
+#. Translators: The first %s is a display name of the source, the second is its UID and
+#. the third is the name of the OAuth service.
+#: ../src/libedataserver/e-oauth2-service.c:1203
+#, fuzzy, c-format
+#| msgid "Source “%s” (%s) is not a valid Google source"
+msgid "Source “%s” (%s) is not valid for “%s” OAuth2 service"
+msgstr "“%s” (%s) 不是有效的 Google 源"
+
+#: ../src/libedataserver/e-oauth2-service.c:1218
+#, fuzzy
+#| msgid "Google secret not found"
+msgid "OAuth2 secret not found"
+msgstr "未找到 Google secret"
+
+#: ../src/libedataserver/e-oauth2-service.c:1413
+#, c-format
+msgid "Received incorrect response from server “%s”."
+msgstr "收到了来自服务器“%s”的不正确的应答。"
+
+#: ../src/libedataserver/e-oauth2-service.c:1422
+msgid "Failed to refresh access token. Sign to the server again, please."
+msgstr "刷新访问令牌失败。请重新登录到服务器。"
+
+#. Translators: The first %s is a display name of the source, the second is its UID.
+#: ../src/libedataserver/e-oauth2-service.c:1464
+#, fuzzy, c-format
+#| msgid "Source “%s” (%s) is not a valid Google source"
+msgid "Source “%s” (%s) is not a valid OAuth2 source"
+msgstr "“%s” (%s) 不是有效的 Google 源"
+
+#: ../src/libedataserver/e-oauth2-service.c:1538
+msgid ""
+"The access token is expired and it failed to refresh it. Sign to the server "
+"again, please."
+msgstr ""
+
+#. Translators: This is a user-visible string, display name of an OAuth2 service.
+#: ../src/libedataserver/e-oauth2-service-google.c:56
+msgctxt "OAuth2Service"
+msgid "Google"
+msgstr "谷歌"
+
+#. Translators: This is a user-visible string, display name of an OAuth2 service.
+#: ../src/libedataserver/e-oauth2-service-outlook.c:57
+msgctxt "OAuth2Service"
+msgid "Outlook"
+msgstr "Outlook"
+
+#: ../src/libedataserver/e-soup-session.c:950
+msgid "Operation was cancelled"
+msgstr "操作已取消"
+
+#: ../src/libedataserver/e-soup-session.c:956
+#, c-format
+msgid "Failed with HTTP error %d: %s"
+msgstr ""
+
+#: ../src/libedataserver/e-source.c:769
#, c-format
msgid "Source file is missing a [%s] group"
msgstr "源文件缺少一个 [%s] 组"
-#: ../src/libedataserver/e-source.c:1379
-#, fuzzy, c-format
+#: ../src/libedataserver/e-source.c:1371
+#, c-format
msgid "Data source “%s” is not removable"
msgstr "数据源“%s”不是可删除的"
-#: ../src/libedataserver/e-source.c:1502
-#, fuzzy, c-format
+#: ../src/libedataserver/e-source.c:1494
+#, c-format
msgid "Data source “%s” is not writable"
msgstr "数据源“%s”不是可写的"
-#: ../src/libedataserver/e-source.c:2198
+#: ../src/libedataserver/e-source.c:2201
msgid "Unnamed"
msgstr "未命名"
@@ -5367,60 +6498,17 @@ msgstr "不支持存储凭据"
msgid "Credentials delete is not supported"
msgstr "不支持删除凭据"
-#. Translators: The first %s is a display name of the source, the second is its UID.
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:79
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:143
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:240
-#, fuzzy, c-format
-msgid "Source “%s” (%s) is not a valid Google source"
-msgstr "“%s” (%s) 不是有效的 Google 源"
-
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:157
-msgid "Google secret not found"
-msgstr "未找到 Google 密文"
-
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:188
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:210
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:233
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:530
-msgid "Google authentication is not supported"
-msgstr "不支持 Google 认证"
-
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:400
-msgid "Failed to get Google secret from credentials"
-msgstr "从证书里获取 Google secret 失败"
-
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:413
-msgid "Refresh token not found in Google secret"
-msgstr "在 Google secret 不能找到刷新令牌"
-
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:421
-msgid "Failed to construct refresh_token request"
-msgstr "不能构造 refresh_token 请求"
-
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:454
-msgid "Failed to encode new access token to Google secret"
-msgstr "编码 Google secret 的新访问令牌失败"
-
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:464
-msgid "Failed to get access token from refresh_token server response"
-msgstr "从 refresh_token 服务器回应中获取访问令牌失败"
-
-#: ../src/libedataserver/e-source-credentials-provider-impl-google.c:470
-msgid "Failed to refresh token"
-msgstr "获取刷新令牌失败"
-
#: ../src/libedataserver/e-source-credentials-provider-impl-password.c:79
msgid "Password not found"
msgstr "未找到密码"
-#: ../src/libedataserver/e-source-mail-signature.c:482
+#: ../src/libedataserver/e-source-mail-signature.c:477
#, c-format
msgid "Signature script must be a local file"
msgstr "签名脚本必须为本地文件"
-#: ../src/libedataserver/e-source-proxy.c:1642
-#, fuzzy, c-format
+#: ../src/libedataserver/e-source-proxy.c:1650
+#, c-format
msgid "Source “%s” does not support proxy lookups"
msgstr "数据源“%s”不支持代理查找"
@@ -5563,126 +6651,414 @@ msgstr "%H%M"
msgid "%I %p"
msgstr "%p%I"
-#: ../src/libedataserver/e-webdav-discover.c:447
-#: ../src/libedataserver/e-webdav-discover.c:486
-#: ../src/libedataserver/e-webdav-discover.c:495
+#: ../src/libedataserver/e-webdav-discover.c:295
+#, fuzzy
+#| msgid "Note"
+msgid "Notes"
+msgstr "注释"
+
+#: ../src/libedataserver/e-webdav-session.c:726
+msgid "Cannot determine destination URL without WebDAV extension"
+msgstr ""
+
+#: ../src/libedataserver/e-webdav-session.c:996
#, c-format
-msgid "HTTP Error: %s"
-msgstr "HTTP 错误：%s"
+msgid ""
+"The server responded with an HTML page, which can mean there’s an error on "
+"the server or with the client request. The used URI was: %s"
+msgstr ""
-#: ../src/libedataserver/e-webdav-discover.c:525
-msgid "Could not parse response"
-msgstr "无法解析响应"
+#: ../src/libedataserver/e-webdav-session.c:998
+#, c-format
+msgid ""
+"The server responded with an HTML page, which can mean there’s an error on "
+"the server or with the client request."
+msgstr ""
+
+#. Translators: The first '%s' is replaced with error prefix, as provided
+#. by the caller, which can be in a form: "Failed with something".
+#. The '%d' is replaced with actual HTTP status code.
+#. The second '%s' is replaced with a reason phrase of the error (user readable text).
+#. The last '%s' is replaced with detailed error text, as returned by the server.
+#: ../src/libedataserver/e-webdav-session.c:1019
+#, fuzzy, c-format
+#| msgid "NSPR error code %d"
+msgid "%s: HTTP error code %d (%s): %s"
+msgstr "NSPR 错误代码 %d"
+
+#. Translators: The '%d' is replaced with actual HTTP status code.
+#. The '%s' is replaced with a reason phrase of the error (user readable text).
+#. The last '%s' is replaced with detailed error text, as returned by the server.
+#: ../src/libedataserver/e-webdav-session.c:1027
+#, c-format
+msgid "Failed with HTTP error code %d (%s): %s"
+msgstr ""
+
+#. Translators: The first '%s' is replaced with error prefix, as provided
+#. by the caller, which can be in a form: "Failed with something".
+#. The '%d' is replaced with actual HTTP status code.
+#. The second '%s' is replaced with a reason phrase of the error (user readable text).
+#: ../src/libedataserver/e-webdav-session.c:1042
+#, c-format
+msgid "%s: HTTP error code %d (%s)"
+msgstr "%s：HTTP 错误代码 %d (%s)"
+
+#. Translators: The '%d' is replaced with actual HTTP status code.
+#. The '%s' is replaced with a reason phrase of the error (user readable text).
+#: ../src/libedataserver/e-webdav-session.c:1048
+#, c-format
+msgid "Failed with HTTP error code %d (%s)"
+msgstr ""
+
+#: ../src/libedataserver/e-webdav-session.c:1343
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to post data"
+msgstr "编码数据失败"
+
+#: ../src/libedataserver/e-webdav-session.c:1474
+#: ../src/libedataserver/e-webdav-session.c:1551
+#: ../src/libedataserver/e-webdav-session.c:1653
+#: ../src/libedataserver/e-webdav-session.c:2906
+#: ../src/libedataserver/e-webdav-session.c:4145
+#, fuzzy
+#| msgid "Failed to find Account element"
+msgid "Failed to get input XML content"
+msgstr "无法找到帐号元素"
+
+#: ../src/libedataserver/e-webdav-session.c:1485
+#, fuzzy
+#| msgid "Failed to get capabilities"
+msgid "Failed to get properties"
+msgstr "无法获取可用性信息"
+
+#: ../src/libedataserver/e-webdav-session.c:1561
+#, fuzzy
+#| msgid "Failed to authenticate"
+msgid "Failed to update properties"
+msgstr "认证失败"
+
+#: ../src/libedataserver/e-webdav-session.c:1663
+#, fuzzy
+#| msgid "Failed to issue NOTIFY"
+msgid "Failed to issue REPORT"
+msgstr "无法提出 NOTIFY 请求"
+
+#: ../src/libedataserver/e-webdav-session.c:1724
+#, fuzzy
+#| msgid "Failed to refresh token"
+msgid "Failed to create collection"
+msgstr "刷新令牌失败"
+
+#: ../src/libedataserver/e-webdav-session.c:1817
+#: ../src/libedataserver/e-webdav-session.c:1978
+msgid "Failed to get XML request content"
+msgstr "获取 XML 请求内容失败"
+
+#: ../src/libedataserver/e-webdav-session.c:1829
+#, fuzzy
+#| msgid "Failed to read From address"
+msgid "Failed to create address book"
+msgstr "读取 From 地址失败"
+
+#: ../src/libedataserver/e-webdav-session.c:1991
+msgid "Failed to create calendar"
+msgstr "创建日历失败"
+
+#: ../src/libedataserver/e-webdav-session.c:2119
+#: ../src/libedataserver/e-webdav-session.c:2130
+msgid "Failed to read resource"
+msgstr "读取资源失败"
+
+#: ../src/libedataserver/e-webdav-session.c:2270
+#, fuzzy
+#| msgid "Credentials store is not supported"
+msgid "Cannot rewind input stream: Not supported"
+msgstr "不支持存储凭据"
+
+#: ../src/libedataserver/e-webdav-session.c:2434
+#: ../src/libedataserver/e-webdav-session.c:2575
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to put data"
+msgstr "编码数据失败"
+
+#: ../src/libedataserver/e-webdav-session.c:2448
+#: ../src/libedataserver/e-webdav-session.c:2583
+#, fuzzy, c-format
+#| msgid "Failed to add data to encoder"
+msgid "Failed to put data to server, error code %d (%s)"
+msgstr "将数据添加到编码器失败"
+
+#: ../src/libedataserver/e-webdav-session.c:2677
+#, fuzzy
+#| msgid "Failed to enable QResync"
+msgid "Failed to delete resource"
+msgstr "无法启用 QResync"
+
+#: ../src/libedataserver/e-webdav-session.c:2746
+#, fuzzy
+#| msgid "Failed to copy the tmp file"
+msgid "Failed to copy resource"
+msgstr "无法复制临时文件"
+
+#: ../src/libedataserver/e-webdav-session.c:2810
+#, fuzzy
+#| msgid "Failed to refresh token"
+msgid "Failed to move resource"
+msgstr "刷新令牌失败"
+
+#: ../src/libedataserver/e-webdav-session.c:2917
+#, fuzzy
+#| msgid "Failed to refresh token"
+msgid "Failed to lock resource"
+msgstr "刷新令牌失败"
+
+#: ../src/libedataserver/e-webdav-session.c:2931
+#: ../src/libedataserver/e-webdav-session.c:3139
+msgid "Expected application/xml response, but none returned"
+msgstr ""
+
+#: ../src/libedataserver/e-webdav-session.c:2934
+#: ../src/libedataserver/e-webdav-session.c:3142
+#, c-format
+msgid "Expected application/xml response, but %s returned"
+msgstr ""
-#: ../src/libedataserver/e-webdav-discover.c:534
-msgid "Empty response"
-msgstr "空响应"
+#: ../src/libedataserver/e-webdav-session.c:2946
+#: ../src/libedataserver/e-webdav-session.c:3155
+msgid "Failed to parse XML data"
+msgstr "解析 XML 数据失败"
-#: ../src/libedataserver/e-webdav-discover.c:542
-msgid "Unexpected reply from server"
-msgstr "服务器返回意外回复"
+#: ../src/libedataserver/e-webdav-session.c:3027
+#, fuzzy
+#| msgid "Failed to refresh token"
+msgid "Failed to refresh lock"
+msgstr "刷新令牌失败"
+
+#: ../src/libedataserver/e-webdav-session.c:3088
+msgid "Failed to unlock"
+msgstr "解锁失败"
+
+#: ../src/libedataserver/e-webdav-session.c:3127
+#, fuzzy, c-format
+#| msgid "Unexpected HTTP status code %d returned (%s) for URI: %s"
+msgid "Expected multistatus response, but %d returned (%s)"
+msgstr "如下 URI 返回了意外的 HTTP 状态代码 %d (%s)：%s"
+
+#: ../src/libedataserver/e-webdav-session.c:3164
+msgid "XML data does not have root node"
+msgstr "XML 数据不含有根节点"
+
+#: ../src/libedataserver/e-webdav-session.c:3187
+#, c-format
+msgid "XML data doesn't have required structure (%s)"
+msgstr "XML 数据不含有必需的结构（%s）"
+
+#: ../src/libedataserver/e-webdav-session.c:4155
+msgid "Failed to get access control list"
+msgstr "获取访问控制列表失败"
+
+#: ../src/libedataserver/e-webdav-session.c:4839
+msgid "Cannot store protected nor inherited Access Control Entry."
+msgstr ""
+
+#: ../src/libedataserver/e-webdav-session.c:4846
+msgid "Provided invalid principal kind for Access Control Entry."
+msgstr ""
+
+#: ../src/libedataserver/e-webdav-session.c:4853
+msgid "Cannot store property-based Access Control Entry."
+msgstr ""
+
+#: ../src/libedataserver/e-webdav-session.c:4860
+msgid "Access Control Entry can be only to Grant or Deny, but not None."
+msgstr ""
+
+#: ../src/libedataserver/e-webdav-session.c:4868
+msgid "Access Control Entry can be only to Grant or Deny, but not both."
+msgstr ""
+
+#: ../src/libedataserver/e-webdav-session.c:4927
+msgid "Access Control Entry privilege cannot be NULL."
+msgstr ""
+
+#: ../src/libedataserverui/e-buffer-tagger.c:71
+msgid "Could not open the link."
+msgstr "无法打开链接。"
-#: ../src/libedataserverui/e-credentials-prompter.c:258
-#: ../src/libedataserverui/e-credentials-prompter.c:1576
-#: ../src/libedataserverui/e-credentials-prompter.c:1620
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
+#: ../src/libedataserverui/e-buffer-tagger.c:458
+msgid "Ctrl-click to open a link"
+msgstr "按住 Ctrl 键点击以打开链接"
+
+#: ../src/libedataserverui/e-credentials-prompter.c:259
+#: ../src/libedataserverui/e-credentials-prompter.c:1692
+#: ../src/libedataserverui/e-credentials-prompter.c:1736
msgid "Credentials prompt was cancelled"
msgstr "提示请求凭据失败"
-#: ../src/libedataserverui/e-credentials-prompter.c:662
-#, fuzzy, c-format
+#: ../src/libedataserverui/e-credentials-prompter.c:775
+#, c-format
msgid "Source “%s” doesn’t support prompt for credentials"
msgstr "源“%s”不支持提示请求凭据"
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:444
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:202
#, fuzzy, c-format
-msgid "Failed to obtain access token from address “%s”. Error code %d (%s)"
-msgstr "无法从地址“%s”获取令牌。错误代码 %d (%s)"
+#| msgid "Failed to obtain an access token for “%s”: "
+msgid "Failed to obtain access token from address “%s”: %s"
+msgstr "无法获取“%s”的访问令牌："
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:492
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:246
msgid "Requesting access token, please wait..."
msgstr "正在请求访问令牌，请稍候…"
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:594
-msgid "Google Address book authentication request"
-msgstr "Google 地址簿认证请求"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Address Book authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:472
+#, c-format
+msgid "%s Address Book authentication request"
+msgstr "%s 地址簿认证请求"
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:597
-msgid "Google Calendar authentication request"
-msgstr "Google 日历认证请求"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Calendar authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:477
+#, c-format
+msgid "%s Calendar authentication request"
+msgstr "%s 日历认证请求"
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:600
-msgid "Google Memo List authentication request"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Memo List authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:482
+#, fuzzy, c-format
+#| msgid "Google Memo List authentication request"
+msgid "%s Memo List authentication request"
msgstr "Google 留言簿认证请求"
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:603
-msgid "Google Task List authentication request"
-msgstr "Google 任务列表认证请求"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Task List authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:487
+#, c-format
+msgid "%s Task List authentication request"
+msgstr "%s 任务列表认证请求"
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:607
-msgid "Google Mail authentication request"
-msgstr "Google 邮件认证请求"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from
"OAuth2Service" translation context,
+#. thus it can form a string like "Google Mail authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:493
+#, c-format
+msgid "%s Mail authentication request"
+msgstr "%s 邮件认证请求"
#. generic account prompt
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:610
-msgid "Google account authentication request"
-msgstr "Google 帐号认证请求"
+#. Translators: The %s is replaced with an OAuth2 service display name, like the strings from
"OAuth2Service" translation context,
+#. thus it can form a string like "Google account authentication request".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:498
+#, c-format
+msgid "%s account authentication request"
+msgstr "%s 帐号认证请求"
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:621
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:512
#, fuzzy, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your address book “%s”."
msgid ""
-"Login to your Google account and accept conditions in order to access your "
+"Login to your %s account and accept conditions in order to access your "
"address book “%s”."
-msgstr "登录到你的 Google 帐号并接受许可以访问你的地址簿“%s”。"
+msgstr "要访问你的地址簿“%s”，请登录到你的 Google 帐号并接受许可。"
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:625
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:519
#, fuzzy, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your calendar “%s”."
msgid ""
-"Login to your Google account and accept conditions in order to access your "
+"Login to your %s account and accept conditions in order to access your "
"calendar “%s”."
-msgstr "登录到你的 Google 帐号并接受许可以访问你的日历“%s”。"
+msgstr "要访问你的日历“%s”，请登录到你的 Google 帐号并接受许可。"
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:629
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:526
#, fuzzy, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your mail account “%s”."
msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"mail account “%s”."
-msgstr "登录到你的 Google 帐号并接受许可以访问你的邮件帐号“%s”。"
+"Login to your %s account and accept conditions in order to access your mail "
+"account “%s”."
+msgstr "要访问你的邮件帐号“%s”，请登录到你的 Google 帐号并接受许可。"
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:633
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:533
#, fuzzy, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your mail transport “%s”."
msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"mail transport “%s”."
-msgstr "登录到你的 Google 帐号并接受许可以访问你的邮件传输“%s”。"
-
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:637
-#, fuzzy, c-format
+"Login to your %s account and accept conditions in order to access your mail "
+"transport “%s”."
+msgstr "要访问你的邮件传输“%s”，请登录到你的 Google 帐号并接受许可。"
+
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:540
+#, fuzzy, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your memo list “%s”."
msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"memo list “%s”."
-msgstr "登录到你的 Google 帐号并接受许可以访问你的留言簿“%s”。"
-
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:641
-#, fuzzy, c-format
+"Login to your %s account and accept conditions in order to access your memo "
+"list “%s”."
+msgstr "要访问你的留言簿“%s”，请登录到你的 Google 帐号并接受许可。"
+
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:547
+#, fuzzy, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your task list “%s”."
msgid ""
-"Login to your Google account and accept conditions in order to access your "
-"task list “%s”."
-msgstr "登录到你的 Google 帐号并接受许可以访问你的任务列表“%s”。"
-
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:645
-#, fuzzy, c-format
+"Login to your %s account and accept conditions in order to access your task "
+"list “%s”."
+msgstr "要访问你的任务列表“%s”，请登录到你的 Google 帐号并接受许可。"
+
+#. Translators: The first %s is replaced with an OAuth2 service display name, like the strings from
"OAuth2Service" translation context,
+#. thus it can form a string like "Login to your Google account and...". The second %s is the actual source
display name,
+#. like "On This Computer : Personal".
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:554
+#, fuzzy, c-format
+#| msgid ""
+#| "Login to your Google account and accept conditions in order to access "
+#| "your account “%s”."
msgid ""
-"Login to your Google account and accept conditions in order to access your "
+"Login to your %s account and accept conditions in order to access your "
"account “%s”."
-msgstr "登录到你的 Google 帐号并接受许可以访问你的帐号“%s”。"
+msgstr "要访问你的帐号“%s”，请登录到你的 Google 帐号并接受许可。"
-#: ../src/libedataserverui/e-credentials-prompter-impl-google.c:689
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:606
#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:230
-#: ../src/libedataserverui/e-trust-prompt.c:112
-#: ../src/libedataserverui/e-webdav-discover-widget.c:1064
+#: ../src/libedataserverui/e-trust-prompt.c:111
+#: ../src/libedataserverui/e-webdav-discover-widget.c:1083
msgid "_Cancel"
msgstr "取消(_C)"
+#: ../src/libedataserverui/e-credentials-prompter-impl-oauth2.c:680
+msgid "URL:"
+msgstr "URL："
+
#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:132
msgid "Address book authentication request"
msgstr "地址簿认证请求"
@@ -5701,127 +7077,223 @@ msgid "Authentication request"
msgstr "认证请求"
#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:155
-#, fuzzy, c-format
+#, c-format
msgid "Please enter the password for address book “%s”."
msgstr "请输入地址簿“%s”的密码。"
#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:159
-#, fuzzy, c-format
+#, c-format
msgid "Please enter the password for calendar “%s”."
msgstr "请输入日历“%s”的密码。"
#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:163
-#, fuzzy, c-format
+#, c-format
msgid "Please enter the password for mail account “%s”."
msgstr "请输入邮件帐号“%s”的密码。"
#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:167
-#, fuzzy, c-format
+#, c-format
msgid "Please enter the password for mail transport “%s”."
msgstr "请输入邮件传输“%s”的密码。"
#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:171
-#, fuzzy, c-format
+#, c-format
msgid "Please enter the password for memo list “%s”."
msgstr "请输入备忘录列表“%s”的密码。"
#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:175
-#, fuzzy, c-format
+#, c-format
msgid "Please enter the password for task list “%s”."
msgstr "请输入任务列表“%s”的密码。"
#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:179
-#, fuzzy, c-format
+#, c-format
msgid "Please enter the password for account “%s”."
msgstr "请输入帐号“%s”的密码。"
#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:231
-#: ../src/libedataserverui/e-webdav-discover-widget.c:1065
+#: ../src/libedataserverui/e-webdav-discover-widget.c:1084
msgid "_OK"
msgstr "确定(_O)"
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:341
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:348
msgid "_User Name:"
msgstr "用户名(_U)："
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:353
-msgid "_Password:"
-msgstr "密码(_P)："
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:360
+msgid "_Password:"
+msgstr "密码(_P)："
+
+#. Remember password check
+#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:376
+msgid "_Add this password to your keyring"
+msgstr "将该密码添加到您的密钥环(_A)"
+
+#: ../src/libedataserverui/e-reminders-widget.c:230
+msgid "Add custom time…"
+msgstr "添加自定义时间…"
+
+#: ../src/libedataserverui/e-reminders-widget.c:234
+msgid "Clear custom times"
+msgstr "清除自定义时间"
+
+#: ../src/libedataserverui/e-reminders-widget.c:282
+#, fuzzy
+#| msgctxt "Priority"
+#| msgid "Low"
+msgctxt "overdue"
+msgid "now"
+msgstr "低"
+
+#: ../src/libedataserverui/e-reminders-widget.c:300
+#, c-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+
+#: ../src/libedataserverui/e-reminders-widget.c:306
+msgctxt "overdue"
+msgid "overdue"
+msgstr ""
+
+#: ../src/libedataserverui/e-reminders-widget.c:926
+#, fuzzy, c-format
+#| msgid "Failed to open client “%s”: %s"
+msgid "Failed to launch URI “%s”:"
+msgstr "打开客户端“%s”失败：%s"
+
+#: ../src/libedataserverui/e-reminders-widget.c:976
+msgid "No reminder is selected."
+msgstr ""
+
+#: ../src/libedataserverui/e-reminders-widget.c:1033
+msgid "No details are available."
+msgstr "无详细信息可用。"
+
+#: ../src/libedataserverui/e-reminders-widget.c:1037
+msgid "Multiple reminders are selected."
+msgstr ""
+
+#: ../src/libedataserverui/e-reminders-widget.c:1057
+#, fuzzy
+#| msgid "Could not discard reminder: "
+msgid "Failed to dismiss reminder:"
+msgstr "无法取消提醒："
+
+#: ../src/libedataserverui/e-reminders-widget.c:1078
+#, fuzzy
+#| msgid "Failed to issue NOTIFY"
+msgid "Failed to dismiss all:"
+msgstr "无法提出 NOTIFY 请求"
+
+#: ../src/libedataserverui/e-reminders-widget.c:1214
+msgid "Set a custom snooze time for"
+msgstr ""
+
+#. Translators: this is part of: "Set a custom snooze time for [nnn] days [nnn] hours [nnn] minutes", where
the text in "[]" means a separate widget
+#: ../src/libedataserverui/e-reminders-widget.c:1227
+msgctxt "reminders-snooze"
+msgid "da_ys"
+msgstr ""
+
+#. Translators: this is part of: "Set a custom snooze time for [nnn] days [nnn] hours [nnn] minutes", where
the text in "[]" means a separate widget
+#: ../src/libedataserverui/e-reminders-widget.c:1243
+msgctxt "reminders-snooze"
+msgid "_hours"
+msgstr ""
+
+#. Translators: this is part of: "Set a custom snooze time for [nnn] days [nnn] hours [nnn] minutes", where
the text in "[]" means a separate widget
+#: ../src/libedataserverui/e-reminders-widget.c:1259
+msgctxt "reminders-snooze"
+msgid "_minutes"
+msgstr ""
+
+#: ../src/libedataserverui/e-reminders-widget.c:1265
+msgid "_Add Snooze time"
+msgstr ""
+
+#: ../src/libedataserverui/e-reminders-widget.c:1568
+#: ../src/services/evolution-user-prompter/prompt-user-gtk.c:119
+#, fuzzy
+msgid "_Dismiss"
+msgstr "废弃(_D)"
-#. Remember password check
-#: ../src/libedataserverui/e-credentials-prompter-impl-password.c:369
-msgid "_Add this password to your keyring"
-msgstr "将该密码添加到您的密钥环(_A)"
+#: ../src/libedataserverui/e-reminders-widget.c:1569
+#, fuzzy
+#| msgid "_Dismiss"
+msgid "Dismiss _All"
+msgstr "废弃(_D)"
-#: ../src/libedataserverui/e-trust-prompt.c:111
+#: ../src/libedataserverui/e-reminders-widget.c:1571
+msgid "_Snooze"
+msgstr ""
+
+#: ../src/libedataserverui/e-trust-prompt.c:110
#: ../src/modules/trust-prompt/trust-prompt-gtk.c:117
msgid "Certificate trust..."
msgstr "证书信任…"
-#: ../src/libedataserverui/e-trust-prompt.c:113
+#: ../src/libedataserverui/e-trust-prompt.c:112
#: ../src/modules/trust-prompt/trust-prompt-gtk.c:118
msgid "_Reject"
msgstr "拒绝(_R)"
-#: ../src/libedataserverui/e-trust-prompt.c:114
+#: ../src/libedataserverui/e-trust-prompt.c:113
#: ../src/modules/trust-prompt/trust-prompt-gtk.c:119
msgid "Accept _Temporarily"
msgstr "临时接受(_T)"
-#: ../src/libedataserverui/e-trust-prompt.c:115
+#: ../src/libedataserverui/e-trust-prompt.c:114
#: ../src/modules/trust-prompt/trust-prompt-gtk.c:120
msgid "_Accept Permanently"
msgstr "永久接受(_A)"
-#: ../src/libedataserverui/e-trust-prompt.c:186
+#: ../src/libedataserverui/e-trust-prompt.c:185
#: ../src/modules/trust-prompt/trust-prompt-gtk.c:157
-#, fuzzy, c-format
+#, c-format
msgid "SSL/TLS certificate for “%s” is not trusted. Do you wish to accept it?"
msgstr "“%s” 的 TLS/SSL 证书不受信任。您是否想要接受它？"
-#: ../src/libedataserverui/e-trust-prompt.c:208
+#: ../src/libedataserverui/e-trust-prompt.c:207
#: ../src/modules/trust-prompt/trust-prompt-gtk.c:172
msgid "Reason:"
msgstr "原因："
-#: ../src/libedataserverui/e-trust-prompt.c:211
+#: ../src/libedataserverui/e-trust-prompt.c:210
msgid "Detailed error:"
msgstr "详细错误："
-#: ../src/libedataserverui/e-trust-prompt.c:273
+#: ../src/libedataserverui/e-trust-prompt.c:272
#: ../src/modules/trust-prompt/module-trust-prompt.c:80
msgid "The signing certificate authority is not known."
msgstr "证书签署机构未知。"
-#: ../src/libedataserverui/e-trust-prompt.c:275
+#: ../src/libedataserverui/e-trust-prompt.c:274
#: ../src/modules/trust-prompt/module-trust-prompt.c:82
msgid ""
"The certificate does not match the expected identity of the site that it was "
"retrieved from."
msgstr "此证书与取得证书的站点身份不匹配。"
-#: ../src/libedataserverui/e-trust-prompt.c:277
+#: ../src/libedataserverui/e-trust-prompt.c:276
#: ../src/modules/trust-prompt/module-trust-prompt.c:84
-#, fuzzy
msgid "The certificate’s activation time is still in the future."
msgstr "还没到证书启用时间。"
-#: ../src/libedataserverui/e-trust-prompt.c:279
+#: ../src/libedataserverui/e-trust-prompt.c:278
#: ../src/modules/trust-prompt/module-trust-prompt.c:86
msgid "The certificate has expired."
msgstr "证书已过期。"
-#: ../src/libedataserverui/e-trust-prompt.c:281
+#: ../src/libedataserverui/e-trust-prompt.c:280
#: ../src/modules/trust-prompt/module-trust-prompt.c:88
-#, fuzzy
msgid ""
"The certificate has been revoked according to the connection’s certificate "
"revocation list."
msgstr "根据该连接的证书吊销列表，该证书已被吊销。"
-#: ../src/libedataserverui/e-trust-prompt.c:283
+#: ../src/libedataserverui/e-trust-prompt.c:282
#: ../src/modules/trust-prompt/module-trust-prompt.c:90
-#, fuzzy
msgid "The certificate’s algorithm is considered insecure."
msgstr "此证书所使用的算法不够安全"
@@ -5833,58 +7305,54 @@ msgstr "支持"
msgid "_User mail:"
msgstr "用户邮件(_U)："
-#: ../src/libedataserverui/e-webdav-discover-widget.c:521
+#: ../src/libedataserverui/e-webdav-discover-widget.c:524
msgctxt "WebDAVDiscover"
msgid "Contacts"
msgstr "联系人"
-#: ../src/libedataserverui/e-webdav-discover-widget.c:522
+#: ../src/libedataserverui/e-webdav-discover-widget.c:525
msgctxt "WebDAVDiscover"
msgid "Events"
msgstr "事件"
-#: ../src/libedataserverui/e-webdav-discover-widget.c:523
+#: ../src/libedataserverui/e-webdav-discover-widget.c:526
msgctxt "WebDAVDiscover"
msgid "Memos"
msgstr "备忘"
-#: ../src/libedataserverui/e-webdav-discover-widget.c:524
+#: ../src/libedataserverui/e-webdav-discover-widget.c:527
msgctxt "WebDAVDiscover"
msgid "Tasks"
msgstr "任务"
-#: ../src/libedataserverui/e-webdav-discover-widget.c:826
+#: ../src/libedataserverui/e-webdav-discover-widget.c:849
msgid "Invalid URL"
msgstr "无效的 URL"
-#: ../src/libedataserverui/e-webdav-discover-widget.c:840
-msgid "User name not filled"
-msgstr "未填入用户名"
-
-#: ../src/libedataserverui/e-webdav-discover-widget.c:881
+#: ../src/libedataserverui/e-webdav-discover-widget.c:895
msgid "Cancel"
msgstr "取消"
-#: ../src/libedataserverui/e-webdav-discover-widget.c:884
+#: ../src/libedataserverui/e-webdav-discover-widget.c:898
msgid "Searching server sources..."
msgstr "正在搜索服务器源…"
-#: ../src/modules/gnome-online-accounts/e-goa-password-based.c:208
-#, fuzzy, c-format
+#: ../src/modules/gnome-online-accounts/e-goa-password-based.c:248
+#, c-format
msgid ""
"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
"from which to obtain a password for “%s”"
msgstr "通过 org.gnome.OnlineAccounts 服务无法找到“%s”对应的帐号并获取密码"
-#: ../src/modules/gnome-online-accounts/e-goa-password-based.c:271
+#: ../src/modules/gnome-online-accounts/e-goa-password-based.c:315
msgid "Failed to get password from GOA: "
msgstr "无法从 GOA 获取密码："
#. TODO: more specific
#: ../src/modules/gnome-online-accounts/goaewsclient.c:220
-#, fuzzy, c-format
+#, c-format
msgid "Code: %u — Unexpected response from server"
-msgstr "代码：%u - 来自服务器的意外应答"
+msgstr "代码：%u — 来自服务器的意外应答"
#. TODO: more specific
#: ../src/modules/gnome-online-accounts/goaewsclient.c:241
@@ -5916,130 +7384,100 @@ msgstr "无法找到帐号元素"
msgid "Failed to find ASUrl and OABUrl in autodiscover response"
msgstr "无法在自动发现响应中找到 ASUrl 和 OABUrl"
-#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1340
-#, fuzzy, c-format
+#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1423
+#, c-format
msgid ""
"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
"from which to obtain an access token for “%s”"
msgstr "通过 org.gnome.OnlineAccounts 服务无法找到“%s”对应的帐号并获取访问令牌"
-#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1370
-#, fuzzy, c-format
+#: ../src/modules/gnome-online-accounts/module-gnome-online-accounts.c:1473
+#, c-format
msgid "Failed to obtain an access token for “%s”: "
msgstr "无法获取“%s”的访问令牌："
-#: ../src/modules/google-backend/module-google-backend.c:605
-#: ../src/modules/yahoo-backend/module-yahoo-backend.c:227
-msgid "Tasks"
-msgstr "任务"
-
-#: ../src/modules/google-backend/module-google-backend.c:662
-#: ../src/modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
+#: ../src/modules/google-backend/module-google-backend.c:631
#: ../src/services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
msgid "Contacts"
msgstr "联系人"
-#: ../src/modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
-#: ../src/modules/yahoo-backend/module-yahoo-backend.c:200
-msgid "Calendar"
-msgstr "日历"
-
-#: ../src/modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2
-msgid "Integrate your calendars"
-msgstr "集成您的日历"
-
-#: ../src/modules/ubuntu-online-accounts/contacts.service-type.in.in.h:2
-msgid "Integrate your contacts"
-msgstr "集成您的联系人"
-
-#: ../src/modules/ubuntu-online-accounts/e-signon-session-password.c:273
-msgid "Signon service did not return a secret"
-msgstr "Signon 服务未返回密钥(secret)"
-
-#: ../src/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:1
-msgid "Evolution Data Server"
-msgstr "Evolution 数据服务器"
-
-#: ../src/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:2
-msgid "Required to have EDS appear in UOA"
-msgstr "要求 UOA 中要出现 EDS"
+#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:38
+#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:40
+#: ../src/services/evolution-user-prompter/evolution-user-prompter.c:33
+msgid "Keep running after the last client is closed"
+msgstr "关闭最后的客户端后继续运行"
-#: ../src/modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1
-msgid "Google Calendar"
-msgstr "Google 日历"
+#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:40
+#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:42
+msgid "Wait running until at least one client is connected"
+msgstr "等待到至少有一个客户端连接"
-#: ../src/modules/ubuntu-online-accounts/google-contacts.service.in.in.h:1
-msgid "Google Contacts"
-msgstr "Google 联系人"
+#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:42
+#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:44
+msgid ""
+"Overrides compile-time backend per process option; use 1 to enable, 0 to "
+"disable, any other value is to use compile-time option"
+msgstr ""
-#: ../src/modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1
-msgid "GMail"
-msgstr "GMail"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:306
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:334
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:845
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:1087
+msgid "Reminders"
+msgstr "提醒"
-#: ../src/modules/ubuntu-online-accounts/mail.service-type.in.in.h:1
-msgid "Mail"
-msgstr "邮件"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:446
+msgid "Warning"
+msgstr "警告"
-#: ../src/modules/ubuntu-online-accounts/mail.service-type.in.in.h:2
-msgid "Integrate your mailboxes"
-msgstr "集成您的邮箱"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:447
+msgid "_No"
+msgstr "否(_N)"
-#: ../src/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1061
-#, fuzzy, c-format
-msgid ""
-"Cannot find a corresponding account service in the accounts database from "
-"which to obtain an access token for “%s”"
-msgstr "在帐号资料库中找不到对应的帐号服务以获取 '%s' 的访问令牌"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:448
+msgid "_Yes"
+msgstr "是(_Y)"
-#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:85
-#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:282
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:452
#, c-format
msgid ""
-"Expected status 200 when requesting your identity, instead got status %d (%s)"
-msgstr "请求您身份时的期望状态为 200，但得到的状态为 %d (%s)"
-
-#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:102
-#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:299
-msgid "Error parsing response as JSON: "
-msgstr "以 JSON 解析响应时出错："
-
-#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:120
-#, fuzzy
-msgid "Didn’t find “email” in JSON data"
-msgstr "JSON 数据中找不到“email”"
+"A calendar reminder is about to trigger. This reminder is configured to run "
+"the following program:\n"
+"\n"
+" %s\n"
+"\n"
+"Are you sure you want to run this program?"
+msgstr ""
-#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:317
-#, fuzzy
-msgid "Didn’t find “id” in JSON data"
-msgstr "JSON 数据中找不到“id”"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:467
+msgid "Do not ask me about this program again"
+msgstr ""
-#: ../src/modules/ubuntu-online-accounts/uoa-utils.c:322
-#, fuzzy
-msgid "Didn’t find “emails.account” in JSON data"
-msgstr "JSON 数据中找不到“emails.account”"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:750
+msgid "Display Reminders window with _notifications"
+msgstr ""
-#: ../src/modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1
-msgid "Windows Live Mail"
-msgstr "Windows Live 邮箱"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:751
+msgid "Keep reminder notification window always on _top"
+msgstr ""
-#: ../src/modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
-msgid "Yahoo! Calendar"
-msgstr "Yahoo! 日历"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:752
+msgid "Display reminders for _completed tasks"
+msgstr ""
-#: ../src/modules/ubuntu-online-accounts/yahoo-mail.service.in.in.h:1
-msgid "Yahoo! Mail"
-msgstr "Yahoo! 邮箱"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:753
+msgid "Display reminders for _past events"
+msgstr ""
-#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:37
-#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:39
-#: ../src/services/evolution-user-prompter/evolution-user-prompter.c:33
-msgid "Keep running after the last client is closed"
-msgstr "关闭最后的客户端后继续运行"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:767
+msgid "Reminders Options:"
+msgstr ""
-#: ../src/services/evolution-addressbook-factory/evolution-addressbook-factory.c:39
-#: ../src/services/evolution-calendar-factory/evolution-calendar-factory.c:41
-msgid "Wait running until at least one client is connected"
-msgstr "等待到至少有一个客户端连接"
+#: ../src/services/evolution-alarm-notify/e-alarm-notify.c:861
+#, c-format
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] ""
#: ../src/services/evolution-source-registry/builtin/birthdays.source.in.h:1
msgid "Birthdays & Anniversaries"
@@ -6049,9 +7487,13 @@ msgstr "生日与周年纪念日提醒"
msgid "CalDAV"
msgstr "CalDAV"
+#: ../src/services/evolution-source-registry/builtin/carddav-stub.source.in.h:1
+msgid "CardDAV"
+msgstr "CardDAV"
+
#: ../src/services/evolution-source-registry/builtin/google-stub.source.in.h:1
msgid "Google"
-msgstr "Google"
+msgstr "谷歌"
#: ../src/services/evolution-source-registry/builtin/ldap-stub.source.in.h:1
msgid "On LDAP Servers"
@@ -6062,6 +7504,10 @@ msgstr "在 LDAP 服务器上"
msgid "On This Computer"
msgstr "在此计算机中"
+#: ../src/services/evolution-source-registry/builtin/system-proxy.source.in.h:1
+msgid "Default Proxy Settings"
+msgstr "默认代理设置"
+
#: ../src/services/evolution-source-registry/builtin/vfolder.source.in.h:1
msgid "Search Folders"
msgstr "搜索文件夹"
@@ -6074,62 +7520,470 @@ msgstr "天气"
msgid "On The Web"
msgstr "在网上"
-#: ../src/services/evolution-source-registry/builtin/webdav-stub.source.in.h:1
-msgid "WebDAV"
+#: ../src/services/evolution-source-registry/builtin/webdav-notes-stub.source.in.h:1
+#, fuzzy
+#| msgid "WebDAV"
+msgid "WebDAV Notes"
msgstr "WebDAV"
-#: ../src/services/evolution-source-registry/evolution-source-registry.c:40
-#, fuzzy
+#: ../src/services/evolution-source-registry/evolution-source-registry.c:41
msgid "Don’t migrate user data from previous versions of Evolution"
msgstr "不从先前版本的 Evolution 迁移用户数据"
-#: ../src/services/evolution-user-prompter/prompt-user-gtk.c:119
-msgid "_Dismiss"
-msgstr "解除(_D)"
-
-#: ../src/tools/addressbook-export/addressbook-export.c:68
-#: ../src/tools/addressbook-export/addressbook-export.c:782
+#: ../src/tools/addressbook-export/addressbook-export.c:69
+#: ../src/tools/addressbook-export/addressbook-export.c:781
msgid "Can not open file"
msgstr "不能打开文件"
-#: ../src/tools/addressbook-export/addressbook-export.c:98
-#, fuzzy, c-format
+#: ../src/tools/addressbook-export/addressbook-export.c:99
+#, c-format
msgid "Failed to open client “%s”: %s"
msgstr "打开客户端“%s”失败：%s"
-#: ../src/tools/addressbook-export/addressbook-export.c:892
+#: ../src/tools/addressbook-export/addressbook-export.c:889
msgid "Unhandled error"
msgstr "未处理的错误"
-#: ../src/tools/addressbook-export/addressbook-export.c:925
+#: ../src/tools/addressbook-export/addressbook-export.c:922
msgid "Specify the output file instead of standard output"
msgstr "指定输出文件而不是标准输出"
-#: ../src/tools/addressbook-export/addressbook-export.c:926
+#: ../src/tools/addressbook-export/addressbook-export.c:923
msgid "OUTPUTFILE"
msgstr "OUTPUTFILE"
-#: ../src/tools/addressbook-export/addressbook-export.c:929
+#: ../src/tools/addressbook-export/addressbook-export.c:926
msgid "List local address book folders"
msgstr "列出本地地址簿文件夹"
-#: ../src/tools/addressbook-export/addressbook-export.c:932
+#: ../src/tools/addressbook-export/addressbook-export.c:929
msgid "Show cards as vcard or csv file"
msgstr "显示卡片为 vcard 或 csv 文件"
-#: ../src/tools/addressbook-export/addressbook-export.c:933
+#: ../src/tools/addressbook-export/addressbook-export.c:930
msgid "[vcard|csv]"
msgstr "[vcard|csv]"
-#: ../src/tools/addressbook-export/addressbook-export.c:981
+#: ../src/tools/addressbook-export/addressbook-export.c:978
msgid ""
"Command line arguments error, please use --help option to see the usage."
msgstr "命令行参数错误，请使用 --help 选项查看使用方法。"
-#: ../src/tools/addressbook-export/addressbook-export.c:995
+#: ../src/tools/addressbook-export/addressbook-export.c:992
msgid "Only support csv or vcard format."
msgstr "仅支持 csv 或 vcard 格式。"
+#: ../src/tools/list-sources/list-sources.c:83
+#, fuzzy
+#| msgid "_Show only subscribed folders"
+msgid "Show only enabled sources"
+msgstr "只显示已订阅的文件夹(_S)"
+
+#: ../src/tools/list-sources/list-sources.c:86
+#, fuzzy
+#| msgid "POP Source UID"
+msgid "Show source’s UID"
+msgstr "POP 源 UID"
+
+#: ../src/tools/list-sources/list-sources.c:89
+#, fuzzy
+#| msgid "Unsupported authentication method"
+msgid "Show source’s authentication information"
+msgstr "不支持的身份认证方式"
+
+#: ../src/tools/list-sources/list-sources.c:92
+msgid ""
+"Write in machine readable format (one source per line, without localized "
+"property names and tab as separator)"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:95
+msgid "Limit only to sources with given extension name"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:106
+msgid "yes"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:106
+msgid "no"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:126
+#, fuzzy
+#| msgctxt "CategoryName"
+#| msgid "Competition"
+msgid "Collection"
+msgstr "完成"
+
+#: ../src/tools/list-sources/list-sources.c:132
+msgid "Collection/GNOME Online Accounts"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:137
+msgid "Collection/Ubuntu Online Accounts"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:147
+msgid "Address Book"
+msgstr "地址簿"
+
+#: ../src/tools/list-sources/list-sources.c:148
+msgid "Calendar"
+msgstr "日历"
+
+#: ../src/tools/list-sources/list-sources.c:149
+#, fuzzy
+#| msgctxt "WebDAVDiscover"
+#| msgid "Memos"
+msgid "Memo List"
+msgstr "备忘"
+
+#: ../src/tools/list-sources/list-sources.c:150
+msgid "Task List"
+msgstr "任务列表"
+
+#: ../src/tools/list-sources/list-sources.c:151
+msgid "Mail Account"
+msgstr "邮件帐号"
+
+#: ../src/tools/list-sources/list-sources.c:152
+msgid "Mail Transport"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:153
+msgid "Mail Identity"
+msgstr "邮件身份"
+
+#: ../src/tools/list-sources/list-sources.c:154
+#, fuzzy
+#| msgid "Message submission port"
+msgid "Mail Submission"
+msgstr "消息提交端口"
+
+#: ../src/tools/list-sources/list-sources.c:155
+msgid "Mail Signature"
+msgstr "邮件签名"
+
+#: ../src/tools/list-sources/list-sources.c:156
+msgid "Proxy"
+msgstr "代理"
+
+#: ../src/tools/list-sources/list-sources.c:224
+#, c-format
+msgid "UID: %s"
+msgstr ""
+
+#: ../src/tools/list-sources/list-sources.c:228
+#, fuzzy, c-format
+#| msgid "Malformed URI: %s"
+msgid "Parent UID: %s"
+msgstr "URI 格式错误：%s"
+
+#: ../src/tools/list-sources/list-sources.c:231
+#, fuzzy, c-format
+#| msgid "Posting failed: %s"
+msgid "Enabled: %s"
+msgstr "发送失败：%s"
+
+#: ../src/tools/list-sources/list-sources.c:233
+#, c-format
+msgid "Backend: %s"
+msgstr "后端：%s"
+
+#: ../src/tools/list-sources/list-sources.c:238
+#, fuzzy, c-format
+#| msgid "Calendar does not exist"
+msgid "Calendar enabled: %s"
+msgstr "日历不存在"
+
+#: ../src/tools/list-sources/list-sources.c:239
+#, fuzzy, c-format
+#| msgid "Contact ID already exists"
+msgid "Contacts enabled: %s"
+msgstr "联系人 ID 已经存在"
+
+#: ../src/tools/list-sources/list-sources.c:240
+#, fuzzy, c-format
+msgid "Mail enabled: %s"
+msgstr "操作失败：%s"
+
+#: ../src/tools/list-sources/list-sources.c:247
+#, c-format
+msgid "MIME Type: %s"
+msgstr "MIME 类型：%s"
+
+#: ../src/tools/list-sources/list-sources.c:269
+#, c-format
+msgid "Auth Host: %s:%d"
+msgstr "认证主机：%s:%d"
+
+#: ../src/tools/list-sources/list-sources.c:275
+#, c-format
+msgid "Auth Host: %s"
+msgstr "认证主机：%s"
+
+#: ../src/tools/list-sources/list-sources.c:283
+#, c-format
+msgid "Auth User: %s"
+msgstr "认证用户：%s"
+
+#: ../src/tools/list-sources/list-sources.c:291
+#, c-format
+msgid "Auth Method: %s"
+msgstr "认证方法：%s"
+
+#: ../src/tools/list-sources/list-sources.c:299
+#, c-format
+msgid "Auth Proxy UID: %s"
+msgstr "认证代理 UID：%s"
+
+#: ../src/tools/list-sources/list-sources.c:420
+msgid "Failed to parse arguments: Unknown error"
+msgstr "解析参数失败：未知错误"
+
+#: ../src/tools/list-sources/list-sources.c:429
+#, fuzzy, c-format
+#| msgid "Failed to connect to a server using SSL/TLS: %s"
+msgid "Failed to connect to source registry: %s\n"
+msgstr "无法使用 SSL/TLS 连接到服务器：%s"
+
+#: ../src/tools/list-sources/list-sources.c:445
+#, c-format
+msgid "No sources had been found\n"
+msgstr ""
+
+#~ msgid "Querying for updated contacts…"
+#~ msgstr "查询联系人的更新…"
+
+#~ msgid "Querying for updated groups…"
+#~ msgstr "查询组的更新..."
+
+#~ msgid "Loading…"
+#~ msgstr "正在载入…"
+
+#~ msgid "Loading Addressbook summary..."
+#~ msgstr "正在加载地址簿概要..."
+
+#~ msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
+#~ msgstr "webdav 上的 PROPFIND 失败，HTTP 状态码：%d (%s)"
+
+#~ msgid "No response body in webdav PROPFIND result"
+#~ msgstr "在 webdav PROPFIND 结果中无应答主体"
+
+#~ msgid "Loading Contacts (%d%%)"
+#~ msgstr "正在加载联系人 (%d%%)"
+
+#~ msgid "Cannot transform SoupURI to string"
+#~ msgstr "无法将 SoupURI 转为字符串"
+
+#~ msgid "Create resource “%s” failed with HTTP status %d (%s)"
+#~ msgstr "创建资源“%s”失败，HTTP 状态码为: %d (%s)"
+
+#~ msgid "Contact on server changed -> not modifying"
+#~ msgstr "服务器上的联系人已更改 -> 将不做更改"
+
+#~ msgid "Modify contact failed with HTTP status %d (%s)"
+#~ msgstr "修改联系人失败，HTTP 状态码：%d (%s)"
+
+#~ msgid "DELETE failed with HTTP status %d"
+#~ msgstr "DELETE 失败，HTTP 状态码：%d"
+
+#~ msgid "Success"
+#~ msgstr "成功"
+
+#~ msgid "Authentication Failed"
+#~ msgstr "认证失败"
+
+#~ msgid "Authentication Required"
+#~ msgstr "需要认证"
+
+#~ msgid "Unsupported field"
+#~ msgstr "不支持的字段"
+
+#~ msgid "Address book does not exist"
+#~ msgstr "地址簿不存在"
+
+#~ msgid "Book removed"
+#~ msgstr "地址簿已删除"
+
+#~ msgid "Not available in offline mode"
+#~ msgstr "在离线模式中无法使用"
+
+#~ msgid "Invalid server version"
+#~ msgstr "无效的服务器版本"
+
+#~ msgid "Server is unreachable (%s)"
+#~ msgstr "服务器不可用 (%s)"
+
+#~ msgid "Failed to login to the server: %s"
+#~ msgstr "登录到此服务器失败：%s"
+
+#~ msgid "CalDAV backend is not loaded yet"
+#~ msgstr "CalDAV 后端尚未加载"
+
+#~ msgid "Invalid Redirect URL"
+#~ msgstr "无效的重定向 URL"
+
+#~ msgid "Cannot create local cache folder “%s”"
+#~ msgstr "无法创建本地缓存文件夹“%s”"
+
+#~ msgid ""
+#~ "Server is unreachable, calendar is opened in read-only mode.\n"
+#~ "Error message: %s"
+#~ msgstr ""
+#~ "服务器不可用，日历将以只读模式打开。\n"
+#~ "错误消息：%s"
+
+#~ msgid "CalDAV does not support bulk additions"
+#~ msgstr "CalDAV 不支持批量添加"
+
+#~ msgid "CalDAV does not support bulk modifications"
+#~ msgstr "CalDAV 不支持批量修改"
+
+#~ msgid "CalDAV does not support bulk removals"
+#~ msgstr "CalDAV 不支持批量删除"
+
+#~ msgid "Calendar doesn’t support Free/Busy"
+#~ msgstr "日历不支持空闲/繁忙"
+
+#~ msgid "Schedule outbox url not found"
+#~ msgstr "未找到定时发件箱 url"
+
+#~ msgid "Unexpected result in schedule-response"
+#~ msgstr "定时响应的结果异常"
+
+#~ msgid "Redirected to Invalid URI"
+#~ msgstr "已重定向到无效 URI"
+
+#~ msgid "Repository is offline"
+#~ msgstr "仓库离线"
+
+#~ msgid "URI already loaded"
+#~ msgstr "URI 已经载入"
+
+#~ msgid "Unknown User"
+#~ msgstr "未知用户"
+
+#~ msgid "Protocol not supported"
+#~ msgstr "不支持的协议"
+
+#~ msgid "Could not cancel operation"
+#~ msgstr "无法取消操作"
+
+#~ msgid "A D-Bus exception has occurred"
+#~ msgstr "发生了一个 D-Bus 异常"
+
+#~ msgid "No error"
+#~ msgstr "无错误"
+
+#~ msgid ""
+#~ "Invalid trace information:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无效的跟踪信息：\n"
+#~ "%s"
+
+#~ msgid "IMAP+"
+#~ msgstr "IMAP+"
+
+#~ msgid "Google authentication is not supported"
+#~ msgstr "不支持的 Google 认证"
+
+#~ msgid "Failed to get Google secret from credentials"
+#~ msgstr "从凭据里获取 Google secret 失败"
+
+#~ msgid "Refresh token not found in Google secret"
+#~ msgstr "在 Google secret 里找不到刷新令牌"
+
+#~ msgid "Failed to construct refresh_token request"
+#~ msgstr "不能构造 refresh_token 请求"
+
+#~ msgid "Failed to encode new access token to Google secret"
+#~ msgstr "编码 Google secret 的新访问令牌失败"
+
+#~ msgid "HTTP Error: %s"
+#~ msgstr "HTTP 错误：%s"
+
+#~ msgid "Empty response"
+#~ msgstr "空响应"
+
+#~ msgid "Unexpected reply from server"
+#~ msgstr "服务器返回意外回复"
+
+#~ msgid "Failed to obtain access token from address “%s”. Error code %d (%s)"
+#~ msgstr "无法从地址“%s”获取令牌。错误代码 %d (%s)"
+
+#~ msgid "Google Address book authentication request"
+#~ msgstr "Google 地址簿认证请求"
+
+#~ msgid "Google Calendar authentication request"
+#~ msgstr "Google 日历认证请求"
+
+#~ msgid "Google Mail authentication request"
+#~ msgstr "Google 邮件认证请求"
+
+#~ msgid "User name not filled"
+#~ msgstr "未填入用户名"
+
+#~ msgid "Integrate your calendars"
+#~ msgstr "集成您的日历"
+
+#~ msgid "Integrate your contacts"
+#~ msgstr "集成您的联系人"
+
+#~ msgid "Evolution Data Server"
+#~ msgstr "Evolution 数据服务器"
+
+#~ msgid "Required to have EDS appear in UOA"
+#~ msgstr "要求 UOA 中要出现 EDS"
+
+#~ msgid "Google Calendar"
+#~ msgstr "Google 日历"
+
+#~ msgid "Google Contacts"
+#~ msgstr "Google 联系人"
+
+#~ msgid "GMail"
+#~ msgstr "GMail"
+
+#~ msgid "Mail"
+#~ msgstr "邮件"
+
+#~ msgid "Integrate your mailboxes"
+#~ msgstr "集成您的邮箱"
+
+#~ msgid ""
+#~ "Cannot find a corresponding account service in the accounts database from "
+#~ "which to obtain an access token for “%s”"
+#~ msgstr "在帐号数据库中找不到对应的帐号服务以获取“%s”的访问令牌"
+
+#~ msgid ""
+#~ "Expected status 200 when requesting your identity, instead got status %d "
+#~ "(%s)"
+#~ msgstr "请求您身份时的期望状态为 200，但得到的状态为 %d (%s)"
+
+#~ msgid "Error parsing response as JSON: "
+#~ msgstr "以 JSON 解析响应时出错："
+
+#~ msgid "Didn’t find “email” in JSON data"
+#~ msgstr "JSON 数据中找不到“email”"
+
+#~ msgid "Didn’t find “id” in JSON data"
+#~ msgstr "JSON 数据中找不到“id”"
+
+#~ msgid "Didn’t find “emails.account” in JSON data"
+#~ msgstr "JSON 数据中找不到“emails.account”"
+
+#~ msgid "Windows Live Mail"
+#~ msgstr "Windows Live 邮箱"
+
+#~ msgid "Yahoo! Calendar"
+#~ msgstr "Yahoo! 日历"
+
+#~ msgid "Yahoo! Mail"
+#~ msgstr "Yahoo! 邮箱"
+
#~ msgid "Update preview data for folder '%s : %s'"
#~ msgstr "正在更新文件夹“%s : %s”的预览数据"
@@ -6301,9 +8155,6 @@ msgstr "仅支持 csv 或 vcard 格式。"
#~ 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"
@@ -6681,9 +8532,6 @@ msgstr "仅支持 csv 或 vcard 格式。"
#~ msgid "Could not create synch slave thread"
#~ msgstr "无法创建同步从属线程"
-#~ msgid "Failed to run calendar factory"
-#~ msgstr "运行日历工厂失败"
-
#~ msgid "Cannot process, calendar backend is opening"
#~ msgstr "无法进行，日历后端正在打开"
@@ -6769,12 +8617,6 @@ msgstr "仅支持 csv 或 vcard 格式。"
#~ 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 载入概要"
@@ -6793,12 +8635,6 @@ msgstr "仅支持 csv 或 vcard 格式。"
#~ 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 失败："
@@ -6808,9 +8644,6 @@ msgstr "仅支持 csv 或 vcard 格式。"
#~ msgid "IMAP default port"
#~ msgstr "IMAP 默认端口"
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
#~ msgid "Retrieving list of folders at '%s'"
#~ msgstr "正在获取“%s”的文件夹列表"
@@ -6885,9 +8718,6 @@ msgstr "仅支持 csv 或 vcard 格式。"
#~ msgid "Search"
#~ msgstr "搜索"
-#~ msgid "Address Book"
-#~ msgstr "地址簿"
-
#~ msgid "Select Contacts from Address Book"
#~ msgstr "从地址簿中选择联系人"
@@ -6942,9 +8772,6 @@ msgstr "仅支持 csv 或 vcard 格式。"
#~ msgid "Flags"
#~ msgstr "标志"
-#~ msgid "Identity"
-#~ msgstr "身份"
-
#~ msgid "Authenticating with the server…"
#~ msgstr "正在与服务器进行认证..."
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
