[evolution-data-server] Updated Chinese simplified translation
- From: Wylmer Wang <wylmerwang src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Updated Chinese simplified translation
- Date: Fri, 12 Jul 2013 14:49:27 +0000 (UTC)
commit ffd4d14662f173ac97620da470fb35cdc5ad1c83
Author: Wylmer Wang <wantinghard gmail com>
Date: Fri Jul 12 22:48:59 2013 +0800
Updated Chinese simplified translation
po/zh_CN.po | 3899 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 2256 insertions(+), 1643 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d21c7e8..f2d1971 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -21,7 +21,7 @@ msgstr ""
"Project-Id-Version: evolution-data-server master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2013-02-28 18:09+0000\n"
+"POT-Creation-Date: 2013-07-12 14:26+0000\n"
"PO-Revision-Date: 2013-07-12 22:24+0800\n"
"Last-Translator: tuhaihe <1132321739qq gmail com>\n"
"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
@@ -31,291 +31,284 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../addressbook/backends/file/e-book-backend-file.c:117
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1243
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4883
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:287
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:972
-#: ../addressbook/libebook/e-book-client.c:106
-#: ../addressbook/libedata-book/e-data-book.c:432
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:575
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:606
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:627
-#: ../calendar/libecal/e-cal.c:4051 ../calendar/libecal/e-cal-client.c:148
-#: ../camel/camel-imapx-command.c:594
-#: ../camel/providers/imap/camel-imap-command.c:525
-#: ../camel/providers/imap/camel-imap-store.c:469
-#: ../libedataserver/e-client.c:165
-msgid "Unknown error"
-msgstr "未知的错误"
-
-#: ../addressbook/backends/file/e-book-backend-file.c:143
+#: ../addressbook/backends/file/e-book-backend-file.c:114
#, c-format
msgid "Failed to remove file '%s': %s"
msgstr "删除文件“%s”失败：%s"
-#: ../addressbook/backends/file/e-book-backend-file.c:167
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:627
+#: ../addressbook/backends/file/e-book-backend-file.c:142
#, c-format
msgid "Failed to make directory %s: %s"
msgstr "创建目录“%s”失败：%s"
-#: ../addressbook/backends/file/e-book-backend-file.c:467
+#: ../addressbook/backends/file/e-book-backend-file.c:393
#, c-format
msgid "Failed to create hardlink for resource '%s': %s"
msgstr "创建资源“%s”的硬链接失败：%s"
-#: ../addressbook/backends/file/e-book-backend-file.c:569
-#: ../addressbook/backends/file/e-book-backend-file.c:1147
+#: ../addressbook/backends/file/e-book-backend-file.c:498
+#: ../addressbook/backends/file/e-book-backend-file.c:1134
msgid "No UID in the contact"
msgstr "联系人没有 UID"
-#: ../addressbook/backends/file/e-book-backend-file.c:1596
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:519
+#: ../addressbook/backends/file/e-book-backend-file.c:772
+#, c-format
+msgid "Conflicting UIDs found in added contacts"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:880
msgid "Loading..."
msgstr "正在载入..."
-#: ../addressbook/backends/file/e-book-backend-file.c:1599
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4985
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:521
+#: ../addressbook/backends/file/e-book-backend-file.c:882
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4402
msgid "Searching..."
msgstr "正在搜索..."
-#: ../addressbook/backends/file/e-book-backend-file.c:2150
+#: ../addressbook/backends/file/e-book-backend-file.c:1163
+#, c-format
+msgid "Tried to modify contact '%s' with out of sync revision"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1299
+#: ../addressbook/backends/file/e-book-backend-file.c:1368
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2702
+#, c-format
+msgid "Contact '%s' not found"
+msgstr "未找到联系人 %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1410
+#: ../addressbook/backends/file/e-book-backend-file.c:1477
+#, fuzzy, c-format
+#| msgid "Protocol not supported"
+msgid "Query '%s' not supported"
+msgstr "不支持的协议"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1419
+#: ../addressbook/backends/file/e-book-backend-file.c:1486
#, c-format
-msgid "Failed to build summary for an address book %s"
-msgstr "为地址簿 %s 创建摘要失败"
+#| msgid "Invalid query: "
+msgid "Invalid Query '%s'"
+msgstr "无效的查询：“%s”"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1670
+#, fuzzy, c-format
+#| msgid "Could not rename folder %s to %s: %s"
+msgid "Failed to rename old database from '%s' to '%s': %s"
+msgstr "无法将文件夹 %s 改名为 %s：%s"
+
+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1237
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4297
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:753
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
+#: ../addressbook/libebook-contacts/e-phone-number.c:58
+#: ../addressbook/libedata-book/e-book-backend-sexp.c:868
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:571
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:602
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:614
+#: ../calendar/libecal/e-cal.c:2335 ../calendar/libecal/e-cal-client.c:268
+#: ../camel/camel-imapx-command.c:609 ../libedataserver/e-client.c:177
+msgid "Unknown error"
+msgstr "未知的错误"
#. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:648
+#: ../addressbook/backends/google/e-book-backend-google.c:750
msgid "Querying for updated contacts…"
msgstr "查询更新的联系人..."
#. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:785
+#: ../addressbook/backends/google/e-book-backend-google.c:887
msgid "Querying for updated groups…"
msgstr "查询更新的组..."
-#: ../addressbook/backends/google/e-book-backend-google.c:1211
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1674
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:290
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:336
+#: ../addressbook/backends/google/e-book-backend-google.c:1572
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5032
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1217
msgid "The backend does not support bulk additions"
msgstr "后端不支持批量添加"
-#. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1243
-msgid "Creating new contact…"
-msgstr "创建新的联系人..."
-
-#: ../addressbook/backends/google/e-book-backend-google.c:1334
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:323
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:452
-msgid "The backend does not support bulk removals"
-msgstr "后端不支持批量删除"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:1362
-msgid "Deleting contact…"
-msgstr "删除联系人..."
-
-#: ../addressbook/backends/google/e-book-backend-google.c:1616
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2353
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:373
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:513
+#: ../addressbook/backends/google/e-book-backend-google.c:1721
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5169
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1316
msgid "The backend does not support bulk modifications"
msgstr "后端不支持批量修改"
-#. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1654
-msgid "Modifying contact…"
-msgstr "修改联系人..."
+#: ../addressbook/backends/google/e-book-backend-google.c:1921
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1404
+msgid "The backend does not support bulk removals"
+msgstr "后端不支持批量删除"
-#: ../addressbook/backends/google/e-book-backend-google.c:1825
+#: ../addressbook/backends/google/e-book-backend-google.c:2047
msgid "Loading…"
msgstr "正在载入..."
-#: ../addressbook/backends/google/e-book-google-utils.c:1568
-#: ../data/sources/system-address-book.source.in.h:1
-#: ../data/sources/system-calendar.source.in.h:1
-#: ../data/sources/system-memo-list.source.in.h:1
-#: ../data/sources/system-task-list.source.in.h:1
+#. System Group: My Contacts
+#: ../addressbook/backends/google/e-book-google-utils.c:1606
+#: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-task-list.source.in.h:1
msgid "Personal"
msgstr "个人"
-#. System Group: My Contacts
-#: ../addressbook/backends/google/e-book-google-utils.c:1569
+#. System Group: Friends
+#: ../addressbook/backends/google/e-book-google-utils.c:1608
msgid "Friends"
msgstr "朋友"
-#. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1570
+#. System Group: Family
+#: ../addressbook/backends/google/e-book-google-utils.c:1610
msgid "Family"
msgstr "家人"
-#. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1571
+#. System Group: Coworkers
+#: ../addressbook/backends/google/e-book-google-utils.c:1612
msgid "Coworkers"
msgstr "同事"
-#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book
which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:165
+#. Translators: An error message shown to a user when trying to do an
+#. * operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:174
msgid "Not connected"
msgstr "未连接。"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:795
-msgid "Using Distinguished Name (DN)"
-msgstr "使用已识别的姓名 (DN)"
-
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:798
-msgid "Using Email Address"
-msgstr "使用电子邮件地址"
-
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:971
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:965
msgid "Failed to bind using either v3 or v2 binds"
msgstr "无法使用 v3 或 v2 绑定"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1094
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1088
msgid "Reconnecting to LDAP server..."
msgstr "正在重新连接 LDAP 服务器..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1224
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1218
msgid "Invalid DN syntax"
msgstr "无效 DN 语法"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1240
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4882
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1234
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4296
#, c-format
msgid "LDAP error 0x%x (%s)"
msgstr "LDAP 错误 0x%x (%s)"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1774
-msgid "Adding contact to LDAP server..."
-msgstr "正在将联系人添加到 LDAP 服务器..."
-
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1912
-msgid "Removing contact from LDAP server..."
-msgstr "正在从 LDAP 服务器删除联系人..."
-
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2054
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2449
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1832
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2155
#, c-format
msgid "%s: NULL returned from ldap_first_entry"
msgstr "%s：ldap_first_entry 返回 NULL"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2306
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2506
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2085
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2213
#, c-format
msgid "%s: Unhandled result type %d returned"
msgstr "%s：返回了未处理的结果类型 %d"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2375
-msgid "Modifying contact from LDAP server..."
-msgstr "正在修改 LDAP 服务器上的联系人..."
-
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2735
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2955
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2346
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2473
#, c-format
msgid "%s: Unhandled search result type %d returned"
msgstr "%s：返回了未处理的搜索结果类型 %d"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4831
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4245
msgid "Receiving LDAP search results..."
msgstr "正在接收 LDAP 的搜索结果..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5007
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4424
msgid "Error performing search"
msgstr "执行搜索错误"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5130
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4552
#, c-format
-msgid "Downloading contacts (%d)... "
+#| msgid "Downloading contacts (%d)... "
+msgid "Downloading contacts (%d)..."
msgstr "正在下载联系人(%d)..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5669
-#, c-format
-msgid "Failed to get the DN for user '%s'"
-msgstr "无法获取用户“%s”的 DN"
-
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:656
-#, c-format
-msgid "Failed to open addressbook at '%s': %s"
-msgstr "无法打开在“%s”的地址簿：%s"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:367
-#, c-format
-msgid "Create resource '%s' failed with HTTP status: %d (%s)"
-msgstr "创建资源“%s”失败，HTTP 状态码为: %d(%s)"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5116
+msgid "Adding contact to LDAP server..."
+msgstr "正在将联系人添加到 LDAP 服务器..."
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:468
-#, c-format
-msgid "DELETE failed with HTTP status %d"
-msgstr "DELETE 失败，HTTP 状态码：%d"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5191
+msgid "Modifying contact from LDAP server..."
+msgstr "正在修改 LDAP 服务器上的联系人..."
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:534
-msgid "Contact on server changed -> not modifying"
-msgstr "服务器上的联系人已更改 -> 将不做更改"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5257
+msgid "Removing contact from LDAP server..."
+msgstr "正在从 LDAP 服务器删除联系人..."
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:543
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5646
#, c-format
-msgid "Modify contact failed with HTTP status: %d (%s)"
-msgstr "修改联系人失败，HTTP 状态码：%d(%s)"
+msgid "Failed to get the DN for user '%s'"
+msgstr "无法获取用户“%s”的 DN"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:950
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:732
msgid "Loading Addressbook summary..."
msgstr "正在加载地址簿概要..."
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:969
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:750
#, c-format
msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
msgstr "webdav 上的 PROPFIND 失败，HTTP 状态码：%d (%s)"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:994
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:769
msgid "No response body in webdav PROPFIND result"
msgstr "在 webdav PROPFIND 结果中无应答主体"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1026
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:811
#, c-format
msgid "Loading Contacts (%d%%)"
msgstr "正在加载联系人(%d%%)"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1354
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1139
msgid "Cannot transform SoupURI to string"
msgstr "无法将 SoupURI 转为字符串"
-#: ../addressbook/libebook/e-book-client.c:95
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1250
+#, c-format
+#| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgid "Create resource '%s' failed with HTTP status %d (%s)"
+msgstr "创建资源“%s”失败，HTTP 状态码为: %d (%s)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1345
+msgid "Contact on server changed -> not modifying"
+msgstr "服务器上的联系人已更改 -> 将不做更改"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353
+#, c-format
+#| msgid "Modify contact failed with HTTP status: %d (%s)"
+msgid "Modify contact failed with HTTP status %d (%s)"
+msgstr "修改联系人失败，HTTP 状态码：%d (%s)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1425
+#, c-format
+msgid "DELETE failed with HTTP status %d"
+msgstr "DELETE 失败，HTTP 状态码：%d"
+
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:24
msgid "No such book"
msgstr "没有该地址簿"
-#: ../addressbook/libebook/e-book-client.c:97
-#: ../addressbook/libedata-book/e-data-book.c:306
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:26
+#: ../addressbook/libedata-book/e-data-book.c:346
msgid "Contact not found"
msgstr "找不到联系人"
-#: ../addressbook/libebook/e-book-client.c:99
-#: ../addressbook/libedata-book/e-data-book.c:307
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:28
+#: ../addressbook/libedata-book/e-data-book.c:347
msgid "Contact ID already exists"
msgstr "联系人 ID 已经存在"
-#: ../addressbook/libebook/e-book-client.c:101
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:30
msgid "No such source"
msgstr "没有该源"
-#: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:32
+#: ../addressbook/libedata-book/e-data-book.c:363
msgid "No space"
msgstr "没有空间"
-#: ../addressbook/libebook/e-book-client.c:489
-msgid "Failed to run book factory"
-msgstr "运行地址簿工厂失败"
-
-#: ../addressbook/libebook/e-book-client.c:2272
-#: ../calendar/libecal/e-cal-client.c:4632
-msgid "Cannot get connection to view"
-msgstr "无法获取到视图的连接"
-
#. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:121
+#: ../addressbook/libebook-contacts/e-contact.c:120
msgid "Unique ID"
msgstr "唯一的 ID"
@@ -323,12 +316,12 @@ msgstr "唯一的 ID"
#. * so we can generate its value if necessary in the getter
#. Translators: This is an EContact field description, in this case it's a
#. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
-#: ../addressbook/libebook/e-contact.c:126
+#: ../addressbook/libebook-contacts/e-contact.c:125
msgid "File Under"
msgstr "存档于"
#. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook-contacts/e-contact.c:127
msgid "Book UID"
msgstr "地址簿 UID"
@@ -336,435 +329,434 @@ msgstr "地址簿 UID"
#. FN isn't really a structured field - we use a getter/setter
#. * so we can set the N property (since evo 1.4 works fine with
#. * vcards that don't even have a N attribute. *sigh*)
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook-contacts/e-contact.c:133
msgid "Full Name"
msgstr "全名"
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook-contacts/e-contact.c:134
msgid "Given Name"
msgstr "名"
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook-contacts/e-contact.c:135
msgid "Family Name"
msgstr "姓"
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook-contacts/e-contact.c:136
msgid "Nickname"
msgstr "昵称"
#. Email fields
-#: ../addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook-contacts/e-contact.c:139
msgid "Email 1"
msgstr "电子邮件 1"
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook-contacts/e-contact.c:140
msgid "Email 2"
msgstr "电子邮件 2"
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook-contacts/e-contact.c:141
msgid "Email 3"
msgstr "电子邮件 3"
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook-contacts/e-contact.c:142
msgid "Email 4"
msgstr "电子邮件 4"
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook-contacts/e-contact.c:144
msgid "Mailer"
msgstr "邮件程序"
#. Address Labels
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook-contacts/e-contact.c:147
msgid "Home Address Label"
msgstr "家庭地址标签"
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook-contacts/e-contact.c:148
msgid "Work Address Label"
msgstr "工作地址标签"
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook-contacts/e-contact.c:149
msgid "Other Address Label"
msgstr "其它地址标签"
#. Phone fields
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook-contacts/e-contact.c:152
msgid "Assistant Phone"
msgstr "助手电话"
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook-contacts/e-contact.c:153
msgid "Business Phone"
msgstr "商务电话"
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook-contacts/e-contact.c:154
msgid "Business Phone 2"
msgstr "商务电话 2"
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook-contacts/e-contact.c:155
msgid "Business Fax"
msgstr "商务传真"
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook-contacts/e-contact.c:156
msgid "Callback Phone"
msgstr "回拨电话"
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook-contacts/e-contact.c:157
msgid "Car Phone"
msgstr "车载电话"
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook-contacts/e-contact.c:158
msgid "Company Phone"
msgstr "公司电话"
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook-contacts/e-contact.c:159
msgid "Home Phone"
msgstr "家庭电话"
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook-contacts/e-contact.c:160
msgid "Home Phone 2"
msgstr "家庭电话 2"
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook-contacts/e-contact.c:161
msgid "Home Fax"
msgstr "家庭传真"
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook-contacts/e-contact.c:162
msgid "ISDN"
msgstr "ISDN"
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook-contacts/e-contact.c:163
msgid "Mobile Phone"
msgstr "移动电话"
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook-contacts/e-contact.c:164
msgid "Other Phone"
msgstr "其它电话"
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook-contacts/e-contact.c:165
msgid "Other Fax"
msgstr "其它传真"
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook-contacts/e-contact.c:166
msgid "Pager"
msgstr "寻呼机"
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook-contacts/e-contact.c:167
msgid "Primary Phone"
msgstr "主要电话"
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook-contacts/e-contact.c:168
msgid "Radio"
msgstr "收音机"
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook-contacts/e-contact.c:169
msgid "Telex"
msgstr "电传"
#. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook-contacts/e-contact.c:171
msgid "TTY"
msgstr "TTY"
#. Organizational fields
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook-contacts/e-contact.c:174
msgid "Organization"
msgstr "组织"
-#: ../addressbook/libebook/e-contact.c:176
+#: ../addressbook/libebook-contacts/e-contact.c:175
msgid "Organizational Unit"
msgstr "组织单元"
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook-contacts/e-contact.c:176
msgid "Office"
msgstr "办公室"
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook-contacts/e-contact.c:177
msgid "Title"
msgstr "头衔"
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook-contacts/e-contact.c:178
msgid "Role"
msgstr "角色"
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook-contacts/e-contact.c:179
msgid "Manager"
msgstr "经理"
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook-contacts/e-contact.c:180
msgid "Assistant"
msgstr "助手"
#. Web fields
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook-contacts/e-contact.c:183
msgid "Homepage URL"
msgstr "个人主页 URL"
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook-contacts/e-contact.c:184
msgid "Weblog URL"
msgstr "网络日记 URL"
#. Contact categories
-#: ../addressbook/libebook/e-contact.c:188
-#: ../libedataserverui/e-categories-dialog.c:90
+#: ../addressbook/libebook-contacts/e-contact.c:187
msgid "Categories"
msgstr "类别"
#. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook-contacts/e-contact.c:190
msgid "Calendar URI"
msgstr "日历 URI"
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook-contacts/e-contact.c:191
msgid "Free/Busy URL"
msgstr "空闲/繁忙 URL"
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook-contacts/e-contact.c:192
msgid "ICS Calendar"
msgstr "ICS 日历"
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook-contacts/e-contact.c:193
msgid "Video Conferencing URL"
msgstr "视频会议 URL"
#. Misc fields
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook-contacts/e-contact.c:196
msgid "Spouse's Name"
msgstr "配偶姓名"
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook-contacts/e-contact.c:197
msgid "Note"
msgstr "注释"
#. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook-contacts/e-contact.c:200
msgid "AIM Home Screen Name 1"
msgstr "AIM 家庭屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook-contacts/e-contact.c:201
msgid "AIM Home Screen Name 2"
msgstr "AIM 家庭屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook-contacts/e-contact.c:202
msgid "AIM Home Screen Name 3"
msgstr "AIM 家庭屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook-contacts/e-contact.c:203
msgid "AIM Work Screen Name 1"
msgstr "AIM 工作屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook-contacts/e-contact.c:204
msgid "AIM Work Screen Name 2"
msgstr "AIM 工作屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook-contacts/e-contact.c:205
msgid "AIM Work Screen Name 3"
msgstr "AIM 工作屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook-contacts/e-contact.c:206
msgid "GroupWise Home Screen Name 1"
msgstr "GroupWise 家庭屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook-contacts/e-contact.c:207
msgid "GroupWise Home Screen Name 2"
msgstr "GroupWise 家庭屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook-contacts/e-contact.c:208
msgid "GroupWise Home Screen Name 3"
msgstr "GroupWise 家庭屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook-contacts/e-contact.c:209
msgid "GroupWise Work Screen Name 1"
msgstr "GroupWise 工作屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook-contacts/e-contact.c:210
msgid "GroupWise Work Screen Name 2"
msgstr "GroupWise 工作屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook-contacts/e-contact.c:211
msgid "GroupWise Work Screen Name 3"
msgstr "GroupWise 工作屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook-contacts/e-contact.c:212
msgid "Jabber Home ID 1"
msgstr "Jabber 家庭 ID 1"
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook-contacts/e-contact.c:213
msgid "Jabber Home ID 2"
msgstr "Jabber 家庭 ID 2"
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook-contacts/e-contact.c:214
msgid "Jabber Home ID 3"
msgstr "Jabber 家庭 ID 3"
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook-contacts/e-contact.c:215
msgid "Jabber Work ID 1"
msgstr "Jabber 工作 ID 1"
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook-contacts/e-contact.c:216
msgid "Jabber Work ID 2"
msgstr "Jabber 工作 ID 2"
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook-contacts/e-contact.c:217
msgid "Jabber Work ID 3"
msgstr "Jabber 工作 ID 3"
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook-contacts/e-contact.c:218
msgid "Yahoo! Home Screen Name 1"
msgstr "Yahoo! 家庭屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook-contacts/e-contact.c:219
msgid "Yahoo! Home Screen Name 2"
msgstr "Yahoo! 家庭屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook-contacts/e-contact.c:220
msgid "Yahoo! Home Screen Name 3"
msgstr "Yahoo! 家庭屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook-contacts/e-contact.c:221
msgid "Yahoo! Work Screen Name 1"
msgstr "Yahoo! 工作屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook-contacts/e-contact.c:222
msgid "Yahoo! Work Screen Name 2"
msgstr "Yahoo! 工作屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook-contacts/e-contact.c:223
msgid "Yahoo! Work Screen Name 3"
msgstr "Yahoo! 工作屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook-contacts/e-contact.c:224
msgid "MSN Home Screen Name 1"
msgstr "MSN 家庭屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook-contacts/e-contact.c:225
msgid "MSN Home Screen Name 2"
msgstr "MSN 家庭屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook-contacts/e-contact.c:226
msgid "MSN Home Screen Name 3"
msgstr "MSN 家庭屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook-contacts/e-contact.c:227
msgid "MSN Work Screen Name 1"
msgstr "MSN 工作屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook-contacts/e-contact.c:228
msgid "MSN Work Screen Name 2"
msgstr "MSN 工作屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook-contacts/e-contact.c:229
msgid "MSN Work Screen Name 3"
msgstr "MSN 工作屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook-contacts/e-contact.c:230
msgid "ICQ Home ID 1"
msgstr "ICQ 家庭 ID 1"
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook-contacts/e-contact.c:231
msgid "ICQ Home ID 2"
msgstr "ICQ 家庭 ID 2"
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook-contacts/e-contact.c:232
msgid "ICQ Home ID 3"
msgstr "ICQ 家庭 ID 3"
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook-contacts/e-contact.c:233
msgid "ICQ Work ID 1"
msgstr "ICQ 工作 ID 1"
-#: ../addressbook/libebook/e-contact.c:235
+#: ../addressbook/libebook-contacts/e-contact.c:234
msgid "ICQ Work ID 2"
msgstr "ICQ 工作 ID 2"
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook-contacts/e-contact.c:235
msgid "ICQ Work ID 3"
msgstr "ICQ 工作 ID 3"
#. Last modified time
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook-contacts/e-contact.c:238
msgid "Last Revision"
msgstr "上次修订"
#. Translators: This is an EContact field description, in this case it's a
#. * virtual field, which returns either name of the contact or the organization
#. * name, recognized by multiple other fields, where the first filled is used.
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook-contacts/e-contact.c:242
msgid "Name or Org"
msgstr "名称或组织"
#. Address fields
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook-contacts/e-contact.c:245
msgid "Address List"
msgstr "地址列表"
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook-contacts/e-contact.c:246
msgid "Home Address"
msgstr "家庭地址"
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook-contacts/e-contact.c:247
msgid "Work Address"
msgstr "办公地址"
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook-contacts/e-contact.c:248
msgid "Other Address"
msgstr "其它地址"
#. Contact categories
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook-contacts/e-contact.c:251
msgid "Category List"
msgstr "类别列表"
#. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook-contacts/e-contact.c:254
msgid "Photo"
msgstr "照片"
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook-contacts/e-contact.c:255
msgid "Logo"
msgstr "标志"
#. Translators: This is an EContact field description, in this case it's a name
#. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
-#: ../addressbook/libebook/e-contact.c:260
+#: ../addressbook/libebook-contacts/e-contact.c:259
msgid "Name"
msgstr "姓名"
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook-contacts/e-contact.c:260
msgid "Email List"
msgstr "邮件列表"
#. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook-contacts/e-contact.c:263
msgid "AIM Screen Name List"
msgstr "AIM 屏幕名列表"
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook-contacts/e-contact.c:264
msgid "GroupWise ID List"
msgstr "GroupWise ID 列表"
-#: ../addressbook/libebook/e-contact.c:266
+#: ../addressbook/libebook-contacts/e-contact.c:265
msgid "Jabber ID List"
msgstr "Jabber ID 列表"
-#: ../addressbook/libebook/e-contact.c:267
+#: ../addressbook/libebook-contacts/e-contact.c:266
msgid "Yahoo! Screen Name List"
msgstr "Yahoo! 屏幕名列表"
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook-contacts/e-contact.c:267
msgid "MSN Screen Name List"
msgstr "MSN 屏幕名列表"
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook-contacts/e-contact.c:268
msgid "ICQ ID List"
msgstr "ICQ ID 列表"
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook-contacts/e-contact.c:270
msgid "Wants HTML Mail"
msgstr "想要 HTML 邮件"
#. Translators: This is an EContact field description, in this case it's a
#. * field describing whether it's a Contact list (list of email addresses) or a
#. * regular contact for one person/organization/...
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook-contacts/e-contact.c:275
msgid "List"
msgstr "列表"
@@ -772,402 +764,463 @@ msgstr "列表"
#. * used to determine whether when sending to Contact lists the addresses should be
#. * shown or not to other recipients - basically whether to use BCC field or CC
#. * message header when sending messages to this Contact list.
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook-contacts/e-contact.c:280
msgid "List Shows Addresses"
msgstr "列表显示地址"
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook-contacts/e-contact.c:282
msgid "Birth Date"
msgstr "生日"
-#: ../addressbook/libebook/e-contact.c:284
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:962
+#: ../addressbook/libebook-contacts/e-contact.c:283
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:887
msgid "Anniversary"
msgstr "周年纪念日"
#. Security fields
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook-contacts/e-contact.c:286
msgid "X.509 Certificate"
msgstr "X.509 证书"
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook-contacts/e-contact.c:288
msgid "Gadu-Gadu Home ID 1"
msgstr "Gadu-Gadu 家庭 ID 1"
-#: ../addressbook/libebook/e-contact.c:290
+#: ../addressbook/libebook-contacts/e-contact.c:289
msgid "Gadu-Gadu Home ID 2"
msgstr "Gadu-Gadu 家庭 ID 2"
-#: ../addressbook/libebook/e-contact.c:291
+#: ../addressbook/libebook-contacts/e-contact.c:290
msgid "Gadu-Gadu Home ID 3"
msgstr "Gadu-Gadu 家庭 ID 3"
-#: ../addressbook/libebook/e-contact.c:292
+#: ../addressbook/libebook-contacts/e-contact.c:291
msgid "Gadu-Gadu Work ID 1"
msgstr "Gadu-Gadu 工作 ID 1"
-#: ../addressbook/libebook/e-contact.c:293
+#: ../addressbook/libebook-contacts/e-contact.c:292
msgid "Gadu-Gadu Work ID 2"
msgstr "Gadu-Gadu 工作 ID 2"
-#: ../addressbook/libebook/e-contact.c:294
+#: ../addressbook/libebook-contacts/e-contact.c:293
msgid "Gadu-Gadu Work ID 3"
msgstr "Gadu-Gadu 工作 ID 3"
-#: ../addressbook/libebook/e-contact.c:295
+#: ../addressbook/libebook-contacts/e-contact.c:294
msgid "Gadu-Gadu ID List"
msgstr "Gadu-Gadu ID 列表"
#. Geo information
-#: ../addressbook/libebook/e-contact.c:298
+#: ../addressbook/libebook-contacts/e-contact.c:297
msgid "Geographic Information"
msgstr "地理信息"
-#: ../addressbook/libebook/e-contact.c:300
+#: ../addressbook/libebook-contacts/e-contact.c:299
msgid "Telephone"
msgstr "电话"
-#: ../addressbook/libebook/e-contact.c:302
+#: ../addressbook/libebook-contacts/e-contact.c:301
msgid "Skype Home Name 1"
msgstr "Skype 家庭屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:303
+#: ../addressbook/libebook-contacts/e-contact.c:302
msgid "Skype Home Name 2"
msgstr "Skype 家庭屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:304
+#: ../addressbook/libebook-contacts/e-contact.c:303
msgid "Skype Home Name 3"
msgstr "Skype 家庭屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:305
+#: ../addressbook/libebook-contacts/e-contact.c:304
msgid "Skype Work Name 1"
msgstr "Skype 工作屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:306
+#: ../addressbook/libebook-contacts/e-contact.c:305
msgid "Skype Work Name 2"
msgstr "Skype 工作屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:307
+#: ../addressbook/libebook-contacts/e-contact.c:306
msgid "Skype Work Name 3"
msgstr "Skype 工作屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:308
+#: ../addressbook/libebook-contacts/e-contact.c:307
msgid "Skype Name List"
msgstr "Skype 屏幕名列表"
-#: ../addressbook/libebook/e-contact.c:310
+#: ../addressbook/libebook-contacts/e-contact.c:309
msgid "SIP address"
msgstr "SIP 地址"
-#: ../addressbook/libebook/e-contact.c:312
+#: ../addressbook/libebook-contacts/e-contact.c:311
msgid "Google Talk Home Name 1"
msgstr "Google Talk 家庭屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:313
+#: ../addressbook/libebook-contacts/e-contact.c:312
msgid "Google Talk Home Name 2"
msgstr "Google Talk 家庭屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:314
+#: ../addressbook/libebook-contacts/e-contact.c:313
msgid "Google Talk Home Name 3"
msgstr "Google Talk 家庭屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:315
+#: ../addressbook/libebook-contacts/e-contact.c:314
msgid "Google Talk Work Name 1"
msgstr "Google Talk 工作屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:316
+#: ../addressbook/libebook-contacts/e-contact.c:315
msgid "Google Talk Work Name 2"
msgstr "Google Talk 工作屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:317
+#: ../addressbook/libebook-contacts/e-contact.c:316
msgid "Google Talk Work Name 3"
msgstr "Google Talk 工作屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:318
+#: ../addressbook/libebook-contacts/e-contact.c:317
msgid "Google Talk Name List"
msgstr "Google Talk 姓名列表"
-#: ../addressbook/libebook/e-contact.c:320
+#: ../addressbook/libebook-contacts/e-contact.c:319
msgid "Twitter Name List"
msgstr "Twitter 姓名列表"
-#: ../addressbook/libebook/e-contact.c:1641
-#: ../addressbook/libebook/e-destination.c:884
+#: ../addressbook/libebook-contacts/e-contact.c:1624
+#: ../addressbook/libebook/e-destination.c:883
msgid "Unnamed List"
msgstr "未命名的列表"
-#: ../addressbook/libedata-book/e-book-backend.c:17
-msgid "Cannot process, book backend is opening"
-msgstr "无法进行，地址簿后端正在打开"
+#: ../addressbook/libebook-contacts/e-phone-number.c:43
+msgid "The library was built without phone number support."
+msgstr ""
+
+#: ../addressbook/libebook-contacts/e-phone-number.c:45
+msgid "The phone number parser reported an yet unkown error code."
+msgstr ""
+
+#: ../addressbook/libebook-contacts/e-phone-number.c:47
+msgid "Not a phone number"
+msgstr ""
+
+#: ../addressbook/libebook-contacts/e-phone-number.c:49
+#| msgid "Invalid range"
+msgid "Invalid country calling code"
+msgstr "无效的国家拨号代码"
+
+#: ../addressbook/libebook-contacts/e-phone-number.c:51
+msgid ""
+"Remaining text after the country calling code is too short for a phone number"
+msgstr ""
+
+#: ../addressbook/libebook-contacts/e-phone-number.c:53
+msgid "Text is too short for a phone number"
+msgstr ""
+
+#: ../addressbook/libebook-contacts/e-phone-number.c:55
+msgid "Text is too long for a phone number"
+msgstr ""
-#: ../addressbook/libedata-book/e-book-backend.c:90
+#: ../addressbook/libebook/e-book-client.c:748
#, c-format
msgid "Unknown book property '%s'"
msgstr "未知的地址簿属性“%s”"
-#: ../addressbook/libedata-book/e-book-backend.c:107
+#: ../addressbook/libebook/e-book-client.c:763
#, c-format
msgid "Cannot change value of book property '%s'"
msgstr "无法更改地址簿属性“%s”的值"
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:501
-#: ../camel/camel-db.c:510
+#: ../addressbook/libebook/e-book-client.c:1098
+#: ../addressbook/libebook/e-book-client.c:1273
+#: ../calendar/libecal/e-cal-client.c:1522
+#: ../calendar/libecal/e-cal-client.c:1704
+#, c-format
+#| msgid "Could not connect to %s: "
+msgid "Unable to connect to '%s': "
+msgstr "无法连接到“%s”："
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:793
+#, c-format
+msgid "Error introspecting unknown summary field '%s'"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1291
+#| msgid ""
+#| "Error executing search expression: %s:\n"
+#| "%s"
+msgid "Error parsing regular expression"
+msgstr "执行搜索表达式错误"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1335
+#: ../camel/camel-db.c:544
#, c-format
msgid "Insufficient memory"
msgstr "内存不足"
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1135
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1468
#, c-format
-msgid "Contact '%s' not found"
-msgstr "未找到联系人 %s"
+msgid "Invalid contact field '%d' specified in summary"
+msgstr ""
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:201
-#: ../addressbook/libedata-book/e-data-book.c:214
-#: ../addressbook/libedata-book/e-data-book.c:724
-msgid "Invalid query: "
-msgstr "无效的查询："
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1502
+#, c-format
+msgid ""
+"Contact field '%s' of type '%s' specified in summary, but only boolean, "
+"string and string list field types are supported"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2690
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3768
+#, c-format
+msgid ""
+"Full search_contacts are not stored in cache. vcards cannot be returned."
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3894
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3975
+#, c-format
+msgid "Query contained unsupported elements"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3898
+#, c-format
+#| msgid "Invalid query"
+msgid "Invalid Query"
+msgstr "无效的查询"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3922
+#, c-format
+msgid ""
+"Full search_contacts are not stored in cache. Hence only summary query is "
+"supported."
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3979
+#: ../addressbook/libedata-book/e-data-book.c:358
+#: ../addressbook/libedata-book/e-data-book.c:992
+#: ../calendar/libedata-cal/e-data-cal.c:412
+#: ../calendar/libedata-cal/e-data-cal.c:1306 ../libedataserver/e-client.c:164
+#, c-format
+msgid "Invalid query"
+msgstr "无效的查询"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4022
+#, c-format
+msgid ""
+"Full vcards are not stored in cache. Hence only summary query is supported."
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4725
+#, fuzzy, c-format
+#| msgid "Failed to remove file '%s': %s"
+msgid "Unable to remove the db file: errno %d"
+msgstr "删除文件“%s”失败：%s"
-#: ../addressbook/libedata-book/e-data-book.c:302
-#: ../calendar/libedata-cal/e-data-cal.c:415
+#: ../addressbook/libedata-book/e-data-book.c:342
+#: ../calendar/libedata-cal/e-data-cal.c:393
msgid "Success"
msgstr "成功"
-#: ../addressbook/libedata-book/e-data-book.c:303
-#: ../calendar/libecal/e-cal.c:4019 ../calendar/libedata-cal/e-data-cal.c:416
-#: ../libedataserver/e-client.c:122
+#: ../addressbook/libedata-book/e-data-book.c:343
+#: ../calendar/libecal/e-cal.c:2303 ../calendar/libedata-cal/e-data-cal.c:394
+#: ../libedataserver/e-client.c:131
msgid "Backend is busy"
msgstr "后端繁忙"
-#: ../addressbook/libedata-book/e-data-book.c:304
-#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132
+#: ../addressbook/libedata-book/e-data-book.c:344
+#: ../calendar/libedata-cal/e-data-cal.c:395 ../libedataserver/e-client.c:141
msgid "Repository offline"
msgstr "仓库离线"
-#: ../addressbook/libedata-book/e-data-book.c:305
-#: ../calendar/libecal/e-cal.c:4033 ../calendar/libedata-cal/e-data-cal.c:418
-#: ../libedataserver/e-client.c:138
+#: ../addressbook/libedata-book/e-data-book.c:345
+#: ../calendar/libecal/e-cal.c:2317 ../calendar/libedata-cal/e-data-cal.c:396
+#: ../libedataserver/e-client.c:148
msgid "Permission denied"
msgstr "没有权限"
-#: ../addressbook/libedata-book/e-data-book.c:308
-#: ../calendar/libedata-cal/e-data-cal.c:423
+#: ../addressbook/libedata-book/e-data-book.c:348
+#: ../calendar/libedata-cal/e-data-cal.c:401
msgid "Authentication Failed"
msgstr "认证失败"
-#: ../addressbook/libedata-book/e-data-book.c:309
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../addressbook/libedata-book/e-data-book.c:349
+#: ../calendar/libedata-cal/e-data-cal.c:402
msgid "Authentication Required"
msgstr "需要认证"
-#: ../addressbook/libedata-book/e-data-book.c:310
-#: ../calendar/libedata-cal/e-data-cal.c:425
+#: ../addressbook/libedata-book/e-data-book.c:350
+#: ../calendar/libedata-cal/e-data-cal.c:403
msgid "Unsupported field"
msgstr "不支持的字段"
-#: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:146
+#: ../addressbook/libedata-book/e-data-book.c:351
+#: ../calendar/libedata-cal/e-data-cal.c:405 ../libedataserver/e-client.c:156
msgid "Unsupported authentication method"
msgstr "不支持的身份认证方式"
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:352
+#: ../calendar/libedata-cal/e-data-cal.c:406 ../libedataserver/e-client.c:158
msgid "TLS not available"
msgstr "TLS 不可用"
-#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../addressbook/libedata-book/e-data-book.c:353
msgid "Address book does not exist"
msgstr "地址簿不存在"
-#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../addressbook/libedata-book/e-data-book.c:354
msgid "Book removed"
msgstr "地址簿已删除"
-#: ../addressbook/libedata-book/e-data-book.c:315
-#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../addressbook/libedata-book/e-data-book.c:355
+#: ../calendar/libedata-cal/e-data-cal.c:409
msgid "Not available in offline mode"
msgstr "在脱机模式中无法使用"
-#: ../addressbook/libedata-book/e-data-book.c:316
-#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:150
+#: ../addressbook/libedata-book/e-data-book.c:356
+#: ../calendar/libedata-cal/e-data-cal.c:410 ../libedataserver/e-client.c:160
msgid "Search size limit exceeded"
msgstr "超过搜索大小限制"
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:152
+#: ../addressbook/libedata-book/e-data-book.c:357
+#: ../calendar/libedata-cal/e-data-cal.c:411 ../libedataserver/e-client.c:162
msgid "Search time limit exceeded"
msgstr "超过搜索时间限制"
-#: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:434 ../libedataserver/e-client.c:154
-msgid "Invalid query"
-msgstr "无效的查询"
-
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:359
+#: ../calendar/libedata-cal/e-data-cal.c:413 ../libedataserver/e-client.c:166
msgid "Query refused"
msgstr "查询被拒绝"
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142
+#: ../addressbook/libedata-book/e-data-book.c:360
+#: ../calendar/libedata-cal/e-data-cal.c:414 ../libedataserver/e-client.c:152
msgid "Could not cancel"
msgstr "无法取消"
#. { E_DATA_BOOK_STATUS_OTHER_ERROR, N_("Other error") },
#. { OtherError, N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:322
-#: ../calendar/libedata-cal/e-data-cal.c:438
+#: ../addressbook/libedata-book/e-data-book.c:362
+#: ../calendar/libedata-cal/e-data-cal.c:416
msgid "Invalid server version"
msgstr "无效的服务器版本"
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libecal/e-cal.c:4017 ../calendar/libedata-cal/e-data-cal.c:439
-#: ../libedataserver/e-client.c:120
+#: ../addressbook/libedata-book/e-data-book.c:364
+#: ../calendar/libecal/e-cal.c:2301 ../calendar/libedata-cal/e-data-cal.c:417
+#: ../libedataserver/e-client.c:129
msgid "Invalid argument"
msgstr "无效参数"
#. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libecal/e-cal.c:4056 ../calendar/libedata-cal/e-data-cal.c:441
-#: ../libedataserver/e-client.c:144
+#: ../addressbook/libedata-book/e-data-book.c:366
+#: ../calendar/libecal/e-cal.c:1060 ../calendar/libecal/e-cal.c:1428
+#: ../calendar/libecal/e-cal.c:1908 ../calendar/libecal/e-cal.c:2340
+#: ../calendar/libedata-cal/e-data-cal.c:419 ../libedataserver/e-client.c:154
+#, c-format
msgid "Not supported"
msgstr "不支持"
-#: ../addressbook/libedata-book/e-data-book.c:327
-#: ../calendar/libedata-cal/e-data-cal.c:442 ../libedataserver/e-client.c:162
+#: ../addressbook/libedata-book/e-data-book.c:367
+#: ../calendar/libedata-cal/e-data-cal.c:420 ../libedataserver/e-client.c:172
msgid "Backend is not opened yet"
msgstr "后端尚未打开"
-#: ../addressbook/libedata-book/e-data-book.c:335
-#: ../calendar/libecal/e-cal-client.c:620
-#: ../calendar/libedata-cal/e-data-cal.c:450 ../libedataserver/e-client.c:160
+#: ../addressbook/libedata-book/e-data-book.c:368
+#: ../libedataserver/e-client.c:174
+#, fuzzy
+#| msgid "Object not found"
+msgid "Object is out of sync"
+msgstr "找不到对象"
+
+#: ../addressbook/libedata-book/e-data-book.c:376
+#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:170
msgid "Other error"
msgstr "其他错误"
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:542
-#: ../addressbook/libedata-book/e-data-book.c:909
-msgid "Cannot get contact: "
-msgstr "无法获取联系人："
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:567
-#: ../addressbook/libedata-book/e-data-book.c:592
-msgid "Empty query: "
-msgstr "空的查询："
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:617
-#: ../addressbook/libedata-book/e-data-book.c:1007
-msgid "Cannot add contact: "
-msgstr "无法添加联系人："
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:642
-#: ../addressbook/libedata-book/e-data-book.c:1041
-msgid "Cannot modify contacts: "
-msgstr "无法修改联系人："
+#: ../addressbook/libedata-book/e-data-book.c:1017
+#: ../calendar/libedata-cal/e-data-cal.c:1331
+msgid "Invalid query: "
+msgstr "无效的查询："
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:796
+#: ../addressbook/libedata-book/e-data-book.c:1069
msgid "Cannot open book: "
msgstr "无法打开地址簿："
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:812
-msgid "Cannot remove book: "
-msgstr "无法删除地址簿："
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:839
+#: ../addressbook/libedata-book/e-data-book.c:1106
msgid "Cannot refresh address book: "
msgstr "无法刷新地址薄："
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:865
-msgid "Cannot get backend property: "
-msgstr "无法获取后端属性："
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:890
-#: ../calendar/libedata-cal/e-data-cal.c:1016
-msgid "Cannot set backend property: "
-msgstr "无法发送后端属性："
+#: ../addressbook/libedata-book/e-data-book.c:1137
+msgid "Cannot get contact: "
+msgstr "无法获取联系人："
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:927
+#: ../addressbook/libedata-book/e-data-book.c:1175
msgid "Cannot get contact list: "
msgstr "无法获取联系人列表："
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:961
+#: ../addressbook/libedata-book/e-data-book.c:1227
msgid "Cannot get contact list uids: "
msgstr "无法获取联系人列表 UID："
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1066
+#: ../addressbook/libedata-book/e-data-book.c:1274
+msgid "Cannot add contact: "
+msgstr "无法添加联系人："
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1323
+msgid "Cannot modify contacts: "
+msgstr "无法修改联系人："
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1365
msgid "Cannot remove contacts: "
msgstr "无法移除联系人："
-#: ../addressbook/libedata-book/e-data-book-factory.c:103
-#: ../calendar/libedata-cal/e-data-cal-factory.c:114
+#: ../addressbook/libedata-book/e-data-book-factory.c:246
+#: ../calendar/libedata-cal/e-data-cal-factory.c:249
#, c-format
msgid "No backend name in source '%s'"
msgstr "源文件“%s”中无后端名称"
-#: ../addressbook/libedata-book/e-data-book-factory.c:115
-#: ../calendar/libedata-cal/e-data-cal-factory.c:127
+#: ../addressbook/libedata-book/e-data-book-factory.c:297
+#: ../calendar/libedata-cal/e-data-cal-factory.c:303
#, c-format
-msgid "Invalid backend name '%s' in source '%s'"
-msgstr "在源文件“%2$s”中的后端名称“%1$s”无效"
-
-#: ../addressbook/libedata-book/e-data-book-factory.c:319
-#: ../calendar/libedata-cal/e-data-cal-factory.c:230
msgid "Missing source UID"
msgstr "缺少源 UID"
-#: ../addressbook/libedata-book/e-data-book-factory.c:332
-#: ../calendar/libedata-cal/e-data-cal-factory.c:243
+#: ../addressbook/libedata-book/e-data-book-factory.c:308
+#: ../calendar/libedata-cal/e-data-cal-factory.c:313
#, c-format
msgid "No such source for UID '%s'"
msgstr "没有 UID “%s”的源"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:573
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:569
#, c-format
msgid "Server is unreachable (%s)"
msgstr "服务器不可用 (%s)"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:600
#, c-format
msgid "Failed to connect to a server using SSL: %s"
msgstr "无法使用 SSL 连接到服务器：%s"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:610
-msgid ""
-"Failed to connect to a server using SSL. One possible reason is an invalid "
-"certificate being used by the server. If this is expected, like self-signed "
-"certificate being used on the server, then disable certificate validity "
-"tests by selecting 'Ignore invalid SSL certificate' option in Properties"
-msgstr ""
-"无法使用 SSL 连接到服务器。一个可能的原因是服务器使用了无效的证书。如果这在您"
-"意料之中，如服务器使用了自我签名的证书，可选择属性里的“忽略无效 SSL 证书”选项来禁用"
-"证书有效性测试"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:624
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:611
#, c-format
msgid "Unexpected HTTP status code %d returned (%s)"
msgstr "返回了意外的 HTTP 状态代码 %d(%s)"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:643
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:630
msgid "CalDAV backend is not loaded yet"
msgstr "CalDAV 后端尚未加载"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1032
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1051
msgid "Invalid Redirect URL"
msgstr "无效的重定向 URL"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2466
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2831
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2528
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2880
#, c-format
msgid ""
"Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1176,214 +1229,211 @@ msgstr ""
"服务器不可用，日历将以只读模式打开。\n"
"错误消息：%s"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2772
-msgid "Cannot create local store"
-msgstr "无法创建本地存储"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2781
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2832
#, c-format
msgid "Cannot create local cache folder '%s'"
msgstr "无法创建本地缓存文件夹“%s”"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2792
-msgid "Could not create synch slave thread"
-msgstr "无法创建同步从属线程"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3874
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3920
msgid "CalDAV does not support bulk additions"
msgstr "CalDAV 不支持批量添加"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3976
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4023
msgid "CalDAV does not support bulk modifications"
msgstr "CalDAV 不支持批量修改"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4144
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4199
msgid "CalDAV does not support bulk removals"
msgstr "CalDAV 不支持批量删除"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4810
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4866
msgid "Calendar doesn't support Free/Busy"
msgstr "日历不支持空闲/繁忙"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4818
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4875
msgid "Schedule outbox url not found"
msgstr "未找到定时发件箱 url"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4917
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4972
msgid "Unexpected result in schedule-response"
msgstr "定时响应的结果异常"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:964
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:889
msgid "Birthday"
msgstr "生日"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1000
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:925
#, c-format
msgid "Birthday: %s"
msgstr "生日：%s"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1031
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:956
#, c-format
msgid "Anniversary: %s"
msgstr "周年：%s"
-#: ../calendar/backends/file/e-cal-backend-file.c:235
+#: ../calendar/backends/file/e-cal-backend-file.c:245
msgid "Cannot save calendar data: Malformed URI."
msgstr "无法保存日历数据：URI 格式错误。"
-#: ../calendar/backends/file/e-cal-backend-file.c:242
-#: ../calendar/backends/file/e-cal-backend-file.c:248
+#: ../calendar/backends/file/e-cal-backend-file.c:252
+#: ../calendar/backends/file/e-cal-backend-file.c:258
msgid "Cannot save calendar data"
msgstr "无法保存日历数据"
-#: ../calendar/backends/http/e-cal-backend-http.c:483
+#: ../calendar/backends/http/e-cal-backend-http.c:478
#, c-format
msgid "Malformed URI: %s"
msgstr "URI 格式错误：%s"
-#: ../calendar/backends/http/e-cal-backend-http.c:544
+#: ../calendar/backends/http/e-cal-backend-http.c:569
#, c-format
msgid "Redirected to Invalid URI"
msgstr "已重定向到无效 URI"
-#: ../calendar/backends/http/e-cal-backend-http.c:581
+#: ../calendar/backends/http/e-cal-backend-http.c:606
#, c-format
msgid "Bad file format."
msgstr "无效的文件格式。"
-#: ../calendar/backends/http/e-cal-backend-http.c:591
+#: ../calendar/backends/http/e-cal-backend-http.c:616
#, c-format
msgid "Not a calendar."
msgstr "不是日历。"
-#: ../calendar/backends/http/e-cal-backend-http.c:892
-#: ../calendar/backends/http/e-cal-backend-http.c:897
-#: ../calendar/backends/weather/e-cal-backend-weather.c:512
+#: ../calendar/backends/http/e-cal-backend-http.c:926
+#: ../calendar/backends/weather/e-cal-backend-weather.c:514
msgid "Could not create cache file"
msgstr "无法创建缓存文件"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:172
+#: ../calendar/backends/weather/e-cal-backend-weather.c:173
msgid "Could not retrieve weather data"
msgstr "无法获取天气数据"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:277
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
msgid "Weather: Fog"
msgstr "天气：雾"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:278
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
msgid "Weather: Cloudy Night"
msgstr "天气：多云夜晚"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
msgid "Weather: Cloudy"
msgstr "天气：多云"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
msgid "Weather: Overcast"
msgstr "天气：阴天"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
msgid "Weather: Showers"
msgstr "天气：阵雨"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:282
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
msgid "Weather: Snow"
msgstr "天气：雪"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
msgid "Weather: Clear Night"
msgstr "天气：晴朗夜晚"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
msgid "Weather: Sunny"
msgstr "天气：晴"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
msgid "Weather: Thunderstorms"
msgstr "天气：暴风雨"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:409
+#: ../calendar/backends/weather/e-cal-backend-weather.c:416
msgid "Forecast"
msgstr "天气预报"
-#: ../calendar/libecal/e-cal.c:4021
+#: ../calendar/libecal/e-cal.c:2305
msgid "Repository is offline"
msgstr "仓库离线"
-#: ../calendar/libecal/e-cal.c:4023 ../calendar/libecal/e-cal-client.c:135
+#: ../calendar/libecal/e-cal.c:2307 ../calendar/libecal/e-cal-client.c:255
msgid "No such calendar"
msgstr "没有这样的日历"
-#: ../calendar/libecal/e-cal.c:4025 ../calendar/libecal/e-cal-client.c:137
-#: ../calendar/libedata-cal/e-data-cal.c:420
+#: ../calendar/libecal/e-cal.c:2309 ../calendar/libecal/e-cal-client.c:257
+#: ../calendar/libedata-cal/e-data-cal.c:398
msgid "Object not found"
msgstr "找不到对象"
-#: ../calendar/libecal/e-cal.c:4027 ../calendar/libecal/e-cal-client.c:139
-#: ../calendar/libedata-cal/e-data-cal.c:421
+#: ../calendar/libecal/e-cal.c:2311 ../calendar/libecal/e-cal-client.c:259
+#: ../calendar/libedata-cal/e-data-cal.c:399
msgid "Invalid object"
msgstr "无效对象"
-#: ../calendar/libecal/e-cal.c:4029
+#: ../calendar/libecal/e-cal.c:2313
msgid "URI not loaded"
msgstr "URI 未载入"
-#: ../calendar/libecal/e-cal.c:4031
+#: ../calendar/libecal/e-cal.c:2315
msgid "URI already loaded"
msgstr "URI 已经载入"
-#: ../calendar/libecal/e-cal.c:4035
+#: ../calendar/libecal/e-cal.c:2319
msgid "Unknown User"
msgstr "未知用户"
-#: ../calendar/libecal/e-cal.c:4037 ../calendar/libecal/e-cal-client.c:143
-#: ../calendar/libedata-cal/e-data-cal.c:422
+#: ../calendar/libecal/e-cal.c:2321 ../calendar/libecal/e-cal-client.c:263
+#: ../calendar/libedata-cal/e-data-cal.c:400
msgid "Object ID already exists"
msgstr "对象 ID 已经存在"
-#: ../calendar/libecal/e-cal.c:4039
+#: ../calendar/libecal/e-cal.c:2323
msgid "Protocol not supported"
msgstr "不支持的协议"
-#: ../calendar/libecal/e-cal.c:4041
+#: ../calendar/libecal/e-cal.c:2325
msgid "Operation has been canceled"
msgstr "操作已取消"
-#: ../calendar/libecal/e-cal.c:4043
+#: ../calendar/libecal/e-cal.c:2327
msgid "Could not cancel operation"
msgstr "无法取消操作"
-#: ../calendar/libecal/e-cal.c:4045 ../libedataserver/e-client.c:128
+#: ../calendar/libecal/e-cal.c:2329 ../libedataserver/e-client.c:137
msgid "Authentication failed"
msgstr "认证失败"
-#: ../calendar/libecal/e-cal.c:4047
-#: ../camel/providers/smtp/camel-smtp-transport.c:856
-#: ../libedataserver/e-client.c:130
+#: ../calendar/libecal/e-cal.c:2331
+#: ../camel/providers/smtp/camel-smtp-transport.c:921
+#: ../libedataserver/e-client.c:139
msgid "Authentication required"
msgstr "必须认证"
-#: ../calendar/libecal/e-cal.c:4049
+#: ../calendar/libecal/e-cal.c:2333
msgid "A D-Bus exception has occurred"
msgstr "发生了一个 D-Bus 异常"
-#: ../calendar/libecal/e-cal.c:4053
+#: ../calendar/libecal/e-cal.c:2337
msgid "No error"
msgstr "无错误"
-#: ../calendar/libecal/e-cal-client.c:141
-#: ../calendar/libedata-cal/e-data-cal.c:430
+#: ../calendar/libecal/e-cal-client.c:261
+#: ../calendar/libedata-cal/e-data-cal.c:408
msgid "Unknown user"
msgstr "未知用户"
-#: ../calendar/libecal/e-cal-client.c:145
-#: ../calendar/libedata-cal/e-data-cal.c:419
+#: ../calendar/libecal/e-cal-client.c:265
+#: ../calendar/libedata-cal/e-data-cal.c:397
msgid "Invalid range"
msgstr "无效范围"
-#: ../calendar/libecal/e-cal-client.c:611
-msgid "Failed to run calendar factory"
-msgstr "运行日历工厂失败"
+#: ../calendar/libecal/e-cal-client.c:928
+#, c-format
+msgid "Unknown calendar property '%s'"
+msgstr "未知的日历属性“%s”"
+
+#: ../calendar/libecal/e-cal-client.c:943
+#, c-format
+msgid "Cannot change value of calendar property '%s'"
+msgstr "无法更改日历属性的值“%s”"
#: ../calendar/libecal/e-cal-component.c:1340
msgid "Untitled appointment"
@@ -1513,128 +1563,104 @@ msgstr "30日"
msgid "31st"
msgstr "31日"
-#: ../calendar/libecal/e-cal-util.c:697 ../calendar/libecal/e-cal-util.c:724
+#: ../calendar/libecal/e-cal-util.c:707 ../calendar/libecal/e-cal-util.c:734
msgctxt "Priority"
msgid "High"
msgstr "高"
-#: ../calendar/libecal/e-cal-util.c:699 ../calendar/libecal/e-cal-util.c:726
+#: ../calendar/libecal/e-cal-util.c:709 ../calendar/libecal/e-cal-util.c:736
msgctxt "Priority"
msgid "Normal"
msgstr "中"
-#: ../calendar/libecal/e-cal-util.c:701 ../calendar/libecal/e-cal-util.c:728
+#: ../calendar/libecal/e-cal-util.c:711 ../calendar/libecal/e-cal-util.c:738
msgctxt "Priority"
msgid "Low"
msgstr "低"
#. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:722
+#: ../calendar/libecal/e-cal-util.c:732
msgctxt "Priority"
msgid "Undefined"
msgstr "未定义"
-#: ../calendar/libedata-cal/e-cal-backend.c:36
-msgid "Cannot process, calendar backend is opening"
-msgstr "无法进行，日历后端正在打开"
-
-#: ../calendar/libedata-cal/e-cal-backend.c:135
-#, c-format
-msgid "Unknown calendar property '%s'"
-msgstr "未知的日历属性“%s”"
-
-#: ../calendar/libedata-cal/e-cal-backend.c:152
-#, c-format
-msgid "Cannot change value of calendar property '%s'"
-msgstr "无法更改日历属性的值“%s”"
-
#: ../calendar/libedata-cal/e-cal-backend-sexp.c:78
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:847
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:990
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1022
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1229
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1260
-#, c-format
-msgid "\"%s\" expects no arguments"
-msgstr "“%s”不需要参数"
-
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:238
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:285
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:326
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1302
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1056
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1365
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1492
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1541
#, c-format
msgid "\"%s\" expects one argument"
msgstr "“%s”需要一个参数"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:122
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:130
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:333
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:917
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1372
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1380
#, c-format
msgid "\"%s\" expects the first argument to be a string"
msgstr "“%s”需要第一个参数是字符串"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:139
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
#, c-format
-msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr "“%s”的第一个参数必须是 ISO 8601 日期/时间字符串"
-
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:562
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:910
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1058
-#, c-format
-msgid "\"%s\" expects two arguments"
-msgstr "“%s”需要两个参数"
+msgid "\"%s\" expects two or three arguments"
+msgstr "“%s”需要两个或三个参数"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:189
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:245
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:292
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:417
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:506
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:569
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1065
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1309
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:256
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1441
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1499
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1548
#, c-format
msgid "\"%s\" expects the first argument to be a time_t"
msgstr "“%s”的第一个参数应该是 time_t"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:198
-#, c-format
-msgid "\"%s\" expects the second argument to be an integer"
-msgstr "“%s”的第二个参数应该是整数"
-
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:410
-#, c-format
-msgid "\"%s\" expects two or three arguments"
-msgstr "“%s”需要两个或三个参数"
-
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:426
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:514
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:579
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1074
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:264
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:328
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:826
#, c-format
msgid "\"%s\" expects the second argument to be a time_t"
msgstr "“%s”的第一个参数应该是 time_t"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:436
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:186
#, c-format
msgid "\"%s\" expects the third argument to be a string"
msgstr "“%s”需要第三个参数是字符串"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:498
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:248
#, c-format
msgid "\"%s\" expects none or two arguments"
msgstr "“%s”需要零个或两个参数"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:926
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:311
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:660
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:810
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1434
+#, c-format
+msgid "\"%s\" expects two arguments"
+msgstr "“%s”需要两个参数"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:596
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:619
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:742
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:774
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:981
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1014
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1326
+#, c-format
+msgid "\"%s\" expects no arguments"
+msgstr "“%s”不需要参数"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
#, c-format
msgid "\"%s\" expects the second argument to be a string"
msgstr "“%s”的第二个参数应该是字符串"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:957
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:707
#, c-format
msgid ""
"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1645,116 +1671,106 @@ msgstr ""
"是“any”、“summary”、“description”、“location”、“attendee”、“organizer”、“classification”之"
"一"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1126
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
#, c-format
msgid "\"%s\" expects at least one argument"
msgstr "“%s”至少需要一个参数"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1141
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:893
#, c-format
msgid ""
"\"%s\" expects all arguments to be strings or one and only one argument to "
"be a boolean false (#f)"
msgstr "“%s”的所有参数都应该为字符串或者它唯一的参数为布尔假 (#f)"
-#: ../calendar/libedata-cal/e-data-cal.c:426
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1389
+#, c-format
+msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
+msgstr "“%s”的第一个参数必须是 ISO 8601 日期/时间字符串"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1450
+#, c-format
+msgid "\"%s\" expects the second argument to be an integer"
+msgstr "“%s”的第二个参数应该是整数"
+
+#: ../calendar/libedata-cal/e-data-cal.c:404
msgid "Unsupported method"
msgstr "不支持的方式"
-#: ../calendar/libedata-cal/e-data-cal.c:429
+#: ../calendar/libedata-cal/e-data-cal.c:407
msgid "Calendar does not exist"
msgstr "日历不存在"
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:909
+#: ../calendar/libedata-cal/e-data-cal.c:1502
msgid "Cannot open calendar: "
msgstr "无法打开日历："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:934
-msgid "Cannot remove calendar: "
-msgstr "无法移除日历："
-
-#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:961
+#: ../calendar/libedata-cal/e-data-cal.c:1539
msgid "Cannot refresh calendar: "
msgstr "无法刷新日历："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:990
-msgid "Cannot retrieve backend property: "
-msgstr "无法获取后端属性："
-
-#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1045
+#: ../calendar/libedata-cal/e-data-cal.c:1580
msgid "Cannot retrieve calendar object path: "
msgstr "无法获取日历对象的路径："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1075
+#: ../calendar/libedata-cal/e-data-cal.c:1635
msgid "Cannot retrieve calendar object list: "
msgstr "无法获取日历对象的列表："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1104
+#: ../calendar/libedata-cal/e-data-cal.c:1691
msgid "Cannot retrieve calendar free/busy list: "
msgstr "无法获取日历空闲/繁忙列表："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1142
+#: ../calendar/libedata-cal/e-data-cal.c:1734
msgid "Cannot create calendar object: "
msgstr "无法创建日历对象："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1177
+#: ../calendar/libedata-cal/e-data-cal.c:1802
msgid "Cannot modify calendar object: "
msgstr "无法修改日历对象："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1217
+#: ../calendar/libedata-cal/e-data-cal.c:1877
msgid "Cannot remove calendar object: "
msgstr "无法移除日历对象："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1254
+#: ../calendar/libedata-cal/e-data-cal.c:1960
msgid "Cannot receive calendar objects: "
msgstr "无法接收日历对象："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1285
+#: ../calendar/libedata-cal/e-data-cal.c:2003
msgid "Cannot send calendar objects: "
msgstr "无法发送日历对象："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1317
+#: ../calendar/libedata-cal/e-data-cal.c:2059
msgid "Could not retrieve attachment uris: "
msgstr "无法获取附件 URI："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1345
+#: ../calendar/libedata-cal/e-data-cal.c:2104
msgid "Could not discard reminder: "
msgstr "无法取消提醒："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1374
-msgid "Could not get calendar view path: "
-msgstr "无法获取日历视图路径："
-
-#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1404
+#: ../calendar/libedata-cal/e-data-cal.c:2145
msgid "Could not retrieve calendar time zone: "
msgstr "无法获取日历时区："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1430
+#: ../calendar/libedata-cal/e-data-cal.c:2185
msgid "Could not add calendar time zone: "
msgstr "无法添加日历时区："
-#: ../calendar/libedata-cal/e-data-cal-factory.c:220
-#, c-format
-msgid "Invalid call"
-msgstr "无效调用"
-
#: ../camel/camel-cipher-context.c:208
#, c-format
msgid "Signing is not supported by this cipher"
@@ -1822,8 +1838,7 @@ msgstr ""
"当您重新连接到网络时本服务器\n"
"上进一步的操作不会重做。"
-#: ../camel/camel-disco-diary.c:271
-#: ../camel/providers/imap/camel-imap-journal.c:312
+#: ../camel/camel-disco-diary.c:279
#, c-format
msgid ""
"Could not open '%s':\n"
@@ -1834,7 +1849,7 @@ msgstr ""
"%s\n"
"对该文件夹的修改不会被重新同步。"
-#: ../camel/camel-disco-diary.c:315
+#: ../camel/camel-disco-diary.c:326
msgid "Resynchronizing with server"
msgstr "重新与服务器同步"
@@ -1842,32 +1857,26 @@ msgstr "重新与服务器同步"
msgid "Downloading new messages for offline mode"
msgstr "下载新消息以进行脱机操作"
-#: ../camel/camel-disco-folder.c:420
+#: ../camel/camel-disco-folder.c:422
#, c-format
msgid "Preparing folder '%s' for offline"
msgstr "准备脱机文件夹“%s”"
-#: ../camel/camel-disco-folder.c:487 ../camel/camel-offline-folder.c:334
+#: ../camel/camel-disco-folder.c:489 ../camel/camel-offline-folder.c:336
msgid "Copy folder content locally for _offline operation"
msgstr "将文件夹内容复制到本地以进行脱机操作(_O)"
-#: ../camel/camel-disco-store.c:469 ../camel/camel-imapx-folder.c:413
-#: ../camel/camel-imapx-folder.c:446 ../camel/camel-imapx-folder.c:482
-#: ../camel/camel-imapx-folder.c:538 ../camel/camel-imapx-folder.c:615
-#: ../camel/camel-imapx-folder.c:649 ../camel/camel-imapx-folder.c:689
-#: ../camel/camel-imapx-folder.c:725 ../camel/camel-imapx-store.c:276
-#: ../camel/camel-imapx-store.c:1410 ../camel/camel-imapx-store.c:1499
-#: ../camel/camel-imapx-store.c:1548
-#: ../camel/providers/imap/camel-imap-store.c:1270
-#: ../camel/providers/imap/camel-imap-store.c:2033
-#: ../camel/providers/imap/camel-imap-store.c:2509
-#: ../camel/providers/imap/camel-imap-store.c:3299
-#: ../camel/providers/pop3/camel-pop3-folder.c:534
-#: ../camel/providers/pop3/camel-pop3-folder.c:677
-#: ../camel/providers/pop3/camel-pop3-folder.c:906
-#: ../camel/providers/pop3/camel-pop3-folder.c:1106
-#: ../camel/providers/pop3/camel-pop3-store.c:424
-#: ../camel/providers/pop3/camel-pop3-store.c:849
+#: ../camel/camel-disco-store.c:516 ../camel/camel-imapx-store.c:454
+#: ../camel/camel-imapx-store.c:2248
+#: ../camel/providers/pop3/camel-pop3-folder.c:555
+#: ../camel/providers/pop3/camel-pop3-folder.c:705
+#: ../camel/providers/pop3/camel-pop3-folder.c:940
+#: ../camel/providers/pop3/camel-pop3-folder.c:1150
+#: ../camel/providers/pop3/camel-pop3-store.c:291
+#: ../camel/providers/pop3/camel-pop3-store.c:510
+#: ../camel/providers/pop3/camel-pop3-store.c:561
+#: ../camel/providers/pop3/camel-pop3-store.c:646
+#: ../camel/providers/pop3/camel-pop3-store.c:1046
#, c-format
msgid "You must be working online to complete this operation"
msgstr "您必须在线工作以便完成该操作"
@@ -1877,7 +1886,7 @@ msgstr "您必须在线工作以便完成该操作"
msgid "Canceled"
msgstr "已取消"
-#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:772
+#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:797
#, c-format
msgid "Failed to create child process '%s': %s"
msgstr "创建子进程“%s”失败：%s"
@@ -1887,187 +1896,205 @@ msgstr "创建子进程“%s”失败：%s"
msgid "Invalid message stream received from %s: %s"
msgstr "收到 %s 发来的无效消息流：%s"
-#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
+#: ../camel/camel-filter-driver.c:1171 ../camel/camel-filter-driver.c:1180
msgid "Syncing folders"
msgstr "同步文件夹"
-#: ../camel/camel-filter-driver.c:1276 ../camel/camel-filter-driver.c:1761
+#: ../camel/camel-filter-driver.c:1278
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "解析过滤规则出错：%s：%s"
-#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1774
+#: ../camel/camel-filter-driver.c:1289
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "执行过滤规则错误：%s：%s"
-#: ../camel/camel-filter-driver.c:1383
+#: ../camel/camel-filter-driver.c:1385
#, c-format
msgid "Unable to open spool folder"
msgstr "无法打开脱机文件夹"
-#: ../camel/camel-filter-driver.c:1395
+#: ../camel/camel-filter-driver.c:1397
#, c-format
msgid "Unable to process spool folder"
msgstr "无法处理脱机文件夹"
-#: ../camel/camel-filter-driver.c:1415
+#: ../camel/camel-filter-driver.c:1420
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "获取第%d封信(%d%%)"
-#: ../camel/camel-filter-driver.c:1424 ../camel/camel-filter-driver.c:1446
+#: ../camel/camel-filter-driver.c:1429 ../camel/camel-filter-driver.c:1451
#, c-format
msgid "Failed on message %d"
msgstr "在第%d封信失败"
-#: ../camel/camel-filter-driver.c:1463 ../camel/camel-filter-driver.c:1573
+#: ../camel/camel-filter-driver.c:1470 ../camel/camel-filter-driver.c:1584
msgid "Syncing folder"
msgstr "同步文件夹"
-#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1581
+#: ../camel/camel-filter-driver.c:1475 ../camel/camel-filter-driver.c:1592
msgid "Complete"
msgstr "完成"
-#: ../camel/camel-filter-driver.c:1529
+#: ../camel/camel-filter-driver.c:1538
#, c-format
msgid "Getting message %d of %d"
msgstr "获取第%d封信，共%d封"
-#: ../camel/camel-filter-driver.c:1547
+#: ../camel/camel-filter-driver.c:1556
#, c-format
msgid "Failed at message %d of %d"
msgstr "在第%d封信失败，共%d封"
+#: ../camel/camel-filter-driver.c:1752 ../camel/camel-filter-driver.c:1779
+#, fuzzy, c-format
+#| msgid "Error executing filter: %s: %s"
+msgid "Execution of filter '%s' failed: "
+msgstr "执行过滤规则错误：%s：%s"
+
+#: ../camel/camel-filter-driver.c:1769
+#, fuzzy, c-format
+#| msgid "Error parsing filter: %s: %s"
+msgid "Error parsing filter '%s': %s: %s"
+msgstr "解析过滤规则出错：%s：%s"
+
+#: ../camel/camel-filter-driver.c:1788
+#, fuzzy, c-format
+#| msgid "Error executing filter: %s: %s"
+msgid "Error executing filter '%s': %s: %s"
+msgstr "执行过滤规则错误：%s：%s"
+
#: ../camel/camel-filter-search.c:138
msgid "Failed to retrieve message"
msgstr "获取消息失败"
-#: ../camel/camel-filter-search.c:512
+#: ../camel/camel-filter-search.c:537
msgid "Invalid arguments to (system-flag)"
msgstr "(system-flag)参数无效"
-#: ../camel/camel-filter-search.c:530
+#: ../camel/camel-filter-search.c:555
msgid "Invalid arguments to (user-tag)"
msgstr "(user-tag)参数无效"
-#: ../camel/camel-filter-search.c:949 ../camel/camel-filter-search.c:958
+#: ../camel/camel-filter-search.c:1046 ../camel/camel-filter-search.c:1055
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "执行过滤规则搜索错误：%s：%s"
-#: ../camel/camel-folder.c:270
+#: ../camel/camel-folder.c:291
#, c-format
msgid "Learning new spam message in '%s'"
msgid_plural "Learning new spam messages in '%s'"
msgstr[0] "在“%s”中学习新的垃圾邮件"
-#: ../camel/camel-folder.c:310
+#: ../camel/camel-folder.c:331
#, c-format
msgid "Learning new ham message in '%s'"
msgid_plural "Learning new ham messages in '%s'"
msgstr[0] "在“%s”中学习新的有害邮件"
-#: ../camel/camel-folder.c:358
+#: ../camel/camel-folder.c:379
#, c-format
msgid "Filtering new message in '%s'"
msgid_plural "Filtering new messages in '%s'"
msgstr[0] "在“%s”中过滤新消息"
-#: ../camel/camel-folder.c:930
+#: ../camel/camel-folder.c:953
#: ../camel/providers/local/camel-maildir-folder.c:321
msgid "Moving messages"
msgstr "移动消息"
-#: ../camel/camel-folder.c:933
+#: ../camel/camel-folder.c:956
msgid "Copying messages"
msgstr "复制消息"
-#: ../camel/camel-folder.c:1253
+#: ../camel/camel-folder.c:1276
#, c-format
msgid "Quota information not supported for folder '%s'"
msgstr "文件夹“%s”不支持配额信息"
-#: ../camel/camel-folder.c:3374
+#: ../camel/camel-folder.c:3506
#, c-format
msgid "Expunging folder '%s'"
msgstr "正在销毁文件夹“%s”"
-#: ../camel/camel-folder.c:3606
+#: ../camel/camel-folder.c:3738
#, c-format
msgid "Retrieving message '%s' in %s"
msgstr "正在获取 %2$s 中的消息“%1$s”"
-#: ../camel/camel-folder.c:3757
+#: ../camel/camel-folder.c:3889
#, c-format
msgid "Retrieving quota information for '%s'"
msgstr "正在获取“%s”的配额信息"
-#: ../camel/camel-folder.c:3989
+#: ../camel/camel-folder.c:4129
#, c-format
msgid "Refreshing folder '%s'"
msgstr "正在刷新文件夹“%s”"
-#: ../camel/camel-folder-search.c:420 ../camel/camel-folder-search.c:587
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"无法解析搜索表达式：%s：\n"
-"%s"
-
-#: ../camel/camel-folder-search.c:432 ../camel/camel-folder-search.c:599
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"执行搜索表达式错误：%s：\n"
-"%s"
-
#. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:822 ../camel/camel-folder-search.c:865
+#: ../camel/camel-folder-search.c:838 ../camel/camel-folder-search.c:881
#, c-format
msgid "(%s) requires a single bool result"
msgstr "(%s) 需要一个布尔结果"
#. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:932
+#: ../camel/camel-folder-search.c:916
#, c-format
msgid "(%s) not allowed inside %s"
msgstr "(%s) 不允许在 %s 中使用"
#. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:939 ../camel/camel-folder-search.c:947
+#: ../camel/camel-folder-search.c:923 ../camel/camel-folder-search.c:931
#, c-format
msgid "(%s) requires a match type string"
msgstr "(%s) 需要一个匹配类型字符串"
#. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:959
#, c-format
msgid "(%s) expects an array result"
msgstr "(%s) 需要一个数组结果"
#. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:985
+#: ../camel/camel-folder-search.c:969
#, c-format
msgid "(%s) requires the folder set"
msgstr "(%s) 需要文件夹集"
-#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
-#: ../camel/camel-gpg-context.c:1331
+#: ../camel/camel-folder-search.c:1862 ../camel/camel-folder-search.c:2029
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"无法解析搜索表达式：%s：\n"
+"%s"
+
+#: ../camel/camel-folder-search.c:1874 ../camel/camel-folder-search.c:2041
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"执行搜索表达式错误：%s：\n"
+"%s"
+
+#: ../camel/camel-gpg-context.c:691 ../camel/camel-gpg-context.c:696
+#: ../camel/camel-gpg-context.c:1359
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "执行 gpg 失败：%s"
-#: ../camel/camel-gpg-context.c:668
-#: ../camel/providers/smtp/camel-smtp-transport.c:859
+#: ../camel/camel-gpg-context.c:696
+#: ../camel/providers/smtp/camel-smtp-transport.c:924
msgid "Unknown"
msgstr "未知"
-#: ../camel/camel-gpg-context.c:733
+#: ../camel/camel-gpg-context.c:761
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -2078,17 +2105,17 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:769
+#: ../camel/camel-gpg-context.c:797
#, c-format
msgid "Failed to parse gpg userid hint."
msgstr "解析 gpg userid 提示失败。"
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
+#: ../camel/camel-gpg-context.c:822 ../camel/camel-gpg-context.c:837
#, c-format
msgid "Failed to parse gpg passphrase request."
msgstr "解析 gpg 密码句请求失败。"
-#: ../camel/camel-gpg-context.c:830
+#: ../camel/camel-gpg-context.c:858
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
@@ -2097,7 +2124,7 @@ msgstr ""
"您需要一个 PIN 用来解锁您的智能卡：\n"
"“%s”"
-#: ../camel/camel-gpg-context.c:834
+#: ../camel/camel-gpg-context.c:862
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -2106,341 +2133,373 @@ msgstr ""
"您需要一个密码句用来解锁以下用户：\n"
"“%s”"
-#: ../camel/camel-gpg-context.c:840
+#: ../camel/camel-gpg-context.c:868
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr "GnuPG 对“%s”的意外响应"
-#: ../camel/camel-gpg-context.c:852
+#: ../camel/camel-gpg-context.c:880
msgid ""
"Note the encrypted content doesn't contain information about a recipient, "
"thus there will be a password prompt for each of stored private key."
msgstr "请注意加密的内容里不包含收件人信息，因此可能会请求输出每个私钥的口令。"
-#: ../camel/camel-gpg-context.c:883 ../camel/camel-net-utils.c:523
+#: ../camel/camel-gpg-context.c:911 ../camel/camel-net-utils.c:523
#: ../camel/camel-tcp-stream-raw.c:268
-#: ../camel/providers/nntp/camel-nntp-summary.c:388
-#: ../libedataserver/e-client.c:140
+#: ../camel/providers/nntp/camel-nntp-summary.c:402
+#: ../libedataserver/e-client.c:150
#, c-format
msgid "Cancelled"
msgstr "已取消"
-#: ../camel/camel-gpg-context.c:904
+#: ../camel/camel-gpg-context.c:932
#, c-format
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr "解锁密钥失败：给出了 3 个错误的密码句。"
-#: ../camel/camel-gpg-context.c:917
+#: ../camel/camel-gpg-context.c:945
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "来自 GnuPG 的意外应答：%s"
-#: ../camel/camel-gpg-context.c:1048
+#: ../camel/camel-gpg-context.c:1076
#, c-format
msgid "Failed to encrypt: No valid recipients specified."
msgstr "加密失败：没有指定有效的收件人。"
-#: ../camel/camel-gpg-context.c:1598 ../camel/camel-smime-context.c:832
+#: ../camel/camel-gpg-context.c:1626 ../camel/camel-smime-context.c:846
msgid "Could not generate signing data: "
msgstr "无法生成签名数据："
-#: ../camel/camel-gpg-context.c:1647 ../camel/camel-gpg-context.c:1851
-#: ../camel/camel-gpg-context.c:1961 ../camel/camel-gpg-context.c:2108
-#: ../camel/camel-gpg-context.c:2208 ../camel/camel-gpg-context.c:2256
+#: ../camel/camel-gpg-context.c:1675 ../camel/camel-gpg-context.c:1879
+#: ../camel/camel-gpg-context.c:1989 ../camel/camel-gpg-context.c:2140
+#: ../camel/camel-gpg-context.c:2240 ../camel/camel-gpg-context.c:2288
msgid "Failed to execute gpg."
msgstr "执行 gpg 失败。"
-#: ../camel/camel-gpg-context.c:1726 ../camel/camel-gpg-context.c:1734
-#: ../camel/camel-gpg-context.c:1742 ../camel/camel-gpg-context.c:1762
-#: ../camel/camel-smime-context.c:959 ../camel/camel-smime-context.c:973
-#: ../camel/camel-smime-context.c:982
+#: ../camel/camel-gpg-context.c:1754 ../camel/camel-gpg-context.c:1762
+#: ../camel/camel-gpg-context.c:1770 ../camel/camel-gpg-context.c:1790
+#: ../camel/camel-smime-context.c:973 ../camel/camel-smime-context.c:987
+#: ../camel/camel-smime-context.c:996
#, c-format
msgid "Cannot verify message signature: Incorrect message format"
msgstr "无法校验消息签名：消息格式不对"
-#: ../camel/camel-gpg-context.c:1804
+#: ../camel/camel-gpg-context.c:1832
msgid "Cannot verify message signature: "
msgstr "无法校验消息签名："
-#: ../camel/camel-gpg-context.c:1927
+#: ../camel/camel-gpg-context.c:1955
msgid "Could not generate encrypting data: "
msgstr "无法生成加密数据："
-#: ../camel/camel-gpg-context.c:1980
+#: ../camel/camel-gpg-context.c:2008
msgid "This is a digitally encrypted message part"
msgstr "这是消息的数字加密部分"
-#: ../camel/camel-gpg-context.c:2038 ../camel/camel-gpg-context.c:2047
-#: ../camel/camel-gpg-context.c:2070
+#: ../camel/camel-gpg-context.c:2066 ../camel/camel-gpg-context.c:2075
+#: ../camel/camel-gpg-context.c:2098
#, c-format
msgid "Cannot decrypt message: Incorrect message format"
msgstr "无法解密消息：消息格式不对"
-#: ../camel/camel-gpg-context.c:2058
+#: ../camel/camel-gpg-context.c:2086
#, c-format
msgid "Failed to decrypt MIME part: protocol error"
msgstr "解密 MIME 部分失败：协议错误"
-#: ../camel/camel-gpg-context.c:2149 ../camel/camel-smime-context.c:1273
+#: ../camel/camel-gpg-context.c:2181 ../camel/camel-smime-context.c:1287
msgid "Encrypted content"
msgstr "加密内容"
-#: ../camel/camel-imapx-folder.c:104
+#: ../camel/camel-imapx-folder.c:643
+#, fuzzy, c-format
+#| msgid "Quota information not supported for folder '%s'"
+msgid "No quota information available for folder '%s'"
+msgstr "文件夹“%s”不支持配额信息"
+
+#: ../camel/camel-imapx-folder.c:727 ../camel/camel-imapx-folder.c:801
+#, c-format
+msgid "No destination folder specified"
+msgstr ""
+
+#: ../camel/camel-imapx-folder.c:747
+#, fuzzy
+#| msgid "Unable to retrieve message: "
+msgid "Unable to move junk messages"
+msgstr "无法获取消息："
+
+#: ../camel/camel-imapx-folder.c:821
+#, fuzzy
+#| msgid "Unable to retrieve message: "
+msgid "Unable to move deleted messages"
+msgstr "无法获取消息："
+
+#: ../camel/camel-imapx-folder.c:1008
+#: ../camel/providers/nntp/camel-nntp-folder.c:794
+msgid "Apply message _filters to this folder"
+msgstr "对这个文件夹应用消息过滤器(_F)"
+
+#: ../camel/camel-imapx-folder.c:1117
#, c-format
msgid "Could not create folder summary for %s"
msgstr "无法为 %s 创建文件夹概要"
-#: ../camel/camel-imapx-folder.c:112
+#: ../camel/camel-imapx-folder.c:1125
#, c-format
msgid "Could not create cache for %s: "
msgstr "无法为 %s 创建缓存："
-#: ../camel/camel-imapx-folder.c:795
-#: ../camel/providers/imap/camel-imap-folder.c:367
-#: ../camel/providers/nntp/camel-nntp-folder.c:738
-msgid "Apply message _filters to this folder"
-msgstr "对这个文件夹应用消息过滤器(_F)"
-
-#: ../camel/camel-imapx-server.c:1184
+#: ../camel/camel-imapx-server.c:1275
msgid "Server disconnected"
msgstr "服务器断开连接"
-#: ../camel/camel-imapx-server.c:1648
-msgid "Error writing to cache stream: "
+#: ../camel/camel-imapx-server.c:1764
+#, fuzzy
+#| msgid "Error writing to cache stream: "
+msgid "Error writing to cache stream"
msgstr "写入缓存流错误："
-#: ../camel/camel-imapx-server.c:2644
+#: ../camel/camel-imapx-server.c:2424
+#, fuzzy, c-format
+#| msgid ""
+#| "Alert from IMAP server %s %s:\n"
+#| "%s"
+msgid ""
+"Alert from IMAP server %s:\n"
+"%s"
+msgstr ""
+"来自 IMAP 服务器 %s %s 的提醒：\n"
+"%s"
+
+#: ../camel/camel-imapx-server.c:3012
#, c-format
msgid "Not authenticated"
msgstr "没有验证"
-#: ../camel/camel-imapx-server.c:2721
+#: ../camel/camel-imapx-server.c:3090
msgid "Error performing IDLE"
msgstr "执行 IDLE 命令出错"
-#: ../camel/camel-imapx-server.c:3622
-#: ../camel/providers/imap/camel-imap-store.c:414
-#: ../camel/providers/imap/camel-imap-store.c:468
+#: ../camel/camel-imapx-server.c:3971
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s"
-#: ../camel/camel-imapx-server.c:3623
-#: ../camel/providers/imap/camel-imap-store.c:415
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/camel-imapx-server.c:3972
+#: ../camel/providers/smtp/camel-smtp-transport.c:206
msgid "STARTTLS not supported"
msgstr "不支持 STARTTLS"
-#: ../camel/camel-imapx-server.c:3662
-#: ../camel/providers/imap/camel-imap-store.c:440
+#: ../camel/camel-imapx-server.c:4011
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: "
msgstr "以安全模式连接到 IMAP 服务器 %s 失败："
-#: ../camel/camel-imapx-server.c:3742
-#: ../camel/providers/imap/camel-imap-store.c:749
+#: ../camel/camel-imapx-server.c:4091
#, c-format
msgid "IMAP server %s does not support %s authentication"
msgstr "IMAP 服务器 %s 不支持 %s 认证"
-#: ../camel/camel-imapx-server.c:3753 ../camel/camel-session.c:495
-#: ../camel/providers/imap/camel-imap-store.c:1174
-#: ../camel/providers/pop3/camel-pop3-store.c:266
-#: ../camel/providers/pop3/camel-pop3-store.c:604
-#: ../camel/providers/smtp/camel-smtp-transport.c:467
+#: ../camel/camel-imapx-server.c:4102 ../camel/camel-session.c:494
+#: ../camel/providers/pop3/camel-pop3-store.c:303
+#: ../camel/providers/pop3/camel-pop3-store.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:515
#, c-format
msgid "No support for %s authentication"
msgstr "不支持 %s 认证"
-#: ../camel/camel-imapx-server.c:3772
-#: ../camel/providers/imap/camel-imap-store.c:1142
-#: ../camel/providers/nntp/camel-nntp-store.c:502
+#: ../camel/camel-imapx-server.c:4121
+#: ../camel/providers/nntp/camel-nntp-store.c:407
+#: ../camel/providers/nntp/camel-nntp-store.c:595
msgid "Cannot authenticate without a username"
msgstr "无法进行无用户名的认证"
-#: ../camel/camel-imapx-server.c:3781
-#: ../camel/providers/imap/camel-imap-store.c:1150
-#: ../camel/providers/nntp/camel-nntp-store.c:511
-#: ../camel/providers/pop3/camel-pop3-store.c:529
-#: ../camel/providers/pop3/camel-pop3-store.c:549
+#: ../camel/camel-imapx-server.c:4130
+#: ../camel/providers/nntp/camel-nntp-store.c:604
+#: ../camel/providers/pop3/camel-pop3-store.c:656
+#: ../camel/providers/pop3/camel-pop3-store.c:676
msgid "Authentication password not available"
msgstr "密码认证不可用"
-#: ../camel/camel-imapx-server.c:3983
+#: ../camel/camel-imapx-server.c:4337
msgid "Error fetching message"
msgstr "取回消息出错"
-#: ../camel/camel-imapx-server.c:4065
+#: ../camel/camel-imapx-server.c:4387 ../camel/camel-imapx-server.c:4395
+msgid "Failed to close the tmp stream"
+msgstr "无法关闭临时流"
+
+#: ../camel/camel-imapx-server.c:4424
msgid "Failed to copy the tmp file"
msgstr "无法复制临时文件"
-#: ../camel/camel-imapx-server.c:4079
-msgid "Failed to close the tmp stream"
-msgstr "无法关闭临时流"
+#: ../camel/camel-imapx-server.c:4549
+#, fuzzy
+#| msgid "Error copying messages"
+msgid "Error moving messages"
+msgstr "复制消息出错"
-#: ../camel/camel-imapx-server.c:4177
+#: ../camel/camel-imapx-server.c:4553
msgid "Error copying messages"
msgstr "复制消息出错"
-#: ../camel/camel-imapx-server.c:4312
+#: ../camel/camel-imapx-server.c:4722
msgid "Error appending message"
msgstr "追加消息出错"
-#: ../camel/camel-imapx-server.c:4495
+#: ../camel/camel-imapx-server.c:4921
msgid "Error fetching message headers"
msgstr "取回消息头出错"
-#: ../camel/camel-imapx-server.c:4632
+#: ../camel/camel-imapx-server.c:5072
msgid "Error retrieving message"
msgstr "收取消息出错"
-#: ../camel/camel-imapx-server.c:4754 ../camel/camel-imapx-server.c:4950
+#: ../camel/camel-imapx-server.c:5203 ../camel/camel-imapx-server.c:5431
#, c-format
msgid "Fetching summary information for new messages in '%s'"
msgstr "获取“%s”中新消息的概要信息"
-#: ../camel/camel-imapx-server.c:4805
+#: ../camel/camel-imapx-server.c:5267
#, c-format
msgid "Scanning for changed messages in '%s'"
msgstr "扫描“%s”中更改了的消息"
-#: ../camel/camel-imapx-server.c:4849
+#: ../camel/camel-imapx-server.c:5320
msgid "Error fetching new messages"
msgstr "取回新消息出错"
-#: ../camel/camel-imapx-server.c:5041
+#: ../camel/camel-imapx-server.c:5533
msgid "Error while fetching messages"
msgstr "取回消息出错"
-#: ../camel/camel-imapx-server.c:5049 ../camel/camel-imapx-server.c:5085
+#: ../camel/camel-imapx-server.c:5541 ../camel/camel-imapx-server.c:5574
#, c-format
msgid "Fetching summary information for %d message in '%s'"
msgid_plural "Fetching summary information for %d messages in '%s'"
msgstr[0] "获取“%2$s”中“%1$d”条消息的概要信息"
-#: ../camel/camel-imapx-server.c:5211 ../camel/camel-imapx-server.c:5247
+#: ../camel/camel-imapx-server.c:5710 ../camel/camel-imapx-server.c:5740
msgid "Error refreshing folder"
msgstr "刷新文件夹出错"
-#: ../camel/camel-imapx-server.c:5343
+#: ../camel/camel-imapx-server.c:5864
msgid "Error expunging message"
msgstr "销毁消息出错"
-#: ../camel/camel-imapx-server.c:5440
+#: ../camel/camel-imapx-server.c:5975
msgid "Error fetching folders"
msgstr "取回文件夹出错"
-#: ../camel/camel-imapx-server.c:5519
+#: ../camel/camel-imapx-server.c:6057
msgid "Error subscribing to folder"
msgstr "订阅文件夹出错"
-#: ../camel/camel-imapx-server.c:5580
+#: ../camel/camel-imapx-server.c:6122
msgid "Error creating folder"
msgstr "创建文件夹出错"
-#: ../camel/camel-imapx-server.c:5629
+#: ../camel/camel-imapx-server.c:6176
msgid "Error deleting folder"
msgstr "删除文件夹出错"
-#: ../camel/camel-imapx-server.c:5690
+#: ../camel/camel-imapx-server.c:6250
msgid "Error renaming folder"
msgstr "重命名文件夹出错"
-#: ../camel/camel-imapx-server.c:5751
+#: ../camel/camel-imapx-server.c:6325
+#, fuzzy
+#| msgid "Retrieving quota information for '%s'"
+msgid "Error retrieving quota information"
+msgstr "正在获取“%s”的配额信息"
+
+#: ../camel/camel-imapx-server.c:6390
+#, fuzzy
+#| msgid "Decoder failed"
+msgid "Search failed"
+msgstr "解码器失败"
+
+#: ../camel/camel-imapx-server.c:6453
msgid "Error performing NOOP"
msgstr "执行 NOOP 出错"
-#: ../camel/camel-imapx-server.c:5847
+#: ../camel/camel-imapx-server.c:6562
msgid "Error syncing changes"
msgstr "同步变更出错"
-#: ../camel/camel-imapx-server.c:6621
-#: ../camel/providers/imap/camel-imap-folder.c:3531
+#: ../camel/camel-imapx-server.c:7334
#, c-format
msgid "Cannot get message with message ID %s: %s"
msgstr "无法获取消息 ID %s：%s"
-#: ../camel/camel-imapx-server.c:6622
-#: ../camel/providers/imap/camel-imap-folder.c:3532
+#: ../camel/camel-imapx-server.c:7335
msgid "No such message available."
msgstr "没有该消息。"
-#: ../camel/camel-imapx-server.c:6777 ../camel/camel-imapx-server.c:6792
+#: ../camel/camel-imapx-server.c:7496 ../camel/camel-imapx-server.c:7511
msgid "Cannot create spool file: "
msgstr "无法创建脱机文件："
-#: ../camel/camel-imapx-store.c:157
-#: ../camel/providers/imap/camel-imap-store.c:827
+#: ../camel/camel-imapx-server.c:8253
+#, fuzzy
+#| msgid "IMAP server %s does not support %s authentication"
+msgid "IMAP server does not support quotas"
+msgstr "IMAP 服务器 %s 不支持 %s 认证"
+
+#: ../camel/camel-imapx-store.c:326
#, c-format
msgid "IMAP server %s"
msgstr "IMAP 服务器 %s"
-#: ../camel/camel-imapx-store.c:160
-#: ../camel/providers/imap/camel-imap-store.c:830
+#: ../camel/camel-imapx-store.c:329
#, c-format
msgid "IMAP service for %s on %s"
msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
-#: ../camel/camel-imapx-store.c:251
-#: ../camel/providers/imap/camel-imap-provider.c:98
-#: ../camel/providers/nntp/camel-nntp-provider.c:85
+#: ../camel/camel-imapx-store.c:427
+#: ../camel/providers/nntp/camel-nntp-provider.c:95
#: ../camel/providers/pop3/camel-pop3-provider.c:83
msgid "Password"
msgstr "密码"
-#: ../camel/camel-imapx-store.c:253
-#: ../camel/providers/imap/camel-imap-provider.c:100
+#: ../camel/camel-imapx-store.c:429
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr "该选项将使用纯文本密码连接到 IMAP 服务器。"
-#: ../camel/camel-imapx-store.c:352
-#: ../camel/providers/imap/camel-imap-store.c:2064
-#: ../camel/providers/imap/camel-imap-store.c:2262
+#: ../camel/camel-imapx-store.c:539
#, c-format
msgid "No such folder %s"
msgstr "没有文件夹 %s"
#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/camel-imapx-store.c:377 ../camel/camel-imapx-store.c:867
-#: ../camel/providers/imap/camel-imap-store.c:275
-#: ../camel/providers/imap/camel-imap-store.c:2684
+#: ../camel/camel-imapx-store.c:565 ../camel/camel-imapx-store.c:1110
#: ../camel/providers/local/camel-maildir-folder.c:473
-#: ../camel/providers/local/camel-maildir-store.c:307
-#: ../camel/providers/local/camel-maildir-store.c:699
-#: ../camel/providers/local/camel-maildir-store.c:705
-#: ../camel/providers/local/camel-maildir-store.c:789
+#: ../camel/providers/local/camel-maildir-store.c:316
+#: ../camel/providers/local/camel-maildir-store.c:750
+#: ../camel/providers/local/camel-maildir-store.c:756
+#: ../camel/providers/local/camel-maildir-store.c:840
#: ../camel/providers/local/camel-spool-store.c:393
msgid "Inbox"
msgstr "收件箱"
-#: ../camel/camel-imapx-store.c:1111
+#: ../camel/camel-imapx-store.c:1384
#, c-format
msgid "Retrieving folder list for %s"
msgstr "正在获取“%s”的文件夹列表"
-#: ../camel/camel-imapx-store.c:1215
-#: ../camel/providers/nntp/camel-nntp-store.c:1771
-#, c-format
-msgid "No such folder: %s"
-msgstr "没有文件夹：%s"
-
-#: ../camel/camel-imapx-store.c:1432
-#: ../camel/providers/imap/camel-imap-store.c:2077
-#: ../camel/providers/imap/camel-imap-store.c:2524
+#: ../camel/camel-imapx-store.c:1774
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”"
-#: ../camel/camel-imapx-store.c:1443
-#: ../camel/providers/imap/camel-imap-store.c:2537
+#: ../camel/camel-imapx-store.c:1785
#, c-format
msgid "Unknown parent folder: %s"
msgstr "未知的父文件夹：%s"
-#: ../camel/camel-imapx-store.c:1453
-#: ../camel/providers/imap/camel-imap-store.c:2140
-#: ../camel/providers/imap/camel-imap-store.c:2589
+#: ../camel/camel-imapx-store.c:1795
#, c-format
msgid "The parent folder is not allowed to contain subfolders"
msgstr "父文件夹不允许含有子文件夹"
@@ -2575,28 +2634,39 @@ msgstr "主机查阅失败"
#: ../camel/camel-net-utils.c:732
#, c-format
-msgid "Host lookup failed: %s: %s"
+msgid "Host lookup '%s' failed. Check your host name for spelling errors."
+msgstr ""
+
+#: ../camel/camel-net-utils.c:736
+#, fuzzy, c-format
+#| msgid "Host lookup failed: %s: %s"
+msgid "Host lookup '%s' failed: %s"
msgstr "主机查阅失败：%s：%s"
-#: ../camel/camel-net-utils.c:853
+#: ../camel/camel-net-utils.c:857
msgid "Resolving address"
msgstr "解析地址"
-#: ../camel/camel-net-utils.c:874
+#: ../camel/camel-net-utils.c:878
msgid "Name lookup failed"
msgstr "名称查阅失败"
-#: ../camel/camel-net-utils.c:880
+#: ../camel/camel-net-utils.c:885
+msgid "Name lookup failed. Check your host name for spelling errors."
+msgstr ""
+
+#: ../camel/camel-net-utils.c:889
#, c-format
msgid "Name lookup failed: %s"
msgstr "名称查阅失败：%s"
-#: ../camel/camel-network-service.c:114
-#, c-format
-msgid "Could not connect to %s: "
+#: ../camel/camel-network-service.c:350
+#, fuzzy, c-format
+#| msgid "Could not connect to %s: "
+msgid "Could not connect to '%s:%s': "
msgstr "无法连接到 %s："
-#: ../camel/camel-offline-folder.c:210
+#: ../camel/camel-offline-folder.c:212
#, c-format
msgid "Syncing messages in folder '%s' to disk"
msgstr "正在将文件夹“%s”中的消息同步到磁盘"
@@ -2614,27 +2684,28 @@ msgstr "虚拟文件夹电子邮件提供者"
msgid "For reading mail as a query of another set of folders"
msgstr "关于将读入邮件作为对另一组文件夹的查询"
-#: ../camel/camel-provider.c:258
+#: ../camel/camel-provider.c:263
#, c-format
msgid "Could not load %s: Module loading not supported on this system."
msgstr "无法载入 %s：本系统不支持模块载入。"
-#: ../camel/camel-provider.c:267
+#: ../camel/camel-provider.c:272
#, c-format
msgid "Could not load %s: %s"
msgstr "无法载入 %s：%s"
-#: ../camel/camel-provider.c:276
+#: ../camel/camel-provider.c:281
#, c-format
msgid "Could not load %s: No initialization code in module."
msgstr "无法载入 %s：模块中没有初始化代码。"
-#: ../camel/camel-provider.c:424 ../camel/camel-session.c:407
+#: ../camel/camel-provider.c:429 ../camel/camel-session.c:406
#, c-format
msgid "No provider available for protocol '%s'"
msgstr "协议“%s”没有可用的提供者"
#: ../camel/camel-sasl-anonymous.c:35
+#: ../camel/providers/nntp/camel-nntp-provider.c:85
msgid "Anonymous"
msgstr "匿名"
@@ -2785,7 +2856,7 @@ msgstr "引用的证书已过期。"
#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340
#: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405
-#: ../camel/providers/smtp/camel-smtp-transport.c:574
+#: ../camel/providers/smtp/camel-smtp-transport.c:622
#, c-format
msgid "Bad authentication response from server."
msgstr "来自服务器的无效认证应答。"
@@ -2808,11 +2879,11 @@ msgstr "该选项将以普通密码连接到服务器。"
msgid "Unknown authentication state."
msgstr "未知的认证状态。"
-#: ../camel/camel-sasl-ntlm.c:47
+#: ../camel/camel-sasl-ntlm.c:48
msgid "NTLM / SPA"
msgstr "NTLM / SPA"
-#: ../camel/camel-sasl-ntlm.c:49
+#: ../camel/camel-sasl-ntlm.c:50
msgid ""
"This option will connect to a Windows-based server using NTLM / Secure "
"Password Authentication."
@@ -2834,41 +2905,44 @@ msgstr "该选项将在尝试 SMTP 之前允许 POP 连接"
msgid "POP Source UID"
msgstr "POP 源 UID"
-#: ../camel/camel-sasl-popb4smtp.c:96
+#: ../camel/camel-sasl-popb4smtp.c:98
#, c-format
msgid "POP Before SMTP authentication using an unknown transport"
msgstr "以未知的传输进行 SMTP 认证授权之前的 POP"
-#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117
+#: ../camel/camel-sasl-popb4smtp.c:110 ../camel/camel-sasl-popb4smtp.c:119
#, c-format
msgid "POP Before SMTP authentication attempted with a %s service"
msgstr "试图通过 %s 服务在 SMTP 认证之前进行 POP"
-#: ../camel/camel-search-private.c:112
+#: ../camel/camel-search-private.c:116
#, c-format
msgid "Regular expression compilation failed: %s: %s"
msgstr "常规表达式编译失败：%s：%s"
-#: ../camel/camel-session.c:416
+#: ../camel/camel-session.c:415
#, c-format
msgid "Invalid GType registered for protocol '%s'"
msgstr "为协议“%s”注册的 GType 无效"
-#: ../camel/camel-session.c:510
+#: ../camel/camel-session.c:509
#, c-format
msgid "%s authentication failed"
msgstr "%s 认证失败"
-#: ../camel/camel-session.c:646
+#: ../camel/camel-session.c:645
msgid "Forwarding messages is not supported"
msgstr "不支持转发消息"
-#: ../camel/camel-session.c:1363
+#. Translators: The first argument is the account type
+#. * (e.g. "IMAP"), the second is the user name, and the
+#. * third is the host name.
+#: ../camel/camel-session.c:1420
#, c-format
msgid "Please enter the %s password for %s on host %s."
msgstr "请输入 %2$s %3$s 的 %1$s 密码"
-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1060
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1074
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "无法找到‘%s’的证书"
@@ -3002,107 +3076,105 @@ msgstr "找不到签名摘要"
msgid "Signer: %s <%s>: %s\n"
msgstr "签名者：%s <%s>：%s\n"
-#: ../camel/camel-smime-context.c:844 ../camel/camel-smime-context.c:1134
+#: ../camel/camel-smime-context.c:858 ../camel/camel-smime-context.c:1148
msgid "Cannot create encoder context"
msgstr "无法创建编码器上下文"
-#: ../camel/camel-smime-context.c:850
+#: ../camel/camel-smime-context.c:864
msgid "Failed to add data to CMS encoder"
msgstr "将数据添加到 CMS 编码器失败"
-#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1151
+#: ../camel/camel-smime-context.c:869 ../camel/camel-smime-context.c:1165
msgid "Failed to encode data"
msgstr "编码数据失败"
-#: ../camel/camel-smime-context.c:999 ../camel/camel-smime-context.c:1248
+#: ../camel/camel-smime-context.c:1013 ../camel/camel-smime-context.c:1262
msgid "Decoder failed"
msgstr "解码器失败"
-#: ../camel/camel-smime-context.c:1068
+#: ../camel/camel-smime-context.c:1082
msgid "Cannot find common bulk encryption algorithm"
msgstr "找不到公共批量加密算法"
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1090
msgid "Cannot allocate slot for encryption bulk key"
msgstr "无法为加密批量密钥分配密钥槽"
-#: ../camel/camel-smime-context.c:1087
+#: ../camel/camel-smime-context.c:1101
msgid "Cannot create CMS Message"
msgstr "无法创建 CMS 消息"
-#: ../camel/camel-smime-context.c:1093
+#: ../camel/camel-smime-context.c:1107
msgid "Cannot create CMS Enveloped data"
msgstr "无法创建 CMS 信封数据"
-#: ../camel/camel-smime-context.c:1099
+#: ../camel/camel-smime-context.c:1113
msgid "Cannot attach CMS Enveloped data"
msgstr "无法附加 CMS 信封数据"
-#: ../camel/camel-smime-context.c:1105
+#: ../camel/camel-smime-context.c:1119
msgid "Cannot attach CMS data object"
msgstr "无法附加 CMS 数据对象"
-#: ../camel/camel-smime-context.c:1114
+#: ../camel/camel-smime-context.c:1128
msgid "Cannot create CMS Recipient information"
msgstr "无法创建 CMS 收件人信息"
-#: ../camel/camel-smime-context.c:1119
+#: ../camel/camel-smime-context.c:1133
msgid "Cannot add CMS Recipient information"
msgstr "无法添加 CMS 收件人信息"
-#: ../camel/camel-smime-context.c:1145
+#: ../camel/camel-smime-context.c:1159
msgid "Failed to add data to encoder"
msgstr "将数据添加到编码器失败"
-#: ../camel/camel-smime-context.c:1255
+#: ../camel/camel-smime-context.c:1269
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME 解密：没有找到加密内容"
-#: ../camel/camel-store.c:1847
+#: ../camel/camel-store.c:1964
#, c-format
msgid "Cannot create folder '%s': folder exists"
msgstr "无法创建文件夹“%s”文件夹已存在"
-#: ../camel/camel-store.c:1890
+#: ../camel/camel-store.c:2007
#, c-format
msgid "Opening folder '%s'"
msgstr "打开文件夹“%s”"
-#: ../camel/camel-store.c:2075
+#: ../camel/camel-store.c:2192
#, c-format
msgid "Scanning folders in '%s'"
msgstr "扫描“%s”中的文件夹"
-#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2087 ../camel/camel-store.c:2097
+#: ../camel/camel-store.c:2208 ../camel/camel-store.c:2239
#: ../camel/camel-vtrash-folder.c:48
msgid "Trash"
msgstr "回收站"
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2090 ../camel/camel-store.c:2101
+#: ../camel/camel-store.c:2220 ../camel/camel-store.c:2255
#: ../camel/camel-vtrash-folder.c:50
msgid "Junk"
msgstr "垃圾"
-#: ../camel/camel-store.c:2549
+#: ../camel/camel-store.c:2708
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "无法创建文件夹：%s：文件夹已存在"
-#: ../camel/camel-store.c:2563
+#: ../camel/camel-store.c:2722
#, c-format
msgid "Creating folder '%s'"
msgstr "创建文件夹“%s”"
-#: ../camel/camel-store.c:2681 ../camel/camel-vee-store.c:410
-#: ../camel/providers/local/camel-maildir-store.c:306
+#: ../camel/camel-store.c:2840 ../camel/camel-vee-store.c:416
+#: ../camel/providers/local/camel-maildir-store.c:315
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "无法删除文件夹：%s：无效操作"
-#: ../camel/camel-store.c:2824 ../camel/camel-vee-store.c:460
-#: ../camel/providers/local/camel-maildir-store.c:788
+#: ../camel/camel-store.c:2983 ../camel/camel-vee-store.c:466
+#: ../camel/providers/local/camel-maildir-store.c:839
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "无法重命名文件夹：%s：无效操作"
@@ -3125,12 +3197,12 @@ msgstr "连接已取消"
msgid "Could not connect with command \"%s\": %s"
msgstr "无法使用命令“%s”连接：%s"
-#: ../camel/camel-subscribable.c:386
+#: ../camel/camel-subscribable.c:395
#, c-format
msgid "Subscribing to folder '%s'"
msgstr "正在订阅文件夹“%s”"
-#: ../camel/camel-subscribable.c:518
+#: ../camel/camel-subscribable.c:527
#, c-format
msgid "Unsubscribing from folder '%s'"
msgstr "正在取消订阅文件夹“%s”"
@@ -3218,88 +3290,6 @@ msgstr "主机名太长 (最长 255 字符)"
msgid "Invalid reply from proxy server"
msgstr "代理服务器的响应无效"
-#: ../camel/camel-tcp-stream-ssl.c:502
-#, c-format
-msgid ""
-" Issuer: %s\n"
-" Subject: %s\n"
-" Fingerprint: %s\n"
-" Signature: %s"
-msgstr ""
-" 提交者： %s\n"
-" 主题： %s\n"
-" 指纹： %s\n"
-" 签名： %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:509
-msgid "GOOD"
-msgstr "好"
-
-#: ../camel/camel-tcp-stream-ssl.c:509
-msgid "BAD"
-msgstr "坏"
-
-#: ../camel/camel-tcp-stream-ssl.c:514
-#, c-format
-msgid ""
-"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
-"\n"
-"Detailed information about the certificate:\n"
-"%s"
-msgstr ""
-"“%s” 的 SSL 证书不受信任。您是否想要接受它？\n"
-"\n"
-"该证书的详细信息：\n"
-"%s"
-
-#: ../camel/camel-tcp-stream-ssl.c:520
-msgid "_Reject"
-msgstr "拒绝(_R)"
-
-#: ../camel/camel-tcp-stream-ssl.c:521
-msgid "Accept _Temporarily"
-msgstr "临时接受(_T)"
-
-#: ../camel/camel-tcp-stream-ssl.c:522
-msgid "_Accept Permanently"
-msgstr "永久接受(_A)"
-
-#: ../camel/camel-tcp-stream-ssl.c:583
-#, c-format
-msgid ""
-"Certificate problem: %s\n"
-"Issuer: %s"
-msgstr ""
-"证书问题：%s\n"
-"发行者：%s"
-
-#: ../camel/camel-tcp-stream-ssl.c:635
-#, c-format
-msgid ""
-"Bad certificate domain: %s\n"
-"Issuer: %s"
-msgstr ""
-"无效的证书域名：%s\n"
-"发行者：%s"
-
-#: ../camel/camel-tcp-stream-ssl.c:653
-#, c-format
-msgid ""
-"Certificate expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"证书过期：%s\n"
-"发行者：%s"
-
-#: ../camel/camel-tcp-stream-ssl.c:670
-#, c-format
-msgid ""
-"Certificate revocation list expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"证书撤销列表已过期：%s\n"
-"发行者：%s"
-
#: ../camel/camel-url.c:331
#, c-format
msgid "Could not parse URL '%s'"
@@ -3325,27 +3315,27 @@ msgstr "在 %2$s 中没有消息 %1$s"
msgid "Error storing '%s': "
msgstr "存储“%s”出错："
-#: ../camel/camel-vee-folder.c:1169
+#: ../camel/camel-vee-folder.c:1171
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
-#: ../camel/camel-vee-store.c:38
+#: ../camel/camel-vee-store.c:42
msgid "Unmatched"
msgstr "无匹配"
-#: ../camel/camel-vee-store.c:436
+#: ../camel/camel-vee-store.c:442
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "无法删除文件夹：%s：没有该文件夹"
-#: ../camel/camel-vee-store.c:470
+#: ../camel/camel-vee-store.c:476
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "无法重命名文件夹：%s：没有该文件夹"
-#: ../camel/camel-vee-store.c:532
+#: ../camel/camel-vee-store.c:538
msgid "Enable _Unmatched folder"
msgstr "启用不匹配的文件夹(_U)"
@@ -3357,173 +3347,43 @@ msgstr "无法将消息复制到回收站文件夹"
msgid "Cannot copy messages to the Junk folder"
msgstr "无法将消息复制到垃圾邮件文件夹"
-#: ../camel/providers/imap/camel-imap-command.c:200
-#: ../camel/providers/imap/camel-imap-command.c:299
-#, c-format
-msgid "No output stream"
-msgstr "没有输出流"
-
-#: ../camel/providers/imap/camel-imap-command.c:208
-#: ../camel/providers/imap/camel-imap-command.c:307
-#, c-format
-msgid "No input stream"
-msgstr "没有输入流"
-
-#: ../camel/providers/imap/camel-imap-command.c:392
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "服务器意外地中止了连接：%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:425
-#, c-format
-msgid ""
-"Alert from IMAP server %s %s in folder %s:\n"
-"%s"
-msgstr ""
-"来自 IMAP 服务器 %s %s 的提醒(%s 文件夹)：\n"
-"%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:429
-#, c-format
-msgid ""
-"Alert from IMAP server %s %s:\n"
-"%s"
-msgstr ""
-"来自 IMAP 服务器 %s %s 的提醒：\n"
-"%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:512
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "来自 IMAP 服务器的意外应答：%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:524
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP 命令失败：%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:607
-#, c-format
-msgid "Server response ended too soon."
-msgstr "服务器应答结束太快。"
-
-#: ../camel/providers/imap/camel-imap-command.c:822
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "IMAP 服务器应答不含有 %s 信息"
-
-#: ../camel/providers/imap/camel-imap-command.c:860
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "来自 IMAP 服务器意外的 OK 应答：%s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:356
-msgid "Always check for _new mail in this folder"
-msgstr "总是检查此文件夹中的新邮件(_N)"
-
-#: ../camel/providers/imap/camel-imap-folder.c:447
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "无法创建目录 %s：%s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:468
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "无法为 %s 载入概要"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1137
-#, c-format
-msgid "Scanning for changed messages in %s"
-msgstr "扫描 %s 中更改了的消息"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3494
-msgid "Unable to retrieve message: "
-msgstr "无法获取消息："
-
-#: ../camel/providers/imap/camel-imap-folder.c:3620
-#: ../camel/providers/imap/camel-imap-folder.c:4512
-#: ../camel/providers/nntp/camel-nntp-folder.c:493
-#, c-format
-msgid "This message is not currently available"
-msgstr "该消息目前不可用"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4085
-#: ../camel/providers/imap/camel-imap-folder.c:4167
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "从 %s 中的新消息中获取概要信息"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4299
-#, c-format
-msgid "Incomplete server response: no information provided for message %d"
-msgstr "不完整的服务器响应：没有为第 %d 封信提供信息"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4309
-#, c-format
-msgid "Incomplete server response: no UID provided for message %d"
-msgstr "不完整的服务器响应：没有为第 %d 封信提供 UID"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4549
-#, c-format
-msgid "Could not find message body in FETCH response."
-msgstr "无法在 FETCH 应答中找到信体。"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:196
-#: ../camel/providers/imap/camel-imap-message-cache.c:253
-msgid "Could not open cache directory: "
-msgstr "无法打开缓存目录："
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:331
-#, c-format
-msgid "Failed to cache message %s: %s"
-msgstr "缓存消息 %s 失败：%s"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:397
-#, c-format
-msgid "Failed to cache message %s: "
-msgstr "缓存消息 %s 失败："
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:539
-#, c-format
-msgid "Failed to cache %s: "
-msgstr "缓存 %s 失败："
-
-#: ../camel/providers/imap/camel-imap-provider.c:40
#: ../camel/providers/imapx/camel-imapx-provider.c:38
msgid "Checking for New Mail"
msgstr "检查新邮件"
-#: ../camel/providers/imap/camel-imap-provider.c:42
#: ../camel/providers/imapx/camel-imapx-provider.c:40
msgid "C_heck for new messages in all folders"
msgstr "在所有文件夹中检查新消息(_H)"
-#: ../camel/providers/imap/camel-imap-provider.c:44
#: ../camel/providers/imapx/camel-imapx-provider.c:42
msgid "Ch_eck for new messages in subscribed folders"
msgstr "在订阅的文件夹中检查新消息(_E)"
-#: ../camel/providers/imap/camel-imap-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use _Quick Resync if the server supports it"
+msgstr "如果服务器支持则使用快速重新同步(_Q)"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "_Listen for server change notifications"
+msgstr "监听服务器变化提醒(_L)"
+
#: ../camel/providers/imapx/camel-imapx-provider.c:49
#: ../camel/providers/nntp/camel-nntp-provider.c:46
msgid "Folders"
msgstr "文件夹"
-#: ../camel/providers/imap/camel-imap-provider.c:49
#: ../camel/providers/imapx/camel-imapx-provider.c:51
msgid "_Show only subscribed folders"
msgstr "只显示订阅了的文件夹(_S)"
-#: ../camel/providers/imap/camel-imap-provider.c:51
#: ../camel/providers/imapx/camel-imapx-provider.c:54
msgid "O_verride server-supplied folder namespace"
msgstr "覆盖服务器提供的文件夹命名空间(_V)"
-#: ../camel/providers/imap/camel-imap-provider.c:53
-msgid "Names_pace:"
-msgstr "命名空间(_P)："
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Namespace:"
+msgstr "命名空间："
-#: ../camel/providers/imap/camel-imap-provider.c:55
#: ../camel/providers/imapx/camel-imapx-provider.c:59
#: ../camel/providers/local/camel-local-provider.c:41
#: ../camel/providers/local/camel-local-provider.c:81
@@ -3532,92 +3392,43 @@ msgstr "命名空间(_P)："
msgid "Options"
msgstr "选项"
-#: ../camel/providers/imap/camel-imap-provider.c:57
#: ../camel/providers/imapx/camel-imapx-provider.c:61
#: ../camel/providers/nntp/camel-nntp-provider.c:43
msgid "Apply _filters to new messages in all folders"
msgstr "对所有文件夹中的新消息应用过滤规则(_F)"
-#: ../camel/providers/imap/camel-imap-provider.c:59
#: ../camel/providers/imapx/camel-imapx-provider.c:63
msgid "_Apply filters to new messages in Inbox on this server"
msgstr "应用过滤规则到此服务器上收件箱中的新消息(_A)"
-#: ../camel/providers/imap/camel-imap-provider.c:61
#: ../camel/providers/imapx/camel-imapx-provider.c:65
msgid "Check new messages for _Junk contents"
msgstr "检查新消息的垃圾内容(_J)"
-#: ../camel/providers/imap/camel-imap-provider.c:63
#: ../camel/providers/imapx/camel-imapx-provider.c:67
msgid "Only check for Junk messages in the IN_BOX folder"
msgstr "仅在收件箱中检查垃圾邮件(_B)"
-#: ../camel/providers/imap/camel-imap-provider.c:65
#: ../camel/providers/imapx/camel-imapx-provider.c:69
msgid "Automatically synchroni_ze remote mail locally"
msgstr "自动将远程邮件同步到本地(_Z)"
-#: ../camel/providers/imap/camel-imap-provider.c:71
-msgid "IMAP default port"
-msgstr "IMAP 默认端口"
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
+msgid "Default IMAP port"
+msgstr "默认的 IMAP 端口"
-#: ../camel/providers/imap/camel-imap-provider.c:72
#: ../camel/providers/imapx/camel-imapx-provider.c:76
msgid "IMAP over SSL"
msgstr "IMAP (SSL 加密)"
-#: ../camel/providers/imap/camel-imap-provider.c:78
-msgid "IMAP"
-msgstr "IMAP"
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
+msgid "IMAP+"
+msgstr "IMAP+"
-#: ../camel/providers/imap/camel-imap-provider.c:80
#: ../camel/providers/imapx/camel-imapx-provider.c:85
msgid "For reading and storing mail on IMAP servers."
msgstr "IMAP 服务器上的邮件的读写。"
-#: ../camel/providers/imap/camel-imap-store.c:2191
-#: ../camel/providers/local/camel-maildir-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:442
-#: ../camel/providers/local/camel-mh-store.c:564
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "无法创建文件夹“%s”：文件夹已存在。"
-
-#: ../camel/providers/imap/camel-imap-store.c:2994
-#, c-format
-msgid "Retrieving list of folders at '%s'"
-msgstr "正在获取“%s”的文件夹列表"
-
-#: ../camel/providers/imap/camel-imap-store.c:3344
-#, c-format
-msgid "Server unexpectedly disconnected"
-msgstr "服务器意外断开 "
-
-#: ../camel/providers/imap/camel-imap-store.c:3348
-msgid "Server unexpectedly disconnected: "
-msgstr "服务器意外断开："
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Use _Quick Resync if the server supports it"
-msgstr "如果服务器支持则使用快速重新同步(_Q)"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "_Listen for server change notifications"
-msgstr "监听服务器变化提醒(_L)"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "Namespace:"
-msgstr "命名空间："
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:75
-msgid "Default IMAP port"
-msgstr "默认的 IMAP 端口"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:83
-msgid "IMAP+"
-msgstr "IMAP+"
-
#: ../camel/providers/local/camel-local-folder.c:194
#, c-format
msgid "~%s (%s)"
@@ -3693,7 +3504,7 @@ msgid "Standard Unix mbox spool file"
msgstr "标准 Unix mbox 脱机文件"
#: ../camel/providers/local/camel-local-provider.c:112
-#: ../camel/providers/local/camel-local-provider.c:124
+#: ../camel/providers/local/camel-local-provider.c:126
msgid ""
"For reading and storing local mail in external standard mbox spool files.\n"
"May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3701,7 +3512,7 @@ msgstr ""
"对于读取和存储外部标准 mbox 脱机文件中的本地邮件。\n"
"也可用于读取 Elm、Pine 或 Mutt 风格的文件夹树。"
-#: ../camel/providers/local/camel-local-provider.c:123
+#: ../camel/providers/local/camel-local-provider.c:125
msgid "Standard Unix mbox spool directory"
msgstr "标准 Unix mbox 脱机目录"
@@ -3717,7 +3528,7 @@ msgstr "本地邮件文件 %s"
#: ../camel/providers/local/camel-local-store.c:223
#: ../camel/providers/local/camel-local-store.c:383
-#: ../camel/providers/local/camel-maildir-store.c:104
+#: ../camel/providers/local/camel-maildir-store.c:117
#: ../camel/providers/local/camel-mbox-store.c:581
#: ../camel/providers/local/camel-spool-store.c:89
#, c-format
@@ -3732,7 +3543,7 @@ msgstr "存储根目录 %s 不是普通目录"
#: ../camel/providers/local/camel-local-store.c:244
#: ../camel/providers/local/camel-local-store.c:254
#: ../camel/providers/local/camel-local-store.c:396
-#: ../camel/providers/local/camel-maildir-store.c:137
+#: ../camel/providers/local/camel-maildir-store.c:145
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "无法获取文件夹：%s：%s"
@@ -3759,7 +3570,7 @@ msgstr "无法删除文件夹元文件“%s”：%s"
msgid "Could not rename '%s': %s"
msgstr "无法重命名“%s”：%s"
-#: ../camel/providers/local/camel-local-summary.c:543
+#: ../camel/providers/local/camel-local-summary.c:567
#, c-format
msgid "Unable to add message to summary: unknown reason"
msgstr "无法将消息添加到概要中：未知的原因"
@@ -3791,87 +3602,84 @@ msgstr "无法从文件夹 %2$s 获取消息 %1$s："
msgid "Cannot transfer message to destination folder: %s"
msgstr "无法将消息转移到目标文件夹：%s"
-#: ../camel/providers/local/camel-maildir-store.c:112
-#, c-format
-msgid "Cannot create folder: %s: Folder name cannot contain a dot"
-msgstr "无法创建文件夹：%s：文件夹名称不能包含点"
-
-#: ../camel/providers/local/camel-maildir-store.c:122
-#: ../camel/providers/local/camel-maildir-store.c:806
+#: ../camel/providers/local/camel-maildir-store.c:125
+#: ../camel/providers/local/camel-maildir-store.c:848
#, c-format
msgid "Folder %s already exists"
msgstr "文件夹 %s 已经存在"
-#: ../camel/providers/local/camel-maildir-store.c:221
-#: ../camel/providers/local/camel-maildir-store.c:252
+#: ../camel/providers/local/camel-maildir-store.c:230
+#: ../camel/providers/local/camel-maildir-store.c:261
#: ../camel/providers/local/camel-mbox-store.c:403
#: ../camel/providers/local/camel-mbox-store.c:424
#, c-format
msgid "Cannot create folder '%s': %s"
msgstr "无法创建文件夹“%s”：%s"
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:245
#: ../camel/providers/local/camel-mbox-store.c:369
-#: ../camel/providers/local/camel-mh-store.c:522
+#: ../camel/providers/local/camel-mh-store.c:514
#, c-format
msgid "Cannot get folder '%s': %s"
msgstr "无法获取文件夹“%s”：%s"
-#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-maildir-store.c:251
#: ../camel/providers/local/camel-mbox-store.c:379
-#: ../camel/providers/local/camel-mh-store.c:531
+#: ../camel/providers/local/camel-mh-store.c:523
#, c-format
msgid "Cannot get folder '%s': folder does not exist."
msgstr "无法获得文件夹“%s”：文件夹不存在。"
-#: ../camel/providers/local/camel-maildir-store.c:269
+#: ../camel/providers/local/camel-maildir-store.c:278
#, c-format
msgid "Cannot get folder '%s': not a maildir directory."
msgstr "无法获取文件夹“%s”：不是 maildir 目录。"
-#: ../camel/providers/local/camel-maildir-store.c:338
-#: ../camel/providers/local/camel-maildir-store.c:378
-#: ../camel/providers/local/camel-mh-store.c:682
+#: ../camel/providers/local/camel-maildir-store.c:283
+#: ../camel/providers/local/camel-mbox-store.c:442
+#: ../camel/providers/local/camel-mh-store.c:556
+#, c-format
+msgid "Cannot create folder '%s': folder exists."
+msgstr "无法创建文件夹“%s”：文件夹已存在。"
+
+#: ../camel/providers/local/camel-maildir-store.c:347
+#: ../camel/providers/local/camel-maildir-store.c:387
+#: ../camel/providers/local/camel-mh-store.c:674
#, c-format
msgid "Could not delete folder '%s': %s"
msgstr "无法删除文件夹“%s”：%s"
-#: ../camel/providers/local/camel-maildir-store.c:340
+#: ../camel/providers/local/camel-maildir-store.c:349
msgid "not a maildir directory"
msgstr "不是 maildir 目录"
-#: ../camel/providers/local/camel-maildir-store.c:589
-#: ../camel/providers/local/camel-maildir-store.c:1003
+#: ../camel/providers/local/camel-maildir-store.c:628
+#: ../camel/providers/local/camel-maildir-store.c:1063
#: ../camel/providers/local/camel-spool-store.c:212
#: ../camel/providers/local/camel-spool-store.c:231
#, c-format
msgid "Could not scan folder '%s': %s"
msgstr "无法扫描文件夹“%s”：%s"
-#: ../camel/providers/local/camel-maildir-store.c:797
-#, c-format
-msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
-msgstr "无法重命名文件夹：%s：文件夹名称不能包含点"
-
-#: ../camel/providers/local/camel-maildir-summary.c:434
-#: ../camel/providers/local/camel-maildir-summary.c:567
+#: ../camel/providers/local/camel-maildir-summary.c:458
+#: ../camel/providers/local/camel-maildir-summary.c:591
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "无法打开邮件目录路径：%s：%s"
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:582
msgid "Checking folder consistency"
msgstr "检查文件夹一致性"
-#: ../camel/providers/local/camel-maildir-summary.c:651
+#: ../camel/providers/local/camel-maildir-summary.c:675
msgid "Checking for new messages"
msgstr "检查新消息"
-#: ../camel/providers/local/camel-maildir-summary.c:746
-#: ../camel/providers/local/camel-mbox-summary.c:418
-#: ../camel/providers/local/camel-mbox-summary.c:650
-#: ../camel/providers/local/camel-mbox-summary.c:794
-#: ../camel/providers/local/camel-spool-summary.c:132
+#: ../camel/providers/local/camel-maildir-summary.c:770
+#: ../camel/providers/local/camel-mbox-summary.c:450
+#: ../camel/providers/local/camel-mbox-summary.c:682
+#: ../camel/providers/local/camel-mbox-summary.c:830
+#: ../camel/providers/local/camel-spool-summary.c:141
msgid "Storing folder"
msgstr "存储文件夹"
@@ -3962,83 +3770,83 @@ msgstr "无法重命名“%s”：“%s”：%s"
msgid "Could not rename '%s' to %s: %s"
msgstr "无法将“%s”重命名为 %s：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:428
+#: ../camel/providers/local/camel-mbox-summary.c:460
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "无法打开文件夹：%s：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:490
+#: ../camel/providers/local/camel-mbox-summary.c:522
#, c-format
msgid "Fatal mail parser error near position %s in folder %s"
msgstr "邮件解析发生致命错误，位于 %s (文件夹 %s)"
-#: ../camel/providers/local/camel-mbox-summary.c:575
+#: ../camel/providers/local/camel-mbox-summary.c:607
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "无法检查文件夹：%s：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:663
-#: ../camel/providers/local/camel-mbox-summary.c:803
-#: ../camel/providers/local/camel-spool-summary.c:139
+#: ../camel/providers/local/camel-mbox-summary.c:695
+#: ../camel/providers/local/camel-mbox-summary.c:839
+#: ../camel/providers/local/camel-spool-summary.c:148
#, c-format
msgid "Could not open file: %s: %s"
msgstr "无法打开文件：%s：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:677
-#: ../camel/providers/local/camel-spool-summary.c:154
+#: ../camel/providers/local/camel-mbox-summary.c:709
+#: ../camel/providers/local/camel-spool-summary.c:163
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "无法打开临时邮件箱：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:694
-#: ../camel/providers/local/camel-mbox-summary.c:920
+#: ../camel/providers/local/camel-mbox-summary.c:726
+#: ../camel/providers/local/camel-mbox-summary.c:956
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "无法关闭来源文件夹 %s：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:705
+#: ../camel/providers/local/camel-mbox-summary.c:739
#, c-format
msgid "Could not close temporary folder: %s"
msgstr "无法关闭临时文件夹：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-mbox-summary.c:758
#, c-format
msgid "Could not rename folder: %s"
msgstr "无法重命名文件夹：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:817
-#: ../camel/providers/local/camel-mbox-summary.c:1086
+#: ../camel/providers/local/camel-mbox-summary.c:853
+#: ../camel/providers/local/camel-mbox-summary.c:1122
#, c-format
msgid "Could not store folder: %s"
msgstr "无法存储文件夹：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:856
-#: ../camel/providers/local/camel-mbox-summary.c:1126
+#: ../camel/providers/local/camel-mbox-summary.c:892
+#: ../camel/providers/local/camel-mbox-summary.c:1162
#, c-format
msgid ""
"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
"it.)"
msgstr "MBOX 文件损坏，请修复。(应该有 From 行，但未找到。)"
-#: ../camel/providers/local/camel-mbox-summary.c:866
-#: ../camel/providers/local/camel-mbox-summary.c:1138
+#: ../camel/providers/local/camel-mbox-summary.c:902
+#: ../camel/providers/local/camel-mbox-summary.c:1174
#, c-format
msgid "Summary and folder mismatch, even after a sync"
msgstr "即使同步后，概要和文件夹仍然不匹配"
-#: ../camel/providers/local/camel-mbox-summary.c:1031
-#: ../camel/providers/local/camel-spool-summary.c:347
+#: ../camel/providers/local/camel-mbox-summary.c:1067
+#: ../camel/providers/local/camel-spool-summary.c:356
#, c-format
msgid "Unknown error: %s"
msgstr "未知的错误：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:1196
-#: ../camel/providers/local/camel-mbox-summary.c:1226
+#: ../camel/providers/local/camel-mbox-summary.c:1232
+#: ../camel/providers/local/camel-mbox-summary.c:1262
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "写入临时 mailbox 失败：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:1215
+#: ../camel/providers/local/camel-mbox-summary.c:1251
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "写入临时 mailbox 失败：%s：%s"
@@ -4048,12 +3856,12 @@ msgstr "写入临时 mailbox 失败：%s：%s"
msgid "Cannot append message to mh folder: %s: "
msgstr "无法将消息附加到 mh 文件夹：%s："
-#: ../camel/providers/local/camel-mh-store.c:541
+#: ../camel/providers/local/camel-mh-store.c:533
#, c-format
msgid "Could not create folder '%s': %s"
msgstr "无法创建文件夹“%s”：%s"
-#: ../camel/providers/local/camel-mh-store.c:557
+#: ../camel/providers/local/camel-mh-store.c:549
#, c-format
msgid "Cannot get folder '%s': not a directory."
msgstr "无法获取文件夹“%s”：不是目录。"
@@ -4135,21 +3943,21 @@ msgstr "脱机文件夹无法删除"
msgid "Spool folders cannot be renamed"
msgstr "脱机文件夹无法改名"
-#: ../camel/providers/local/camel-spool-summary.c:170
-#: ../camel/providers/local/camel-spool-summary.c:182
-#: ../camel/providers/local/camel-spool-summary.c:194
+#: ../camel/providers/local/camel-spool-summary.c:179
+#: ../camel/providers/local/camel-spool-summary.c:191
+#: ../camel/providers/local/camel-spool-summary.c:203
#, c-format
msgid "Could not synchronize temporary folder %s: %s"
msgstr "无法同步临时文件夹 %s: %s"
-#: ../camel/providers/local/camel-spool-summary.c:212
+#: ../camel/providers/local/camel-spool-summary.c:221
#, c-format
msgid "Could not synchronize spool folder %s: %s"
msgstr "无法同步脱机文件夹 %s: %s"
-#: ../camel/providers/local/camel-spool-summary.c:244
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:276
+#: ../camel/providers/local/camel-spool-summary.c:253
+#: ../camel/providers/local/camel-spool-summary.c:272
+#: ../camel/providers/local/camel-spool-summary.c:285
#, c-format
msgid ""
"Could not synchronize spool folder %s: %s\n"
@@ -4158,47 +3966,51 @@ msgstr ""
"无法同步脱机文件夹 %s: %s\n"
"文件夹可能已损坏，副本已存放在 '%s'"
-#: ../camel/providers/nntp/camel-nntp-folder.c:278
-#: ../camel/providers/nntp/camel-nntp-folder.c:360
-#: ../camel/providers/nntp/camel-nntp-folder.c:481
+#: ../camel/providers/nntp/camel-nntp-folder.c:285
+#: ../camel/providers/nntp/camel-nntp-folder.c:388
+#: ../camel/providers/nntp/camel-nntp-folder.c:510
#, c-format
msgid "Internal error: UID in invalid format: %s"
msgstr "内部错误：UID 的格式无效：%s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:328
-#: ../camel/providers/nntp/camel-nntp-folder.c:332
-#: ../camel/providers/pop3/camel-pop3-folder.c:633
-#: ../camel/providers/pop3/camel-pop3-folder.c:1065
+#: ../camel/providers/nntp/camel-nntp-folder.c:349
+#: ../camel/providers/nntp/camel-nntp-folder.c:354
+#: ../camel/providers/pop3/camel-pop3-folder.c:657
+#: ../camel/providers/pop3/camel-pop3-folder.c:1107
#, c-format
msgid "Cannot get message %s: %s"
msgstr "无法获取消息 %s：%s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:339
-#: ../camel/providers/nntp/camel-nntp-folder.c:504
-#: ../camel/providers/pop3/camel-pop3-folder.c:558
-#: ../camel/providers/pop3/camel-pop3-folder.c:623
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
+#: ../camel/providers/nntp/camel-nntp-folder.c:361
+#: ../camel/providers/nntp/camel-nntp-folder.c:536
+#: ../camel/providers/pop3/camel-pop3-folder.c:582
+#: ../camel/providers/pop3/camel-pop3-folder.c:647
+#: ../camel/providers/pop3/camel-pop3-folder.c:666
#, c-format
msgid "Cannot get message %s: "
msgstr "无法获取消息 %s："
-#: ../camel/providers/nntp/camel-nntp-folder.c:559
-#: ../camel/providers/nntp/camel-nntp-folder.c:565
-#: ../camel/providers/nntp/camel-nntp-folder.c:611
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
+#, c-format
+msgid "This message is not currently available"
+msgstr "该消息目前不可用"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:593
+#: ../camel/providers/nntp/camel-nntp-folder.c:599
#, c-format
msgid "Posting failed: %s"
msgstr "发送失败：%s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:606
+#: ../camel/providers/nntp/camel-nntp-folder.c:664
msgid "Posting failed: "
msgstr "发送失败："
-#: ../camel/providers/nntp/camel-nntp-folder.c:633
+#: ../camel/providers/nntp/camel-nntp-folder.c:689
#, c-format
msgid "You cannot post NNTP messages while working offline!"
msgstr "您离线时无法投递 NNTP 消息！"
-#: ../camel/providers/nntp/camel-nntp-folder.c:653
+#: ../camel/providers/nntp/camel-nntp-folder.c:709
#, c-format
msgid "You cannot copy messages from a NNTP folder!"
msgstr "您无法从 NNTP 文件夹复制消息！"
@@ -4229,27 +4041,36 @@ msgid "This is a provider for reading from and posting to USENET newsgroups."
msgstr "这是一个读取 USENET 新闻组和向 USENET 新闻组发布邮件的提供者。"
#: ../camel/providers/nntp/camel-nntp-provider.c:87
+#, fuzzy
+#| msgid ""
+#| "This option will connect to the server using Kerberos 5 authentication."
+msgid ""
+"This option will connect to the NNTP server anonymously, without "
+"authentication."
+msgstr "该选项将用 Kerberos 5 认证连接到服务器。"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:97
msgid ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
msgstr "该选项将以明文密码向进行 NNTP 服务器进行认证。"
-#: ../camel/providers/nntp/camel-nntp-store.c:286
+#: ../camel/providers/nntp/camel-nntp-store.c:386
#, c-format
msgid "Could not read greeting from %s: "
msgstr "无法阅读来自 %s 的欢迎信息："
-#: ../camel/providers/nntp/camel-nntp-store.c:298
+#: ../camel/providers/nntp/camel-nntp-store.c:394
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "NNTP 服务器 %s 返回错误码 %d：%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:463
+#: ../camel/providers/nntp/camel-nntp-store.c:555
#, c-format
msgid "USENET News via %s"
msgstr "USENET 新闻 %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1058
+#: ../camel/providers/nntp/camel-nntp-store.c:1218
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -4260,22 +4081,22 @@ msgstr ""
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1152
+#: ../camel/providers/nntp/camel-nntp-store.c:1319
#, c-format
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr "您无法在新闻存储中创建文件夹：应该订阅。"
-#: ../camel/providers/nntp/camel-nntp-store.c:1168
+#: ../camel/providers/nntp/camel-nntp-store.c:1335
#, c-format
msgid "You cannot rename a folder in a News store."
msgstr "您无法在新闻存储中重命名文件夹。"
-#: ../camel/providers/nntp/camel-nntp-store.c:1191
+#: ../camel/providers/nntp/camel-nntp-store.c:1358
#, c-format
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr "您无法在新闻存储中删除文件夹：应该退订。"
-#: ../camel/providers/nntp/camel-nntp-store.c:1390
+#: ../camel/providers/nntp/camel-nntp-store.c:1577
#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
@@ -4286,7 +4107,7 @@ msgstr ""
"\n"
"没有这样的新闻组。选中项目可能是父文件夹。"
-#: ../camel/providers/nntp/camel-nntp-store.c:1438
+#: ../camel/providers/nntp/camel-nntp-store.c:1644
#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
@@ -4297,68 +4118,73 @@ msgstr ""
"\n"
"新闻组不存在！"
-#: ../camel/providers/nntp/camel-nntp-store.c:1628
+#: ../camel/providers/nntp/camel-nntp-store.c:2081
msgid "NNTP Command failed: "
msgstr "NNTP 命令失败："
-#: ../camel/providers/nntp/camel-nntp-store.c:1713
+#: ../camel/providers/nntp/camel-nntp-store.c:2178
#, c-format
msgid "Not connected."
msgstr "未连接。"
-#: ../camel/providers/nntp/camel-nntp-summary.c:198
-#: ../camel/providers/nntp/camel-nntp-summary.c:328
+#: ../camel/providers/nntp/camel-nntp-store.c:2272
+#, c-format
+msgid "No such folder: %s"
+msgstr "没有文件夹：%s"
+
+#: ../camel/providers/nntp/camel-nntp-summary.c:200
+#: ../camel/providers/nntp/camel-nntp-summary.c:339
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s：正在扫描新消息"
-#: ../camel/providers/nntp/camel-nntp-summary.c:216
+#: ../camel/providers/nntp/camel-nntp-summary.c:222
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "来自 xover 的意外服务器应答：%s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:346
+#: ../camel/providers/nntp/camel-nntp-summary.c:360
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "来自 head 的意外服务器应答：%s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:393
+#: ../camel/providers/nntp/camel-nntp-summary.c:407
#, c-format
msgid "Operation failed: %s"
msgstr "操作失败：%s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:453
-#: ../camel/providers/pop3/camel-pop3-folder.c:526
+#: ../camel/providers/pop3/camel-pop3-folder.c:468
+#: ../camel/providers/pop3/camel-pop3-folder.c:547
#, c-format
msgid "No message with UID %s"
msgstr "没有 UID 为 %s 的消息"
-#: ../camel/providers/pop3/camel-pop3-folder.c:542
+#: ../camel/providers/pop3/camel-pop3-folder.c:563
#, c-format
msgid "Retrieving POP message %d"
msgstr "正在获取 POP 消息 %d"
-#: ../camel/providers/pop3/camel-pop3-folder.c:634
+#: ../camel/providers/pop3/camel-pop3-folder.c:658
msgid "Unknown reason"
msgstr "未知原因"
-#: ../camel/providers/pop3/camel-pop3-folder.c:682
+#: ../camel/providers/pop3/camel-pop3-folder.c:710
msgid "Retrieving POP summary"
msgstr "正在获取 POP 概要"
-#: ../camel/providers/pop3/camel-pop3-folder.c:741
-#: ../camel/providers/pop3/camel-pop3-folder.c:744
-#: ../camel/providers/pop3/camel-pop3-folder.c:757
-#: ../camel/providers/pop3/camel-pop3-folder.c:770
-#: ../camel/providers/pop3/camel-pop3-folder.c:784
+#: ../camel/providers/pop3/camel-pop3-folder.c:771
+#: ../camel/providers/pop3/camel-pop3-folder.c:774
+#: ../camel/providers/pop3/camel-pop3-folder.c:787
+#: ../camel/providers/pop3/camel-pop3-folder.c:800
+#: ../camel/providers/pop3/camel-pop3-folder.c:814
msgid "Cannot get POP summary: "
msgstr "无法获取 POP 概要："
-#: ../camel/providers/pop3/camel-pop3-folder.c:891
+#: ../camel/providers/pop3/camel-pop3-folder.c:925
msgid "Expunging old messages"
msgstr "销毁旧消息"
-#: ../camel/providers/pop3/camel-pop3-folder.c:911
+#: ../camel/providers/pop3/camel-pop3-folder.c:945
msgid "Expunging deleted messages"
msgstr "彻底销毁已删除的消息"
@@ -4419,57 +4245,57 @@ msgstr ""
"能的服务器，也不一定能使所有用户工作。"
#. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:83
+#: ../camel/providers/pop3/camel-pop3-store.c:99
msgid ": "
msgstr "："
-#: ../camel/providers/pop3/camel-pop3-store.c:144
+#: ../camel/providers/pop3/camel-pop3-store.c:161
#, c-format
msgid "Failed to read a valid greeting from POP server %s"
msgstr "从 POP 服务器 %s 读取欢迎词失败"
-#: ../camel/providers/pop3/camel-pop3-store.c:159
+#: ../camel/providers/pop3/camel-pop3-store.c:176
#, c-format
msgid "Failed to connect to POP server %s in secure mode: %s"
msgstr "以安全模式连接到 POP 服务器 %s 失败：%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:160
+#: ../camel/providers/pop3/camel-pop3-store.c:177
msgid "STLS not supported by server"
msgstr "服务器不支持 STLS"
#. Translators: Last %s is an optional
#. * explanation beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/pop3/camel-pop3-store.c:198
#, c-format
msgid "Failed to connect to POP server %s in secure mode%s"
msgstr "以安全模式连接到 POP 服务器 %s 失败%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:194
+#: ../camel/providers/pop3/camel-pop3-store.c:211
#, c-format
msgid "Failed to connect to POP server %s in secure mode: "
msgstr "以安全模式连接到 POP 服务器 %s 失败："
-#: ../camel/providers/pop3/camel-pop3-store.c:305
+#: ../camel/providers/pop3/camel-pop3-store.c:342
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "无法登录到 POP 服务器 %s：SASL 协议错误"
-#: ../camel/providers/pop3/camel-pop3-store.c:327
+#: ../camel/providers/pop3/camel-pop3-store.c:364
#, c-format
msgid "Failed to authenticate on POP server %s: "
msgstr "无法认证 POP 服务器 %s："
-#: ../camel/providers/pop3/camel-pop3-store.c:387
+#: ../camel/providers/pop3/camel-pop3-store.c:472
#, c-format
msgid "POP3 server %s"
msgstr "POP3 服务器 %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:390
+#: ../camel/providers/pop3/camel-pop3-store.c:475
#, c-format
msgid "POP3 server for %s on %s"
msgstr "%2$s 为 %1$s 提供的 POP 服务"
-#: ../camel/providers/pop3/camel-pop3-store.c:563
+#: ../camel/providers/pop3/camel-pop3-store.c:690
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4478,7 +4304,7 @@ msgstr ""
"无法连接到 POP 服务器 %s：\t接收到非法的 APOP ID。可能是冒名攻击。请联系您的"
"管理员。"
-#: ../camel/providers/pop3/camel-pop3-store.c:615
+#: ../camel/providers/pop3/camel-pop3-store.c:742
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4489,7 +4315,7 @@ msgstr ""
#. Translators: Last %s is an optional explanation
#. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:630
+#: ../camel/providers/pop3/camel-pop3-store.c:757
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4498,23 +4324,18 @@ msgstr ""
"无法连接到 POP 服务器 %s。\n"
"发送用户名错误%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:690
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "无法连接到 POP 服务器 %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:718
+#: ../camel/providers/pop3/camel-pop3-store.c:839
#, c-format
msgid "No such folder '%s'."
msgstr "没有文件夹“%s”。"
-#: ../camel/providers/pop3/camel-pop3-store.c:735
+#: ../camel/providers/pop3/camel-pop3-store.c:856
#, c-format
msgid "POP3 stores have no folder hierarchy"
msgstr "POP3 的存储没有文件夹结构"
#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
-#: ../data/sources/sendmail.source.in.h:1
+#: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
msgid "Sendmail"
msgstr "Sendmail"
@@ -4524,46 +4345,68 @@ msgid ""
"system."
msgstr "将邮件传递到本地系统的“sendmail”来发送邮件。"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
msgid "sendmail"
msgstr "sendmail"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:52
msgid "Mail delivery via the sendmail program"
msgstr "通过 sendmail 程序发送邮件"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:93
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:140
+#, fuzzy, c-format
+#| msgid "Failed to retrieve message"
+msgid "Failed to read From address"
+msgstr "获取消息失败"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:157
+#, c-format
+msgid "Message send in offline mode is disabled"
+msgstr ""
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:185
#, c-format
msgid "Could not parse recipient list"
msgstr "无法解析收件人列表"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:126
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:202
+#, fuzzy, c-format
+#| msgid "Could not parse recipient list"
+msgid "Could not parse arguments"
+msgstr "无法解析收件人列表"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:233
+#, fuzzy, c-format
+#| msgid "Could not create pipe to sendmail: %s: mail not sent"
+msgid "Could not create pipe to '%s': %s: mail not sent"
msgstr "无法创建到 sendmail 的管道：%s：邮件未发送"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:148
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:258
+#, fuzzy, c-format
+#| msgid "Could not fork sendmail: %s: mail not sent"
+msgid "Could not fork '%s': %s: mail not sent"
msgstr "无法创建 sendmail 进程：%s：邮件未发送"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:307
msgid "Could not send message: "
msgstr "无法发送消息："
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:337
+#, fuzzy, c-format
+#| msgid "sendmail exited with signal %s: mail not sent."
+msgid "'%s' exited with signal %s: mail not sent."
msgstr "sendmail 以信号 %s 退出：邮件未发送。"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
-#, c-format
-msgid "Could not execute %s: mail not sent."
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:347
+#, fuzzy, c-format
+#| msgid "Could not execute %s: mail not sent."
+msgid "Could not execute '%s': mail not sent."
msgstr "无法执行 %s：邮件未发送。"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:352
+#, fuzzy, c-format
+#| msgid "sendmail exited with status %d: mail not sent."
+msgid "'%s' exited with status %d: mail not sent."
msgstr "sendmail 以状态码 %d 退出：邮件未发送。"
#: ../camel/providers/smtp/camel-smtp-provider.c:42
@@ -4586,218 +4429,218 @@ msgstr "SMTP"
msgid "For delivering mail by connecting to a remote mailhub using SMTP."
msgstr "要投递邮件，应该使用 SMTP 连接到远程的邮件交换服务器。"
-#: ../camel/providers/smtp/camel-smtp-transport.c:154
-#: ../camel/providers/smtp/camel-smtp-transport.c:162
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
msgid "Welcome response error: "
msgstr "欢迎应答错误："
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:205
#, c-format
msgid "Failed to connect to SMTP server %s in secure mode: %s"
msgstr "以安全模式连接 SMTP 服务器 %s 失败：%s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
-#: ../camel/providers/smtp/camel-smtp-transport.c:223
-#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:227
+#: ../camel/providers/smtp/camel-smtp-transport.c:234
msgid "STARTTLS command failed: "
msgstr "STARTTLS 命令失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:241
+#: ../camel/providers/smtp/camel-smtp-transport.c:245
#, c-format
msgid "Failed to connect to SMTP server %s in secure mode: "
msgstr "以安全模式连接 SMTP 服务器 %s 失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:301
+#: ../camel/providers/smtp/camel-smtp-transport.c:347
#, c-format
msgid "SMTP server %s"
msgstr "SMTP 服务器 %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:304
+#: ../camel/providers/smtp/camel-smtp-transport.c:350
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "通过 %s 发送 SMTP 邮件"
-#: ../camel/providers/smtp/camel-smtp-transport.c:378
+#: ../camel/providers/smtp/camel-smtp-transport.c:424
#, c-format
msgid "SMTP server %s does not support %s authentication"
msgstr "SMTP 服务器 %s 不支持 %s 认证。"
-#: ../camel/providers/smtp/camel-smtp-transport.c:458
+#: ../camel/providers/smtp/camel-smtp-transport.c:506
#, c-format
msgid "No SASL mechanism was specified"
msgstr "未指定 SASL 机制"
-#: ../camel/providers/smtp/camel-smtp-transport.c:488
-#: ../camel/providers/smtp/camel-smtp-transport.c:499
-#: ../camel/providers/smtp/camel-smtp-transport.c:512
+#: ../camel/providers/smtp/camel-smtp-transport.c:536
+#: ../camel/providers/smtp/camel-smtp-transport.c:547
+#: ../camel/providers/smtp/camel-smtp-transport.c:560
msgid "AUTH command failed: "
msgstr "AUTH 命令失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:653
+#: ../camel/providers/smtp/camel-smtp-transport.c:701
#, c-format
msgid "Cannot send message: service not connected."
msgstr "无法发送消息：服务未连接。"
-#: ../camel/providers/smtp/camel-smtp-transport.c:660
+#: ../camel/providers/smtp/camel-smtp-transport.c:708
#, c-format
msgid "Cannot send message: sender address not valid."
msgstr "无法发送消息：发件人地址不合法。"
-#: ../camel/providers/smtp/camel-smtp-transport.c:664
+#: ../camel/providers/smtp/camel-smtp-transport.c:712
msgid "Sending message"
msgstr "正在发送消息"
-#: ../camel/providers/smtp/camel-smtp-transport.c:689
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
#, c-format
msgid "Cannot send message: no recipients defined."
msgstr "无法发送消息：没有定义收件人。"
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
#, c-format
msgid "Cannot send message: one or more invalid recipients"
msgstr "无法发送消息：一个或多个非法收件人"
-#: ../camel/providers/smtp/camel-smtp-transport.c:806
+#: ../camel/providers/smtp/camel-smtp-transport.c:871
msgid "Syntax error, command unrecognized"
msgstr "语法错误，命令无法识别"
-#: ../camel/providers/smtp/camel-smtp-transport.c:808
+#: ../camel/providers/smtp/camel-smtp-transport.c:873
msgid "Syntax error in parameters or arguments"
msgstr "参数语法错误"
-#: ../camel/providers/smtp/camel-smtp-transport.c:810
+#: ../camel/providers/smtp/camel-smtp-transport.c:875
msgid "Command not implemented"
msgstr "命令尚未实现"
-#: ../camel/providers/smtp/camel-smtp-transport.c:812
+#: ../camel/providers/smtp/camel-smtp-transport.c:877
msgid "Command parameter not implemented"
msgstr "命令参数尚未实现"
-#: ../camel/providers/smtp/camel-smtp-transport.c:814
+#: ../camel/providers/smtp/camel-smtp-transport.c:879
msgid "System status, or system help reply"
msgstr "系统状态，或系统求助就绪"
-#: ../camel/providers/smtp/camel-smtp-transport.c:816
+#: ../camel/providers/smtp/camel-smtp-transport.c:881
msgid "Help message"
msgstr "帮助消息"
-#: ../camel/providers/smtp/camel-smtp-transport.c:818
+#: ../camel/providers/smtp/camel-smtp-transport.c:883
msgid "Service ready"
msgstr "服务就绪"
-#: ../camel/providers/smtp/camel-smtp-transport.c:820
+#: ../camel/providers/smtp/camel-smtp-transport.c:885
msgid "Service closing transmission channel"
msgstr "服务正在关闭传输通道"
-#: ../camel/providers/smtp/camel-smtp-transport.c:822
+#: ../camel/providers/smtp/camel-smtp-transport.c:887
msgid "Service not available, closing transmission channel"
msgstr "服务不可用，正在关闭传输通道"
-#: ../camel/providers/smtp/camel-smtp-transport.c:824
+#: ../camel/providers/smtp/camel-smtp-transport.c:889
msgid "Requested mail action okay, completed"
msgstr "邮件动作请求确认，已完成"
-#: ../camel/providers/smtp/camel-smtp-transport.c:826
+#: ../camel/providers/smtp/camel-smtp-transport.c:891
msgid "User not local; will forward to <forward-path>"
msgstr "用户不在本地；将转发到 <转发路径>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:828
+#: ../camel/providers/smtp/camel-smtp-transport.c:893
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "邮件动作请求未发生：邮箱无效"
-#: ../camel/providers/smtp/camel-smtp-transport.c:830
+#: ../camel/providers/smtp/camel-smtp-transport.c:895
msgid "Requested action not taken: mailbox unavailable"
msgstr "动作请求未发生：邮箱无效"
-#: ../camel/providers/smtp/camel-smtp-transport.c:832
+#: ../camel/providers/smtp/camel-smtp-transport.c:897
msgid "Requested action aborted: error in processing"
msgstr "动作请求已放弃：处理出错"
-#: ../camel/providers/smtp/camel-smtp-transport.c:834
+#: ../camel/providers/smtp/camel-smtp-transport.c:899
msgid "User not local; please try <forward-path>"
msgstr "用户不在本地；请尝试 <转发路径>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:836
+#: ../camel/providers/smtp/camel-smtp-transport.c:901
msgid "Requested action not taken: insufficient system storage"
msgstr "动作请求未发生：系统存储空间不足"
-#: ../camel/providers/smtp/camel-smtp-transport.c:838
+#: ../camel/providers/smtp/camel-smtp-transport.c:903
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "邮件动作请求已放弃：存储分配超额"
-#: ../camel/providers/smtp/camel-smtp-transport.c:840
+#: ../camel/providers/smtp/camel-smtp-transport.c:905
msgid "Requested action not taken: mailbox name not allowed"
msgstr "动作请求未发生：不允许的邮件箱名称"
-#: ../camel/providers/smtp/camel-smtp-transport.c:842
+#: ../camel/providers/smtp/camel-smtp-transport.c:907
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "开始输入邮件；以 <CRLF>.<CRLF> 结束"
-#: ../camel/providers/smtp/camel-smtp-transport.c:844
+#: ../camel/providers/smtp/camel-smtp-transport.c:909
msgid "Transaction failed"
msgstr "传送失败"
-#: ../camel/providers/smtp/camel-smtp-transport.c:848
+#: ../camel/providers/smtp/camel-smtp-transport.c:913
msgid "A password transition is needed"
msgstr "必须传输密码"
-#: ../camel/providers/smtp/camel-smtp-transport.c:850
+#: ../camel/providers/smtp/camel-smtp-transport.c:915
msgid "Authentication mechanism is too weak"
msgstr "认证机制太弱"
-#: ../camel/providers/smtp/camel-smtp-transport.c:852
+#: ../camel/providers/smtp/camel-smtp-transport.c:917
msgid "Encryption required for requested authentication mechanism"
msgstr "请求的认证机制必须加密"
-#: ../camel/providers/smtp/camel-smtp-transport.c:854
+#: ../camel/providers/smtp/camel-smtp-transport.c:919
msgid "Temporary authentication failure"
msgstr "临时认证失败"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1111
+#: ../camel/providers/smtp/camel-smtp-transport.c:1176
msgid "SMTP Greeting"
msgstr "SMTP 欢迎"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1138
-#: ../camel/providers/smtp/camel-smtp-transport.c:1156
-#: ../camel/providers/smtp/camel-smtp-transport.c:1164
+#: ../camel/providers/smtp/camel-smtp-transport.c:1203
+#: ../camel/providers/smtp/camel-smtp-transport.c:1221
+#: ../camel/providers/smtp/camel-smtp-transport.c:1229
msgid "HELO command failed: "
msgstr "HELO 命令失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:1239
-#: ../camel/providers/smtp/camel-smtp-transport.c:1254
-#: ../camel/providers/smtp/camel-smtp-transport.c:1264
+#: ../camel/providers/smtp/camel-smtp-transport.c:1304
+#: ../camel/providers/smtp/camel-smtp-transport.c:1319
+#: ../camel/providers/smtp/camel-smtp-transport.c:1329
msgid "MAIL FROM command failed: "
msgstr "MAIL FROM 命令失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:1291
+#: ../camel/providers/smtp/camel-smtp-transport.c:1356
msgid "RCPT TO command failed: "
msgstr "RSET 命令失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:1308
-#: ../camel/providers/smtp/camel-smtp-transport.c:1318
+#: ../camel/providers/smtp/camel-smtp-transport.c:1373
+#: ../camel/providers/smtp/camel-smtp-transport.c:1383
#, c-format
msgid "RCPT TO <%s> failed: "
msgstr "RCPT TO <%s> 失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:1361
-#: ../camel/providers/smtp/camel-smtp-transport.c:1372
-#: ../camel/providers/smtp/camel-smtp-transport.c:1383
-#: ../camel/providers/smtp/camel-smtp-transport.c:1442
-#: ../camel/providers/smtp/camel-smtp-transport.c:1462
-#: ../camel/providers/smtp/camel-smtp-transport.c:1476
-#: ../camel/providers/smtp/camel-smtp-transport.c:1485
+#: ../camel/providers/smtp/camel-smtp-transport.c:1426
+#: ../camel/providers/smtp/camel-smtp-transport.c:1437
+#: ../camel/providers/smtp/camel-smtp-transport.c:1448
+#: ../camel/providers/smtp/camel-smtp-transport.c:1507
+#: ../camel/providers/smtp/camel-smtp-transport.c:1527
+#: ../camel/providers/smtp/camel-smtp-transport.c:1541
+#: ../camel/providers/smtp/camel-smtp-transport.c:1550
msgid "DATA command failed: "
msgstr "DATP 命令失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
-#: ../camel/providers/smtp/camel-smtp-transport.c:1525
-#: ../camel/providers/smtp/camel-smtp-transport.c:1534
+#: ../camel/providers/smtp/camel-smtp-transport.c:1575
+#: ../camel/providers/smtp/camel-smtp-transport.c:1590
+#: ../camel/providers/smtp/camel-smtp-transport.c:1599
msgid "RSET command failed: "
msgstr "RSET 命令失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:1559
-#: ../camel/providers/smtp/camel-smtp-transport.c:1573
-#: ../camel/providers/smtp/camel-smtp-transport.c:1580
+#: ../camel/providers/smtp/camel-smtp-transport.c:1624
+#: ../camel/providers/smtp/camel-smtp-transport.c:1638
+#: ../camel/providers/smtp/camel-smtp-transport.c:1645
msgid "QUIT command failed: "
msgstr "QUIT 命令失败："
@@ -4831,57 +4674,10 @@ msgid ""
"\"days\""
msgstr "生日/周年纪念日提醒单位，“分钟”、“小时”或“天”"
-#: ../data/sources/birthdays.source.in.h:1
-#| msgid "Birthday and anniversary reminder"
-msgid "Birthdays & Anniversaries"
-msgstr "生日与周年纪念日提醒"
-
-#: ../data/sources/caldav-stub.source.in.h:1
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../data/sources/contacts-stub.source.in.h:1
-#: ../libedataserverui/e-name-selector-dialog.c:427
-#: ../modules/google-backend/module-google-backend.c:195
-msgid "Contacts"
-msgstr "联系人"
-
-#: ../data/sources/google-stub.source.in.h:1
-msgid "Google"
-msgstr "Google"
-
-#: ../data/sources/ldap-stub.source.in.h:1
-#| msgid "IMAP server %s"
-msgid "On LDAP Servers"
-msgstr "在 LDAP 服务器上"
-
-#: ../data/sources/local.source.in.h:1
-#: ../data/sources/local-stub.source.in.h:1
-msgid "On This Computer"
-msgstr "在此计算机中"
-
-#: ../data/sources/vfolder.source.in.h:1
-#| msgid "Folders"
-msgid "Search Folders"
-msgstr "搜索文件夹"
-
-#: ../data/sources/weather-stub.source.in.h:1
-#| msgid "Weather: Fog"
-msgid "Weather"
-msgstr "天气"
-
-#: ../data/sources/webcal-stub.source.in.h:1
-msgid "On The Web"
-msgstr "在网上"
-
-#: ../data/sources/webdav-stub.source.in.h:1
-msgid "WebDAV"
-msgstr "WebDAV"
-
#: ../libebackend/e-authentication-mediator.c:205
#: ../libebackend/e-authentication-mediator.c:216
-#: ../libebackend/e-authentication-mediator.c:849
-#: ../libebackend/e-authentication-mediator.c:1179
+#: ../libebackend/e-authentication-mediator.c:852
+#: ../libebackend/e-authentication-mediator.c:1185
msgid "Bus name vanished (client terminated?)"
msgstr "Bus 名称消失(客户端终止了？)"
@@ -4891,8 +4687,8 @@ msgstr "客户端无响应"
#: ../libebackend/e-authentication-mediator.c:334
#: ../libebackend/e-authentication-mediator.c:345
-#: ../libebackend/e-authentication-mediator.c:843
-#: ../libebackend/e-authentication-mediator.c:1173
+#: ../libebackend/e-authentication-mediator.c:846
+#: ../libebackend/e-authentication-mediator.c:1179
msgid "Client cancelled the operation"
msgstr "客户端已取消操作"
@@ -4900,78 +4696,94 @@ msgstr "客户端已取消操作"
msgid "Client reports password was rejected"
msgstr "客户端报告密码被拒绝"
-#: ../libebackend/e-authentication-session.c:532
+#: ../libebackend/e-authentication-session.c:543
msgid "Add this password to your keyring"
msgstr "将该密码添加到您的密钥环"
-#: ../libebackend/e-authentication-session.c:622
+#: ../libebackend/e-authentication-session.c:648
msgid "Password was incorrect"
msgstr "密码错误"
-#: ../libebackend/e-authentication-session.c:1358
-#: ../libebackend/e-authentication-session.c:1534
-#: ../libebackend/e-authentication-session.c:1717
-msgid "Keyring operation was cancelled"
-msgstr "密钥环操作已取消"
-
-#: ../libebackend/e-backend.c:190
+#: ../libebackend/e-backend.c:428
#, c-format
msgid "%s does not support authentication"
msgstr "%s 不支持认证"
-#: ../libebackend/e-collection-backend.c:765
+#: ../libebackend/e-collection-backend.c:800
#, c-format
msgid "%s does not support creating remote resources"
msgstr "%s 不支持创建远程资源"
-#: ../libebackend/e-collection-backend.c:824
+#: ../libebackend/e-collection-backend.c:859
#, c-format
msgid "%s does not support deleting remote resources"
msgstr "%s 不支持删除远程资源"
-#: ../libebackend/e-server-side-source.c:126
+#: ../libebackend/e-data-factory.c:304
+#, fuzzy, c-format
+#| msgid "No backend name in source '%s'"
+msgid "No backend factory for hash key '%s'"
+msgstr "源文件“%s”中无后端名称"
+
+#: ../libebackend/e-server-side-source.c:134
#, c-format
msgid "Data source is missing a [%s] group"
msgstr "数据源缺少一个 [%s] 组"
-#: ../libebackend/e-server-side-source.c:916 ../libedataserver/e-source.c:1119
+#: ../libebackend/e-server-side-source.c:1008
+#: ../libedataserver/e-source.c:1138
#, c-format
msgid "Data source '%s' does not support creating remote resources"
msgstr "数据源“%s”不支持创建远程资源"
# collection backend，如何翻译更好？
-#: ../libebackend/e-server-side-source.c:930
+#: ../libebackend/e-server-side-source.c:1022
#, fuzzy, c-format
msgid ""
"Data source '%s' has no collection backend to create the remote resource"
msgstr "数据源“%s”没有合集后端来创建远程资源"
-#: ../libebackend/e-server-side-source.c:958 ../libedataserver/e-source.c:1228
+#: ../libebackend/e-server-side-source.c:1050
+#: ../libedataserver/e-source.c:1251
#, c-format
msgid "Data source '%s' does not support deleting remote resources"
msgstr "数据源“%s”不支持删除远程资源"
-#: ../libebackend/e-server-side-source.c:972
+#: ../libebackend/e-server-side-source.c:1064
#, fuzzy, c-format
msgid ""
"Data source '%s' has no collection backend to delete the remote resource"
msgstr "数据源“%s”没有合集后端来删除远程资源"
-#: ../libebackend/e-server-side-source.c:1285
+#: ../libebackend/e-server-side-source.c:1095
+#: ../libedataserver/e-source.c:1347
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990
+#, fuzzy, c-format
+#| msgid "IMAP server %s does not support %s authentication"
+msgid "Data source '%s' does not support OAuth 2.0 authentication"
+msgstr "IMAP 服务器 %s 不支持 %s 认证"
+
+#: ../libebackend/e-server-side-source.c:1438
#, c-format
msgid "File must have a '.source' extension"
msgstr "文件扩展名必须为“.source”"
-#: ../libebackend/e-source-registry-server.c:522
-#: ../libedataserver/e-source-registry.c:1552
+#: ../libebackend/e-source-registry-server.c:521
+#: ../libedataserver/e-source-registry.c:1876
msgid "The user declined to authenticate"
msgstr "用户拒绝认证"
-#: ../libebackend/e-source-registry-server.c:770
+#: ../libebackend/e-source-registry-server.c:790
#, c-format
msgid "UID '%s' is already in use"
msgstr "UID“%s” 已在使用"
+#: ../libebackend/e-user-prompter-server.c:301
+#, fuzzy, c-format
+#| msgid "Contact '%s' not found"
+msgid "Extension dialog '%s' not found."
+msgstr "未找到联系人 %s"
+
#: ../libedataserver/e-categories.c:46
msgctxt "CategoryName"
msgid "Anniversary"
@@ -5084,21 +4896,22 @@ msgctxt "CategoryName"
msgid "Waiting"
msgstr "等候"
-#: ../libedataserver/e-client.c:124
+#: ../libedataserver/e-client.c:133
msgid "Source not loaded"
msgstr "源尚未加载"
-#: ../libedataserver/e-client.c:126
+#: ../libedataserver/e-client.c:135
msgid "Source already loaded"
msgstr "源已经加载"
-#. Translators: This means that the EClient does not support offline mode, or
-#. * it's not set to by a user, thus it is unavailable while user is not connected.
-#: ../libedataserver/e-client.c:136
+#. Translators: This means that the EClient does not
+#. * support offline mode, or it's not set to by a user,
+#. * thus it is unavailable while user is not connected.
+#: ../libedataserver/e-client.c:146
msgid "Offline unavailable"
msgstr "离线不可用"
-#: ../libedataserver/e-client.c:158
+#: ../libedataserver/e-client.c:168
msgid "D-Bus error"
msgstr "D-Bus 错误"
@@ -5154,35 +4967,99 @@ msgstr "请输入任务列表“%s”的密码。"
msgid "Please enter the password for account \"%s\"."
msgstr "请输入帐号“%s”的密码。"
-#: ../libedataserver/e-source.c:621
+#: ../libedataserver/e-source.c:627
#, c-format
msgid "Source file is missing a [%s] group"
msgstr "源文件缺少一个 [%s] 组"
-#: ../libedataserver/e-source.c:942
+#: ../libedataserver/e-source.c:949
#, c-format
msgid "Data source '%s' is not removable"
msgstr "数据源“%s”不是可删除的"
-#: ../libedataserver/e-source.c:1028
+#: ../libedataserver/e-source.c:1041
#, c-format
msgid "Data source '%s' is not writable"
msgstr "数据源“%s”不是可写的"
-#: ../libedataserver/e-source.c:1416
+#: ../libedataserver/e-source.c:1559
msgid "Unnamed"
msgstr "未命名"
-#: ../libedataserver/e-source-mail-signature.c:485
+#: ../libedataserver/e-source-mail-signature.c:487
#, c-format
msgid "Signature script must be a local file"
msgstr "签名脚本必须为本地文件"
+#: ../libedataserver/e-source-webdav.c:1553
+#, fuzzy, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid ""
+"SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
+"you wish to accept it?"
+msgstr ""
+"“%s” 的 SSL 证书不受信任。您是否想要接受它？\n"
+"\n"
+"该证书的详细信息：\n"
+"%s"
+
+#: ../libedataserver/e-source-webdav.c:1562
+#, fuzzy, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid ""
+"SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
+"wish to accept it?"
+msgstr ""
+"“%s” 的 SSL 证书不受信任。您是否想要接受它？\n"
+"\n"
+"该证书的详细信息：\n"
+"%s"
+
+#: ../libedataserver/e-source-webdav.c:1571
+#, fuzzy, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid ""
+"SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
+"you wish to accept it?"
+msgstr ""
+"“%s” 的 SSL 证书不受信任。您是否想要接受它？\n"
+"\n"
+"该证书的详细信息：\n"
+"%s"
+
+#: ../libedataserver/e-source-webdav.c:1580
+#, fuzzy, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid ""
+"SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
+"you wish to accept it?"
+msgstr ""
+"“%s” 的 SSL 证书不受信任。您是否想要接受它？\n"
+"\n"
+"该证书的详细信息：\n"
+"%s"
+
#. strptime format of a weekday, a date and a time,
#. * in 12-hour format.
#. strftime format of a weekday, a date and a
#. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1647 ../libedataserver/e-time-utils.c:1946
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1962
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%Y-%m-%d %A%p%I:%M:%S"
@@ -5190,7 +5067,7 @@ msgstr "%Y-%m-%d %A%p%I:%M:%S"
#. * in 24-hour format.
#. strftime format of a weekday, a date and a
#. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1652 ../libedataserver/e-time-utils.c:1937
+#: ../libedataserver/e-time-utils.c:1668 ../libedataserver/e-time-utils.c:1953
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%Y-%m-%d %A %H:%M:%S"
@@ -5198,7 +5075,7 @@ msgstr "%Y-%m-%d %A %H:%M:%S"
#. * in 12-hour format, without seconds.
#. strftime format of a weekday, a date and a
#. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1657 ../libedataserver/e-time-utils.c:1942
+#: ../libedataserver/e-time-utils.c:1673 ../libedataserver/e-time-utils.c:1958
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%Y-%m-%d %A%p%I:%M"
@@ -5206,78 +5083,78 @@ msgstr "%Y-%m-%d %A%p%I:%M"
#. * in 24-hour format, without seconds.
#. strftime format of a weekday, a date and a
#. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1933
+#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1949
msgid "%a %m/%d/%Y %H:%M"
msgstr "%Y-%m-%d %A %H:%M"
#. strptime format of a weekday, a date and a time,
#. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1667
+#: ../libedataserver/e-time-utils.c:1683
msgid "%a %m/%d/%Y %I %p"
msgstr "%Y-%m-%d %A%p%I"
#. strptime format of a weekday, a date and a time,
#. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1672
+#: ../libedataserver/e-time-utils.c:1688
msgid "%a %m/%d/%Y %H"
msgstr "%Y-%m-%d %A %H"
#. strptime format of a weekday and a date.
#. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1675 ../libedataserver/e-time-utils.c:1795
-#: ../libedataserver/e-time-utils.c:1928
+#: ../libedataserver/e-time-utils.c:1691 ../libedataserver/e-time-utils.c:1811
+#: ../libedataserver/e-time-utils.c:1944
msgid "%a %m/%d/%Y"
msgstr "%Y-%m-%d %A"
#. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1682
+#: ../libedataserver/e-time-utils.c:1698
msgid "%m/%d/%Y %I:%M:%S %p"
msgstr "%Y-%m-%d%p%I:%M:%S"
#. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1686
+#: ../libedataserver/e-time-utils.c:1702
msgid "%m/%d/%Y %H:%M:%S"
msgstr "%Y-%m-%d %H:%M:%S"
#. strptime format of a date and a time, in 12-hour format,
#. * without seconds.
-#: ../libedataserver/e-time-utils.c:1691
+#: ../libedataserver/e-time-utils.c:1707
msgid "%m/%d/%Y %I:%M %p"
msgstr "%Y-%m-%d%p%I:%M"
#. strptime format of a date and a time, in 24-hour format,
#. * without seconds.
-#: ../libedataserver/e-time-utils.c:1696
+#: ../libedataserver/e-time-utils.c:1712
msgid "%m/%d/%Y %H:%M"
msgstr "%Y-%m-%d %H:%M"
#. strptime format of a date and a time, in 12-hour format,
#. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1701
+#: ../libedataserver/e-time-utils.c:1717
msgid "%m/%d/%Y %I %p"
msgstr "%Y-%m-%d%p%I"
#. strptime format of a date and a time, in 24-hour format,
#. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1706
+#: ../libedataserver/e-time-utils.c:1722
msgid "%m/%d/%Y %H"
msgstr "%Y-%m-%d %H"
#. strptime format of a weekday and a date.
#. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1709 ../libedataserver/e-time-utils.c:1798
+#: ../libedataserver/e-time-utils.c:1725 ../libedataserver/e-time-utils.c:1814
msgid "%m/%d/%Y"
msgstr "%Y-%m-%d"
#. strptime format for a time of day, in 12-hour format.
#. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1869 ../libedataserver/e-time-utils.c:1990
+#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:2006
msgid "%I:%M:%S %p"
msgstr "%p%I:%M:%S"
#. strptime format for a time of day, in 24-hour format.
#. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1873 ../libedataserver/e-time-utils.c:1982
+#: ../libedataserver/e-time-utils.c:1889 ../libedataserver/e-time-utils.c:1998
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
@@ -5285,25 +5162,25 @@ msgstr "%H:%M:%S"
#. * in 12-hour format.
#. strftime format of a time in 12-hour format,
#. * without seconds.
-#: ../libedataserver/e-time-utils.c:1878 ../libedataserver/e-time-utils.c:1987
+#: ../libedataserver/e-time-utils.c:1894 ../libedataserver/e-time-utils.c:2003
msgid "%I:%M %p"
msgstr "%p%I:%M"
#. strptime format for time of day, without seconds 24-hour format.
#. strftime format of a time in 24-hour format,
#. * without seconds.
-#: ../libedataserver/e-time-utils.c:1882 ../libedataserver/e-time-utils.c:1979
+#: ../libedataserver/e-time-utils.c:1898 ../libedataserver/e-time-utils.c:1995
msgid "%H:%M"
msgstr "%H:%M"
#. strptime format for time of day, without seconds 24-hour format,
#. * and no colon.
-#: ../libedataserver/e-time-utils.c:1886
+#: ../libedataserver/e-time-utils.c:1902
msgid "%H%M"
msgstr "%H%M"
#. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1890
+#: ../libedataserver/e-time-utils.c:1906
msgid "%I %p"
msgstr "%p%I"
@@ -5415,210 +5292,583 @@ msgstr "自动代理配置 URL"
msgid "Where to read automatic proxy configuration from."
msgstr "从何处读取自动代理配置信息。"
-#: ../libedataserverui/e-categories-editor.c:230
-msgid "Currently _used categories:"
-msgstr "当前使用的分类(_U)："
-
-#: ../libedataserverui/e-categories-editor.c:239
-msgid "_Available Categories:"
-msgstr "可用类别(_A)："
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:129
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:365
+#, fuzzy, c-format
+#| msgid "No such source for UID '%s'"
+msgid "No such data source for UID '%s'"
+msgstr "没有 UID “%s”的源"
-#: ../libedataserverui/e-categories-selector.c:325
-msgid "Icon"
-msgstr "图标"
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:141
+#, c-format
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain a password for '%s'"
+msgstr ""
-#: ../libedataserverui/e-categories-selector.c:330
-msgid "Category"
-msgstr "类别"
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:213
+#, fuzzy, c-format
+#| msgid "Invalid GType registered for protocol '%s'"
+msgid "Invalid password for '%s'"
+msgstr "为协议“%s”注册的 GType 无效"
-#: ../libedataserverui/e-category-completion.c:300
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:222
#, c-format
-msgid "Create category \"%s\""
-msgstr "创建分类“%s”"
+msgid "Code: %u - Unexpected response from server"
+msgstr "代码：%u - 来自服务器的意外应答"
-#: ../libedataserverui/e-category-editor.c:137
-msgid "Category Icon"
-msgstr "类别图标"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:243
+#, c-format
+msgid "Failed to parse autodiscover response XML"
+msgstr "无法解析自动发现响应 XML"
-#: ../libedataserverui/e-category-editor.c:141
-msgid "_No Image"
-msgstr "没有图像(_N)"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:252
+#, c-format
+msgid "Failed to find Autodiscover element"
+msgstr "无法找到自动发现元素"
-#: ../libedataserverui/e-category-editor.c:178
-msgid "Category _Name"
-msgstr "类别名称(_N)"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:264
+#, c-format
+msgid "Failed to find Response element"
+msgstr "无法找到响应元素"
-#: ../libedataserverui/e-category-editor.c:186
-msgid "Category _Icon"
-msgstr "类别图标(_I)"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:276
+#, c-format
+msgid "Failed to find Account element"
+msgstr "无法找到帐号元素"
-#: ../libedataserverui/e-category-editor.c:226
-msgid "Category Properties"
-msgstr "类别属性"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:290
+#, c-format
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr "无法在自动发现响应中找到 ASUrl 和 OABUrl"
-#: ../libedataserverui/e-category-editor.c:287
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1251
#, c-format
msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr "配置中已有类别“%s”了。请使用另外一个名称"
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an access token for '%s'"
+msgstr ""
-#: ../libedataserverui/e-name-selector-dialog.c:278
-msgid "Show Contacts"
-msgstr "显示联系人"
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1278
+#, fuzzy, c-format
+#| msgid "Failed to open addressbook at '%s': %s"
+msgid "Failed to obtain an access token for '%s': "
+msgstr "无法打开在“%s”的地址簿：%s"
-#: ../libedataserverui/e-name-selector-dialog.c:300
-msgid "Address B_ook:"
-msgstr "地址簿(_O)："
+#: ../modules/google-backend/module-google-backend.c:192
+#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
+#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+msgid "Calendar"
+msgstr "日历"
-#: ../libedataserverui/e-name-selector-dialog.c:310
-msgid "Cat_egory:"
-msgstr "类别(_E)："
+#: ../modules/google-backend/module-google-backend.c:261
+#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
+#: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
+msgid "Contacts"
+msgstr "联系人"
-#: ../libedataserverui/e-name-selector-dialog.c:332
-msgid "_Search:"
-msgstr "搜索(_S)："
+#: ../modules/trust-prompt/certificate-viewer.c:292
+#, fuzzy
+#| msgid "Cannot add encryption certificate"
+msgid "Not part of certificate"
+msgstr "无法添加加密证书"
-#: ../libedataserverui/e-name-selector-dialog.c:357
-#: ../libedataserverui/e-name-selector-dialog.c:1184
-msgid "Any Category"
-msgstr "任何类别"
+#: ../modules/trust-prompt/certificate-viewer.c:600
+msgid "This certificate has been verified for the following uses:"
+msgstr ""
-#: ../libedataserverui/e-name-selector-dialog.c:359
-msgid "Co_ntacts"
-msgstr "联系人(_N)"
+#: ../modules/trust-prompt/certificate-viewer.c:604
+#: ../modules/trust-prompt/e-asn1-object.c:387
+#, fuzzy
+#| msgid "X.509 Certificate"
+msgid "SSL Client Certificate"
+msgstr "X.509 证书"
-#: ../libedataserverui/e-name-selector-dialog.c:421
-msgid "Search"
-msgstr "搜索"
+#: ../modules/trust-prompt/certificate-viewer.c:609
+#: ../modules/trust-prompt/e-asn1-object.c:391
+#, fuzzy
+#| msgid "X.509 Certificate"
+msgid "SSL Server Certificate"
+msgstr "X.509 证书"
-#: ../libedataserverui/e-name-selector-dialog.c:424
-msgid "Address Book"
-msgstr "地址簿"
+#: ../modules/trust-prompt/certificate-viewer.c:614
+msgid "Email Signer Certificate"
+msgstr ""
-#: ../libedataserverui/e-name-selector-dialog.c:547
-msgid "Select Contacts from Address Book"
-msgstr "从地址簿中选择联系人"
+#: ../modules/trust-prompt/certificate-viewer.c:619
+#, fuzzy
+#| msgid "Cannot add encryption certificate"
+msgid "Email Recipient Certificate"
+msgstr "无法添加加密证书"
-#: ../libedataserverui/e-name-selector-dialog.c:919
-msgid "_Add"
-msgstr "添加(_A)"
+#: ../modules/trust-prompt/certificate-viewer.c:634
+msgid "Issued To"
+msgstr ""
-#: ../libedataserverui/e-name-selector-dialog.c:923
-msgid "_Remove"
-msgstr "删除(_R)"
+#: ../modules/trust-prompt/certificate-viewer.c:635
+#: ../modules/trust-prompt/certificate-viewer.c:641
+msgid "Common Name (CN)"
+msgstr ""
-#: ../libedataserverui/e-name-selector-dialog.c:1099
-#, c-format
-msgid "Error loading address book: %s"
-msgstr "载入地址簿时出错：%s"
+#: ../modules/trust-prompt/certificate-viewer.c:636
+#: ../modules/trust-prompt/certificate-viewer.c:642
+#, fuzzy
+#| msgid "Organization"
+msgid "Organization (O)"
+msgstr "组织"
-#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:3054
-#, c-format
-msgid "E_xpand %s Inline"
-msgstr "嵌入式展开 %s(_X)"
+#: ../modules/trust-prompt/certificate-viewer.c:637
+#: ../modules/trust-prompt/certificate-viewer.c:643
+#, fuzzy
+#| msgid "Organizational Unit"
+msgid "Organizational Unit (OU)"
+msgstr "组织单元"
-#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:3070
-#, c-format
-msgid "Cop_y %s"
-msgstr "复制 %s(_Y)"
+#: ../modules/trust-prompt/certificate-viewer.c:638
+#: ../modules/trust-prompt/e-asn1-object.c:134
+msgid "Serial Number"
+msgstr ""
-#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:3081
-#, c-format
-msgid "C_ut %s"
-msgstr "剪切 %s(_U)"
+#: ../modules/trust-prompt/certificate-viewer.c:640
+msgid "Issued By"
+msgstr ""
-#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:3099
-#, c-format
-msgid "_Edit %s"
-msgstr "编辑 %s(_E)"
+#: ../modules/trust-prompt/certificate-viewer.c:645
+msgid "Validity"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:646
+msgid "Issued On"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:647
+msgid "Expires On"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:649
+msgid "Fingerprints"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:650
+msgid "SHA1 Fingerprint"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:651
+msgid "MD5 Fingerprint"
+msgstr ""
-#: ../libedataserverui/e-name-selector-list.c:532
+#: ../modules/trust-prompt/certificate-viewer.c:653
+msgid "General"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:672
+#, fuzzy
+#| msgid "Certificate import failed"
+msgid "Certificate Hierarchy"
+msgstr "证书导入失败"
+
+#: ../modules/trust-prompt/certificate-viewer.c:676
+#, fuzzy
+#| msgid "Certificate import failed"
+msgid "Certificate Fields"
+msgstr "证书导入失败"
+
+#: ../modules/trust-prompt/certificate-viewer.c:680
+msgid "Field Value"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:682
+msgid "Details"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:95
+msgid "Version"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:110
+msgid "Version 1"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:113
+msgid "Version 2"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:116
+msgid "Version 3"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:192
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:195
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:198
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:201
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:204
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:207
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:234
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:237
+#, fuzzy
+#| msgid "Certificate import failed"
+msgid "Certificate Key Usage"
+msgstr "证书导入失败"
+
+#: ../modules/trust-prompt/e-asn1-object.c:240
+msgid "Netscape Certificate Type"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:243
+#, fuzzy
+#| msgid "Certificate import failed"
+msgid "Certificate Authority Key Identifier"
+msgstr "证书导入失败"
+
+#: ../modules/trust-prompt/e-asn1-object.c:255
#, c-format
-msgid "_Delete %s"
-msgstr "删除 %s(_D)"
+msgid "Object Identifier (%s)"
+msgstr ""
-#: ../libedataserverui/e-passwords.c:126
-msgid "Keyring key is unusable: no user or host name"
-msgstr "密钥环不可用：没有用户或主机名"
+#: ../modules/trust-prompt/e-asn1-object.c:306
+msgid "Algorithm Identifier"
+msgstr ""
-#: ../libedataserverui/e-passwords.c:701
-#: ../libedataserverui/e-passwords-win32.c:614
-msgid "You have the Caps Lock key on."
-msgstr "您打开了 Caps Lock。"
+#: ../modules/trust-prompt/e-asn1-object.c:314
+msgid "Algorithm Parameters"
+msgstr ""
-#: ../libedataserverui/e-passwords.c:821
-#: ../libedataserverui/e-passwords-win32.c:737
-msgid "_Remember this passphrase"
-msgstr "记住此密码句(_R)"
+#: ../modules/trust-prompt/e-asn1-object.c:336
+msgid "Subject Public Key Info"
+msgstr ""
-#: ../libedataserverui/e-passwords.c:822
-#: ../libedataserverui/e-passwords-win32.c:738
-msgid "_Remember this passphrase for the remainder of this session"
-msgstr "本次会话记住此密码句(_R)"
+#: ../modules/trust-prompt/e-asn1-object.c:341
+msgid "Subject Public Key Algorithm"
+msgstr ""
-#: ../libedataserverui/e-passwords.c:827
-#: ../libedataserverui/e-passwords-win32.c:743
-msgid "_Remember this password"
-msgstr "记住此密码(_R)"
+#: ../modules/trust-prompt/e-asn1-object.c:356
+msgid "Subject's Public Key"
+msgstr ""
-#: ../libedataserverui/e-passwords.c:828
-#: ../libedataserverui/e-passwords-win32.c:744
-msgid "_Remember this password for the remainder of this session"
-msgstr "本次会话记住此密码(_R)"
+#: ../modules/trust-prompt/e-asn1-object.c:378
+#: ../modules/trust-prompt/e-asn1-object.c:428
+#, fuzzy
+#| msgid "Unable to process spool folder"
+msgid "Error: Unable to process extension"
+msgstr "无法处理脱机文件夹"
-#: ../libedataserverui/e-source-selector-dialog.c:224
-msgid "_Destination"
-msgstr "目的(_D)"
+#: ../modules/trust-prompt/e-asn1-object.c:395
+#, fuzzy
+#| msgid "Email 1"
+msgid "Email"
+msgstr "电子邮件 1"
-#: ../libedataserverui/e-source-selector-dialog.c:326
-msgid "Select destination"
-msgstr "选择目的地"
+#: ../modules/trust-prompt/e-asn1-object.c:399
+#: ../modules/trust-prompt/e-asn1-object.c:411
+msgid "Object Signer"
+msgstr ""
-#: ../modules/google-backend/module-google-backend.c:118
-#: ../modules/yahoo-backend/module-yahoo-backend.c:200
-msgid "Calendar"
+#: ../modules/trust-prompt/e-asn1-object.c:403
+#, fuzzy
+#| msgid "Certificate import failed"
+msgid "SSL Certificate Authority"
+msgstr "证书导入失败"
+
+#: ../modules/trust-prompt/e-asn1-object.c:407
+msgid "Email Certificate Authority"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:436
+#, fuzzy
+#| msgid "Signing message"
+msgid "Signing"
+msgstr "签名消息"
+
+#: ../modules/trust-prompt/e-asn1-object.c:440
+msgid "Non-repudiation"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:444
+msgid "Key Encipherment"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:448
+msgid "Data Encipherment"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:452
+msgid "Key Agreement"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:456
+#, fuzzy
+#| msgid "Certificate import failed"
+msgid "Certificate Signer"
+msgstr "证书导入失败"
+
+#: ../modules/trust-prompt/e-asn1-object.c:460
+msgid "CRL Signer"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:509
+msgid "Critical"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:511
+#: ../modules/trust-prompt/e-asn1-object.c:514
+msgid "Not Critical"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:535
+msgid "Extensions"
+msgstr ""
+
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself. You probably do not need to
+#. * change this string, unless changing the order of
+#. * name and value. As a result example:
+#. * "OU = VeriSign Trust Network"
+#: ../modules/trust-prompt/e-asn1-object.c:615
+#, c-format
+msgid "%s = %s"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:658
+#, fuzzy
+#| msgid "X.509 Certificate"
+msgid "Certificate"
+msgstr "X.509 证书"
+
+#: ../modules/trust-prompt/e-asn1-object.c:674
+#: ../modules/trust-prompt/e-asn1-object.c:812
+#, fuzzy
+#| msgid "Signature algorithm unknown"
+msgid "Certificate Signature Algorithm"
+msgstr "签名算法未知"
+
+#: ../modules/trust-prompt/e-asn1-object.c:683
+msgid "Issuer"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:714
+msgid "Subject"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:738
+#, fuzzy
+#| msgid "Unique ID"
+msgid "Issuer Unique ID"
+msgstr "唯一的 ID"
+
+#: ../modules/trust-prompt/e-asn1-object.c:757
+#, fuzzy
+#| msgid "Unique ID"
+msgid "Subject Unique ID"
+msgstr "唯一的 ID"
+
+#: ../modules/trust-prompt/e-asn1-object.c:818
+#, fuzzy
+#| msgid "Certificate import failed"
+msgid "Certificate Signature Value"
+msgstr "证书导入失败"
+
+#: ../modules/trust-prompt/module-trust-prompt.c:201
+#, fuzzy
+#| msgid "Signing certificate not found"
+msgid "The signing certificate authority is not known."
+msgstr "签名证书找不到"
+
+#: ../modules/trust-prompt/module-trust-prompt.c:203
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+
+#: ../modules/trust-prompt/module-trust-prompt.c:205
+msgid "The certificate's activation time is still in the future."
+msgstr ""
+
+#: ../modules/trust-prompt/module-trust-prompt.c:207
+#, fuzzy
+#| msgid "The referenced credentials have expired."
+msgid "The certificate has expired."
+msgstr "引用的证书已过期。"
+
+#: ../modules/trust-prompt/module-trust-prompt.c:209
+msgid ""
+"The certificate has been revoked according to the connection's certificate "
+"revocation list."
+msgstr ""
+
+#: ../modules/trust-prompt/module-trust-prompt.c:211
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:162
+#, fuzzy
+#| msgid "Signing certificate not trusted"
+msgid "Certificate trust..."
+msgstr "签名证书不可信"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:163
+#, fuzzy
+#| msgid "X.509 Certificate"
+msgid "_View Certificate"
+msgstr "X.509 证书"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:164
+msgid "_Reject"
+msgstr "拒绝(_R)"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:165
+msgid "Accept _Temporarily"
+msgstr "临时接受(_T)"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:166
+msgid "_Accept Permanently"
+msgstr "永久接受(_A)"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:203
+#, fuzzy, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
+msgstr ""
+"“%s” 的 SSL 证书不受信任。您是否想要接受它？\n"
+"\n"
+"该证书的详细信息：\n"
+"%s"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:209
+msgid "Detailed information about the certificate:"
+msgstr ""
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:223
+msgid "Issuer:"
+msgstr ""
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:224
+msgid "Subject:"
+msgstr ""
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:225
+msgid "Fingerprint:"
+msgstr ""
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:226
+msgid "Reason:"
+msgstr ""
+
+#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2
+msgid "Integrate your calendars"
+msgstr ""
+
+#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:2
+msgid "Integrate your contacts"
+msgstr ""
+
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:257
+msgid "Signon service did not return a secret"
+msgstr ""
+
+#: ../modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:1
+#, fuzzy
+#| msgid "Connection to Server"
+msgid "Evolution Data Server"
+msgstr "连接服务器"
+
+#: ../modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:2
+msgid "Required to have EDS appear in UOA"
+msgstr ""
+
+#: ../modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1
+#, fuzzy
+#| msgid "Calendar"
+msgid "Google Calendar"
msgstr "日历"
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:223
-#, c-format
-msgid "Code: %u - Unexpected response from server"
-msgstr "代码：%u - 来自服务器的意外应答"
+#: ../modules/ubuntu-online-accounts/google-contacts.service.in.in.h:1
+#, fuzzy
+#| msgctxt "CategoryName"
+#| msgid "Hot Contacts"
+msgid "Google Contacts"
+msgstr "亲密联系人"
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:244
-#, c-format
-msgid "Failed to parse autodiscover response XML"
-msgstr "无法解析自动发现响应 XML"
+#: ../modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1
+#, fuzzy
+#| msgid "Mailer"
+msgid "GMail"
+msgstr "邮件程序"
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:253
-#, c-format
-msgid "Failed to find Autodiscover element"
-msgstr "无法找到自动发现元素"
+#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:1
+#, fuzzy
+#| msgid "Mailer"
+msgid "Mail"
+msgstr "邮件程序"
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:265
-#, c-format
-msgid "Failed to find Response element"
-msgstr "无法找到响应元素"
+#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:2
+msgid "Integrate your mailboxes"
+msgstr ""
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:277
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:971
#, c-format
-msgid "Failed to find Account element"
-msgstr "无法找到帐号元素"
+msgid ""
+"Cannot find a corresponding account service in the accounts database from "
+"which to obtain an access token for '%s'"
+msgstr ""
-#. TODO: more specific
-#: ../modules/online-accounts/goaewsclient.c:291
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:79
#, c-format
-msgid "Failed to find ASUrl and OABUrl in autodiscover response"
-msgstr "无法在自动发现响应中找到 ASUrl 和 OABUrl"
+msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
+msgstr ""
+
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:96
+#, fuzzy
+#| msgid "Error parsing filter: %s: %s"
+msgid "Error parsing response as JSON: "
+msgstr "解析过滤规则出错：%s：%s"
+
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:112
+msgid "Didn't find email member in JSON data"
+msgstr ""
+
+#: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
+#, fuzzy
+#| msgid "Calendar"
+msgid "Yahoo! Calendar"
+msgstr "日历"
+
+#: ../modules/ubuntu-online-accounts/yahoo-mail.service.in.in.h:1
+msgid "Yahoo! Mail"
+msgstr ""
#: ../modules/yahoo-backend/module-yahoo-backend.c:227
msgid "Tasks"
@@ -5626,6 +5876,7 @@ msgstr "任务"
#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47
#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51
+#: ../services/evolution-user-prompter/evolution-user-prompter.c:31
msgid "Keep running after the last client is closed"
msgstr "关闭最后的客户端后继续运行"
@@ -5634,22 +5885,387 @@ msgstr "关闭最后的客户端后继续运行"
msgid "Wait running until at least one client is connected"
msgstr "等待到至少有一个客户端连接"
-#: ../tests/libedataserverui/evolution-source-viewer.c:620
-msgid "Evolution Source Viewer"
-msgstr "Evolution 源码查看器"
+#: ../services/evolution-source-registry/builtin/birthdays.source.in.h:1
+msgid "Birthdays & Anniversaries"
+msgstr "生日与周年纪念日提醒"
-#. Translators: The name that is displayed in the user interface
-#: ../tests/libedataserverui/evolution-source-viewer.c:650
-msgid "Display Name"
-msgstr "显示名称"
+#: ../services/evolution-source-registry/builtin/caldav-stub.source.in.h:1
+msgid "CalDAV"
+msgstr "CalDAV"
-#: ../tests/libedataserverui/evolution-source-viewer.c:659
-msgid "Flags"
-msgstr "标志"
+#: ../services/evolution-source-registry/builtin/google-stub.source.in.h:1
+msgid "Google"
+msgstr "Google"
+
+#: ../services/evolution-source-registry/builtin/ldap-stub.source.in.h:1
+msgid "On LDAP Servers"
+msgstr "在 LDAP 服务器上"
+
+#: ../services/evolution-source-registry/builtin/local.source.in.h:1
+#: ../services/evolution-source-registry/builtin/local-stub.source.in.h:1
+msgid "On This Computer"
+msgstr "在此计算机中"
+
+#: ../services/evolution-source-registry/builtin/vfolder.source.in.h:1
+msgid "Search Folders"
+msgstr "搜索文件夹"
+
+#: ../services/evolution-source-registry/builtin/weather-stub.source.in.h:1
+msgid "Weather"
+msgstr "天气"
+
+#: ../services/evolution-source-registry/builtin/webcal-stub.source.in.h:1
+msgid "On The Web"
+msgstr "在网上"
+
+#: ../services/evolution-source-registry/builtin/webdav-stub.source.in.h:1
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: ../services/evolution-user-prompter/prompt-user-gtk.c:122
+msgid "_Dismiss"
+msgstr ""
+
+#~ msgid "Failed to build summary for an address book %s"
+#~ msgstr "为地址簿 %s 创建摘要失败"
+
+#~ msgid "Creating new contact…"
+#~ msgstr "创建新的联系人..."
+
+#~ msgid "Deleting contact…"
+#~ msgstr "删除联系人..."
+
+#~ msgid "Modifying contact…"
+#~ msgstr "修改联系人..."
+
+#~ msgid "Using Distinguished Name (DN)"
+#~ msgstr "使用已识别的姓名 (DN)"
+
+#~ msgid "Using Email Address"
+#~ msgstr "使用电子邮件地址"
+
+#~ msgid "Failed to run book factory"
+#~ msgstr "运行地址簿工厂失败"
+
+#~ msgid "Cannot get connection to view"
+#~ msgstr "无法获取到视图的连接"
+
+#~ msgid "Cannot process, book backend is opening"
+#~ msgstr "无法进行，地址簿后端正在打开"
+
+#~ msgid "Empty query: "
+#~ msgstr "空的查询："
+
+#~ msgid "Cannot remove book: "
+#~ msgstr "无法删除地址簿："
+
+#~ msgid "Cannot get backend property: "
+#~ msgstr "无法获取后端属性："
+
+#~ msgid "Cannot set backend property: "
+#~ msgstr "无法发送后端属性："
+
+#~ msgid "Invalid backend name '%s' in source '%s'"
+#~ msgstr "在源文件“%2$s”中的后端名称“%1$s”无效"
+
+#~ msgid ""
+#~ "Failed to connect to a server using SSL. One possible reason is an "
+#~ "invalid certificate being used by the server. If this is expected, like "
+#~ "self-signed certificate being used on the server, then disable "
+#~ "certificate validity tests by selecting 'Ignore invalid SSL certificate' "
+#~ "option in Properties"
+#~ msgstr ""
+#~ "无法使用 SSL 连接到服务器。一个可能的原因是服务器使用了无效的证书。如果这"
+#~ "在您意料之中，如服务器使用了自我签名的证书，可选择属性里的“忽略无效 SSL 证"
+#~ "书”选项来禁用证书有效性测试"
+
+#~ msgid "Cannot create local store"
+#~ msgstr "无法创建本地存储"
+
+#~ msgid "Could not create synch slave thread"
+#~ msgstr "无法创建同步从属线程"
+
+#~ msgid "Failed to run calendar factory"
+#~ msgstr "运行日历工厂失败"
+
+#~ msgid "Cannot process, calendar backend is opening"
+#~ msgstr "无法进行，日历后端正在打开"
+
+#~ msgid "Cannot remove calendar: "
+#~ msgstr "无法移除日历："
+
+#~ msgid "Cannot retrieve backend property: "
+#~ msgstr "无法获取后端属性："
+
+#~ msgid "Could not get calendar view path: "
+#~ msgstr "无法获取日历视图路径："
+
+#~ msgid "Invalid call"
+#~ msgstr "无效调用"
+
+#~ msgid ""
+#~ " Issuer: %s\n"
+#~ " Subject: %s\n"
+#~ " Fingerprint: %s\n"
+#~ " Signature: %s"
+#~ msgstr ""
+#~ " 提交者： %s\n"
+#~ " 主题： %s\n"
+#~ " 指纹： %s\n"
+#~ " 签名： %s"
+
+#~ msgid "GOOD"
+#~ msgstr "好"
+
+#~ msgid "BAD"
+#~ msgstr "坏"
+
+#~ msgid ""
+#~ "Certificate problem: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "证书问题：%s\n"
+#~ "发行者：%s"
+
+#~ msgid ""
+#~ "Bad certificate domain: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "无效的证书域名：%s\n"
+#~ "发行者：%s"
+
+#~ msgid ""
+#~ "Certificate expired: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "证书过期：%s\n"
+#~ "发行者：%s"
+
+#~ msgid ""
+#~ "Certificate revocation list expired: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "证书撤销列表已过期：%s\n"
+#~ "发行者：%s"
+
+#~ msgid "No output stream"
+#~ msgstr "没有输出流"
+
+#~ msgid "No input stream"
+#~ msgstr "没有输入流"
+
+#~ msgid "Server unexpectedly disconnected: %s"
+#~ msgstr "服务器意外地中止了连接：%s"
+
+#~ msgid ""
+#~ "Alert from IMAP server %s %s in folder %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "来自 IMAP 服务器 %s %s 的提醒(%s 文件夹)：\n"
+#~ "%s"
+
+#~ msgid "Unexpected response from IMAP server: %s"
+#~ msgstr "来自 IMAP 服务器的意外应答：%s"
+
+#~ msgid "IMAP command failed: %s"
+#~ msgstr "IMAP 命令失败：%s"
+
+#~ msgid "Server response ended too soon."
+#~ msgstr "服务器应答结束太快。"
+
+#~ msgid "IMAP server response did not contain %s information"
+#~ msgstr "IMAP 服务器应答不含有 %s 信息"
+
+#~ msgid "Unexpected OK response from IMAP server: %s"
+#~ msgstr "来自 IMAP 服务器意外的 OK 应答：%s"
+
+#~ msgid "Always check for _new mail in this folder"
+#~ msgstr "总是检查此文件夹中的新邮件(_N)"
+
+#~ msgid "Could not create directory %s: %s"
+#~ msgstr "无法创建目录 %s：%s"
-#: ../tests/libedataserverui/evolution-source-viewer.c:711
-msgid "Identity"
-msgstr "身份"
+#~ msgid "Could not load summary for %s"
+#~ msgstr "无法为 %s 载入概要"
+
+#~ msgid "Scanning for changed messages in %s"
+#~ msgstr "扫描 %s 中更改了的消息"
+
+#~ msgid "Fetching summary information for new messages in %s"
+#~ msgstr "从 %s 中的新消息中获取概要信息"
+
+#~ msgid "Incomplete server response: no information provided for message %d"
+#~ msgstr "不完整的服务器响应：没有为第 %d 封信提供信息"
+
+#~ msgid "Incomplete server response: no UID provided for message %d"
+#~ msgstr "不完整的服务器响应：没有为第 %d 封信提供 UID"
+
+#~ msgid "Could not find message body in FETCH response."
+#~ msgstr "无法在 FETCH 应答中找到信体。"
+
+#~ msgid "Could not open cache directory: "
+#~ msgstr "无法打开缓存目录："
+
+#~ msgid "Failed to cache message %s: %s"
+#~ msgstr "缓存消息 %s 失败：%s"
+
+#~ msgid "Failed to cache message %s: "
+#~ msgstr "缓存消息 %s 失败："
+
+#~ msgid "Failed to cache %s: "
+#~ msgstr "缓存 %s 失败："
+
+#~ msgid "Names_pace:"
+#~ msgstr "命名空间(_P)："
+
+#~ msgid "IMAP default port"
+#~ msgstr "IMAP 默认端口"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "Retrieving list of folders at '%s'"
+#~ msgstr "正在获取“%s”的文件夹列表"
+
+#~ msgid "Server unexpectedly disconnected"
+#~ msgstr "服务器意外断开 "
+
+#~ msgid "Server unexpectedly disconnected: "
+#~ msgstr "服务器意外断开："
+
+#~ msgid "Cannot create folder: %s: Folder name cannot contain a dot"
+#~ msgstr "无法创建文件夹：%s：文件夹名称不能包含点"
+
+#~ msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+#~ msgstr "无法重命名文件夹：%s：文件夹名称不能包含点"
+
+#~ msgid "Could not connect to POP server %s"
+#~ msgstr "无法连接到 POP 服务器 %s"
+
+#~ msgid "Keyring operation was cancelled"
+#~ msgstr "密钥环操作已取消"
+
+#~ msgid "Currently _used categories:"
+#~ msgstr "当前使用的分类(_U)："
+
+#~ msgid "_Available Categories:"
+#~ msgstr "可用类别(_A)："
+
+#~ msgid "Icon"
+#~ msgstr "图标"
+
+#~ msgid "Category"
+#~ msgstr "类别"
+
+#~ msgid "Create category \"%s\""
+#~ msgstr "创建分类“%s”"
+
+#~ msgid "Category Icon"
+#~ msgstr "类别图标"
+
+#~ msgid "_No Image"
+#~ msgstr "没有图像(_N)"
+
+#~ msgid "Category _Name"
+#~ msgstr "类别名称(_N)"
+
+#~ msgid "Category _Icon"
+#~ msgstr "类别图标(_I)"
+
+#~ msgid "Category Properties"
+#~ msgstr "类别属性"
+
+#~ msgid ""
+#~ "There is already a category '%s' in the configuration. Please use another "
+#~ "name"
+#~ msgstr "配置中已有类别“%s”了。请使用另外一个名称"
+
+#~ msgid "Show Contacts"
+#~ msgstr "显示联系人"
+
+#~ msgid "Address B_ook:"
+#~ msgstr "地址簿(_O)："
+
+#~ msgid "Cat_egory:"
+#~ msgstr "类别(_E)："
+
+#~ msgid "_Search:"
+#~ msgstr "搜索(_S)："
+
+#~ msgid "Any Category"
+#~ msgstr "任何类别"
+
+#~ msgid "Co_ntacts"
+#~ msgstr "联系人(_N)"
+
+#~ msgid "Search"
+#~ msgstr "搜索"
+
+#~ msgid "Address Book"
+#~ msgstr "地址簿"
+
+#~ msgid "Select Contacts from Address Book"
+#~ msgstr "从地址簿中选择联系人"
+
+#~ msgid "_Add"
+#~ msgstr "添加(_A)"
+
+#~ msgid "_Remove"
+#~ msgstr "删除(_R)"
+
+#~ msgid "Error loading address book: %s"
+#~ msgstr "载入地址簿时出错：%s"
+
+#~ msgid "E_xpand %s Inline"
+#~ msgstr "嵌入式展开 %s(_X)"
+
+#~ msgid "Cop_y %s"
+#~ msgstr "复制 %s(_Y)"
+
+#~ msgid "C_ut %s"
+#~ msgstr "剪切 %s(_U)"
+
+#~ msgid "_Edit %s"
+#~ msgstr "编辑 %s(_E)"
+
+#~ msgid "_Delete %s"
+#~ msgstr "删除 %s(_D)"
+
+#~ msgid "Keyring key is unusable: no user or host name"
+#~ msgstr "密钥环不可用：没有用户或主机名"
+
+#~ msgid "You have the Caps Lock key on."
+#~ msgstr "您打开了 Caps Lock。"
+
+#~ msgid "_Remember this passphrase"
+#~ msgstr "记住此密码句(_R)"
+
+#~ msgid "_Remember this passphrase for the remainder of this session"
+#~ msgstr "本次会话记住此密码句(_R)"
+
+#~ msgid "_Remember this password"
+#~ msgstr "记住此密码(_R)"
+
+#~ msgid "_Remember this password for the remainder of this session"
+#~ msgstr "本次会话记住此密码(_R)"
+
+#~ msgid "_Destination"
+#~ msgstr "目的(_D)"
+
+#~ msgid "Select destination"
+#~ msgstr "选择目的地"
+
+#~ msgid "Evolution Source Viewer"
+#~ msgstr "Evolution 源码查看器"
+
+#~ msgid "Display Name"
+#~ msgstr "显示名称"
+
+#~ msgid "Flags"
+#~ msgstr "标志"
+
+#~ msgid "Identity"
+#~ msgstr "身份"
#~ msgid "Authenticating with the server…"
#~ msgstr "正在与服务器进行认证..."
@@ -5697,9 +6313,6 @@ msgstr "身份"
#~ msgid "Updating %s folder"
#~ msgstr "更新 %s 文件夹"
-#~ msgid "Connection to Server"
-#~ msgstr "连接服务器"
-
#~ msgid "_Use custom command to connect to server"
#~ msgstr "使用自定义命令连接到服务器(_U)"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
