[evolution-data-server/gnome-3-6] Updated Chinese simplified translation
- From: Wylmer Wang <wylmerwang src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server/gnome-3-6] Updated Chinese simplified translation
- Date: Fri, 12 Jul 2013 14:56:14 +0000 (UTC)
commit eeea343e094a2b1efccce572e277dedc03536444
Author: tuhaihe <1132321739qq gmail com>
Date: Fri Jul 12 22:55:52 2013 +0800
Updated Chinese simplified translation
po/zh_CN.po | 3530 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 1997 insertions(+), 1533 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 867872b..d21c7e8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -21,216 +21,278 @@ 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: 2012-02-23 12:45+0000\n"
-"PO-Revision-Date: 2012-03-20 16:08+0000\n"
-"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
+"POT-Creation-Date: 2013-02-28 18:09+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"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
-"Language: zh_CN\n"
+"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../addressbook/backends/file/e-book-backend-file.c:129
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:939
+#: ../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:441
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:548
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:577
-#: ../calendar/backends/http/e-cal-backend-http.c:424
-#: ../calendar/libecal/e-cal.c:4596 ../calendar/libecal/e-cal-client.c:150
-#: ../camel/providers/imap/camel-imap-command.c:515
-#: ../camel/providers/imap/camel-imap-store.c:464
-#: ../camel/providers/imapx/camel-imapx-command.c:538
-#: ../libedataserver/e-client.c:164
+#: ../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:154
+#: ../addressbook/backends/file/e-book-backend-file.c:143
#, c-format
msgid "Failed to remove file '%s': %s"
msgstr "删除文件“%s”失败：%s"
-#: ../addressbook/backends/file/e-book-backend-file.c:177
+#: ../addressbook/backends/file/e-book-backend-file.c:167
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:627
#, c-format
msgid "Failed to make directory %s: %s"
msgstr "创建目录“%s”失败：%s"
-#: ../addressbook/backends/file/e-book-backend-file.c:472
+#: ../addressbook/backends/file/e-book-backend-file.c:467
#, c-format
msgid "Failed to create hardlink for resource '%s': %s"
msgstr "创建资源“%s”的硬链接失败：%s"
-#: ../addressbook/backends/file/e-book-backend-file.c:574
-#: ../addressbook/backends/file/e-book-backend-file.c:1129
+#: ../addressbook/backends/file/e-book-backend-file.c:569
+#: ../addressbook/backends/file/e-book-backend-file.c:1147
msgid "No UID in the contact"
msgstr "联系人没有 UID"
-#: ../addressbook/backends/file/e-book-backend-file.c:1563
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:516
+#: ../addressbook/backends/file/e-book-backend-file.c:1596
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:519
msgid "Loading..."
msgstr "正在载入..."
-#: ../addressbook/backends/file/e-book-backend-file.c:1566
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4870
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:518
+#: ../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
msgid "Searching..."
msgstr "正在搜索..."
-#: ../addressbook/backends/file/e-book-backend-file.c:2108
+#: ../addressbook/backends/file/e-book-backend-file.c:2150
#, c-format
msgid "Failed to build summary for an address book %s"
msgstr "为地址簿 %s 创建摘要失败"
#. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:874
+#: ../addressbook/backends/google/e-book-backend-google.c:648
msgid "Querying for updated contacts…"
msgstr "查询更新的联系人..."
-#: ../addressbook/backends/google/e-book-backend-google.c:923
-#: ../addressbook/libebook/e-book.c:3531 ../calendar/libecal/e-cal.c:1380
-#: ../libedataserver/e-client.c:1918
-msgid "Personal"
-msgstr "个人"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:925
-msgid "Friends"
-msgstr "朋友"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:927
-msgid "Family"
-msgstr "家人"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:929
-msgid "Coworkers"
-msgstr "同事"
-
#. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1019
+#: ../addressbook/backends/google/e-book-backend-google.c:785
msgid "Querying for updated groups…"
msgstr "查询更新的组..."
-#: ../addressbook/backends/google/e-book-backend-google.c:1424
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1639
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:295
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:326
+#: ../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
msgid "The backend does not support bulk additions"
msgstr "后端不支持批量添加"
#. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1451
+#: ../addressbook/backends/google/e-book-backend-google.c:1243
msgid "Creating new contact…"
msgstr "创建新的联系人..."
-#: ../addressbook/backends/google/e-book-backend-google.c:1540
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:327
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:433
+#: ../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:1568
+#: ../addressbook/backends/google/e-book-backend-google.c:1362
msgid "Deleting contact…"
msgstr "删除联系人..."
-#: ../addressbook/backends/google/e-book-backend-google.c:1818
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2296
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:375
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:487
+#: ../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
msgid "The backend does not support bulk modifications"
msgstr "后端不支持批量修改"
#. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1851
+#: ../addressbook/backends/google/e-book-backend-google.c:1654
msgid "Modifying contact…"
msgstr "修改联系人..."
-#: ../addressbook/backends/google/e-book-backend-google.c:2058
+#: ../addressbook/backends/google/e-book-backend-google.c:1825
msgid "Loading…"
msgstr "正在载入..."
-#: ../addressbook/backends/google/e-book-backend-google.c:2187
-msgid "Authenticating with the server…"
-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
+msgid "Personal"
+msgstr "个人"
+
+#. System Group: My Contacts
+#: ../addressbook/backends/google/e-book-google-utils.c:1569
+msgid "Friends"
+msgstr "朋友"
+
+#. System Group: Friends
+#: ../addressbook/backends/google/e-book-google-utils.c:1570
+msgid "Family"
+msgstr "家人"
+
+#. System Group: Family
+#: ../addressbook/backends/google/e-book-google-utils.c:1571
+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:177
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:165
msgid "Not connected"
msgstr "未连接。"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:797
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:795
msgid "Using Distinguished Name (DN)"
msgstr "使用已识别的姓名 (DN)"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:800
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:798
msgid "Using Email Address"
msgstr "使用电子邮件地址"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1071
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:971
+msgid "Failed to bind using either v3 or v2 binds"
+msgstr "无法使用 v3 或 v2 绑定"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1094
msgid "Reconnecting to LDAP server..."
msgstr "正在重新连接 LDAP 服务器..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1200
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1224
msgid "Invalid DN syntax"
msgstr "无效 DN 语法"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1240
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4882
+#, 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:1869
+#: ../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:2318
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2054
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2449
+#, 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
+#, 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:4720
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2735
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2955
+#, c-format
+msgid "%s: Unhandled search result type %d returned"
+msgstr "%s：返回了未处理的搜索结果类型 %d"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4831
msgid "Receiving LDAP search results..."
msgstr "正在接收 LDAP 的搜索结果..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4891
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5007
msgid "Error performing search"
msgstr "执行搜索错误"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5012
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5130
#, c-format
msgid "Downloading contacts (%d)... "
msgstr "正在下载联系人(%d)..."
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
+#: ../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/libebook/e-book.c:3198
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:468
#, c-format
-msgid "%s: there was no source for UID '%s' stored in GConf."
-msgstr "%s：GConf 中没有存储 UID“%s”的源。"
+msgid "DELETE failed with HTTP status %d"
+msgstr "DELETE 失败，HTTP 状态码：%d"
-#: ../addressbook/libebook/e-book.c:3514 ../calendar/libecal/e-cal.c:1360
-#: ../libedataserver/e-client.c:1913
-msgid "On This Computer"
-msgstr "在此计算机中"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:534
+msgid "Contact on server changed -> not modifying"
+msgstr "服务器上的联系人已更改 -> 将不做更改"
-#: ../addressbook/libebook/e-book.c:3640
-#: ../addressbook/libebook/e-book-client.c:702
-#: ../addressbook/libedata-book/e-data-book.c:322
-msgid "Address book does not exist"
-msgstr "地址簿不存在"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:543
+#, c-format
+msgid "Modify contact failed with HTTP status: %d (%s)"
+msgstr "修改联系人失败，HTTP 状态码：%d(%s)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:950
+msgid "Loading Addressbook summary..."
+msgstr "正在加载地址簿概要..."
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:969
+#, 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
+msgid "No response body in webdav PROPFIND result"
+msgstr "在 webdav PROPFIND 结果中无应答主体"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1026
+#, c-format
+msgid "Loading Contacts (%d%%)"
+msgstr "正在加载联系人(%d%%)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1354
+msgid "Cannot transform SoupURI to string"
+msgstr "无法将 SoupURI 转为字符串"
#: ../addressbook/libebook/e-book-client.c:95
msgid "No such book"
msgstr "没有该地址簿"
#: ../addressbook/libebook/e-book-client.c:97
-#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../addressbook/libedata-book/e-data-book.c:306
msgid "Contact not found"
msgstr "找不到联系人"
#: ../addressbook/libebook/e-book-client.c:99
-#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../addressbook/libedata-book/e-data-book.c:307
msgid "Contact ID already exists"
msgstr "联系人 ID 已经存在"
@@ -239,42 +301,16 @@ msgid "No such source"
msgstr "没有该源"
#: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:332
+#: ../addressbook/libedata-book/e-data-book.c:323
msgid "No space"
msgstr "没有空间"
-#: ../addressbook/libebook/e-book-client.c:515
+#: ../addressbook/libebook/e-book-client.c:489
msgid "Failed to run book factory"
msgstr "运行地址簿工厂失败"
-#: ../addressbook/libebook/e-book-client.c:525
-#: ../addressbook/libedata-book/e-data-book-factory.c:196
-#: ../addressbook/libedata-book/e-data-book-factory.c:228
-#: ../calendar/libecal/e-cal-client.c:613
-#: ../calendar/libedata-cal/e-data-cal-factory.c:213
-#: ../calendar/libedata-cal/e-data-cal-factory.c:242
-#, c-format
-msgid "Invalid source"
-msgstr "无效的源"
-
-#: ../addressbook/libebook/e-book-client.c:627
-#: ../calendar/libecal/e-cal-client.c:728
-#, c-format
-msgid "Incorrect uri '%s'"
-msgstr "不正确的 URI “%s”"
-
-#: ../addressbook/libebook/e-book-client.c:665
-msgid "Failed to find system book"
-msgstr "找不到系统地址簿"
-
-#: ../addressbook/libebook/e-book-client.c:774
-#: ../calendar/libecal/e-cal-client.c:881
-#, c-format
-msgid "There was no source for UID '%s' stored in a source list."
-msgstr "源列表中没有存储对应 UID “%s”的源。"
-
-#: ../addressbook/libebook/e-book-client.c:2566
-#: ../calendar/libecal/e-cal-client.c:4483
+#: ../addressbook/libebook/e-book-client.c:2272
+#: ../calendar/libecal/e-cal-client.c:4632
msgid "Cannot get connection to view"
msgstr "无法获取到视图的连接"
@@ -284,798 +320,854 @@ msgid "Unique ID"
msgstr "唯一的 ID"
#. FILE_AS is not really a structured field - we use a getter/setter
-#. * so we can generate its value if necessary in the getter
-#: ../addressbook/libebook/e-contact.c:124
+#. * 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
msgid "File Under"
msgstr "存档于"
#. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:126
-msgid "Book URI"
-msgstr "地址簿 URI"
+#: ../addressbook/libebook/e-contact.c:128
+msgid "Book UID"
+msgstr "地址簿 UID"
#. Name fields
#. 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:132
+#: ../addressbook/libebook/e-contact.c:134
msgid "Full Name"
msgstr "全名"
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
msgid "Given Name"
msgstr "名"
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:136
msgid "Family Name"
msgstr "姓"
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:137
msgid "Nickname"
msgstr "昵称"
#. Email fields
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
msgid "Email 1"
msgstr "电子邮件 1"
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:141
msgid "Email 2"
msgstr "电子邮件 2"
-#: ../addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook/e-contact.c:142
msgid "Email 3"
msgstr "电子邮件 3"
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
msgid "Email 4"
msgstr "电子邮件 4"
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
msgid "Mailer"
msgstr "邮件程序"
#. Address Labels
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
msgid "Home Address Label"
msgstr "家庭地址标签"
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
msgid "Work Address Label"
msgstr "工作地址标签"
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
msgid "Other Address Label"
msgstr "其它地址标签"
#. Phone fields
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
msgid "Assistant Phone"
msgstr "助手电话"
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
msgid "Business Phone"
msgstr "商务电话"
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
msgid "Business Phone 2"
msgstr "商务电话 2"
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
msgid "Business Fax"
msgstr "商务传真"
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
msgid "Callback Phone"
msgstr "回拨电话"
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
msgid "Car Phone"
msgstr "车载电话"
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
msgid "Company Phone"
msgstr "公司电话"
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
msgid "Home Phone"
msgstr "家庭电话"
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:161
msgid "Home Phone 2"
msgstr "家庭电话 2"
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
msgid "Home Fax"
msgstr "家庭传真"
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:163
msgid "ISDN"
msgstr "ISDN"
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:164
msgid "Mobile Phone"
msgstr "移动电话"
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
msgid "Other Phone"
msgstr "其它电话"
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
msgid "Other Fax"
msgstr "其它传真"
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
msgid "Pager"
msgstr "寻呼机"
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
msgid "Primary Phone"
msgstr "主要电话"
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
msgid "Radio"
msgstr "收音机"
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
msgid "Telex"
msgstr "电传"
#. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:172
msgid "TTY"
msgstr "TTY"
#. Organizational fields
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
msgid "Organization"
msgstr "组织"
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:176
msgid "Organizational Unit"
msgstr "组织单元"
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:177
msgid "Office"
msgstr "办公室"
-#: ../addressbook/libebook/e-contact.c:176
+#: ../addressbook/libebook/e-contact.c:178
msgid "Title"
msgstr "头衔"
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook/e-contact.c:179
msgid "Role"
msgstr "角色"
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:180
msgid "Manager"
msgstr "经理"
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
msgid "Assistant"
msgstr "助手"
#. Web fields
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
msgid "Homepage URL"
msgstr "个人主页 URL"
-#: ../addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:185
msgid "Weblog URL"
msgstr "网络日记 URL"
#. Contact categories
-#: ../addressbook/libebook/e-contact.c:186
-#: ../libedataserverui/e-categories-dialog.c:88
+#: ../addressbook/libebook/e-contact.c:188
+#: ../libedataserverui/e-categories-dialog.c:90
msgid "Categories"
msgstr "类别"
#. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:191
msgid "Calendar URI"
msgstr "日历 URI"
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
msgid "Free/Busy URL"
msgstr "空闲/繁忙 URL"
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
msgid "ICS Calendar"
msgstr "ICS 日历"
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
msgid "Video Conferencing URL"
msgstr "视频会议 URL"
#. Misc fields
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
msgid "Spouse's Name"
msgstr "配偶姓名"
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
msgid "Note"
msgstr "注释"
#. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
msgid "AIM Home Screen Name 1"
msgstr "AIM 家庭屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
msgid "AIM Home Screen Name 2"
msgstr "AIM 家庭屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:203
msgid "AIM Home Screen Name 3"
msgstr "AIM 家庭屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:204
msgid "AIM Work Screen Name 1"
msgstr "AIM 工作屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:205
msgid "AIM Work Screen Name 2"
msgstr "AIM 工作屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:206
msgid "AIM Work Screen Name 3"
msgstr "AIM 工作屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:207
msgid "GroupWise Home Screen Name 1"
msgstr "GroupWise 家庭屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:208
msgid "GroupWise Home Screen Name 2"
msgstr "GroupWise 家庭屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:209
msgid "GroupWise Home Screen Name 3"
msgstr "GroupWise 家庭屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
msgid "GroupWise Work Screen Name 1"
msgstr "GroupWise 工作屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
msgid "GroupWise Work Screen Name 2"
msgstr "GroupWise 工作屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
msgid "GroupWise Work Screen Name 3"
msgstr "GroupWise 工作屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
msgid "Jabber Home ID 1"
msgstr "Jabber 家庭 ID 1"
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
msgid "Jabber Home ID 2"
msgstr "Jabber 家庭 ID 2"
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
msgid "Jabber Home ID 3"
msgstr "Jabber 家庭 ID 3"
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
msgid "Jabber Work ID 1"
msgstr "Jabber 工作 ID 1"
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
msgid "Jabber Work ID 2"
msgstr "Jabber 工作 ID 2"
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
msgid "Jabber Work ID 3"
msgstr "Jabber 工作 ID 3"
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
msgid "Yahoo! Home Screen Name 1"
msgstr "Yahoo! 家庭屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
msgid "Yahoo! Home Screen Name 2"
msgstr "Yahoo! 家庭屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:221
msgid "Yahoo! Home Screen Name 3"
msgstr "Yahoo! 家庭屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:222
msgid "Yahoo! Work Screen Name 1"
msgstr "Yahoo! 工作屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:223
msgid "Yahoo! Work Screen Name 2"
msgstr "Yahoo! 工作屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:224
msgid "Yahoo! Work Screen Name 3"
msgstr "Yahoo! 工作屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:225
msgid "MSN Home Screen Name 1"
msgstr "MSN 家庭屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:226
msgid "MSN Home Screen Name 2"
msgstr "MSN 家庭屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:227
msgid "MSN Home Screen Name 3"
msgstr "MSN 家庭屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:228
msgid "MSN Work Screen Name 1"
msgstr "MSN 工作屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
msgid "MSN Work Screen Name 2"
msgstr "MSN 工作屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
msgid "MSN Work Screen Name 3"
msgstr "MSN 工作屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:231
msgid "ICQ Home ID 1"
msgstr "ICQ 家庭 ID 1"
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook/e-contact.c:232
msgid "ICQ Home ID 2"
msgstr "ICQ 家庭 ID 2"
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
msgid "ICQ Home ID 3"
msgstr "ICQ 家庭 ID 3"
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
msgid "ICQ Work ID 1"
msgstr "ICQ 工作 ID 1"
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
msgid "ICQ Work ID 2"
msgstr "ICQ 工作 ID 2"
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
msgid "ICQ Work ID 3"
msgstr "ICQ 工作 ID 3"
#. Last modified time
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
msgid "Last Revision"
msgstr "上次修订"
-#: ../addressbook/libebook/e-contact.c:238
+#. 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
msgid "Name or Org"
msgstr "名称或组织"
#. Address fields
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:246
msgid "Address List"
msgstr "地址列表"
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:247
msgid "Home Address"
msgstr "家庭地址"
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:248
msgid "Work Address"
msgstr "办公地址"
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:249
msgid "Other Address"
msgstr "其它地址"
#. Contact categories
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:252
msgid "Category List"
msgstr "类别列表"
#. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:255
msgid "Photo"
msgstr "照片"
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:256
msgid "Logo"
msgstr "标志"
-#: ../addressbook/libebook/e-contact.c:253
+#. 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
msgid "Name"
msgstr "姓名"
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:261
msgid "Email List"
msgstr "邮件列表"
#. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:264
msgid "AIM Screen Name List"
msgstr "AIM 屏幕名列表"
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:265
msgid "GroupWise ID List"
msgstr "GroupWise ID 列表"
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:266
msgid "Jabber ID List"
msgstr "Jabber ID 列表"
-#: ../addressbook/libebook/e-contact.c:260
+#: ../addressbook/libebook/e-contact.c:267
msgid "Yahoo! Screen Name List"
msgstr "Yahoo! 屏幕名列表"
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:268
msgid "MSN Screen Name List"
msgstr "MSN 屏幕名列表"
-#: ../addressbook/libebook/e-contact.c:262
+#: ../addressbook/libebook/e-contact.c:269
msgid "ICQ ID List"
msgstr "ICQ ID 列表"
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook/e-contact.c:271
msgid "Wants HTML Mail"
msgstr "想要 HTML 邮件"
-#: ../addressbook/libebook/e-contact.c:266
+#. 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
msgid "List"
msgstr "列表"
-#: ../addressbook/libebook/e-contact.c:267
-msgid "List Show Addresses"
+#. Translators: This is an EContact field description, in this case it's a flag
+#. * 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
+msgid "List Shows Addresses"
msgstr "列表显示地址"
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:283
msgid "Birth Date"
msgstr "生日"
-#: ../addressbook/libebook/e-contact.c:270
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1063
+#: ../addressbook/libebook/e-contact.c:284
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:962
msgid "Anniversary"
msgstr "周年纪念日"
#. Security fields
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:287
msgid "X.509 Certificate"
msgstr "X.509 证书"
-#: ../addressbook/libebook/e-contact.c:275
+#: ../addressbook/libebook/e-contact.c:289
msgid "Gadu-Gadu Home ID 1"
msgstr "Gadu-Gadu 家庭 ID 1"
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:290
msgid "Gadu-Gadu Home ID 2"
msgstr "Gadu-Gadu 家庭 ID 2"
-#: ../addressbook/libebook/e-contact.c:277
+#: ../addressbook/libebook/e-contact.c:291
msgid "Gadu-Gadu Home ID 3"
msgstr "Gadu-Gadu 家庭 ID 3"
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:292
msgid "Gadu-Gadu Work ID 1"
msgstr "Gadu-Gadu 工作 ID 1"
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:293
msgid "Gadu-Gadu Work ID 2"
msgstr "Gadu-Gadu 工作 ID 2"
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:294
msgid "Gadu-Gadu Work ID 3"
msgstr "Gadu-Gadu 工作 ID 3"
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:295
msgid "Gadu-Gadu ID List"
msgstr "Gadu-Gadu ID 列表"
#. Geo information
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:298
msgid "Geographic Information"
msgstr "地理信息"
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:300
msgid "Telephone"
msgstr "电话"
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:302
msgid "Skype Home Name 1"
msgstr "Skype 家庭屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook/e-contact.c:303
msgid "Skype Home Name 2"
msgstr "Skype 家庭屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:290
+#: ../addressbook/libebook/e-contact.c:304
msgid "Skype Home Name 3"
msgstr "Skype 家庭屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:291
+#: ../addressbook/libebook/e-contact.c:305
msgid "Skype Work Name 1"
msgstr "Skype 工作屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:292
+#: ../addressbook/libebook/e-contact.c:306
msgid "Skype Work Name 2"
msgstr "Skype 工作屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:293
+#: ../addressbook/libebook/e-contact.c:307
msgid "Skype Work Name 3"
msgstr "Skype 工作屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:294
+#: ../addressbook/libebook/e-contact.c:308
msgid "Skype Name List"
msgstr "Skype 屏幕名列表"
-#: ../addressbook/libebook/e-contact.c:296
+#: ../addressbook/libebook/e-contact.c:310
msgid "SIP address"
msgstr "SIP 地址"
-#: ../addressbook/libebook/e-contact.c:298
+#: ../addressbook/libebook/e-contact.c:312
msgid "Google Talk Home Name 1"
msgstr "Google Talk 家庭屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:299
+#: ../addressbook/libebook/e-contact.c:313
msgid "Google Talk Home Name 2"
msgstr "Google Talk 家庭屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:300
+#: ../addressbook/libebook/e-contact.c:314
msgid "Google Talk Home Name 3"
msgstr "Google Talk 家庭屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:301
+#: ../addressbook/libebook/e-contact.c:315
msgid "Google Talk Work Name 1"
msgstr "Google Talk 工作屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:302
+#: ../addressbook/libebook/e-contact.c:316
msgid "Google Talk Work Name 2"
msgstr "Google Talk 工作屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:303
+#: ../addressbook/libebook/e-contact.c:317
msgid "Google Talk Work Name 3"
msgstr "Google Talk 工作屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:304
+#: ../addressbook/libebook/e-contact.c:318
msgid "Google Talk Name List"
-msgstr "Google Talk 屏幕名列表"
+msgstr "Google Talk 姓名列表"
-#: ../addressbook/libebook/e-contact.c:1597
-#: ../addressbook/libebook/e-destination.c:878
+#: ../addressbook/libebook/e-contact.c:320
+msgid "Twitter Name List"
+msgstr "Twitter 姓名列表"
+
+#: ../addressbook/libebook/e-contact.c:1641
+#: ../addressbook/libebook/e-destination.c:884
msgid "Unnamed List"
msgstr "未命名的列表"
-#: ../addressbook/libedata-book/e-book-backend.c:19
+#: ../addressbook/libedata-book/e-book-backend.c:17
msgid "Cannot process, book backend is opening"
msgstr "无法进行，地址簿后端正在打开"
-#: ../addressbook/libedata-book/e-book-backend.c:91
+#: ../addressbook/libedata-book/e-book-backend.c:90
#, c-format
msgid "Unknown book property '%s'"
msgstr "未知的地址簿属性“%s”"
-#: ../addressbook/libedata-book/e-book-backend.c:108
+#: ../addressbook/libedata-book/e-book-backend.c:107
#, 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:503
+#: ../camel/camel-db.c:510
#, c-format
msgid "Insufficient memory"
msgstr "内存不足"
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1093
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1135
#, c-format
msgid "Contact '%s' not found"
msgstr "未找到联系人 %s"
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:206
-#: ../addressbook/libedata-book/e-data-book.c:219
-#: ../addressbook/libedata-book/e-data-book.c:733
+#: ../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-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../addressbook/libedata-book/e-data-book.c:302
+#: ../calendar/libedata-cal/e-data-cal.c:415
msgid "Success"
msgstr "成功"
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libecal/e-cal.c:4564 ../calendar/libedata-cal/e-data-cal.c:428
-#: ../libedataserver/e-client.c:123
+#: ../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
msgid "Backend is busy"
msgstr "后端繁忙"
-#: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:133
+#: ../addressbook/libedata-book/e-data-book.c:304
+#: ../calendar/libedata-cal/e-data-cal.c:417 ../libedataserver/e-client.c:132
msgid "Repository offline"
msgstr "仓库离线"
-#: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libecal/e-cal.c:4578 ../calendar/libedata-cal/e-data-cal.c:430
-#: ../libedataserver/e-client.c:137
+#: ../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
msgid "Permission denied"
msgstr "没有权限"
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:435
+#: ../addressbook/libedata-book/e-data-book.c:308
+#: ../calendar/libedata-cal/e-data-cal.c:423
msgid "Authentication Failed"
msgstr "认证失败"
-#: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:436
+#: ../addressbook/libedata-book/e-data-book.c:309
+#: ../calendar/libedata-cal/e-data-cal.c:424
msgid "Authentication Required"
msgstr "需要认证"
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:437
+#: ../addressbook/libedata-book/e-data-book.c:310
+#: ../calendar/libedata-cal/e-data-cal.c:425
msgid "Unsupported field"
msgstr "不支持的字段"
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:145
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:146
msgid "Unsupported authentication method"
msgstr "不支持的身份认证方式"
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:147
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:148
msgid "TLS not available"
msgstr "TLS 不可用"
-#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../addressbook/libedata-book/e-data-book.c:313
+msgid "Address book does not exist"
+msgstr "地址簿不存在"
+
+#: ../addressbook/libedata-book/e-data-book.c:314
msgid "Book removed"
msgstr "地址簿已删除"
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libedata-cal/e-data-cal.c:443
+#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../calendar/libedata-cal/e-data-cal.c:431
msgid "Not available in offline mode"
msgstr "在脱机模式中无法使用"
-#: ../addressbook/libedata-book/e-data-book.c:325
-#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:149
+#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:150
msgid "Search size limit exceeded"
msgstr "超过搜索大小限制"
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:151
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:433 ../libedataserver/e-client.c:152
msgid "Search time limit exceeded"
msgstr "超过搜索时间限制"
-#: ../addressbook/libedata-book/e-data-book.c:327
-#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:153
+#: ../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:328
-#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:155
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:156
msgid "Query refused"
msgstr "查询被拒绝"
-#: ../addressbook/libedata-book/e-data-book.c:329
-#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:141
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:142
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:331
-#: ../calendar/libedata-cal/e-data-cal.c:450
+#: ../addressbook/libedata-book/e-data-book.c:322
+#: ../calendar/libedata-cal/e-data-cal.c:438
msgid "Invalid server version"
msgstr "无效的服务器版本"
-#: ../addressbook/libedata-book/e-data-book.c:333
-#: ../calendar/libecal/e-cal.c:4562 ../calendar/libedata-cal/e-data-cal.c:451
-#: ../libedataserver/e-client.c:121
+#: ../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
msgid "Invalid argument"
msgstr "无效参数"
#. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:335
-#: ../calendar/libecal/e-cal.c:4601 ../calendar/libedata-cal/e-data-cal.c:453
-#: ../libedataserver/e-client.c:143
+#: ../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
msgid "Not supported"
msgstr "不支持"
-#: ../addressbook/libedata-book/e-data-book.c:336
-#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:161
+#: ../addressbook/libedata-book/e-data-book.c:327
+#: ../calendar/libedata-cal/e-data-cal.c:442 ../libedataserver/e-client.c:162
msgid "Backend is not opened yet"
msgstr "后端尚未打开"
-#: ../addressbook/libedata-book/e-data-book.c:344
-#: ../calendar/libecal/e-cal-client.c:621
-#: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:159
+#: ../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
msgid "Other error"
msgstr "其他错误"
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:551
-#: ../addressbook/libedata-book/e-data-book.c:943
+#: ../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:576
-#: ../addressbook/libedata-book/e-data-book.c:601
+#: ../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:626
-#: ../addressbook/libedata-book/e-data-book.c:1041
+#: ../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:651
-#: ../addressbook/libedata-book/e-data-book.c:1075
+#: ../addressbook/libedata-book/e-data-book.c:642
+#: ../addressbook/libedata-book/e-data-book.c:1041
msgid "Cannot modify contacts: "
msgstr "无法修改联系人："
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:759
-#: ../calendar/libedata-cal/e-data-cal.c:866
-msgid "Cannot authenticate user: "
-msgstr "无法认证用户："
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:830
+#: ../addressbook/libedata-book/e-data-book.c:796
msgid "Cannot open book: "
msgstr "无法打开地址簿："
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:846
+#: ../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:873
+#: ../addressbook/libedata-book/e-data-book.c:839
msgid "Cannot refresh address book: "
msgstr "无法刷新地址薄："
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:899
+#: ../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:924
-#: ../calendar/libedata-cal/e-data-cal.c:1069
+#: ../addressbook/libedata-book/e-data-book.c:890
+#: ../calendar/libedata-cal/e-data-cal.c:1016
msgid "Cannot set backend property: "
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:927
msgid "Cannot get contact list: "
msgstr "无法获取联系人列表："
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:995
+#: ../addressbook/libedata-book/e-data-book.c:961
msgid "Cannot get contact list uids: "
msgstr "无法获取联系人列表 UID："
#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1100
+#: ../addressbook/libedata-book/e-data-book.c:1066
msgid "Cannot remove contacts: "
msgstr "无法移除联系人："
-#: ../addressbook/libedata-book/e-data-book-factory.c:184
-#: ../addressbook/libedata-book/e-data-book-factory.c:212
-#: ../calendar/libedata-cal/e-data-cal-factory.c:229
+#: ../addressbook/libedata-book/e-data-book-factory.c:103
+#: ../calendar/libedata-cal/e-data-cal-factory.c:114
#, c-format
-msgid "Empty URI"
-msgstr "空的 URI"
+msgid "No backend name in source '%s'"
+msgstr "源文件“%s”中无后端名称"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:546
+#: ../addressbook/libedata-book/e-data-book-factory.c:115
+#: ../calendar/libedata-cal/e-data-cal-factory.c:127
+#, 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
+#, c-format
+msgid "No such source for UID '%s'"
+msgstr "没有 UID “%s”的源"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:573
#, c-format
msgid "Server is unreachable (%s)"
msgstr "服务器不可用 (%s)"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604
+#, c-format
+msgid "Failed to connect to a server using SSL: %s"
+msgstr "无法使用 SSL 连接到服务器：%s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c: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
#, c-format
msgid "Unexpected HTTP status code %d returned (%s)"
msgstr "返回了意外的 HTTP 状态代码 %d(%s)"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2212
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2567
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:643
+msgid "CalDAV backend is not loaded yet"
+msgstr "CalDAV 后端尚未加载"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1032
+msgid "Invalid Redirect URL"
+msgstr "无效的重定向 URL"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2466
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2831
#, c-format
msgid ""
"Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1084,468 +1176,465 @@ msgstr ""
"服务器不可用，日历将以只读模式打开。\n"
"错误消息：%s"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4482
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2772
+msgid "Cannot create local store"
+msgstr "无法创建本地存储"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2781
+#, 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
+msgid "CalDAV does not support bulk additions"
+msgstr "CalDAV 不支持批量添加"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3976
+msgid "CalDAV does not support bulk modifications"
+msgstr "CalDAV 不支持批量修改"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4144
+msgid "CalDAV does not support bulk removals"
+msgstr "CalDAV 不支持批量删除"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4810
msgid "Calendar doesn't support Free/Busy"
msgstr "日历不支持空闲/繁忙"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:219
-#: ../libedataserverui/e-client-utils.c:875
-#, c-format
-msgid ""
-"Enter password for address book %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"输入地址簿 %s 的密码(用户 %s)\n"
-"原因：%s"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4818
+msgid "Schedule outbox url not found"
+msgstr "未找到定时发件箱 url"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:221
-#: ../libedataserverui/e-client-utils.c:877
-#, c-format
-msgid "Enter password for address book %s (user %s)"
-msgstr "输入地址簿 %s 的密码(用户 %s)"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4917
+msgid "Unexpected result in schedule-response"
+msgstr "定时响应的结果异常"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1065
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:964
msgid "Birthday"
msgstr "生日"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1101
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1000
#, c-format
msgid "Birthday: %s"
msgstr "生日：%s"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1132
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1031
#, c-format
msgid "Anniversary: %s"
msgstr "周年：%s"
-#: ../calendar/backends/file/e-cal-backend-file.c:251
+#: ../calendar/backends/file/e-cal-backend-file.c:235
msgid "Cannot save calendar data: Malformed URI."
msgstr "无法保存日历数据：URI 格式错误。"
-#: ../calendar/backends/file/e-cal-backend-file.c:258
-#: ../calendar/backends/file/e-cal-backend-file.c:264
+#: ../calendar/backends/file/e-cal-backend-file.c:242
+#: ../calendar/backends/file/e-cal-backend-file.c:248
msgid "Cannot save calendar data"
msgstr "无法保存日历数据"
-#: ../calendar/backends/http/e-cal-backend-http.c:405
+#: ../calendar/backends/http/e-cal-backend-http.c:483
+#, c-format
+msgid "Malformed URI: %s"
+msgstr "URI 格式错误：%s"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:544
+#, c-format
msgid "Redirected to Invalid URI"
msgstr "已重定向到无效 URI"
-#: ../calendar/backends/http/e-cal-backend-http.c:446
+#: ../calendar/backends/http/e-cal-backend-http.c:581
+#, c-format
msgid "Bad file format."
msgstr "无效的文件格式。"
-#: ../calendar/backends/http/e-cal-backend-http.c:454
+#: ../calendar/backends/http/e-cal-backend-http.c:591
+#, c-format
msgid "Not a calendar."
msgstr "不是日历。"
-#: ../calendar/backends/http/e-cal-backend-http.c:780
-#: ../calendar/backends/http/e-cal-backend-http.c:781
-#: ../calendar/backends/weather/e-cal-backend-weather.c:524
+#: ../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
msgid "Could not create cache file"
msgstr "无法创建缓存文件"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:183
+#: ../calendar/backends/weather/e-cal-backend-weather.c:172
msgid "Could not retrieve weather data"
msgstr "无法获取天气数据"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
msgid "Weather: Fog"
msgstr "天气：雾"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
msgid "Weather: Cloudy Night"
msgstr "天气：多云夜晚"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
msgid "Weather: Cloudy"
msgstr "天气：多云"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:282
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
msgid "Weather: Overcast"
msgstr "天气：阴天"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
msgid "Weather: Showers"
msgstr "天气：阵雨"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
msgid "Weather: Snow"
msgstr "天气：雪"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
msgid "Weather: Clear Night"
msgstr "天气：晴朗夜晚"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
msgid "Weather: Sunny"
msgstr "天气：晴"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
msgid "Weather: Thunderstorms"
msgstr "天气：暴风雨"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:435
+#: ../calendar/backends/weather/e-cal-backend-weather.c:409
msgid "Forecast"
msgstr "天气预报"
-#: ../calendar/libecal/e-cal.c:891 ../libedataserverui/e-book-auth-util.c:204
-#: ../libedataserverui/e-book-auth-util.c:428
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "输入 %s 的密码 (用户 %s)"
-
-#.
-#. * This password prompt will be prompted rarely. Since the key that is passed to
-#. * the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:905
-#, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "输入 %s 的密码，以便为用户 %s 启用代理服务器"
-
-#: ../calendar/libecal/e-cal.c:4566
+#: ../calendar/libecal/e-cal.c:4021
msgid "Repository is offline"
msgstr "仓库离线"
-#: ../calendar/libecal/e-cal.c:4568 ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libecal/e-cal.c:4023 ../calendar/libecal/e-cal-client.c:135
msgid "No such calendar"
msgstr "没有这样的日历"
-#: ../calendar/libecal/e-cal.c:4570 ../calendar/libecal/e-cal-client.c:139
-#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../calendar/libecal/e-cal.c:4025 ../calendar/libecal/e-cal-client.c:137
+#: ../calendar/libedata-cal/e-data-cal.c:420
msgid "Object not found"
msgstr "找不到对象"
-#: ../calendar/libecal/e-cal.c:4572 ../calendar/libecal/e-cal-client.c:141
-#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../calendar/libecal/e-cal.c:4027 ../calendar/libecal/e-cal-client.c:139
+#: ../calendar/libedata-cal/e-data-cal.c:421
msgid "Invalid object"
msgstr "无效对象"
-#: ../calendar/libecal/e-cal.c:4574
+#: ../calendar/libecal/e-cal.c:4029
msgid "URI not loaded"
msgstr "URI 未载入"
-#: ../calendar/libecal/e-cal.c:4576
+#: ../calendar/libecal/e-cal.c:4031
msgid "URI already loaded"
msgstr "URI 已经载入"
-#: ../calendar/libecal/e-cal.c:4580
+#: ../calendar/libecal/e-cal.c:4035
msgid "Unknown User"
msgstr "未知用户"
-#: ../calendar/libecal/e-cal.c:4582 ../calendar/libecal/e-cal-client.c:145
-#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../calendar/libecal/e-cal.c:4037 ../calendar/libecal/e-cal-client.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:422
msgid "Object ID already exists"
msgstr "对象 ID 已经存在"
-#: ../calendar/libecal/e-cal.c:4584
+#: ../calendar/libecal/e-cal.c:4039
msgid "Protocol not supported"
msgstr "不支持的协议"
-#: ../calendar/libecal/e-cal.c:4586
+#: ../calendar/libecal/e-cal.c:4041
msgid "Operation has been canceled"
msgstr "操作已取消"
-#: ../calendar/libecal/e-cal.c:4588
+#: ../calendar/libecal/e-cal.c:4043
msgid "Could not cancel operation"
msgstr "无法取消操作"
-#: ../calendar/libecal/e-cal.c:4590 ../libedataserver/e-client.c:129
+#: ../calendar/libecal/e-cal.c:4045 ../libedataserver/e-client.c:128
msgid "Authentication failed"
msgstr "认证失败"
-#: ../calendar/libecal/e-cal.c:4592
-#: ../camel/providers/smtp/camel-smtp-transport.c:846
-#: ../libedataserver/e-client.c:131
+#: ../calendar/libecal/e-cal.c:4047
+#: ../camel/providers/smtp/camel-smtp-transport.c:856
+#: ../libedataserver/e-client.c:130
msgid "Authentication required"
msgstr "必须认证"
-#: ../calendar/libecal/e-cal.c:4594
+#: ../calendar/libecal/e-cal.c:4049
msgid "A D-Bus exception has occurred"
msgstr "发生了一个 D-Bus 异常"
-#: ../calendar/libecal/e-cal.c:4598
+#: ../calendar/libecal/e-cal.c:4053
msgid "No error"
msgstr "无错误"
-#: ../calendar/libecal/e-cal-client.c:143
-#: ../calendar/libedata-cal/e-data-cal.c:442
+#: ../calendar/libecal/e-cal-client.c:141
+#: ../calendar/libedata-cal/e-data-cal.c:430
msgid "Unknown user"
msgstr "未知用户"
-#: ../calendar/libecal/e-cal-client.c:147
-#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../calendar/libecal/e-cal-client.c:145
+#: ../calendar/libedata-cal/e-data-cal.c:419
msgid "Invalid range"
msgstr "无效范围"
-#: ../calendar/libecal/e-cal-client.c:603
+#: ../calendar/libecal/e-cal-client.c:611
msgid "Failed to run calendar factory"
msgstr "运行日历工厂失败"
-#: ../calendar/libecal/e-cal-client.c:768
-msgid "Failed to find system calendar"
-msgstr "找不到系统日历"
-
-#: ../calendar/libecal/e-cal-client.c:807
-#: ../calendar/libedata-cal/e-data-cal.c:441
-msgid "Calendar does not exist"
-msgstr "日历不存在"
-
-#: ../calendar/libecal/e-cal-client.c:922
-msgid "Invalid source type"
-msgstr "无效的源类型"
-
-#: ../calendar/libecal/e-cal-component.c:1337
+#: ../calendar/libecal/e-cal-component.c:1340
msgid "Untitled appointment"
msgstr "无标题约会"
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:4036
msgid "1st"
msgstr "1日"
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:4037
msgid "2nd"
msgstr "2日"
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:4038
msgid "3rd"
msgstr "3日"
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:4039
msgid "4th"
msgstr "4日"
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:4040
msgid "5th"
msgstr "5日"
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:4041
msgid "6th"
msgstr "6日"
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:4042
msgid "7th"
msgstr "7日"
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:4043
msgid "8th"
msgstr "8日"
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:4044
msgid "9th"
msgstr "9日"
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:4045
msgid "10th"
msgstr "10日"
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:4046
msgid "11th"
msgstr "11日"
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:4047
msgid "12th"
msgstr "12日"
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:4048
msgid "13th"
msgstr "13日"
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4049
msgid "14th"
msgstr "14日"
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4050
msgid "15th"
msgstr "15日"
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4051
msgid "16th"
msgstr "16日"
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4052
msgid "17th"
msgstr "17日"
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4053
msgid "18th"
msgstr "18八日"
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4054
msgid "19th"
msgstr "19日"
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4055
msgid "20th"
msgstr "20日"
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4056
msgid "21st"
msgstr "21日"
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4057
msgid "22nd"
msgstr "22日"
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4058
msgid "23rd"
msgstr "23日"
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4059
msgid "24th"
msgstr "24日"
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4060
msgid "25th"
msgstr "25日"
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4061
msgid "26th"
msgstr "26日"
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4062
msgid "27th"
msgstr "27日"
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4063
msgid "28th"
msgstr "28日"
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4064
msgid "29th"
msgstr "29日"
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4065
msgid "30th"
msgstr "30日"
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4066
msgid "31st"
msgstr "31日"
-#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
+#: ../calendar/libecal/e-cal-util.c:697 ../calendar/libecal/e-cal-util.c:724
msgctxt "Priority"
msgid "High"
msgstr "高"
-#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
+#: ../calendar/libecal/e-cal-util.c:699 ../calendar/libecal/e-cal-util.c:726
msgctxt "Priority"
msgid "Normal"
msgstr "中"
-#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
+#: ../calendar/libecal/e-cal-util.c:701 ../calendar/libecal/e-cal-util.c:728
msgctxt "Priority"
msgid "Low"
msgstr "低"
#. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:722
msgctxt "Priority"
msgid "Undefined"
msgstr "未定义"
-#: ../calendar/libedata-cal/e-cal-backend.c:38
+#: ../calendar/libedata-cal/e-cal-backend.c:36
msgid "Cannot process, calendar backend is opening"
msgstr "无法进行，日历后端正在打开"
-#: ../calendar/libedata-cal/e-cal-backend.c:146
+#: ../calendar/libedata-cal/e-cal-backend.c:135
#, c-format
msgid "Unknown calendar property '%s'"
msgstr "未知的日历属性“%s”"
-#: ../calendar/libedata-cal/e-cal-backend.c:163
+#: ../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:79
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:819
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:841
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:956
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1187
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1217
+#: ../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:231
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:276
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:315
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1258
+#: ../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
#, c-format
msgid "\"%s\" expects one argument"
msgstr "“%s”需要一个参数"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:128
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:321
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:886
+#: ../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
#, c-format
msgid "\"%s\" expects the first argument to be a string"
msgstr "“%s”需要第一个参数是字符串"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:136
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:139
#, 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:178
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:537
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:880
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1022
+#: ../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”需要两个参数"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:184
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:237
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:282
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:403
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:486
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:543
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1028
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1264
+#: ../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
#, 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:192
+#: ../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:397
+#: ../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:411
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:492
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:552
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1036
+#: ../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
#, 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:420
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:436
#, c-format
msgid "\"%s\" expects the third argument to be a string"
msgstr "“%s”需要第三个参数是字符串"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:480
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:498
#, c-format
msgid "\"%s\" expects none or two arguments"
msgstr "“%s”需要零个或两个参数"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:894
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:926
#, c-format
msgid "\"%s\" expects the second argument to be a string"
msgstr "“%s”的第二个参数应该是字符串"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:924
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:957
#, c-format
msgid ""
"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1556,151 +1645,155 @@ msgstr ""
"是“any”、“summary”、“description”、“location”、“attendee”、“organizer”、“classification”之"
"一"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1086
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1126
#, c-format
msgid "\"%s\" expects at least one argument"
msgstr "“%s”至少需要一个参数"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1100
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1141
#, 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:438
+#: ../calendar/libedata-cal/e-data-cal.c:426
msgid "Unsupported method"
msgstr "不支持的方式"
+#: ../calendar/libedata-cal/e-data-cal.c:429
+msgid "Calendar does not exist"
+msgstr "日历不存在"
+
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:962
+#: ../calendar/libedata-cal/e-data-cal.c:909
msgid "Cannot open calendar: "
msgstr "无法打开日历："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:987
+#: ../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:1014
+#: ../calendar/libedata-cal/e-data-cal.c:961
msgid "Cannot refresh calendar: "
msgstr "无法刷新日历："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1043
+#: ../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:1098
+#: ../calendar/libedata-cal/e-data-cal.c:1045
msgid "Cannot retrieve calendar object path: "
msgstr "无法获取日历对象的路径："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1128
+#: ../calendar/libedata-cal/e-data-cal.c:1075
msgid "Cannot retrieve calendar object list: "
msgstr "无法获取日历对象的列表："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1157
+#: ../calendar/libedata-cal/e-data-cal.c:1104
msgid "Cannot retrieve calendar free/busy list: "
msgstr "无法获取日历空闲/繁忙列表："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1188
+#: ../calendar/libedata-cal/e-data-cal.c:1142
msgid "Cannot create calendar object: "
msgstr "无法创建日历对象："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1220
+#: ../calendar/libedata-cal/e-data-cal.c:1177
msgid "Cannot modify 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:1217
msgid "Cannot remove calendar object: "
msgstr "无法移除日历对象："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1281
+#: ../calendar/libedata-cal/e-data-cal.c:1254
msgid "Cannot receive calendar objects: "
msgstr "无法接收日历对象："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1312
+#: ../calendar/libedata-cal/e-data-cal.c:1285
msgid "Cannot send calendar objects: "
msgstr "无法发送日历对象："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1344
+#: ../calendar/libedata-cal/e-data-cal.c:1317
msgid "Could not retrieve attachment uris: "
msgstr "无法获取附件 URI："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1372
+#: ../calendar/libedata-cal/e-data-cal.c:1345
msgid "Could not discard reminder: "
msgstr "无法取消提醒："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1401
+#: ../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:1431
+#: ../calendar/libedata-cal/e-data-cal.c:1404
msgid "Could not retrieve calendar time zone: "
msgstr "无法获取日历时区："
#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1457
+#: ../calendar/libedata-cal/e-data-cal.c:1430
msgid "Could not add calendar time zone: "
msgstr "无法添加日历时区："
-#: ../calendar/libedata-cal/e-data-cal-factory.c:199
+#: ../calendar/libedata-cal/e-data-cal-factory.c:220
#, c-format
msgid "Invalid call"
msgstr "无效调用"
-#: ../camel/camel-cipher-context.c:206
+#: ../camel/camel-cipher-context.c:208
#, c-format
msgid "Signing is not supported by this cipher"
msgstr "该密码不支持签名"
-#: ../camel/camel-cipher-context.c:219
+#: ../camel/camel-cipher-context.c:221
#, c-format
msgid "Verifying is not supported by this cipher"
msgstr "该密码不支持验证"
-#: ../camel/camel-cipher-context.c:235
+#: ../camel/camel-cipher-context.c:237
#, c-format
msgid "Encryption is not supported by this cipher"
msgstr "该密码不支持加密"
-#: ../camel/camel-cipher-context.c:249
+#: ../camel/camel-cipher-context.c:251
#, c-format
msgid "Decryption is not supported by this cipher"
msgstr "该密码不支持解密"
-#: ../camel/camel-cipher-context.c:262
+#: ../camel/camel-cipher-context.c:264
#, c-format
msgid "You may not import keys with this cipher"
msgstr "您不能用此密码导入密钥"
-#: ../camel/camel-cipher-context.c:276
+#: ../camel/camel-cipher-context.c:278
#, c-format
msgid "You may not export keys with this cipher"
msgstr "您不能用此密码导出密钥"
-#: ../camel/camel-cipher-context.c:805
+#: ../camel/camel-cipher-context.c:819
msgid "Signing message"
msgstr "签名消息"
-#: ../camel/camel-cipher-context.c:1046
+#: ../camel/camel-cipher-context.c:1060
msgid "Encrypting message"
msgstr "加密消息"
-#: ../camel/camel-cipher-context.c:1173
+#: ../camel/camel-cipher-context.c:1187
msgid "Decrypting message"
msgstr "解密消息"
@@ -1709,12 +1802,16 @@ msgstr "解密消息"
msgid "Unable to create cache path"
msgstr "无法创建缓存路径"
-#: ../camel/camel-data-cache.c:507
+#: ../camel/camel-data-cache.c:440
+msgid "Empty cache file"
+msgstr "清空缓存文件"
+
+#: ../camel/camel-data-cache.c:509
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "无法删除缓存条目：%s：%s"
-#: ../camel/camel-disco-diary.c:201
+#: ../camel/camel-disco-diary.c:207
#, c-format
msgid ""
"Could not write log entry: %s\n"
@@ -1725,8 +1822,8 @@ msgstr ""
"当您重新连接到网络时本服务器\n"
"上进一步的操作不会重做。"
-#: ../camel/camel-disco-diary.c:266
-#: ../camel/providers/imap/camel-imap-journal.c:309
+#: ../camel/camel-disco-diary.c:271
+#: ../camel/providers/imap/camel-imap-journal.c:312
#, c-format
msgid ""
"Could not open '%s':\n"
@@ -1737,7 +1834,7 @@ msgstr ""
"%s\n"
"对该文件夹的修改不会被重新同步。"
-#: ../camel/camel-disco-diary.c:310
+#: ../camel/camel-disco-diary.c:315
msgid "Resynchronizing with server"
msgstr "重新与服务器同步"
@@ -1745,38 +1842,32 @@ msgstr "重新与服务器同步"
msgid "Downloading new messages for offline mode"
msgstr "下载新消息以进行脱机操作"
-#: ../camel/camel-disco-folder.c:416
+#: ../camel/camel-disco-folder.c:420
#, c-format
msgid "Preparing folder '%s' for offline"
msgstr "准备脱机文件夹“%s”"
-#: ../camel/camel-disco-folder.c:482 ../camel/camel-offline-folder.c:327
+#: ../camel/camel-disco-folder.c:487 ../camel/camel-offline-folder.c:334
msgid "Copy folder content locally for _offline operation"
msgstr "将文件夹内容复制到本地以进行脱机操作(_O)"
-#: ../camel/camel-disco-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1239
-#: ../camel/providers/imap/camel-imap-store.c:2028
-#: ../camel/providers/imap/camel-imap-store.c:2523
-#: ../camel/providers/imap/camel-imap-store.c:3282
-#: ../camel/providers/imapx/camel-imapx-folder.c:407
-#: ../camel/providers/imapx/camel-imapx-folder.c:440
-#: ../camel/providers/imapx/camel-imapx-folder.c:474
-#: ../camel/providers/imapx/camel-imapx-folder.c:530
-#: ../camel/providers/imapx/camel-imapx-folder.c:587
-#: ../camel/providers/imapx/camel-imapx-folder.c:621
-#: ../camel/providers/imapx/camel-imapx-folder.c:661
-#: ../camel/providers/imapx/camel-imapx-folder.c:697
-#: ../camel/providers/imapx/camel-imapx-store.c:276
-#: ../camel/providers/imapx/camel-imapx-store.c:1367
-#: ../camel/providers/imapx/camel-imapx-store.c:1455
-#: ../camel/providers/imapx/camel-imapx-store.c:1501
-#: ../camel/providers/pop3/camel-pop3-folder.c:525
-#: ../camel/providers/pop3/camel-pop3-folder.c:655
-#: ../camel/providers/pop3/camel-pop3-folder.c:838
-#: ../camel/providers/pop3/camel-pop3-folder.c:1036
-#: ../camel/providers/pop3/camel-pop3-store.c:393
-#: ../camel/providers/pop3/camel-pop3-store.c:805
+#: ../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
#, c-format
msgid "You must be working online to complete this operation"
msgstr "您必须在线工作以便完成该操作"
@@ -1786,64 +1877,64 @@ msgstr "您必须在线工作以便完成该操作"
msgid "Canceled"
msgstr "已取消"
-#: ../camel/camel-filter-driver.c:895 ../camel/camel-filter-search.c:762
+#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:772
#, c-format
msgid "Failed to create child process '%s': %s"
msgstr "创建子进程“%s”失败：%s"
-#: ../camel/camel-filter-driver.c:943
+#: ../camel/camel-filter-driver.c:964
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "收到 %s 发来的无效消息流：%s"
-#: ../camel/camel-filter-driver.c:1139 ../camel/camel-filter-driver.c:1146
+#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
msgid "Syncing folders"
msgstr "同步文件夹"
-#: ../camel/camel-filter-driver.c:1240 ../camel/camel-filter-driver.c:1695
+#: ../camel/camel-filter-driver.c:1276 ../camel/camel-filter-driver.c:1761
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "解析过滤规则出错：%s：%s"
-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1706
+#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1774
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "执行过滤规则错误：%s：%s"
-#: ../camel/camel-filter-driver.c:1347
+#: ../camel/camel-filter-driver.c:1383
#, c-format
msgid "Unable to open spool folder"
msgstr "无法打开脱机文件夹"
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1395
#, c-format
msgid "Unable to process spool folder"
msgstr "无法处理脱机文件夹"
-#: ../camel/camel-filter-driver.c:1377
+#: ../camel/camel-filter-driver.c:1415
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "获取第%d封信(%d%%)"
-#: ../camel/camel-filter-driver.c:1384 ../camel/camel-filter-driver.c:1406
+#: ../camel/camel-filter-driver.c:1424 ../camel/camel-filter-driver.c:1446
#, c-format
msgid "Failed on message %d"
msgstr "在第%d封信失败"
-#: ../camel/camel-filter-driver.c:1421 ../camel/camel-filter-driver.c:1527
+#: ../camel/camel-filter-driver.c:1463 ../camel/camel-filter-driver.c:1573
msgid "Syncing folder"
msgstr "同步文件夹"
-#: ../camel/camel-filter-driver.c:1426 ../camel/camel-filter-driver.c:1533
+#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1581
msgid "Complete"
msgstr "完成"
-#: ../camel/camel-filter-driver.c:1485
+#: ../camel/camel-filter-driver.c:1529
#, c-format
msgid "Getting message %d of %d"
msgstr "获取第%d封信，共%d封"
-#: ../camel/camel-filter-driver.c:1503
+#: ../camel/camel-filter-driver.c:1547
#, c-format
msgid "Failed at message %d of %d"
msgstr "在第%d封信失败，共%d封"
@@ -1860,55 +1951,64 @@ msgstr "(system-flag)参数无效"
msgid "Invalid arguments to (user-tag)"
msgstr "(user-tag)参数无效"
-#: ../camel/camel-filter-search.c:939 ../camel/camel-filter-search.c:948
+#: ../camel/camel-filter-search.c:949 ../camel/camel-filter-search.c:958
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "执行过滤规则搜索错误：%s：%s"
-#: ../camel/camel-folder.c:262
+#: ../camel/camel-folder.c:270
#, c-format
msgid "Learning new spam message in '%s'"
msgid_plural "Learning new spam messages in '%s'"
msgstr[0] "在“%s”中学习新的垃圾邮件"
-#: ../camel/camel-folder.c:302
+#: ../camel/camel-folder.c:310
#, c-format
msgid "Learning new ham message in '%s'"
msgid_plural "Learning new ham messages in '%s'"
msgstr[0] "在“%s”中学习新的有害邮件"
-#: ../camel/camel-folder.c:350
+#: ../camel/camel-folder.c:358
#, c-format
msgid "Filtering new message in '%s'"
msgid_plural "Filtering new messages in '%s'"
msgstr[0] "在“%s”中过滤新消息"
-#: ../camel/camel-folder.c:918
-#: ../camel/providers/local/camel-maildir-folder.c:322
+#: ../camel/camel-folder.c:930
+#: ../camel/providers/local/camel-maildir-folder.c:321
msgid "Moving messages"
msgstr "移动消息"
-#: ../camel/camel-folder.c:921
+#: ../camel/camel-folder.c:933
msgid "Copying messages"
msgstr "复制消息"
-#: ../camel/camel-folder.c:1233
+#: ../camel/camel-folder.c:1253
#, c-format
msgid "Quota information not supported for folder '%s'"
msgstr "文件夹“%s”不支持配额信息"
-#: ../camel/camel-folder.c:3549
+#: ../camel/camel-folder.c:3374
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "正在销毁文件夹“%s”"
+
+#: ../camel/camel-folder.c:3606
#, c-format
msgid "Retrieving message '%s' in %s"
msgstr "正在获取 %2$s 中的消息“%1$s”"
-#: ../camel/camel-folder.c:3698
+#: ../camel/camel-folder.c:3757
#, c-format
msgid "Retrieving quota information for '%s'"
msgstr "正在获取“%s”的配额信息"
-#: ../camel/camel-folder-search.c:365 ../camel/camel-folder-search.c:479
-#: ../camel/camel-folder-search.c:664
+#: ../camel/camel-folder.c:3989
+#, 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"
@@ -1917,8 +2017,7 @@ msgstr ""
"无法解析搜索表达式：%s：\n"
"%s"
-#: ../camel/camel-folder-search.c:377 ../camel/camel-folder-search.c:491
-#: ../camel/camel-folder-search.c:676
+#: ../camel/camel-folder-search.c:432 ../camel/camel-folder-search.c:599
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -1928,43 +2027,43 @@ msgstr ""
"%s"
#. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:890 ../camel/camel-folder-search.c:933
+#: ../camel/camel-folder-search.c:822 ../camel/camel-folder-search.c:865
#, 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:994
+#: ../camel/camel-folder-search.c:932
#, 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:1001 ../camel/camel-folder-search.c:1009
+#: ../camel/camel-folder-search.c:939 ../camel/camel-folder-search.c:947
#, 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:1037
+#: ../camel/camel-folder-search.c:975
#, 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:1047
+#: ../camel/camel-folder-search.c:985
#, 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:1327
+#: ../camel/camel-gpg-context.c:1331
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "执行 gpg 失败：%s"
#: ../camel/camel-gpg-context.c:668
-#: ../camel/providers/smtp/camel-smtp-transport.c:849
+#: ../camel/providers/smtp/camel-smtp-transport.c:859
msgid "Unknown"
msgstr "未知"
@@ -2012,84 +2111,349 @@ msgstr ""
msgid "Unexpected request from GnuPG for '%s'"
msgstr "GnuPG 对“%s”的意外响应"
-#: ../camel/camel-gpg-context.c:850
+#: ../camel/camel-gpg-context.c:852
msgid ""
"Note the encrypted content doesn't contain information about a recipient, "
"thus there will be a password prompt for each of stored private key."
-msgstr ""
-"请注意加密的内容里不包含收件人信息，因此可能会请求输出每个私钥的口令。"
+msgstr "请注意加密的内容里不包含收件人信息，因此可能会请求输出每个私钥的口令。"
-#: ../camel/camel-gpg-context.c:879 ../camel/camel-net-utils.c:523
+#: ../camel/camel-gpg-context.c:883 ../camel/camel-net-utils.c:523
#: ../camel/camel-tcp-stream-raw.c:268
-#: ../camel/providers/nntp/camel-nntp-summary.c:382
-#: ../libedataserver/e-client.c:139 ../libedataserverui/e-book-auth-util.c:227
+#: ../camel/providers/nntp/camel-nntp-summary.c:388
+#: ../libedataserver/e-client.c:140
#, c-format
msgid "Cancelled"
msgstr "已取消"
-#: ../camel/camel-gpg-context.c:900
+#: ../camel/camel-gpg-context.c:904
#, c-format
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr "解锁密钥失败：给出了 3 个错误的密码句。"
-#: ../camel/camel-gpg-context.c:913
+#: ../camel/camel-gpg-context.c:917
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "来自 GnuPG 的意外应答：%s"
-#: ../camel/camel-gpg-context.c:1044
+#: ../camel/camel-gpg-context.c:1048
#, c-format
msgid "Failed to encrypt: No valid recipients specified."
msgstr "加密失败：没有指定有效的收件人。"
-#: ../camel/camel-gpg-context.c:1591 ../camel/camel-smime-context.c:831
+#: ../camel/camel-gpg-context.c:1598 ../camel/camel-smime-context.c:832
msgid "Could not generate signing data: "
msgstr "无法生成签名数据："
-#: ../camel/camel-gpg-context.c:1640 ../camel/camel-gpg-context.c:1844
-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:2101
-#: ../camel/camel-gpg-context.c:2201 ../camel/camel-gpg-context.c:2249
+#: ../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
msgid "Failed to execute gpg."
msgstr "执行 gpg 失败。"
-#: ../camel/camel-gpg-context.c:1719 ../camel/camel-gpg-context.c:1727
-#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1755
-#: ../camel/camel-smime-context.c:957 ../camel/camel-smime-context.c:971
-#: ../camel/camel-smime-context.c:980
+#: ../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
#, c-format
msgid "Cannot verify message signature: Incorrect message format"
msgstr "无法校验消息签名：消息格式不对"
-#: ../camel/camel-gpg-context.c:1797
+#: ../camel/camel-gpg-context.c:1804
msgid "Cannot verify message signature: "
msgstr "无法校验消息签名："
-#: ../camel/camel-gpg-context.c:1920
+#: ../camel/camel-gpg-context.c:1927
msgid "Could not generate encrypting data: "
msgstr "无法生成加密数据："
-#: ../camel/camel-gpg-context.c:1973
+#: ../camel/camel-gpg-context.c:1980
msgid "This is a digitally encrypted message part"
msgstr "这是消息的数字加密部分"
-#: ../camel/camel-gpg-context.c:2031 ../camel/camel-gpg-context.c:2040
-#: ../camel/camel-gpg-context.c:2063
+#: ../camel/camel-gpg-context.c:2038 ../camel/camel-gpg-context.c:2047
+#: ../camel/camel-gpg-context.c:2070
#, c-format
msgid "Cannot decrypt message: Incorrect message format"
msgstr "无法解密消息：消息格式不对"
-#: ../camel/camel-gpg-context.c:2051
+#: ../camel/camel-gpg-context.c:2058
#, c-format
msgid "Failed to decrypt MIME part: protocol error"
msgstr "解密 MIME 部分失败：协议错误"
-#: ../camel/camel-gpg-context.c:2142 ../camel/camel-smime-context.c:1268
+#: ../camel/camel-gpg-context.c:2149 ../camel/camel-smime-context.c:1273
msgid "Encrypted content"
msgstr "加密内容"
-#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
-msgid "Only reset to beginning is supported with CamelHttpStream"
-msgstr "CamelHttpStream 只支持重设到开始"
+#: ../camel/camel-imapx-folder.c:104
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "无法为 %s 创建文件夹概要"
+
+#: ../camel/camel-imapx-folder.c:112
+#, 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
+msgid "Server disconnected"
+msgstr "服务器断开连接"
+
+#: ../camel/camel-imapx-server.c:1648
+msgid "Error writing to cache stream: "
+msgstr "写入缓存流错误："
+
+#: ../camel/camel-imapx-server.c:2644
+#, c-format
+msgid "Not authenticated"
+msgstr "没有验证"
+
+#: ../camel/camel-imapx-server.c:2721
+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
+#, 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
+msgid "STARTTLS not supported"
+msgstr "不支持 STARTTLS"
+
+#: ../camel/camel-imapx-server.c:3662
+#: ../camel/providers/imap/camel-imap-store.c:440
+#, 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
+#, 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
+#, 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
+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
+msgid "Authentication password not available"
+msgstr "密码认证不可用"
+
+#: ../camel/camel-imapx-server.c:3983
+msgid "Error fetching message"
+msgstr "取回消息出错"
+
+#: ../camel/camel-imapx-server.c:4065
+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:4177
+msgid "Error copying messages"
+msgstr "复制消息出错"
+
+#: ../camel/camel-imapx-server.c:4312
+msgid "Error appending message"
+msgstr "追加消息出错"
+
+#: ../camel/camel-imapx-server.c:4495
+msgid "Error fetching message headers"
+msgstr "取回消息头出错"
+
+#: ../camel/camel-imapx-server.c:4632
+msgid "Error retrieving message"
+msgstr "收取消息出错"
+
+#: ../camel/camel-imapx-server.c:4754 ../camel/camel-imapx-server.c:4950
+#, c-format
+msgid "Fetching summary information for new messages in '%s'"
+msgstr "获取“%s”中新消息的概要信息"
+
+#: ../camel/camel-imapx-server.c:4805
+#, c-format
+msgid "Scanning for changed messages in '%s'"
+msgstr "扫描“%s”中更改了的消息"
+
+#: ../camel/camel-imapx-server.c:4849
+msgid "Error fetching new messages"
+msgstr "取回新消息出错"
+
+#: ../camel/camel-imapx-server.c:5041
+msgid "Error while fetching messages"
+msgstr "取回消息出错"
+
+#: ../camel/camel-imapx-server.c:5049 ../camel/camel-imapx-server.c:5085
+#, 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
+msgid "Error refreshing folder"
+msgstr "刷新文件夹出错"
+
+#: ../camel/camel-imapx-server.c:5343
+msgid "Error expunging message"
+msgstr "销毁消息出错"
+
+#: ../camel/camel-imapx-server.c:5440
+msgid "Error fetching folders"
+msgstr "取回文件夹出错"
+
+#: ../camel/camel-imapx-server.c:5519
+msgid "Error subscribing to folder"
+msgstr "订阅文件夹出错"
+
+#: ../camel/camel-imapx-server.c:5580
+msgid "Error creating folder"
+msgstr "创建文件夹出错"
+
+#: ../camel/camel-imapx-server.c:5629
+msgid "Error deleting folder"
+msgstr "删除文件夹出错"
+
+#: ../camel/camel-imapx-server.c:5690
+msgid "Error renaming folder"
+msgstr "重命名文件夹出错"
+
+#: ../camel/camel-imapx-server.c:5751
+msgid "Error performing NOOP"
+msgstr "执行 NOOP 出错"
+
+#: ../camel/camel-imapx-server.c:5847
+msgid "Error syncing changes"
+msgstr "同步变更出错"
+
+#: ../camel/camel-imapx-server.c:6621
+#: ../camel/providers/imap/camel-imap-folder.c:3531
+#, 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
+msgid "No such message available."
+msgstr "没有该消息。"
+
+#: ../camel/camel-imapx-server.c:6777 ../camel/camel-imapx-server.c:6792
+msgid "Cannot create spool file: "
+msgstr "无法创建脱机文件："
+
+#: ../camel/camel-imapx-store.c:157
+#: ../camel/providers/imap/camel-imap-store.c:827
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP 服务器 %s"
+
+#: ../camel/camel-imapx-store.c:160
+#: ../camel/providers/imap/camel-imap-store.c:830
+#, 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/providers/pop3/camel-pop3-provider.c:83
+msgid "Password"
+msgstr "密码"
+
+#: ../camel/camel-imapx-store.c:253
+#: ../camel/providers/imap/camel-imap-provider.c:100
+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
+#, 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/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-spool-store.c:393
+msgid "Inbox"
+msgstr "收件箱"
+
+#: ../camel/camel-imapx-store.c:1111
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "父文件夹不允许含有子文件夹"
+
+#: ../camel/camel-imapx-stream.c:98
+#, c-format
+msgid "Source stream returned no data"
+msgstr "源流没返回数据"
+
+#: ../camel/camel-imapx-stream.c:107
+#, c-format
+msgid "Source stream unavailable"
+msgstr "源流不可用"
#: ../camel/camel-lock.c:102
#, c-format
@@ -2180,7 +2544,7 @@ msgstr "阅读邮件文件错误：%s"
msgid "Error writing mail temp file: %s"
msgstr "写入邮件临时文件错误：%s"
-#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
+#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562
#, c-format
msgid "Error copying mail temp file: %s"
msgstr "复制邮件临时文件错误：%s"
@@ -2227,12 +2591,12 @@ msgstr "名称查阅失败"
msgid "Name lookup failed: %s"
msgstr "名称查阅失败：%s"
-#: ../camel/camel-network-service.c:112
+#: ../camel/camel-network-service.c:114
#, c-format
msgid "Could not connect to %s: "
msgstr "无法连接到 %s："
-#: ../camel/camel-offline-folder.c:206
+#: ../camel/camel-offline-folder.c:210
#, c-format
msgid "Syncing messages in folder '%s' to disk"
msgstr "正在将文件夹“%s”中的消息同步到磁盘"
@@ -2250,22 +2614,22 @@ msgstr "虚拟文件夹电子邮件提供者"
msgid "For reading mail as a query of another set of folders"
msgstr "关于将读入邮件作为对另一组文件夹的查询"
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:258
#, c-format
msgid "Could not load %s: Module loading not supported on this system."
msgstr "无法载入 %s：本系统不支持模块载入。"
-#: ../camel/camel-provider.c:202
+#: ../camel/camel-provider.c:267
#, c-format
msgid "Could not load %s: %s"
msgstr "无法载入 %s：%s"
-#: ../camel/camel-provider.c:211
+#: ../camel/camel-provider.c:276
#, c-format
msgid "Could not load %s: No initialization code in module."
msgstr "无法载入 %s：模块中没有初始化代码。"
-#: ../camel/camel-provider.c:402 ../camel/camel-session.c:388
+#: ../camel/camel-provider.c:424 ../camel/camel-session.c:407
#, c-format
msgid "No provider available for protocol '%s'"
msgstr "协议“%s”没有可用的提供者"
@@ -2330,32 +2694,32 @@ msgid ""
"if the server supports it."
msgstr "如果服务器支持的话，该选项将用安全 DIGEST-MD5 密码连接到服务器。"
-#: ../camel/camel-sasl-digest-md5.c:850
+#: ../camel/camel-sasl-digest-md5.c:855
#, c-format
msgid "Server challenge too long (>2048 octets)"
msgstr "服务器质询过长 (>2048 字节)"
-#: ../camel/camel-sasl-digest-md5.c:861
+#: ../camel/camel-sasl-digest-md5.c:866
#, c-format
msgid "Server challenge invalid\n"
msgstr "服务器质询无效\n"
-#: ../camel/camel-sasl-digest-md5.c:869
+#: ../camel/camel-sasl-digest-md5.c:874
#, c-format
msgid "Server challenge contained invalid \"Quality of Protection\" token"
msgstr "服务器质询含有无效的“品质保护”标志"
-#: ../camel/camel-sasl-digest-md5.c:902
+#: ../camel/camel-sasl-digest-md5.c:907
#, c-format
msgid "Server response did not contain authorization data"
msgstr "服务器应答不含有认证数据"
-#: ../camel/camel-sasl-digest-md5.c:923
+#: ../camel/camel-sasl-digest-md5.c:928
#, c-format
msgid "Server response contained incomplete authorization data"
msgstr "服务器应达含有不完整的认证数据"
-#: ../camel/camel-sasl-digest-md5.c:936
+#: ../camel/camel-sasl-digest-md5.c:941
#, c-format
msgid "Server response does not match"
msgstr "服务器应答不匹配"
@@ -2419,14 +2783,14 @@ msgstr "对证书执行完整性检查失败。"
msgid "The referenced credentials have expired."
msgstr "引用的证书已过期。"
-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:337
-#: ../camel/camel-sasl-gssapi.c:381 ../camel/camel-sasl-gssapi.c:398
-#: ../camel/providers/smtp/camel-smtp-transport.c:562
+#: ../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
#, c-format
msgid "Bad authentication response from server."
msgstr "来自服务器的无效认证应答。"
-#: ../camel/camel-sasl-gssapi.c:410
+#: ../camel/camel-sasl-gssapi.c:417
#, c-format
msgid "Unsupported security layer."
msgstr "不支持的安全层。"
@@ -2439,7 +2803,7 @@ msgstr "Login"
msgid "This option will connect to the server using a simple password."
msgstr "该选项将以普通密码连接到服务器。"
-#: ../camel/camel-sasl-login.c:107
+#: ../camel/camel-sasl-login.c:110
#, c-format
msgid "Unknown authentication state."
msgstr "未知的认证状态。"
@@ -2475,7 +2839,7 @@ msgstr "POP 源 UID"
msgid "POP Before SMTP authentication using an unknown transport"
msgstr "以未知的传输进行 SMTP 认证授权之前的 POP"
-#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:118
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117
#, c-format
msgid "POP Before SMTP authentication attempted with a %s service"
msgstr "试图通过 %s 服务在 SMTP 认证之前进行 POP"
@@ -2485,32 +2849,26 @@ msgstr "试图通过 %s 服务在 SMTP 认证之前进行 POP"
msgid "Regular expression compilation failed: %s: %s"
msgstr "常规表达式编译失败：%s：%s"
-#: ../camel/camel-session.c:397
+#: ../camel/camel-session.c:416
#, c-format
msgid "Invalid GType registered for protocol '%s'"
msgstr "为协议“%s”注册的 GType 无效"
-#: ../camel/camel-session.c:466
-#: ../camel/providers/imap/camel-imap-store.c:1143
-#: ../camel/providers/imapx/camel-imapx-server.c:2946
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-#: ../camel/providers/pop3/camel-pop3-store.c:566
-#: ../camel/providers/smtp/camel-smtp-transport.c:455
-#, c-format
-msgid "No support for %s authentication"
-msgstr "不支持 %s 认证"
-
-#: ../camel/camel-session.c:481
+#: ../camel/camel-session.c:510
#, c-format
msgid "%s authentication failed"
msgstr "%s 认证失败"
-#: ../camel/camel-session.c:1187
+#: ../camel/camel-session.c:646
+msgid "Forwarding messages is not supported"
+msgstr "不支持转发消息"
+
+#: ../camel/camel-session.c:1363
#, 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:1057
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1060
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "无法找到‘%s’的证书"
@@ -2639,112 +2997,112 @@ msgstr "只有证书的消息，证书已导入并校验"
msgid "Cannot find signature digests"
msgstr "找不到签名摘要"
-#: ../camel/camel-smime-context.c:661
+#: ../camel/camel-smime-context.c:662
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "签名者：%s <%s>：%s\n"
-#: ../camel/camel-smime-context.c:842 ../camel/camel-smime-context.c:1130
+#: ../camel/camel-smime-context.c:844 ../camel/camel-smime-context.c:1134
msgid "Cannot create encoder context"
msgstr "无法创建编码器上下文"
-#: ../camel/camel-smime-context.c:848
+#: ../camel/camel-smime-context.c:850
msgid "Failed to add data to CMS encoder"
msgstr "将数据添加到 CMS 编码器失败"
-#: ../camel/camel-smime-context.c:853 ../camel/camel-smime-context.c:1147
+#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1151
msgid "Failed to encode data"
msgstr "编码数据失败"
-#: ../camel/camel-smime-context.c:996 ../camel/camel-smime-context.c:1243
+#: ../camel/camel-smime-context.c:999 ../camel/camel-smime-context.c:1248
msgid "Decoder failed"
msgstr "解码器失败"
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:1068
msgid "Cannot find common bulk encryption algorithm"
msgstr "找不到公共批量加密算法"
-#: ../camel/camel-smime-context.c:1073
+#: ../camel/camel-smime-context.c:1076
msgid "Cannot allocate slot for encryption bulk key"
msgstr "无法为加密批量密钥分配密钥槽"
-#: ../camel/camel-smime-context.c:1084
+#: ../camel/camel-smime-context.c:1087
msgid "Cannot create CMS Message"
msgstr "无法创建 CMS 消息"
-#: ../camel/camel-smime-context.c:1090
+#: ../camel/camel-smime-context.c:1093
msgid "Cannot create CMS Enveloped data"
msgstr "无法创建 CMS 信封数据"
-#: ../camel/camel-smime-context.c:1096
+#: ../camel/camel-smime-context.c:1099
msgid "Cannot attach CMS Enveloped data"
msgstr "无法附加 CMS 信封数据"
-#: ../camel/camel-smime-context.c:1102
+#: ../camel/camel-smime-context.c:1105
msgid "Cannot attach CMS data object"
msgstr "无法附加 CMS 数据对象"
-#: ../camel/camel-smime-context.c:1111
+#: ../camel/camel-smime-context.c:1114
msgid "Cannot create CMS Recipient information"
msgstr "无法创建 CMS 收件人信息"
-#: ../camel/camel-smime-context.c:1116
+#: ../camel/camel-smime-context.c:1119
msgid "Cannot add CMS Recipient information"
msgstr "无法添加 CMS 收件人信息"
-#: ../camel/camel-smime-context.c:1141
+#: ../camel/camel-smime-context.c:1145
msgid "Failed to add data to encoder"
msgstr "将数据添加到编码器失败"
-#: ../camel/camel-smime-context.c:1250
+#: ../camel/camel-smime-context.c:1255
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME 解密：没有找到加密内容"
-#: ../camel/camel-store.c:1799
+#: ../camel/camel-store.c:1847
#, c-format
msgid "Cannot create folder '%s': folder exists"
msgstr "无法创建文件夹“%s”文件夹已存在"
-#: ../camel/camel-store.c:1842
+#: ../camel/camel-store.c:1890
#, c-format
msgid "Opening folder '%s'"
msgstr "打开文件夹“%s”"
-#: ../camel/camel-store.c:2027
+#: ../camel/camel-store.c:2075
#, c-format
msgid "Scanning folders in '%s'"
msgstr "扫描“%s”中的文件夹"
#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2039 ../camel/camel-store.c:2049
+#: ../camel/camel-store.c:2087 ../camel/camel-store.c:2097
#: ../camel/camel-vtrash-folder.c:48
msgid "Trash"
msgstr "回收站"
#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2042 ../camel/camel-store.c:2053
+#: ../camel/camel-store.c:2090 ../camel/camel-store.c:2101
#: ../camel/camel-vtrash-folder.c:50
msgid "Junk"
msgstr "垃圾"
-#: ../camel/camel-store.c:2501
+#: ../camel/camel-store.c:2549
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "无法创建文件夹：%s：文件夹已存在"
-#: ../camel/camel-store.c:2515
+#: ../camel/camel-store.c:2563
#, c-format
msgid "Creating folder '%s'"
msgstr "创建文件夹“%s”"
-#: ../camel/camel-store.c:2633 ../camel/camel-vee-store.c:352
-#: ../camel/providers/local/camel-maildir-store.c:300
+#: ../camel/camel-store.c:2681 ../camel/camel-vee-store.c:410
+#: ../camel/providers/local/camel-maildir-store.c:306
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "无法删除文件夹：%s：无效操作"
-#: ../camel/camel-store.c:2776 ../camel/camel-vee-store.c:402
-#: ../camel/providers/local/camel-maildir-store.c:764
+#: ../camel/camel-store.c:2824 ../camel/camel-vee-store.c:460
+#: ../camel/providers/local/camel-maildir-store.c:788
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "无法重命名文件夹：%s：无效操作"
@@ -2753,100 +3111,114 @@ msgstr "无法重命名文件夹：%s：无效操作"
msgid "Only reset to beginning is supported with CamelStreamFilter"
msgstr "CamelStreamFilter 只支持重设到开始"
-#: ../camel/camel-stream-process.c:267
+#: ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "CamelHttpStream 只支持重设到开始"
+
+#: ../camel/camel-stream-process.c:275
#, c-format
msgid "Connection cancelled"
msgstr "连接已取消"
-#: ../camel/camel-stream-process.c:272
+#: ../camel/camel-stream-process.c:280
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "无法使用命令“%s”连接：%s"
-#: ../camel/camel-tcp-stream-raw.c:303
+#: ../camel/camel-subscribable.c:386
+#, c-format
+msgid "Subscribing to folder '%s'"
+msgstr "正在订阅文件夹“%s”"
+
+#: ../camel/camel-subscribable.c:518
+#, c-format
+msgid "Unsubscribing from folder '%s'"
+msgstr "正在取消订阅文件夹“%s”"
+
+#: ../camel/camel-tcp-stream-raw.c:310
#, c-format
msgid "NSPR error code %d"
msgstr "NSPR 错误代码 %d"
-#: ../camel/camel-tcp-stream-raw.c:640 ../camel/camel-tcp-stream-raw.c:651
+#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662
#, c-format
msgid "The proxy host does not support SOCKS4"
msgstr "代理主机不支持 SOCKS4"
-#: ../camel/camel-tcp-stream-raw.c:662
+#: ../camel/camel-tcp-stream-raw.c:675
#, c-format
msgid "The proxy host denied our request: code %d"
msgstr "代理主机拒绝了已方的请求：代码 %d"
-#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764
+#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781
#, c-format
msgid "The proxy host does not support SOCKS5"
msgstr "代理主机不支持 SOCKS5"
-#: ../camel/camel-tcp-stream-raw.c:770
+#: ../camel/camel-tcp-stream-raw.c:789
#, c-format
msgid "Could not find a suitable authentication type: code 0x%x"
msgstr "无法找到合适的认证类型: 代码 0x%x"
-#: ../camel/camel-tcp-stream-raw.c:782
+#: ../camel/camel-tcp-stream-raw.c:801
msgid "General SOCKS server failure"
msgstr "通用 SOCKS 服务器失败"
-#: ../camel/camel-tcp-stream-raw.c:783
+#: ../camel/camel-tcp-stream-raw.c:802
msgid "SOCKS server's rules do not allow connection"
msgstr "SOCKS 服务器的策略不允许连接"
-#: ../camel/camel-tcp-stream-raw.c:784
+#: ../camel/camel-tcp-stream-raw.c:803
msgid "Network is unreachable from SOCKS server"
msgstr "SOCKS 服务器网络不可及"
-#: ../camel/camel-tcp-stream-raw.c:785
+#: ../camel/camel-tcp-stream-raw.c:804
msgid "Host is unreachable from SOCKS server"
msgstr "SOCKS 服务器主机不可及"
-#: ../camel/camel-tcp-stream-raw.c:786
+#: ../camel/camel-tcp-stream-raw.c:805
msgid "Connection refused"
msgstr "连接被拒绝"
-#: ../camel/camel-tcp-stream-raw.c:787
+#: ../camel/camel-tcp-stream-raw.c:806
msgid "Time-to-live expired"
msgstr "连通时间过期"
-#: ../camel/camel-tcp-stream-raw.c:788
+#: ../camel/camel-tcp-stream-raw.c:807
msgid "Command not supported by SOCKS server"
msgstr "SOCKS 服务器不支持该命令"
-#: ../camel/camel-tcp-stream-raw.c:789
+#: ../camel/camel-tcp-stream-raw.c:808
msgid "Address type not supported by SOCKS server"
msgstr "SOCKS 服务器不支持该地址类型"
-#: ../camel/camel-tcp-stream-raw.c:790
+#: ../camel/camel-tcp-stream-raw.c:809
msgid "Unknown error from SOCKS server"
msgstr "SOCKS 服务器发生未知错误"
-#: ../camel/camel-tcp-stream-raw.c:823
+#: ../camel/camel-tcp-stream-raw.c:842
#, c-format
msgid "Got unknown address type from SOCKS server"
msgstr "从 SOCKS 服务器获取的地址类型未知"
-#: ../camel/camel-tcp-stream-raw.c:841
+#: ../camel/camel-tcp-stream-raw.c:860
#, c-format
msgid "Incomplete reply from SOCKS server"
msgstr "SOCKS 服务器的响应不完整"
-#: ../camel/camel-tcp-stream-raw.c:861
+#: ../camel/camel-tcp-stream-raw.c:880
#, c-format
msgid "Hostname is too long (maximum is 255 characters)"
msgstr "主机名太长 (最长 255 字符)"
#. SOCKS5
#. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:893 ../camel/camel-tcp-stream-raw.c:903
+#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922
#, c-format
msgid "Invalid reply from proxy server"
msgstr "代理服务器的响应无效"
-#: ../camel/camel-tcp-stream-ssl.c:474
+#: ../camel/camel-tcp-stream-ssl.c:502
#, c-format
msgid ""
" Issuer: %s\n"
@@ -2859,16 +3231,15 @@ msgstr ""
" 指纹： %s\n"
" 签名： %s"
-#: ../camel/camel-tcp-stream-ssl.c:480
+#: ../camel/camel-tcp-stream-ssl.c:509
msgid "GOOD"
msgstr "好"
-#: ../camel/camel-tcp-stream-ssl.c:480
+#: ../camel/camel-tcp-stream-ssl.c:509
msgid "BAD"
msgstr "坏"
-#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:484
+#: ../camel/camel-tcp-stream-ssl.c:514
#, c-format
msgid ""
"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
@@ -2881,19 +3252,19 @@ msgstr ""
"该证书的详细信息：\n"
"%s"
-#: ../camel/camel-tcp-stream-ssl.c:488
+#: ../camel/camel-tcp-stream-ssl.c:520
msgid "_Reject"
msgstr "拒绝(_R)"
-#: ../camel/camel-tcp-stream-ssl.c:489
+#: ../camel/camel-tcp-stream-ssl.c:521
msgid "Accept _Temporarily"
msgstr "临时接受(_T)"
-#: ../camel/camel-tcp-stream-ssl.c:490
+#: ../camel/camel-tcp-stream-ssl.c:522
msgid "_Accept Permanently"
msgstr "永久接受(_A)"
-#: ../camel/camel-tcp-stream-ssl.c:548
+#: ../camel/camel-tcp-stream-ssl.c:583
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -2902,7 +3273,7 @@ msgstr ""
"证书问题：%s\n"
"发行者：%s"
-#: ../camel/camel-tcp-stream-ssl.c:600
+#: ../camel/camel-tcp-stream-ssl.c:635
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -2911,7 +3282,7 @@ msgstr ""
"无效的证书域名：%s\n"
"发行者：%s"
-#: ../camel/camel-tcp-stream-ssl.c:618
+#: ../camel/camel-tcp-stream-ssl.c:653
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -2920,7 +3291,7 @@ msgstr ""
"证书过期：%s\n"
"发行者：%s"
-#: ../camel/camel-tcp-stream-ssl.c:635
+#: ../camel/camel-tcp-stream-ssl.c:670
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -2929,47 +3300,55 @@ msgstr ""
"证书撤销列表已过期：%s\n"
"发行者：%s"
-#: ../camel/camel-url.c:330
+#: ../camel/camel-url.c:331
#, c-format
msgid "Could not parse URL '%s'"
msgstr "无法解析 URL“%s”"
-#: ../camel/camel-vee-folder.c:651
+#: ../camel/camel-vee-folder.c:494
#, c-format
-msgid "Updating %s folder"
-msgstr "更新 %s 文件夹"
+msgid "Updating folder '%s'"
+msgstr "正在更新文件夹“%s”"
-#: ../camel/camel-vee-folder.c:1325 ../camel/camel-vee-folder.c:1482
+#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965
#, c-format
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "无法将消息移动或复制到虚拟文件夹中"
-#: ../camel/camel-vee-folder.c:1358
+#: ../camel/camel-vee-folder.c:888
#, c-format
msgid "No such message %s in %s"
msgstr "在 %2$s 中没有消息 %1$s"
-#: ../camel/camel-vee-folder.c:1426
+#: ../camel/camel-vee-folder.c:941
#, c-format
msgid "Error storing '%s': "
msgstr "存储“%s”出错："
+#: ../camel/camel-vee-folder.c:1169
+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:37
+#: ../camel/camel-vee-store.c:38
msgid "Unmatched"
msgstr "无匹配"
-#: ../camel/camel-vee-store.c:378
+#: ../camel/camel-vee-store.c:436
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "无法删除文件夹：%s：没有该文件夹"
-#: ../camel/camel-vee-store.c:412
+#: ../camel/camel-vee-store.c:470
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "无法重命名文件夹：%s：没有该文件夹"
+#: ../camel/camel-vee-store.c:532
+msgid "Enable _Unmatched folder"
+msgstr "启用不匹配的文件夹(_U)"
+
#: ../camel/camel-vtrash-folder.c:49
msgid "Cannot copy messages to the Trash folder"
msgstr "无法将消息复制到回收站文件夹"
@@ -2979,23 +3358,23 @@ msgid "Cannot copy messages to the Junk folder"
msgstr "无法将消息复制到垃圾邮件文件夹"
#: ../camel/providers/imap/camel-imap-command.c:200
-#: ../camel/providers/imap/camel-imap-command.c:297
+#: ../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:305
+#: ../camel/providers/imap/camel-imap-command.c:307
#, c-format
msgid "No input stream"
msgstr "没有输入流"
-#: ../camel/providers/imap/camel-imap-command.c:383
+#: ../camel/providers/imap/camel-imap-command.c:392
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "服务器意外地中止了连接：%s"
-#: ../camel/providers/imap/camel-imap-command.c:416
+#: ../camel/providers/imap/camel-imap-command.c:425
#, c-format
msgid ""
"Alert from IMAP server %s %s in folder %s:\n"
@@ -3004,7 +3383,7 @@ msgstr ""
"来自 IMAP 服务器 %s %s 的提醒(%s 文件夹)：\n"
"%s"
-#: ../camel/providers/imap/camel-imap-command.c:420
+#: ../camel/providers/imap/camel-imap-command.c:429
#, c-format
msgid ""
"Alert from IMAP server %s %s:\n"
@@ -3013,98 +3392,78 @@ msgstr ""
"来自 IMAP 服务器 %s %s 的提醒：\n"
"%s"
-#: ../camel/providers/imap/camel-imap-command.c:502
+#: ../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:514
+#: ../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:594
+#: ../camel/providers/imap/camel-imap-command.c:607
#, c-format
msgid "Server response ended too soon."
msgstr "服务器应答结束太快。"
-#: ../camel/providers/imap/camel-imap-command.c:806
+#: ../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:844
+#: ../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:348
+#: ../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:359
-#: ../camel/providers/imapx/camel-imapx-folder.c:747
-#: ../camel/providers/nntp/camel-nntp-folder.c:760
-msgid "Apply message _filters to this folder"
-msgstr "对这个文件夹应用消息过滤器(_F)"
-
-#: ../camel/providers/imap/camel-imap-folder.c:440
+#: ../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:461
+#: ../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:1119
-#: ../camel/providers/imapx/camel-imapx-server.c:3949
+#: ../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:3478
+#: ../camel/providers/imap/camel-imap-folder.c:3494
msgid "Unable to retrieve message: "
msgstr "无法获取消息："
-#: ../camel/providers/imap/camel-imap-folder.c:3515
-#: ../camel/providers/imapx/camel-imapx-server.c:5509
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "无法获取消息 ID %s：%s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3516
-#: ../camel/providers/imapx/camel-imapx-server.c:5510
-msgid "No such message available."
-msgstr "没有该消息。"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3591
-#: ../camel/providers/imap/camel-imap-folder.c:4469
-#: ../camel/providers/nntp/camel-nntp-folder.c:515
+#: ../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:4050
-#: ../camel/providers/imap/camel-imap-folder.c:4133
-#: ../camel/providers/imapx/camel-imapx-server.c:3901
-#: ../camel/providers/imapx/camel-imapx-server.c:4081
+#: ../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:4267
+#: ../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:4277
+#: ../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:4509
+#: ../camel/providers/imap/camel-imap-folder.c:4549
#, c-format
msgid "Could not find message body in FETCH response."
msgstr "无法在 FETCH 应答中找到信体。"
@@ -3130,407 +3489,156 @@ msgid "Failed to cache %s: "
msgstr "缓存 %s 失败："
#: ../camel/providers/imap/camel-imap-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-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: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: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:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:52
-msgid "Connection to Server"
-msgstr "连接服务器"
-
-#: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "使用自定义命令连接到服务器(_U)"
-
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Co_mmand:"
-msgstr "命令(_M)："
-
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/imap/camel-imap-provider.c:47
+#: ../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:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
+#: ../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:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:67
+#: ../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:62
+#: ../camel/providers/imap/camel-imap-provider.c:53
msgid "Names_pace:"
msgstr "命名空间(_P)："
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:42
-#: ../camel/providers/local/camel-local-provider.c:84
-#: ../camel/providers/local/camel-local-provider.c:105
+#: ../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
+#: ../camel/providers/local/camel-local-provider.c:101
#: ../camel/providers/nntp/camel-nntp-provider.c:41
msgid "Options"
msgstr "选项"
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../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:68
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
+#: ../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:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
+#: ../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:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../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:74
-#: ../camel/providers/imapx/camel-imapx-provider.c:82
+#: ../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:80
+#: ../camel/providers/imap/camel-imap-provider.c:71
msgid "IMAP default port"
msgstr "IMAP 默认端口"
-#: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#: ../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:87
+#: ../camel/providers/imap/camel-imap-provider.c:78
msgid "IMAP"
msgstr "IMAP"
-#: ../camel/providers/imap/camel-imap-provider.c:89
-#: ../camel/providers/imapx/camel-imapx-provider.c:98
+#: ../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-provider.c:107
-#: ../camel/providers/imapx/camel-imapx-provider.c:118
-#: ../camel/providers/nntp/camel-nntp-provider.c:84
-#: ../camel/providers/pop3/camel-pop3-provider.c:82
-msgid "Password"
-msgstr "密码"
-
-#: ../camel/providers/imap/camel-imap-provider.c:109
-#: ../camel/providers/imapx/camel-imapx-provider.c:120
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "该选项将使用纯文本密码连接到 IMAP 服务器。"
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:272
-#: ../camel/providers/imap/camel-imap-store.c:2694
-#: ../camel/providers/imapx/camel-imapx-store.c:373
-#: ../camel/providers/imapx/camel-imapx-store.c:844
-#: ../camel/providers/local/camel-maildir-folder.c:471
-#: ../camel/providers/local/camel-maildir-store.c:301
-#: ../camel/providers/local/camel-maildir-store.c:675
-#: ../camel/providers/local/camel-maildir-store.c:681
-#: ../camel/providers/local/camel-maildir-store.c:765
-#: ../camel/providers/local/camel-spool-store.c:387
-msgid "Inbox"
-msgstr "收件箱"
-
-#: ../camel/providers/imap/camel-imap-store.c:409
-#: ../camel/providers/imap/camel-imap-store.c:463
-#: ../camel/providers/imapx/camel-imapx-server.c:2828
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s"
-
-#: ../camel/providers/imap/camel-imap-store.c:410
-#: ../camel/providers/imapx/camel-imapx-server.c:2829
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
-msgid "STARTTLS not supported"
-msgstr "不支持 STARTTLS"
-
-#: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imapx/camel-imapx-server.c:2868
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: "
-msgstr "以安全模式连接到 IMAP 服务器 %s 失败："
-
-#: ../camel/providers/imap/camel-imap-store.c:734
-#: ../camel/providers/imapx/camel-imapx-server.c:2935
-#, c-format
-msgid "IMAP server %s does not support %s authentication"
-msgstr "IMAP 服务器 %s 不支持 %s 认证"
-
-#: ../camel/providers/imap/camel-imap-store.c:809
-#: ../camel/providers/imapx/camel-imapx-store.c:155
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP 服务器 %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:812
-#: ../camel/providers/imapx/camel-imapx-store.c:158
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
-
-#: ../camel/providers/imap/camel-imap-store.c:1111
-#: ../camel/providers/imapx/camel-imapx-server.c:2965
-#: ../camel/providers/nntp/camel-nntp-store.c:505
-msgid "Cannot authenticate without a username"
-msgstr "无法进行无用户名的认证"
-
-#: ../camel/providers/imap/camel-imap-store.c:1119
-#: ../camel/providers/imapx/camel-imapx-server.c:2974
-#: ../camel/providers/nntp/camel-nntp-store.c:514
-#: ../camel/providers/pop3/camel-pop3-store.c:491
-#: ../camel/providers/pop3/camel-pop3-store.c:511
-msgid "Authentication password not available"
-msgstr "密码认证不可用"
-
-#: ../camel/providers/imap/camel-imap-store.c:2065
-#: ../camel/providers/imap/camel-imap-store.c:2269
-#: ../camel/providers/imapx/camel-imapx-store.c:348
-#, c-format
-msgid "No such folder %s"
-msgstr "没有文件夹 %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:2079
-#: ../camel/providers/imap/camel-imap-store.c:2538
-#: ../camel/providers/imapx/camel-imapx-store.c:1388
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”"
-
-#: ../camel/providers/imap/camel-imap-store.c:2143
-#: ../camel/providers/imap/camel-imap-store.c:2602
-#: ../camel/providers/imapx/camel-imapx-store.c:1409
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "父文件夹不允许含有子文件夹"
-
-#: ../camel/providers/imap/camel-imap-store.c:2196
-#: ../camel/providers/local/camel-maildir-store.c:268
-#: ../camel/providers/local/camel-mbox-store.c:421
-#: ../camel/providers/local/camel-mh-store.c:558
+#: ../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:2551
-#: ../camel/providers/imapx/camel-imapx-store.c:1399
+#: ../camel/providers/imap/camel-imap-store.c:2994
#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "未知的父文件夹：%s"
+msgid "Retrieving list of folders at '%s'"
+msgstr "正在获取“%s”的文件夹列表"
-#: ../camel/providers/imap/camel-imap-store.c:3326
+#: ../camel/providers/imap/camel-imap-store.c:3344
#, c-format
msgid "Server unexpectedly disconnected"
msgstr "服务器意外断开 "
-#: ../camel/providers/imap/camel-imap-store.c:3329
+#: ../camel/providers/imap/camel-imap-store.c:3348
msgid "Server unexpectedly disconnected: "
msgstr "服务器意外断开："
-#: ../camel/providers/imapx/camel-imapx-folder.c:101
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "无法为 %s 创建文件夹概要"
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:109
-#, c-format
-msgid "Could not create cache for %s: "
-msgstr "无法为 %s 创建缓存："
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../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:48
+#: ../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 "Command:"
-msgstr "命令："
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Numbe_r of cached connections to use"
-msgstr "使用的缓存连接的数目(_R)"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:69
msgid "Namespace:"
msgstr "命名空间："
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
msgid "Default IMAP port"
msgstr "默认的 IMAP 端口"
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
msgid "IMAP+"
msgstr "IMAP+"
-#: ../camel/providers/imapx/camel-imapx-server.c:817
-msgid "Server disconnected"
-msgstr "服务器断开连接"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1206
-msgid "Error writing to cache stream: "
-msgstr "写入缓存流错误："
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1940
-#, c-format
-msgid "Not authenticated"
-msgstr "没有验证"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:2005
-msgid "Error performing IDLE"
-msgstr "执行 IDLE 命令出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3160
-msgid "Error fetching message"
-msgstr "取回消息出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3228
-msgid "Closing tmp stream failed: "
-msgstr "关闭临时流失败："
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3327
-msgid "Error copying messages"
-msgstr "复制消息出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3457
-msgid "Error appending message"
-msgstr "追加消息出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3637
-msgid "Error fetching message headers"
-msgstr "取回消息头出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3778
-msgid "Error retrieving message"
-msgstr "收取消息出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3982
-msgid "Error fetching new messages"
-msgstr "取回新消息出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4172
-msgid "Error while fetching messages"
-msgstr "取回消息出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4180
-#: ../camel/providers/imapx/camel-imapx-server.c:4210
-#, 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/providers/imapx/camel-imapx-server.c:4332
-#: ../camel/providers/imapx/camel-imapx-server.c:4366
-msgid "Error refreshing folder"
-msgstr "刷新文件夹出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4455
-msgid "Error expunging message"
-msgstr "销毁消息出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4540
-msgid "Error fetching folders"
-msgstr "取回文件夹出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4614
-msgid "Error subscribing to folder"
-msgstr "订阅文件夹出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4667
-msgid "Error creating folder"
-msgstr "创建文件夹出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4712
-msgid "Error deleting folder"
-msgstr "删除文件夹出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4762
-msgid "Error renaming folder"
-msgstr "重命名文件夹出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4813
-msgid "Error performing NOOP"
-msgstr "执行 NOOP 出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:4908
-msgid "Error syncing changes"
-msgstr "同步变更出错"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:5664
-#: ../camel/providers/imapx/camel-imapx-server.c:5679
-msgid "Cannot create spool file: "
-msgstr "无法创建脱机文件："
-
-#: ../camel/providers/imapx/camel-imapx-store.c:1076
-#, c-format
-msgid "Retrieving folder list for %s"
-msgstr "正在获取“%s”的文件夹列表"
-
-#: ../camel/providers/imapx/camel-imapx-store.c:1176
-#: ../camel/providers/nntp/camel-nntp-store.c:1790
-#, c-format
-msgid "No such folder: %s"
-msgstr "没有文件夹：%s"
-
-#: ../camel/providers/imapx/camel-imapx-stream.c:70
-#, c-format
-msgid "Source stream returned no data"
-msgstr "源流没返回数据"
-
-#: ../camel/providers/imapx/camel-imapx-stream.c:79
-#, c-format
-msgid "Source stream unavailable"
-msgstr "源流不可用"
-
-#: ../camel/providers/local/camel-local-folder.c:191
+#: ../camel/providers/local/camel-local-folder.c:194
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:201
-#: ../camel/providers/local/camel-local-folder.c:210
+#: ../camel/providers/local/camel-local-folder.c:204
+#: ../camel/providers/local/camel-local-folder.c:213
#, c-format
msgid "mailbox: %s (%s)"
msgstr "邮件箱：%s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:219
+#: ../camel/providers/local/camel-local-folder.c:222
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:483
+#: ../camel/providers/local/camel-local-folder.c:499
msgid "_Index message body data"
msgstr "索引消息正文(_I)"
-#: ../camel/providers/local/camel-local-folder.c:712
+#: ../camel/providers/local/camel-local-folder.c:727
#, c-format
msgid ""
"Cannot get message %s from folder %s\n"
@@ -3539,23 +3647,23 @@ msgstr ""
"无法从文件夹 %2$s 获取消息 %1$s\n"
"%3$s"
-#: ../camel/providers/local/camel-local-provider.c:44
+#: ../camel/providers/local/camel-local-provider.c:43
msgid "_Use the '.folders' folder summary file (exmh)"
msgstr "使用“.folders”文件夹概览文件(exmh)(_U)"
-#: ../camel/providers/local/camel-local-provider.c:51
+#: ../camel/providers/local/camel-local-provider.c:50
msgid "MH-format mail directories"
msgstr "MH-格式的邮件目录"
-#: ../camel/providers/local/camel-local-provider.c:52
+#: ../camel/providers/local/camel-local-provider.c:51
msgid "For storing local mail in MH-like mail directories."
msgstr "在类似于 MH 的邮件目录中存储本地邮件。"
-#: ../camel/providers/local/camel-local-provider.c:70
+#: ../camel/providers/local/camel-local-provider.c:68
msgid "Local delivery"
msgstr "本地发送"
-#: ../camel/providers/local/camel-local-provider.c:71
+#: ../camel/providers/local/camel-local-provider.c:69
msgid ""
"For retrieving (moving) local mail from standard mbox-formatted spools into "
"folders managed by Evolution."
@@ -3563,29 +3671,29 @@ msgstr ""
"对于将本地邮件从标准 mbox 格式脱机文件夹获取(移动)到由 Evolution 管理的文件"
"夹。"
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:83
+#: ../camel/providers/local/camel-local-provider.c:103
msgid "_Apply filters to new messages in Inbox"
msgstr "对收件箱中的新消息应用过滤规则(_A)"
-#: ../camel/providers/local/camel-local-provider.c:93
+#: ../camel/providers/local/camel-local-provider.c:90
msgid "Maildir-format mail directories"
msgstr "Maildir 格式的邮件目录"
-#: ../camel/providers/local/camel-local-provider.c:94
+#: ../camel/providers/local/camel-local-provider.c:91
msgid "For storing local mail in maildir directories."
msgstr "在 maildir 邮件目录中存储本地邮件。"
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
msgid "_Store status headers in Elm/Pine/Mutt format"
msgstr "以 Elm/Pine/Mutt 格式存储状态头(_S)"
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
msgid "Standard Unix mbox spool file"
msgstr "标准 Unix mbox 脱机文件"
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:128
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:124
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."
@@ -3593,7 +3701,7 @@ msgstr ""
"对于读取和存储外部标准 mbox 脱机文件中的本地邮件。\n"
"也可用于读取 Elm、Pine 或 Mutt 风格的文件夹树。"
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:123
msgid "Standard Unix mbox spool directory"
msgstr "标准 Unix mbox 脱机目录"
@@ -3602,168 +3710,168 @@ msgstr "标准 Unix mbox 脱机目录"
msgid "Could not rename folder %s to %s: %s"
msgstr "无法将文件夹 %s 改名为 %s：%s"
-#: ../camel/providers/local/camel-local-store.c:178
+#: ../camel/providers/local/camel-local-store.c:180
#, c-format
msgid "Local mail file %s"
msgstr "本地邮件文件 %s"
-#: ../camel/providers/local/camel-local-store.c:218
-#: ../camel/providers/local/camel-local-store.c:375
-#: ../camel/providers/local/camel-maildir-store.c:101
-#: ../camel/providers/local/camel-mbox-store.c:555
-#: ../camel/providers/local/camel-spool-store.c:86
+#: ../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-mbox-store.c:581
+#: ../camel/providers/local/camel-spool-store.c:89
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "存储根目录 %s 不是绝对路径"
-#: ../camel/providers/local/camel-local-store.c:227
+#: ../camel/providers/local/camel-local-store.c:232
#, c-format
msgid "Store root %s is not a regular directory"
msgstr "存储根目录 %s 不是普通目录"
-#: ../camel/providers/local/camel-local-store.c:239
-#: ../camel/providers/local/camel-local-store.c:249
-#: ../camel/providers/local/camel-local-store.c:388
-#: ../camel/providers/local/camel-maildir-store.c:134
+#: ../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
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "无法获取文件夹：%s：%s"
-#: ../camel/providers/local/camel-local-store.c:286
+#: ../camel/providers/local/camel-local-store.c:291
#, c-format
msgid "Local stores do not have an inbox"
msgstr "本地存储没有收件箱"
-#: ../camel/providers/local/camel-local-store.c:445
-#: ../camel/providers/local/camel-mbox-store.c:722
+#: ../camel/providers/local/camel-local-store.c:456
+#: ../camel/providers/local/camel-mbox-store.c:748
#, c-format
msgid "Could not delete folder index file '%s': %s"
msgstr "无法删除文件夹索引文件“%s”：%s"
-#: ../camel/providers/local/camel-local-store.c:473
-#: ../camel/providers/local/camel-mbox-store.c:752
+#: ../camel/providers/local/camel-local-store.c:484
+#: ../camel/providers/local/camel-mbox-store.c:778
#, c-format
msgid "Could not delete folder meta file '%s': %s"
msgstr "无法删除文件夹元文件“%s”：%s"
-#: ../camel/providers/local/camel-local-store.c:581
+#: ../camel/providers/local/camel-local-store.c:596
#, c-format
msgid "Could not rename '%s': %s"
msgstr "无法重命名“%s”：%s"
-#: ../camel/providers/local/camel-local-summary.c:527
+#: ../camel/providers/local/camel-local-summary.c:543
#, c-format
msgid "Unable to add message to summary: unknown reason"
msgstr "无法将消息添加到概要中：未知的原因"
#: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:336
+#: ../camel/providers/local/camel-maildir-folder.c:335
#: ../camel/providers/local/camel-mbox-folder.c:117
#: ../camel/providers/local/camel-mbox-folder.c:329
-#: ../camel/providers/local/camel-mh-folder.c:160
+#: ../camel/providers/local/camel-mh-folder.c:159
msgid "No such message"
msgstr "没有该消息"
-#: ../camel/providers/local/camel-maildir-folder.c:226
+#: ../camel/providers/local/camel-maildir-folder.c:225
#, c-format
msgid "Cannot append message to maildir folder: %s: "
msgstr "无法将消息附加到邮件目录文件夹：%s："
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:284
+#: ../camel/providers/local/camel-maildir-folder.c:273
+#: ../camel/providers/local/camel-maildir-folder.c:283
#: ../camel/providers/local/camel-mbox-folder.c:390
-#: ../camel/providers/local/camel-mh-folder.c:172
-#: ../camel/providers/local/camel-mh-folder.c:182
+#: ../camel/providers/local/camel-mh-folder.c:171
+#: ../camel/providers/local/camel-mh-folder.c:181
#, c-format
msgid "Cannot get message %s from folder %s: "
msgstr "无法从文件夹 %2$s 获取消息 %1$s："
-#: ../camel/providers/local/camel-maildir-folder.c:354
+#: ../camel/providers/local/camel-maildir-folder.c:353
#, c-format
msgid "Cannot transfer message to destination folder: %s"
msgstr "无法将消息转移到目标文件夹：%s"
-#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../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:119
-#: ../camel/providers/local/camel-maildir-store.c:782
+#: ../camel/providers/local/camel-maildir-store.c:122
+#: ../camel/providers/local/camel-maildir-store.c:806
#, c-format
msgid "Folder %s already exists"
msgstr "文件夹 %s 已经存在"
-#: ../camel/providers/local/camel-maildir-store.c:215
-#: ../camel/providers/local/camel-maildir-store.c:246
-#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-maildir-store.c:221
+#: ../camel/providers/local/camel-maildir-store.c:252
#: ../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:230
-#: ../camel/providers/local/camel-mbox-store.c:355
-#: ../camel/providers/local/camel-mh-store.c:516
+#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-mbox-store.c:369
+#: ../camel/providers/local/camel-mh-store.c:522
#, c-format
msgid "Cannot get folder '%s': %s"
msgstr "无法获取文件夹“%s”：%s"
-#: ../camel/providers/local/camel-maildir-store.c:236
-#: ../camel/providers/local/camel-mbox-store.c:365
-#: ../camel/providers/local/camel-mh-store.c:525
+#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-mbox-store.c:379
+#: ../camel/providers/local/camel-mh-store.c:531
#, c-format
msgid "Cannot get folder '%s': folder does not exist."
msgstr "无法获得文件夹“%s”：文件夹不存在。"
-#: ../camel/providers/local/camel-maildir-store.c:263
+#: ../camel/providers/local/camel-maildir-store.c:269
#, c-format
msgid "Cannot get folder '%s': not a maildir directory."
msgstr "无法获取文件夹“%s”：不是 maildir 目录。"
-#: ../camel/providers/local/camel-maildir-store.c:329
-#: ../camel/providers/local/camel-maildir-store.c:369
-#: ../camel/providers/local/camel-mh-store.c:670
+#: ../camel/providers/local/camel-maildir-store.c:338
+#: ../camel/providers/local/camel-maildir-store.c:378
+#: ../camel/providers/local/camel-mh-store.c:682
#, c-format
msgid "Could not delete folder '%s': %s"
msgstr "无法删除文件夹“%s”：%s"
-#: ../camel/providers/local/camel-maildir-store.c:331
+#: ../camel/providers/local/camel-maildir-store.c:340
msgid "not a maildir directory"
msgstr "不是 maildir 目录"
-#: ../camel/providers/local/camel-maildir-store.c:569
-#: ../camel/providers/local/camel-maildir-store.c:970
-#: ../camel/providers/local/camel-spool-store.c:209
-#: ../camel/providers/local/camel-spool-store.c:228
+#: ../camel/providers/local/camel-maildir-store.c:589
+#: ../camel/providers/local/camel-maildir-store.c:1003
+#: ../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:773
+#: ../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:416
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:434
+#: ../camel/providers/local/camel-maildir-summary.c:567
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "无法打开邮件目录路径：%s：%s"
-#: ../camel/providers/local/camel-maildir-summary.c:540
+#: ../camel/providers/local/camel-maildir-summary.c:558
msgid "Checking folder consistency"
msgstr "检查文件夹一致性"
-#: ../camel/providers/local/camel-maildir-summary.c:633
+#: ../camel/providers/local/camel-maildir-summary.c:651
msgid "Checking for new messages"
msgstr "检查新消息"
-#: ../camel/providers/local/camel-maildir-summary.c:728
+#: ../camel/providers/local/camel-maildir-summary.c:746
#: ../camel/providers/local/camel-mbox-summary.c:418
-#: ../camel/providers/local/camel-mbox-summary.c:649
-#: ../camel/providers/local/camel-mbox-summary.c:793
-#: ../camel/providers/local/camel-spool-summary.c:130
+#: ../camel/providers/local/camel-mbox-summary.c:650
+#: ../camel/providers/local/camel-mbox-summary.c:794
+#: ../camel/providers/local/camel-spool-summary.c:132
msgid "Storing folder"
msgstr "存储文件夹"
@@ -3782,39 +3890,39 @@ msgid "The folder appears to be irrecoverably corrupted."
msgstr "文件夹好像已经被不可恢复地破坏了。"
#: ../camel/providers/local/camel-mbox-folder.c:439
-#: ../camel/providers/local/camel-spool-folder.c:70
+#: ../camel/providers/local/camel-spool-folder.c:69
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr "无法在 %s 创建文件夹锁：%s"
-#: ../camel/providers/local/camel-mbox-store.c:377
-#: ../camel/providers/local/camel-mbox-store.c:563
+#: ../camel/providers/local/camel-mbox-store.c:391
+#: ../camel/providers/local/camel-mbox-store.c:589
#, c-format
msgid "Cannot create a folder by this name."
msgstr "无法以此名称创建文件夹。"
-#: ../camel/providers/local/camel-mbox-store.c:414
+#: ../camel/providers/local/camel-mbox-store.c:435
#, c-format
msgid "Cannot get folder '%s': not a regular file."
msgstr "无法获取文件夹“%s”：不是普通文件"
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:605
#, c-format
msgid "Cannot create directory '%s': %s."
msgstr "无法创建目录“%s”：%s"
-#: ../camel/providers/local/camel-mbox-store.c:591
+#: ../camel/providers/local/camel-mbox-store.c:617
#, c-format
msgid "Cannot create folder: %s: %s"
msgstr "无法创建文件夹：%s：%s"
-#: ../camel/providers/local/camel-mbox-store.c:593
+#: ../camel/providers/local/camel-mbox-store.c:619
msgid "Folder already exists"
msgstr "文件夹已经存在"
-#: ../camel/providers/local/camel-mbox-store.c:633
-#: ../camel/providers/local/camel-mbox-store.c:646
-#: ../camel/providers/local/camel-mbox-store.c:675
+#: ../camel/providers/local/camel-mbox-store.c:659
+#: ../camel/providers/local/camel-mbox-store.c:672
+#: ../camel/providers/local/camel-mbox-store.c:701
#, c-format
msgid ""
"Could not delete folder '%s':\n"
@@ -3823,33 +3931,33 @@ msgstr ""
"无法删除文件夹“%s”：\n"
"%s"
-#: ../camel/providers/local/camel-mbox-store.c:656
+#: ../camel/providers/local/camel-mbox-store.c:682
#, c-format
msgid "'%s' is not a regular file."
msgstr "“%s”并不是普通文件。"
-#: ../camel/providers/local/camel-mbox-store.c:665
+#: ../camel/providers/local/camel-mbox-store.c:691
#, c-format
msgid "Folder '%s' is not empty. Not deleted."
msgstr "文件夹“%s”非空。没有删除。"
-#: ../camel/providers/local/camel-mbox-store.c:692
-#: ../camel/providers/local/camel-mbox-store.c:707
+#: ../camel/providers/local/camel-mbox-store.c:718
+#: ../camel/providers/local/camel-mbox-store.c:733
#, c-format
msgid "Could not delete folder summary file '%s': %s"
msgstr "无法删除文件夹概要文件“%s”：%s"
-#: ../camel/providers/local/camel-mbox-store.c:789
+#: ../camel/providers/local/camel-mbox-store.c:815
#, c-format
msgid "The new folder name is illegal."
msgstr "指定的文件夹名称不合法。"
-#: ../camel/providers/local/camel-mbox-store.c:805
+#: ../camel/providers/local/camel-mbox-store.c:831
#, c-format
msgid "Could not rename '%s': '%s': %s"
msgstr "无法重命名“%s”：“%s”：%s"
-#: ../camel/providers/local/camel-mbox-store.c:888
+#: ../camel/providers/local/camel-mbox-store.c:915
#, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "无法将“%s”重命名为 %s：%s"
@@ -3864,88 +3972,88 @@ msgstr "无法打开文件夹：%s：%s"
msgid "Fatal mail parser error near position %s in folder %s"
msgstr "邮件解析发生致命错误，位于 %s (文件夹 %s)"
-#: ../camel/providers/local/camel-mbox-summary.c:574
+#: ../camel/providers/local/camel-mbox-summary.c:575
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "无法检查文件夹：%s：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:662
-#: ../camel/providers/local/camel-mbox-summary.c:802
-#: ../camel/providers/local/camel-spool-summary.c:137
+#: ../camel/providers/local/camel-mbox-summary.c:663
+#: ../camel/providers/local/camel-mbox-summary.c:803
+#: ../camel/providers/local/camel-spool-summary.c:139
#, c-format
msgid "Could not open file: %s: %s"
msgstr "无法打开文件：%s：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:676
-#: ../camel/providers/local/camel-spool-summary.c:152
+#: ../camel/providers/local/camel-mbox-summary.c:677
+#: ../camel/providers/local/camel-spool-summary.c:154
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "无法打开临时邮件箱：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:693
-#: ../camel/providers/local/camel-mbox-summary.c:918
+#: ../camel/providers/local/camel-mbox-summary.c:694
+#: ../camel/providers/local/camel-mbox-summary.c:920
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "无法关闭来源文件夹 %s：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:704
+#: ../camel/providers/local/camel-mbox-summary.c:705
#, c-format
msgid "Could not close temporary folder: %s"
msgstr "无法关闭临时文件夹：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:721
+#: ../camel/providers/local/camel-mbox-summary.c:722
#, c-format
msgid "Could not rename folder: %s"
msgstr "无法重命名文件夹：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:816
-#: ../camel/providers/local/camel-mbox-summary.c:1084
+#: ../camel/providers/local/camel-mbox-summary.c:817
+#: ../camel/providers/local/camel-mbox-summary.c:1086
#, c-format
msgid "Could not store folder: %s"
msgstr "无法存储文件夹：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:855
-#: ../camel/providers/local/camel-mbox-summary.c:1115
+#: ../camel/providers/local/camel-mbox-summary.c:856
+#: ../camel/providers/local/camel-mbox-summary.c:1126
#, 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:864
-#: ../camel/providers/local/camel-mbox-summary.c:1124
+#: ../camel/providers/local/camel-mbox-summary.c:866
+#: ../camel/providers/local/camel-mbox-summary.c:1138
#, c-format
msgid "Summary and folder mismatch, even after a sync"
msgstr "即使同步后，概要和文件夹仍然不匹配"
-#: ../camel/providers/local/camel-mbox-summary.c:1029
-#: ../camel/providers/local/camel-spool-summary.c:345
+#: ../camel/providers/local/camel-mbox-summary.c:1031
+#: ../camel/providers/local/camel-spool-summary.c:347
#, c-format
msgid "Unknown error: %s"
msgstr "未知的错误：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:1182
-#: ../camel/providers/local/camel-mbox-summary.c:1212
+#: ../camel/providers/local/camel-mbox-summary.c:1196
+#: ../camel/providers/local/camel-mbox-summary.c:1226
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "写入临时 mailbox 失败：%s"
-#: ../camel/providers/local/camel-mbox-summary.c:1201
+#: ../camel/providers/local/camel-mbox-summary.c:1215
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "写入临时 mailbox 失败：%s：%s"
-#: ../camel/providers/local/camel-mh-folder.c:119
+#: ../camel/providers/local/camel-mh-folder.c:118
#, c-format
msgid "Cannot append message to mh folder: %s: "
msgstr "无法将消息附加到 mh 文件夹：%s："
-#: ../camel/providers/local/camel-mh-store.c:535
+#: ../camel/providers/local/camel-mh-store.c:541
#, c-format
msgid "Could not create folder '%s': %s"
msgstr "无法创建文件夹“%s”：%s"
-#: ../camel/providers/local/camel-mh-store.c:551
+#: ../camel/providers/local/camel-mh-store.c:557
#, c-format
msgid "Cannot get folder '%s': not a directory."
msgstr "无法获取文件夹“%s”：不是目录。"
@@ -3955,36 +4063,36 @@ msgstr "无法获取文件夹“%s”：不是目录。"
msgid "Cannot open MH directory path: %s: %s"
msgstr "无法打开 MH 目录：%s：%s"
-#: ../camel/providers/local/camel-spool-store.c:94
+#: ../camel/providers/local/camel-spool-store.c:97
#, c-format
msgid "Spool '%s' cannot be opened: %s"
msgstr "无法打开脱机文件“%s”：%s"
-#: ../camel/providers/local/camel-spool-store.c:108
+#: ../camel/providers/local/camel-spool-store.c:111
#, c-format
msgid "Spool '%s' is not a regular file or directory"
msgstr "脱机文件“%s”不是普通文件或目录"
-#: ../camel/providers/local/camel-spool-store.c:416
+#: ../camel/providers/local/camel-spool-store.c:425
#, c-format
msgid "Spool mail file %s"
msgstr "脱机邮件文件 %s"
-#: ../camel/providers/local/camel-spool-store.c:420
+#: ../camel/providers/local/camel-spool-store.c:429
#, c-format
msgid "Spool folder tree %s"
msgstr "脱机文件夹树 %s"
-#: ../camel/providers/local/camel-spool-store.c:423
+#: ../camel/providers/local/camel-spool-store.c:432
msgid "Invalid spool"
msgstr "无效的本地文件"
-#: ../camel/providers/local/camel-spool-store.c:480
+#: ../camel/providers/local/camel-spool-store.c:492
#, c-format
msgid "Folder '%s/%s' does not exist."
msgstr "文件夹“%s/%s”不存在。"
-#: ../camel/providers/local/camel-spool-store.c:493
+#: ../camel/providers/local/camel-spool-store.c:505
#, c-format
msgid ""
"Could not open folder '%s':\n"
@@ -3993,12 +4101,12 @@ msgstr ""
"无法打开文件夹“%s”：\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:499
+#: ../camel/providers/local/camel-spool-store.c:511
#, c-format
msgid "Folder '%s' does not exist."
msgstr "文件夹“%s”不存在。"
-#: ../camel/providers/local/camel-spool-store.c:507
+#: ../camel/providers/local/camel-spool-store.c:519
#, c-format
msgid ""
"Could not create folder '%s':\n"
@@ -4007,41 +4115,41 @@ msgstr ""
"无法创建文件夹“%s”：\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:520
+#: ../camel/providers/local/camel-spool-store.c:532
#, c-format
msgid "'%s' is not a mailbox file."
msgstr "“%s”不是邮件箱文件。"
-#: ../camel/providers/local/camel-spool-store.c:584
+#: ../camel/providers/local/camel-spool-store.c:596
#, c-format
msgid "Store does not support an INBOX"
msgstr "存储并不支持收件箱"
-#: ../camel/providers/local/camel-spool-store.c:603
+#: ../camel/providers/local/camel-spool-store.c:615
#, c-format
msgid "Spool folders cannot be deleted"
msgstr "脱机文件夹无法删除"
-#: ../camel/providers/local/camel-spool-store.c:618
+#: ../camel/providers/local/camel-spool-store.c:630
#, c-format
msgid "Spool folders cannot be renamed"
msgstr "脱机文件夹无法改名"
-#: ../camel/providers/local/camel-spool-summary.c:168
-#: ../camel/providers/local/camel-spool-summary.c:180
-#: ../camel/providers/local/camel-spool-summary.c:192
+#: ../camel/providers/local/camel-spool-summary.c:170
+#: ../camel/providers/local/camel-spool-summary.c:182
+#: ../camel/providers/local/camel-spool-summary.c:194
#, c-format
msgid "Could not synchronize temporary folder %s: %s"
msgstr "无法同步临时文件夹 %s: %s"
-#: ../camel/providers/local/camel-spool-summary.c:210
+#: ../camel/providers/local/camel-spool-summary.c:212
#, c-format
msgid "Could not synchronize spool folder %s: %s"
msgstr "无法同步脱机文件夹 %s: %s"
-#: ../camel/providers/local/camel-spool-summary.c:242
-#: ../camel/providers/local/camel-spool-summary.c:261
-#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:244
+#: ../camel/providers/local/camel-spool-summary.c:263
+#: ../camel/providers/local/camel-spool-summary.c:276
#, c-format
msgid ""
"Could not synchronize spool folder %s: %s\n"
@@ -4050,47 +4158,47 @@ msgstr ""
"无法同步脱机文件夹 %s: %s\n"
"文件夹可能已损坏，副本已存放在 '%s'"
-#: ../camel/providers/nntp/camel-nntp-folder.c:290
-#: ../camel/providers/nntp/camel-nntp-folder.c:379
-#: ../camel/providers/nntp/camel-nntp-folder.c:501
+#: ../camel/providers/nntp/camel-nntp-folder.c:278
+#: ../camel/providers/nntp/camel-nntp-folder.c:360
+#: ../camel/providers/nntp/camel-nntp-folder.c:481
#, c-format
msgid "Internal error: UID in invalid format: %s"
msgstr "内部错误：UID 的格式无效：%s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:340
-#: ../camel/providers/nntp/camel-nntp-folder.c:344
-#: ../camel/providers/pop3/camel-pop3-folder.c:611
-#: ../camel/providers/pop3/camel-pop3-folder.c:995
+#: ../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
#, c-format
msgid "Cannot get message %s: %s"
msgstr "无法获取消息 %s：%s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:351
-#: ../camel/providers/nntp/camel-nntp-folder.c:526
-#: ../camel/providers/pop3/camel-pop3-folder.c:549
-#: ../camel/providers/pop3/camel-pop3-folder.c:601
-#: ../camel/providers/pop3/camel-pop3-folder.c:620
+#: ../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
#, c-format
msgid "Cannot get message %s: "
msgstr "无法获取消息 %s："
-#: ../camel/providers/nntp/camel-nntp-folder.c:585
-#: ../camel/providers/nntp/camel-nntp-folder.c:591
-#: ../camel/providers/nntp/camel-nntp-folder.c:638
+#: ../camel/providers/nntp/camel-nntp-folder.c:559
+#: ../camel/providers/nntp/camel-nntp-folder.c:565
+#: ../camel/providers/nntp/camel-nntp-folder.c:611
#, c-format
msgid "Posting failed: %s"
-msgstr "发表失败：%s"
+msgstr "发送失败：%s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:633
+#: ../camel/providers/nntp/camel-nntp-folder.c:606
msgid "Posting failed: "
-msgstr "发表失败："
+msgstr "发送失败："
-#: ../camel/providers/nntp/camel-nntp-folder.c:662
+#: ../camel/providers/nntp/camel-nntp-folder.c:633
#, c-format
msgid "You cannot post NNTP messages while working offline!"
msgstr "您离线时无法投递 NNTP 消息！"
-#: ../camel/providers/nntp/camel-nntp-folder.c:682
+#: ../camel/providers/nntp/camel-nntp-folder.c:653
#, c-format
msgid "You cannot copy messages from a NNTP folder!"
msgstr "您无法从 NNTP 文件夹复制消息！"
@@ -4100,48 +4208,48 @@ msgid ""
"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
msgstr "以短格式显示文件夹(如 c.o.linux 而不是 comp.os.linux)(_S)"
-#: ../camel/providers/nntp/camel-nntp-provider.c:50
+#: ../camel/providers/nntp/camel-nntp-provider.c:51
msgid "In the subscription _dialog, show relative folder names"
msgstr "在订阅对话框中显示相对文件夹名称(_D)"
-#: ../camel/providers/nntp/camel-nntp-provider.c:56
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
msgid "Default NNTP port"
msgstr "默认的 NNTP 端口"
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:58
msgid "NNTP over SSL"
msgstr "NNTP (SSL 加密)"
-#: ../camel/providers/nntp/camel-nntp-provider.c:63
+#: ../camel/providers/nntp/camel-nntp-provider.c:64
msgid "USENET news"
msgstr "USENET 新闻"
-#: ../camel/providers/nntp/camel-nntp-provider.c:65
+#: ../camel/providers/nntp/camel-nntp-provider.c:66
msgid "This is a provider for reading from and posting to USENET newsgroups."
msgstr "这是一个读取 USENET 新闻组和向 USENET 新闻组发布邮件的提供者。"
-#: ../camel/providers/nntp/camel-nntp-provider.c:86
+#: ../camel/providers/nntp/camel-nntp-provider.c:87
msgid ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
msgstr "该选项将以明文密码向进行 NNTP 服务器进行认证。"
-#: ../camel/providers/nntp/camel-nntp-store.c:285
+#: ../camel/providers/nntp/camel-nntp-store.c:286
#, c-format
msgid "Could not read greeting from %s: "
msgstr "无法阅读来自 %s 的欢迎信息："
-#: ../camel/providers/nntp/camel-nntp-store.c:297
+#: ../camel/providers/nntp/camel-nntp-store.c:298
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "NNTP 服务器 %s 返回错误码 %d：%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:469
+#: ../camel/providers/nntp/camel-nntp-store.c:463
#, c-format
msgid "USENET News via %s"
msgstr "USENET 新闻 %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1072
+#: ../camel/providers/nntp/camel-nntp-store.c:1058
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -4152,22 +4260,22 @@ msgstr ""
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1165
+#: ../camel/providers/nntp/camel-nntp-store.c:1152
#, c-format
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr "您无法在新闻存储中创建文件夹：应该订阅。"
-#: ../camel/providers/nntp/camel-nntp-store.c:1181
+#: ../camel/providers/nntp/camel-nntp-store.c:1168
#, c-format
msgid "You cannot rename a folder in a News store."
msgstr "您无法在新闻存储中重命名文件夹。"
-#: ../camel/providers/nntp/camel-nntp-store.c:1204
+#: ../camel/providers/nntp/camel-nntp-store.c:1191
#, c-format
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr "您无法在新闻存储中删除文件夹：应该退订。"
-#: ../camel/providers/nntp/camel-nntp-store.c:1402
+#: ../camel/providers/nntp/camel-nntp-store.c:1390
#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
@@ -4178,7 +4286,7 @@ msgstr ""
"\n"
"没有这样的新闻组。选中项目可能是父文件夹。"
-#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#: ../camel/providers/nntp/camel-nntp-store.c:1438
#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
@@ -4189,64 +4297,68 @@ msgstr ""
"\n"
"新闻组不存在！"
-#: ../camel/providers/nntp/camel-nntp-store.c:1647
+#: ../camel/providers/nntp/camel-nntp-store.c:1628
msgid "NNTP Command failed: "
msgstr "NNTP 命令失败："
-#: ../camel/providers/nntp/camel-nntp-store.c:1732
+#: ../camel/providers/nntp/camel-nntp-store.c:1713
#, c-format
msgid "Not connected."
msgstr "未连接。"
-#: ../camel/providers/nntp/camel-nntp-summary.c:195
-#: ../camel/providers/nntp/camel-nntp-summary.c:322
+#: ../camel/providers/nntp/camel-nntp-summary.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:328
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s：正在扫描新消息"
-#: ../camel/providers/nntp/camel-nntp-summary.c:213
+#: ../camel/providers/nntp/camel-nntp-summary.c:216
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "来自 xover 的意外服务器应答：%s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:340
+#: ../camel/providers/nntp/camel-nntp-summary.c:346
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "来自 head 的意外服务器应答：%s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:387
+#: ../camel/providers/nntp/camel-nntp-summary.c:393
#, c-format
msgid "Operation failed: %s"
msgstr "操作失败：%s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:447
-#: ../camel/providers/pop3/camel-pop3-folder.c:517
+#: ../camel/providers/pop3/camel-pop3-folder.c:453
+#: ../camel/providers/pop3/camel-pop3-folder.c:526
#, c-format
msgid "No message with UID %s"
msgstr "没有 UID 为 %s 的消息"
-#: ../camel/providers/pop3/camel-pop3-folder.c:533
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
#, c-format
msgid "Retrieving POP message %d"
msgstr "正在获取 POP 消息 %d"
-#: ../camel/providers/pop3/camel-pop3-folder.c:612
+#: ../camel/providers/pop3/camel-pop3-folder.c:634
msgid "Unknown reason"
msgstr "未知原因"
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/pop3/camel-pop3-folder.c:682
msgid "Retrieving POP summary"
msgstr "正在获取 POP 概要"
-#: ../camel/providers/pop3/camel-pop3-folder.c:711
+#: ../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
msgid "Cannot get POP summary: "
msgstr "无法获取 POP 概要："
-#: ../camel/providers/pop3/camel-pop3-folder.c:823
+#: ../camel/providers/pop3/camel-pop3-folder.c:891
msgid "Expunging old messages"
msgstr "销毁旧消息"
-#: ../camel/providers/pop3/camel-pop3-folder.c:843
+#: ../camel/providers/pop3/camel-pop3-folder.c:911
msgid "Expunging deleted messages"
msgstr "彻底销毁已删除的消息"
@@ -4258,37 +4370,38 @@ msgstr "消息存储"
msgid "_Leave messages on server"
msgstr "在服务器上保留消息(_L)"
-#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on
the server
-#: ../camel/providers/pop3/camel-pop3-provider.c:44
+#. Translators: '%s' is replaced with a widget, where user can
+#. * select how many days can be message left on the server.
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
#, c-format
msgid "_Delete after %s day(s)"
msgstr "%s 天之后删除(_D)"
-#: ../camel/providers/pop3/camel-pop3-provider.c:46
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
msgid "Delete _expunged from local Inbox"
msgstr "从本地的收件箱中删除已在远端清除的邮件(_E)"
-#: ../camel/providers/pop3/camel-pop3-provider.c:48
+#: ../camel/providers/pop3/camel-pop3-provider.c:49
msgid "Disable _support for all POP3 extensions"
msgstr "禁用所有 POP3 扩展的支持(_S)"
-#: ../camel/providers/pop3/camel-pop3-provider.c:54
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
msgid "Default POP3 port"
msgstr "默认的 POP3 端口"
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
msgid "POP3 over SSL"
msgstr "POP3 (SSL 加密)"
-#: ../camel/providers/pop3/camel-pop3-provider.c:62
+#: ../camel/providers/pop3/camel-pop3-provider.c:63
msgid "POP"
msgstr "POP"
-#: ../camel/providers/pop3/camel-pop3-provider.c:64
+#: ../camel/providers/pop3/camel-pop3-provider.c:65
msgid "For connecting to and downloading mail from POP servers."
msgstr "关于连接到 POP 服务器和从 POP 服务器下载邮件。"
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:85
msgid ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
@@ -4296,7 +4409,7 @@ msgstr ""
"该选项使 Evolution 在连接到 POP 服务器时使用明文密码。这是许多 POP 服务器唯一"
"支持的选项。"
-#: ../camel/providers/pop3/camel-pop3-provider.c:94
+#: ../camel/providers/pop3/camel-pop3-provider.c:95
msgid ""
"This option will connect to the POP server using an encrypted password via "
"the APOP protocol. This may not work for all users even on servers that "
@@ -4310,52 +4423,53 @@ msgstr ""
msgid ": "
msgstr "："
-#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/pop3/camel-pop3-store.c:144
#, c-format
msgid "Failed to read a valid greeting from POP server %s"
msgstr "从 POP 服务器 %s 读取欢迎词失败"
-#: ../camel/providers/pop3/camel-pop3-store.c:153
+#: ../camel/providers/pop3/camel-pop3-store.c:159
#, 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:154
+#: ../camel/providers/pop3/camel-pop3-store.c:160
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:172
+#. Translators: Last %s is an optional
+#. * explanation beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:181
#, c-format
msgid "Failed to connect to POP server %s in secure mode%s"
msgstr "以安全模式连接到 POP 服务器 %s 失败%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:185
+#: ../camel/providers/pop3/camel-pop3-store.c:194
#, c-format
msgid "Failed to connect to POP server %s in secure mode: "
msgstr "以安全模式连接到 POP 服务器 %s 失败："
-#: ../camel/providers/pop3/camel-pop3-store.c:288
+#: ../camel/providers/pop3/camel-pop3-store.c:305
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "无法登录到 POP 服务器 %s：SASL 协议错误"
-#: ../camel/providers/pop3/camel-pop3-store.c:310
+#: ../camel/providers/pop3/camel-pop3-store.c:327
#, c-format
msgid "Failed to authenticate on POP server %s: "
-msgstr "认证到 POP 服务器 %s 失败："
+msgstr "无法认证 POP 服务器 %s："
-#: ../camel/providers/pop3/camel-pop3-store.c:359
+#: ../camel/providers/pop3/camel-pop3-store.c:387
#, c-format
msgid "POP3 server %s"
msgstr "POP3 服务器 %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:362
+#: ../camel/providers/pop3/camel-pop3-store.c:390
#, c-format
msgid "POP3 server for %s on %s"
msgstr "%2$s 为 %1$s 提供的 POP 服务"
-#: ../camel/providers/pop3/camel-pop3-store.c:525
+#: ../camel/providers/pop3/camel-pop3-store.c:563
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4364,7 +4478,7 @@ msgstr ""
"无法连接到 POP 服务器 %s：\t接收到非法的 APOP ID。可能是冒名攻击。请联系您的"
"管理员。"
-#: ../camel/providers/pop3/camel-pop3-store.c:577
+#: ../camel/providers/pop3/camel-pop3-store.c:615
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4375,7 +4489,7 @@ msgstr ""
#. Translators: Last %s is an optional explanation
#. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:592
+#: ../camel/providers/pop3/camel-pop3-store.c:630
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4384,22 +4498,23 @@ msgstr ""
"无法连接到 POP 服务器 %s。\n"
"发送用户名错误%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:650
+#: ../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:678
+#: ../camel/providers/pop3/camel-pop3-store.c:718
#, c-format
msgid "No such folder '%s'."
msgstr "没有文件夹“%s”。"
-#: ../camel/providers/pop3/camel-pop3-store.c:695
+#: ../camel/providers/pop3/camel-pop3-store.c:735
#, 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
msgid "Sendmail"
msgstr "Sendmail"
@@ -4417,36 +4532,36 @@ msgstr "sendmail"
msgid "Mail delivery via the sendmail program"
msgstr "通过 sendmail 程序发送邮件"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:93
#, c-format
msgid "Could not parse recipient list"
msgstr "无法解析收件人列表"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:126
#, c-format
msgid "Could not create pipe to sendmail: %s: mail not sent"
msgstr "无法创建到 sendmail 的管道：%s：邮件未发送"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:148
#, c-format
msgid "Could not fork sendmail: %s: mail not sent"
msgstr "无法创建 sendmail 进程：%s：邮件未发送"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:184
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
msgid "Could not send message: "
msgstr "无法发送消息："
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:212
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr "sendmail 以信号 %s 退出：邮件未发送。"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:219
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr "无法执行 %s：邮件未发送。"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:224
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr "sendmail 以状态码 %d 退出：邮件未发送。"
@@ -4471,358 +4586,603 @@ msgstr "SMTP"
msgid "For delivering mail by connecting to a remote mailhub using SMTP."
msgstr "要投递邮件，应该使用 SMTP 连接到远程的邮件交换服务器。"
-#: ../camel/providers/smtp/camel-smtp-transport.c:150
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
msgid "Welcome response error: "
msgstr "欢迎应答错误："
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:201
#, 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:204
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
-#: ../camel/providers/smtp/camel-smtp-transport.c:224
+#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:223
+#: ../camel/providers/smtp/camel-smtp-transport.c:230
msgid "STARTTLS command failed: "
msgstr "STARTTLS 命令失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:235
+#: ../camel/providers/smtp/camel-smtp-transport.c:241
#, c-format
msgid "Failed to connect to SMTP server %s in secure mode: "
msgstr "以安全模式连接 SMTP 服务器 %s 失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:292
+#: ../camel/providers/smtp/camel-smtp-transport.c:301
#, c-format
msgid "SMTP server %s"
msgstr "SMTP 服务器 %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#: ../camel/providers/smtp/camel-smtp-transport.c:304
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "通过 %s 发送 SMTP 邮件"
-#: ../camel/providers/smtp/camel-smtp-transport.c:367
+#: ../camel/providers/smtp/camel-smtp-transport.c:378
#, c-format
msgid "SMTP server %s does not support %s authentication"
msgstr "SMTP 服务器 %s 不支持 %s 认证。"
-#: ../camel/providers/smtp/camel-smtp-transport.c:446
+#: ../camel/providers/smtp/camel-smtp-transport.c:458
#, c-format
msgid "No SASL mechanism was specified"
msgstr "未指定 SASL 机制"
-#: ../camel/providers/smtp/camel-smtp-transport.c:459
-msgid "SMTP Authentication"
-msgstr "SMTP 认证"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:478
-#: ../camel/providers/smtp/camel-smtp-transport.c:489
-#: ../camel/providers/smtp/camel-smtp-transport.c:502
+#: ../camel/providers/smtp/camel-smtp-transport.c:488
+#: ../camel/providers/smtp/camel-smtp-transport.c:499
+#: ../camel/providers/smtp/camel-smtp-transport.c:512
msgid "AUTH command failed: "
msgstr "AUTH 命令失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:643
+#: ../camel/providers/smtp/camel-smtp-transport.c:653
#, c-format
msgid "Cannot send message: service not connected."
msgstr "无法发送消息：服务未连接。"
-#: ../camel/providers/smtp/camel-smtp-transport.c:650
+#: ../camel/providers/smtp/camel-smtp-transport.c:660
#, c-format
msgid "Cannot send message: sender address not valid."
msgstr "无法发送消息：发件人地址不合法。"
-#: ../camel/providers/smtp/camel-smtp-transport.c:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:664
msgid "Sending message"
-msgstr "发送消息"
+msgstr "正在发送消息"
-#: ../camel/providers/smtp/camel-smtp-transport.c:679
+#: ../camel/providers/smtp/camel-smtp-transport.c:689
#, c-format
msgid "Cannot send message: no recipients defined."
msgstr "无法发送消息：没有定义收件人。"
-#: ../camel/providers/smtp/camel-smtp-transport.c:692
+#: ../camel/providers/smtp/camel-smtp-transport.c:702
#, c-format
msgid "Cannot send message: one or more invalid recipients"
msgstr "无法发送消息：一个或多个非法收件人"
-#: ../camel/providers/smtp/camel-smtp-transport.c:796
+#: ../camel/providers/smtp/camel-smtp-transport.c:806
msgid "Syntax error, command unrecognized"
-msgstr "语法错误，无法识别的命令"
+msgstr "语法错误，命令无法识别"
-#: ../camel/providers/smtp/camel-smtp-transport.c:798
+#: ../camel/providers/smtp/camel-smtp-transport.c:808
msgid "Syntax error in parameters or arguments"
msgstr "参数语法错误"
-#: ../camel/providers/smtp/camel-smtp-transport.c:800
+#: ../camel/providers/smtp/camel-smtp-transport.c:810
msgid "Command not implemented"
msgstr "命令尚未实现"
-#: ../camel/providers/smtp/camel-smtp-transport.c:802
+#: ../camel/providers/smtp/camel-smtp-transport.c:812
msgid "Command parameter not implemented"
msgstr "命令参数尚未实现"
-#: ../camel/providers/smtp/camel-smtp-transport.c:804
+#: ../camel/providers/smtp/camel-smtp-transport.c:814
msgid "System status, or system help reply"
msgstr "系统状态，或系统求助就绪"
-#: ../camel/providers/smtp/camel-smtp-transport.c:806
+#: ../camel/providers/smtp/camel-smtp-transport.c:816
msgid "Help message"
msgstr "帮助消息"
-#: ../camel/providers/smtp/camel-smtp-transport.c:808
+#: ../camel/providers/smtp/camel-smtp-transport.c:818
msgid "Service ready"
msgstr "服务就绪"
-#: ../camel/providers/smtp/camel-smtp-transport.c:810
+#: ../camel/providers/smtp/camel-smtp-transport.c:820
msgid "Service closing transmission channel"
msgstr "服务正在关闭传输通道"
-#: ../camel/providers/smtp/camel-smtp-transport.c:812
+#: ../camel/providers/smtp/camel-smtp-transport.c:822
msgid "Service not available, closing transmission channel"
msgstr "服务不可用，正在关闭传输通道"
-#: ../camel/providers/smtp/camel-smtp-transport.c:814
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
msgid "Requested mail action okay, completed"
msgstr "邮件动作请求确认，已完成"
-#: ../camel/providers/smtp/camel-smtp-transport.c:816
+#: ../camel/providers/smtp/camel-smtp-transport.c:826
msgid "User not local; will forward to <forward-path>"
msgstr "用户不在本地；将转发到 <转发路径>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:818
+#: ../camel/providers/smtp/camel-smtp-transport.c:828
msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "邮件动作请求未发生：邮件箱无效"
+msgstr "邮件动作请求未发生：邮箱无效"
-#: ../camel/providers/smtp/camel-smtp-transport.c:820
+#: ../camel/providers/smtp/camel-smtp-transport.c:830
msgid "Requested action not taken: mailbox unavailable"
-msgstr "动作请求未发生：邮件箱无效"
+msgstr "动作请求未发生：邮箱无效"
-#: ../camel/providers/smtp/camel-smtp-transport.c:822
+#: ../camel/providers/smtp/camel-smtp-transport.c:832
msgid "Requested action aborted: error in processing"
-msgstr "动作请求已放弃：处理中出错"
+msgstr "动作请求已放弃：处理出错"
-#: ../camel/providers/smtp/camel-smtp-transport.c:824
+#: ../camel/providers/smtp/camel-smtp-transport.c:834
msgid "User not local; please try <forward-path>"
msgstr "用户不在本地；请尝试 <转发路径>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:826
+#: ../camel/providers/smtp/camel-smtp-transport.c:836
msgid "Requested action not taken: insufficient system storage"
msgstr "动作请求未发生：系统存储空间不足"
-#: ../camel/providers/smtp/camel-smtp-transport.c:828
+#: ../camel/providers/smtp/camel-smtp-transport.c:838
msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "邮件动作请求已放弃：超定额德存储分配"
+msgstr "邮件动作请求已放弃：存储分配超额"
-#: ../camel/providers/smtp/camel-smtp-transport.c:830
+#: ../camel/providers/smtp/camel-smtp-transport.c:840
msgid "Requested action not taken: mailbox name not allowed"
msgstr "动作请求未发生：不允许的邮件箱名称"
-#: ../camel/providers/smtp/camel-smtp-transport.c:832
+#: ../camel/providers/smtp/camel-smtp-transport.c:842
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "开始输入邮件；以 <CRLF>.<CRLF> 结束"
-#: ../camel/providers/smtp/camel-smtp-transport.c:834
+#: ../camel/providers/smtp/camel-smtp-transport.c:844
msgid "Transaction failed"
-msgstr "事务失败"
+msgstr "传送失败"
-#: ../camel/providers/smtp/camel-smtp-transport.c:838
+#: ../camel/providers/smtp/camel-smtp-transport.c:848
msgid "A password transition is needed"
msgstr "必须传输密码"
-#: ../camel/providers/smtp/camel-smtp-transport.c:840
+#: ../camel/providers/smtp/camel-smtp-transport.c:850
msgid "Authentication mechanism is too weak"
msgstr "认证机制太弱"
-#: ../camel/providers/smtp/camel-smtp-transport.c:842
+#: ../camel/providers/smtp/camel-smtp-transport.c:852
msgid "Encryption required for requested authentication mechanism"
msgstr "请求的认证机制必须加密"
-#: ../camel/providers/smtp/camel-smtp-transport.c:844
+#: ../camel/providers/smtp/camel-smtp-transport.c:854
msgid "Temporary authentication failure"
msgstr "临时认证失败"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../camel/providers/smtp/camel-smtp-transport.c:1111
msgid "SMTP Greeting"
msgstr "SMTP 欢迎"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1122
-#: ../camel/providers/smtp/camel-smtp-transport.c:1139
-#: ../camel/providers/smtp/camel-smtp-transport.c:1147
+#: ../camel/providers/smtp/camel-smtp-transport.c:1138
+#: ../camel/providers/smtp/camel-smtp-transport.c:1156
+#: ../camel/providers/smtp/camel-smtp-transport.c:1164
msgid "HELO command failed: "
-msgstr "HELO 命令失败：%s\\"
+msgstr "HELO 命令失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:1222
-#: ../camel/providers/smtp/camel-smtp-transport.c:1236
-#: ../camel/providers/smtp/camel-smtp-transport.c:1245
+#: ../camel/providers/smtp/camel-smtp-transport.c:1239
+#: ../camel/providers/smtp/camel-smtp-transport.c:1254
+#: ../camel/providers/smtp/camel-smtp-transport.c:1264
msgid "MAIL FROM command failed: "
msgstr "MAIL FROM 命令失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../camel/providers/smtp/camel-smtp-transport.c:1291
msgid "RCPT TO command failed: "
msgstr "RSET 命令失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:1288
-#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#: ../camel/providers/smtp/camel-smtp-transport.c:1308
+#: ../camel/providers/smtp/camel-smtp-transport.c:1318
#, c-format
msgid "RCPT TO <%s> failed: "
msgstr "RCPT TO <%s> 失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:1339
-#: ../camel/providers/smtp/camel-smtp-transport.c:1349
-#: ../camel/providers/smtp/camel-smtp-transport.c:1359
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#: ../camel/providers/smtp/camel-smtp-transport.c:1437
-#: ../camel/providers/smtp/camel-smtp-transport.c:1450
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../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
msgid "DATA command failed: "
msgstr "DATP 命令失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:1483
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-#: ../camel/providers/smtp/camel-smtp-transport.c:1505
+#: ../camel/providers/smtp/camel-smtp-transport.c:1510
+#: ../camel/providers/smtp/camel-smtp-transport.c:1525
+#: ../camel/providers/smtp/camel-smtp-transport.c:1534
msgid "RSET command failed: "
msgstr "RSET 命令失败："
-#: ../camel/providers/smtp/camel-smtp-transport.c:1530
-#: ../camel/providers/smtp/camel-smtp-transport.c:1544
-#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1559
+#: ../camel/providers/smtp/camel-smtp-transport.c:1573
+#: ../camel/providers/smtp/camel-smtp-transport.c:1580
msgid "QUIT command failed: "
msgstr "QUIT 命令失败："
-#: ../libedataserver/e-categories.c:47
+#: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1
+msgid "Contact UID of a user"
+msgstr "用户的联系人 UID"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:1
+msgid "Birthday and anniversary reminder"
+msgstr "生日与周年纪念日提醒"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:2
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr "是否为生日与周年纪念日设置提醒"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:3
+msgid "Birthday and anniversary reminder value"
+msgstr "生日与周年纪念日提醒值"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr "决定生日与周年纪念日提醒的单位数量"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5
+msgid "Birthday and anniversary reminder units"
+msgstr "生日与周年纪念日提醒单位"
+
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"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
+msgid "Bus name vanished (client terminated?)"
+msgstr "Bus 名称消失(客户端终止了？)"
+
+#: ../libebackend/e-authentication-mediator.c:264
+msgid "No response from client"
+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
+msgid "Client cancelled the operation"
+msgstr "客户端已取消操作"
+
+#: ../libebackend/e-authentication-mediator.c:416
+msgid "Client reports password was rejected"
+msgstr "客户端报告密码被拒绝"
+
+#: ../libebackend/e-authentication-session.c:532
+msgid "Add this password to your keyring"
+msgstr "将该密码添加到您的密钥环"
+
+#: ../libebackend/e-authentication-session.c:622
+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
+#, c-format
+msgid "%s does not support authentication"
+msgstr "%s 不支持认证"
+
+#: ../libebackend/e-collection-backend.c:765
+#, c-format
+msgid "%s does not support creating remote resources"
+msgstr "%s 不支持创建远程资源"
+
+#: ../libebackend/e-collection-backend.c:824
+#, c-format
+msgid "%s does not support deleting remote resources"
+msgstr "%s 不支持删除远程资源"
+
+#: ../libebackend/e-server-side-source.c:126
+#, c-format
+msgid "Data source is missing a [%s] group"
+msgstr "数据源缺少一个 [%s] 组"
+
+#: ../libebackend/e-server-side-source.c:916 ../libedataserver/e-source.c:1119
+#, c-format
+msgid "Data source '%s' does not support creating remote resources"
+msgstr "数据源“%s”不支持创建远程资源"
+
+# collection backend，如何翻译更好？
+#: ../libebackend/e-server-side-source.c:930
+#, 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
+#, c-format
+msgid "Data source '%s' does not support deleting remote resources"
+msgstr "数据源“%s”不支持删除远程资源"
+
+#: ../libebackend/e-server-side-source.c:972
+#, 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
+#, c-format
+msgid "File must have a '.source' extension"
+msgstr "文件扩展名必须为“.source”"
+
+#: ../libebackend/e-source-registry-server.c:522
+#: ../libedataserver/e-source-registry.c:1552
+msgid "The user declined to authenticate"
+msgstr "用户拒绝认证"
+
+#: ../libebackend/e-source-registry-server.c:770
+#, c-format
+msgid "UID '%s' is already in use"
+msgstr "UID“%s” 已在使用"
+
+#: ../libedataserver/e-categories.c:46
msgctxt "CategoryName"
msgid "Anniversary"
msgstr "周年纪念日"
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:47
msgctxt "CategoryName"
msgid "Birthday"
msgstr "生日"
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:48
msgctxt "CategoryName"
msgid "Business"
msgstr "商务"
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:49
msgctxt "CategoryName"
msgid "Competition"
msgstr "完成"
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:50
msgctxt "CategoryName"
msgid "Favorites"
msgstr "最爱"
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:51
msgctxt "CategoryName"
msgid "Gifts"
msgstr "礼物"
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:52
msgctxt "CategoryName"
msgid "Goals/Objectives"
msgstr "目标"
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:53
msgctxt "CategoryName"
msgid "Holiday"
msgstr "假日"
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:54
msgctxt "CategoryName"
msgid "Holiday Cards"
msgstr "假日卡"
#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:56
msgctxt "CategoryName"
msgid "Hot Contacts"
msgstr "亲密联系人"
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:57
msgctxt "CategoryName"
msgid "Ideas"
msgstr "想法"
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:58
msgctxt "CategoryName"
msgid "International"
msgstr "国际"
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:59
msgctxt "CategoryName"
msgid "Key Customer"
msgstr "关键客户"
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:60
msgctxt "CategoryName"
msgid "Miscellaneous"
msgstr "杂类"
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:61
msgctxt "CategoryName"
msgid "Personal"
msgstr "个人"
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:62
msgctxt "CategoryName"
msgid "Phone Calls"
msgstr "通电话"
#. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:64
msgctxt "CategoryName"
msgid "Status"
msgstr "状态"
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:65
msgctxt "CategoryName"
msgid "Strategies"
msgstr "策略"
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:66
msgctxt "CategoryName"
msgid "Suppliers"
msgstr "供应商"
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:67
msgctxt "CategoryName"
msgid "Time & Expenses"
msgstr "时间和花费"
-#: ../libedataserver/e-categories.c:69
+#: ../libedataserver/e-categories.c:68
msgctxt "CategoryName"
msgid "VIP"
msgstr "VIP"
-#: ../libedataserver/e-categories.c:70
+#: ../libedataserver/e-categories.c:69
msgctxt "CategoryName"
msgid "Waiting"
msgstr "等候"
-#: ../libedataserver/e-client.c:125
+#: ../libedataserver/e-client.c:124
msgid "Source not loaded"
msgstr "源尚未加载"
-#: ../libedataserver/e-client.c:127
+#: ../libedataserver/e-client.c:126
msgid "Source already loaded"
msgstr "源已经加载"
-#: ../libedataserver/e-client.c:135
+#. 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
msgid "Offline unavailable"
msgstr "离线不可用"
-#: ../libedataserver/e-client.c:157
+#: ../libedataserver/e-client.c:158
msgid "D-Bus error"
msgstr "D-Bus 错误"
+#: ../libedataserver/e-source-authenticator.c:166
+msgid "Address book authentication request"
+msgstr "地址簿认证请求"
+
+#: ../libedataserver/e-source-authenticator.c:171
+msgid "Calendar authentication request"
+msgstr "日历认证请求"
+
+#: ../libedataserver/e-source-authenticator.c:175
+msgid "Mail authentication request"
+msgstr "邮件认证请求"
+
+#. generic account prompt
+#: ../libedataserver/e-source-authenticator.c:178
+msgid "Authentication request"
+msgstr "认证请求"
+
+#: ../libedataserver/e-source-authenticator.c:188
+#, c-format
+msgid "Please enter the password for address book \"%s\"."
+msgstr "请输入地址簿“%s”的密码。"
+
+#: ../libedataserver/e-source-authenticator.c:194
+#, c-format
+msgid "Please enter the password for calendar \"%s\"."
+msgstr "请输入日历“%s”的密码。"
+
+#: ../libedataserver/e-source-authenticator.c:200
+#, c-format
+msgid "Please enter the password for mail account \"%s\"."
+msgstr "请输入邮件帐号“%s”的密码。"
+
+#: ../libedataserver/e-source-authenticator.c:206
+#, c-format
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr "请输入邮件传输“%s”的密码。"
+
+#: ../libedataserver/e-source-authenticator.c:212
+#, c-format
+msgid "Please enter the password for memo list \"%s\"."
+msgstr "请输入备忘录列表“%s”的密码。"
+
+#: ../libedataserver/e-source-authenticator.c:218
+#, c-format
+msgid "Please enter the password for task list \"%s\"."
+msgstr "请输入任务列表“%s”的密码。"
+
+#: ../libedataserver/e-source-authenticator.c:224
+#, c-format
+msgid "Please enter the password for account \"%s\"."
+msgstr "请输入帐号“%s”的密码。"
+
+#: ../libedataserver/e-source.c:621
+#, c-format
+msgid "Source file is missing a [%s] group"
+msgstr "源文件缺少一个 [%s] 组"
+
+#: ../libedataserver/e-source.c:942
+#, c-format
+msgid "Data source '%s' is not removable"
+msgstr "数据源“%s”不是可删除的"
+
+#: ../libedataserver/e-source.c:1028
+#, c-format
+msgid "Data source '%s' is not writable"
+msgstr "数据源“%s”不是可写的"
+
+#: ../libedataserver/e-source.c:1416
+msgid "Unnamed"
+msgstr "未命名"
+
+#: ../libedataserver/e-source-mail-signature.c:485
+#, c-format
+msgid "Signature script must be a local file"
+msgstr "签名脚本必须为本地文件"
+
#. 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:1646 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1647 ../libedataserver/e-time-utils.c:1946
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%Y-%m-%d %A%p%I:%M:%S"
@@ -4830,7 +5190,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:1651 ../libedataserver/e-time-utils.c:1935
+#: ../libedataserver/e-time-utils.c:1652 ../libedataserver/e-time-utils.c:1937
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%Y-%m-%d %A %H:%M:%S"
@@ -4838,7 +5198,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:1656 ../libedataserver/e-time-utils.c:1940
+#: ../libedataserver/e-time-utils.c:1657 ../libedataserver/e-time-utils.c:1942
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%Y-%m-%d %A%p%I:%M"
@@ -4846,78 +5206,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:1661 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1933
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:1666
+#: ../libedataserver/e-time-utils.c:1667
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:1671
+#: ../libedataserver/e-time-utils.c:1672
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:1674 ../libedataserver/e-time-utils.c:1794
-#: ../libedataserver/e-time-utils.c:1926
+#: ../libedataserver/e-time-utils.c:1675 ../libedataserver/e-time-utils.c:1795
+#: ../libedataserver/e-time-utils.c:1928
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:1681
+#: ../libedataserver/e-time-utils.c:1682
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:1685
+#: ../libedataserver/e-time-utils.c:1686
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:1690
+#: ../libedataserver/e-time-utils.c:1691
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:1695
+#: ../libedataserver/e-time-utils.c:1696
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:1700
+#: ../libedataserver/e-time-utils.c:1701
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:1705
+#: ../libedataserver/e-time-utils.c:1706
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:1708 ../libedataserver/e-time-utils.c:1797
+#: ../libedataserver/e-time-utils.c:1709 ../libedataserver/e-time-utils.c:1798
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:1868 ../libedataserver/e-time-utils.c:1988
+#: ../libedataserver/e-time-utils.c:1869 ../libedataserver/e-time-utils.c:1990
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:1872 ../libedataserver/e-time-utils.c:1980
+#: ../libedataserver/e-time-utils.c:1873 ../libedataserver/e-time-utils.c:1982
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
@@ -4925,24 +5285,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:1877 ../libedataserver/e-time-utils.c:1985
+#: ../libedataserver/e-time-utils.c:1878 ../libedataserver/e-time-utils.c:1987
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:1881 ../libedataserver/e-time-utils.c:1977
+#: ../libedataserver/e-time-utils.c:1882 ../libedataserver/e-time-utils.c:1979
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:1884
+#. strptime format for time of day, without seconds 24-hour format,
+#. * and no colon.
+#: ../libedataserver/e-time-utils.c:1886
msgid "%H%M"
msgstr "%H%M"
#. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1888
+#: ../libedataserver/e-time-utils.c:1890
msgid "%I %p"
msgstr "%p%I"
@@ -4954,8 +5315,9 @@ msgstr "代理类型"
msgid ""
"What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" "
"means manual proxy."
-msgstr "使用何种类型的代理。0 代表使用系统代理设置、1 代表不使用代理、2 代"
-"表手动设置代理。"
+msgstr ""
+"使用何种类型的代理。0 代表使用系统代理设置、1 代表不使用代理、2 代表手动设置"
+"代理。"
#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
msgid "Whether to use http-proxy"
@@ -4970,7 +5332,6 @@ msgid "Whether proxy server requires authentication"
msgstr "代理服务器是否需要认证"
#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
-#| msgid "Bad authentication response from server."
msgid "Whether authentication is required to access proxy server."
msgstr "访问代理服务器是否需要认证。"
@@ -5054,193 +5415,129 @@ msgstr "自动代理配置 URL"
msgid "Where to read automatic proxy configuration from."
msgstr "从何处读取自动代理配置信息。"
-#: ../libedataserverui/e-book-auth-util.c:96
-#: ../libedataserverui/e-book-auth-util.c:656
-msgid "Accessing LDAP Server anonymously"
-msgstr "匿名访问 LDAP 服务器"
-
-#: ../libedataserverui/e-book-auth-util.c:197
-#: ../libedataserverui/e-book-auth-util.c:423
-msgid "Failed to authenticate.\n"
-msgstr "身份验证失败。\n"
-
-#: ../libedataserverui/e-categories-editor.c:228
+#: ../libedataserverui/e-categories-editor.c:230
msgid "Currently _used categories:"
msgstr "当前使用的分类(_U)："
-#: ../libedataserverui/e-categories-editor.c:237
+#: ../libedataserverui/e-categories-editor.c:239
msgid "_Available Categories:"
msgstr "可用类别(_A)："
-#: ../libedataserverui/e-categories-selector.c:322
+#: ../libedataserverui/e-categories-selector.c:325
msgid "Icon"
msgstr "图标"
-#: ../libedataserverui/e-categories-selector.c:327
+#: ../libedataserverui/e-categories-selector.c:330
msgid "Category"
msgstr "类别"
-#: ../libedataserverui/e-category-completion.c:299
+#: ../libedataserverui/e-category-completion.c:300
#, c-format
msgid "Create category \"%s\""
msgstr "创建分类“%s”"
-#: ../libedataserverui/e-category-editor.c:135
+#: ../libedataserverui/e-category-editor.c:137
msgid "Category Icon"
msgstr "类别图标"
-#: ../libedataserverui/e-category-editor.c:139
+#: ../libedataserverui/e-category-editor.c:141
msgid "_No Image"
msgstr "没有图像(_N)"
-#: ../libedataserverui/e-category-editor.c:176
+#: ../libedataserverui/e-category-editor.c:178
msgid "Category _Name"
msgstr "类别名称(_N)"
-#: ../libedataserverui/e-category-editor.c:184
+#: ../libedataserverui/e-category-editor.c:186
msgid "Category _Icon"
msgstr "类别图标(_I)"
-#: ../libedataserverui/e-category-editor.c:224
+#: ../libedataserverui/e-category-editor.c:226
msgid "Category Properties"
msgstr "类别属性"
-#: ../libedataserverui/e-category-editor.c:285
+#: ../libedataserverui/e-category-editor.c:287
#, c-format
msgid ""
"There is already a category '%s' in the configuration. Please use another "
"name"
-msgstr "配置中已经有类别“%s”了。请使用另外一个名称"
-
-#: ../libedataserverui/e-client-utils.c:856
-#, c-format
-msgid ""
-"Enter password for calendar %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"输入日历 %s 的密码(用户 %s)\n"
-"原因：%s"
-
-#: ../libedataserverui/e-client-utils.c:858
-#, c-format
-msgid "Enter password for calendar %s (user %s)"
-msgstr "输入日历 %s 的密码(用户 %s)"
-
-#: ../libedataserverui/e-client-utils.c:862
-#, c-format
-msgid ""
-"Enter password for task list %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"输入任务列表 %s 的密码(用户 %s)\n"
-"原因：%s"
-
-#: ../libedataserverui/e-client-utils.c:864
-#, c-format
-msgid "Enter password for task list %s (user %s)"
-msgstr "输入任务列表 %s 的密码(用户 %s)"
-
-#: ../libedataserverui/e-client-utils.c:868
-#, c-format
-msgid ""
-"Enter password for memo list %s (user %s)\n"
-"Reason: %s"
-msgstr ""
-"输入备忘 %s 的密码(用户 %s)\n"
-"原因：%s"
-
-#: ../libedataserverui/e-client-utils.c:870
-#, c-format
-msgid "Enter password for memo list %s (user %s)"
-msgstr "输入备忘 %s 的密码(用户 %s)"
-
-#: ../libedataserverui/e-client-utils.c:981
-msgid "Enter Passphrase"
-msgstr "输入口令"
+msgstr "配置中已有类别“%s”了。请使用另外一个名称"
-#: ../libedataserverui/e-client-utils.c:983
-msgid "Enter Password"
-msgstr "输入密码"
-
-#: ../libedataserverui/e-name-selector-dialog.c:187
+#: ../libedataserverui/e-name-selector-dialog.c:278
msgid "Show Contacts"
msgstr "显示联系人"
-#: ../libedataserverui/e-name-selector-dialog.c:209
+#: ../libedataserverui/e-name-selector-dialog.c:300
msgid "Address B_ook:"
msgstr "地址簿(_O)："
-#: ../libedataserverui/e-name-selector-dialog.c:217
-msgid "Cate_gory:"
-msgstr "类别(_G)："
+#: ../libedataserverui/e-name-selector-dialog.c:310
+msgid "Cat_egory:"
+msgstr "类别(_E)："
-#: ../libedataserverui/e-name-selector-dialog.c:235
+#: ../libedataserverui/e-name-selector-dialog.c:332
msgid "_Search:"
msgstr "搜索(_S)："
-#: ../libedataserverui/e-name-selector-dialog.c:253
-#: ../libedataserverui/e-name-selector-dialog.c:1038
+#: ../libedataserverui/e-name-selector-dialog.c:357
+#: ../libedataserverui/e-name-selector-dialog.c:1184
msgid "Any Category"
msgstr "任何类别"
-#: ../libedataserverui/e-name-selector-dialog.c:255
+#: ../libedataserverui/e-name-selector-dialog.c:359
msgid "Co_ntacts"
msgstr "联系人(_N)"
-#: ../libedataserverui/e-name-selector-dialog.c:310
+#: ../libedataserverui/e-name-selector-dialog.c:421
msgid "Search"
msgstr "搜索"
-#: ../libedataserverui/e-name-selector-dialog.c:313
+#: ../libedataserverui/e-name-selector-dialog.c:424
msgid "Address Book"
msgstr "地址簿"
-#: ../libedataserverui/e-name-selector-dialog.c:316
-msgid "Contacts"
-msgstr "联系人"
-
-#: ../libedataserverui/e-name-selector-dialog.c:433
+#: ../libedataserverui/e-name-selector-dialog.c:547
msgid "Select Contacts from Address Book"
msgstr "从地址簿中选择联系人"
-#: ../libedataserverui/e-name-selector-dialog.c:781
+#: ../libedataserverui/e-name-selector-dialog.c:919
msgid "_Add"
msgstr "添加(_A)"
-#: ../libedataserverui/e-name-selector-dialog.c:785
+#: ../libedataserverui/e-name-selector-dialog.c:923
msgid "_Remove"
msgstr "删除(_R)"
-#: ../libedataserverui/e-name-selector-dialog.c:957
+#: ../libedataserverui/e-name-selector-dialog.c:1099
#, c-format
msgid "Error loading address book: %s"
msgstr "载入地址簿时出错：%s"
#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2823
+#: ../libedataserverui/e-name-selector-entry.c:3054
#, c-format
msgid "E_xpand %s Inline"
msgstr "嵌入式展开 %s(_X)"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2838
+#: ../libedataserverui/e-name-selector-entry.c:3070
#, c-format
msgid "Cop_y %s"
msgstr "复制 %s(_Y)"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2848
+#: ../libedataserverui/e-name-selector-entry.c:3081
#, c-format
msgid "C_ut %s"
msgstr "剪切 %s(_U)"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2865
+#: ../libedataserverui/e-name-selector-entry.c:3099
#, c-format
msgid "_Edit %s"
msgstr "编辑 %s(_E)"
-#: ../libedataserverui/e-name-selector-list.c:524
+#: ../libedataserverui/e-name-selector-list.c:532
#, c-format
msgid "_Delete %s"
msgstr "删除 %s(_D)"
@@ -5274,21 +5571,188 @@ msgstr "记住此密码(_R)"
msgid "_Remember this password for the remainder of this session"
msgstr "本次会话记住此密码(_R)"
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:91
+#: ../libedataserverui/e-source-selector-dialog.c:224
+msgid "_Destination"
+msgstr "目的(_D)"
+
+#: ../libedataserverui/e-source-selector-dialog.c:326
msgid "Select destination"
msgstr "选择目的地"
-#: ../libedataserverui/e-source-selector-dialog.c:166
-msgid "_Destination"
-msgstr "目的(_D)"
+#: ../modules/google-backend/module-google-backend.c:118
+#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+msgid "Calendar"
+msgstr "日历"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:223
+#, c-format
+msgid "Code: %u - Unexpected response from server"
+msgstr "代码：%u - 来自服务器的意外应答"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:244
+#, c-format
+msgid "Failed to parse autodiscover response XML"
+msgstr "无法解析自动发现响应 XML"
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:253
+#, c-format
+msgid "Failed to find Autodiscover element"
+msgstr "无法找到自动发现元素"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:265
+#, c-format
+msgid "Failed to find Response element"
+msgstr "无法找到响应元素"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:277
+#, c-format
+msgid "Failed to find Account element"
+msgstr "无法找到帐号元素"
+
+#. TODO: more specific
+#: ../modules/online-accounts/goaewsclient.c:291
+#, c-format
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr "无法在自动发现响应中找到 ASUrl 和 OABUrl"
+
+#: ../modules/yahoo-backend/module-yahoo-backend.c:227
+msgid "Tasks"
+msgstr "任务"
+
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51
msgid "Keep running after the last client is closed"
-msgstr "客户端推出后继续运行"
+msgstr "关闭最后的客户端后继续运行"
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:50
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:54
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53
msgid "Wait running until at least one client is connected"
msgstr "等待到至少有一个客户端连接"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:620
+msgid "Evolution Source Viewer"
+msgstr "Evolution 源码查看器"
+
+#. Translators: The name that is displayed in the user interface
+#: ../tests/libedataserverui/evolution-source-viewer.c:650
+msgid "Display Name"
+msgstr "显示名称"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:659
+msgid "Flags"
+msgstr "标志"
+
+#: ../tests/libedataserverui/evolution-source-viewer.c:711
+msgid "Identity"
+msgstr "身份"
+
+#~ msgid "Authenticating with the server…"
+#~ msgstr "正在与服务器进行认证..."
+
+#~ msgid "%s: there was no source for UID '%s' stored in GConf."
+#~ msgstr "%s：GConf 中没有存储 UID“%s”的源。"
+
+#~ msgid "Invalid source"
+#~ msgstr "无效的源"
+
+#~ msgid "Incorrect uri '%s'"
+#~ msgstr "不正确的 URI “%s”"
+
+#~ msgid "Failed to find system book"
+#~ msgstr "找不到系统地址簿"
+
+#~ msgid "There was no source for UID '%s' stored in a source list."
+#~ msgstr "源列表中没有存储对应 UID “%s”的源。"
+
+#~ msgid "Cannot authenticate user: "
+#~ msgstr "无法认证用户："
+
+#~ msgid "Empty URI"
+#~ msgstr "空的 URI"
+
+#~ msgid ""
+#~ "Enter password for address book %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "输入地址簿 %s 的密码(用户 %s)\n"
+#~ "原因：%s"
+
+#~ msgid "Enter password for address book %s (user %s)"
+#~ msgstr "输入地址簿 %s 的密码(用户 %s)"
+
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "输入 %s 的密码 (用户 %s)"
+
+#~ msgid "Enter password for %s to enable proxy for user %s"
+#~ msgstr "输入 %s 的密码，以便为用户 %s 启用代理服务器"
+
+#~ msgid "Invalid source type"
+#~ msgstr "无效的源类型"
+
+#~ msgid "Updating %s folder"
+#~ msgstr "更新 %s 文件夹"
+
+#~ msgid "Connection to Server"
+#~ msgstr "连接服务器"
+
+#~ msgid "_Use custom command to connect to server"
+#~ msgstr "使用自定义命令连接到服务器(_U)"
+
+#~ msgid "Co_mmand:"
+#~ msgstr "命令(_M)："
+
+#~ msgid "Command:"
+#~ msgstr "命令："
+
+#~ msgid "Numbe_r of cached connections to use"
+#~ msgstr "使用的缓存连接的数目(_R)"
+
+#~ msgid "Closing tmp stream failed: "
+#~ msgstr "关闭临时流失败："
+
+#~ msgid "SMTP Authentication"
+#~ msgstr "SMTP 认证"
+
+#~ msgid "Accessing LDAP Server anonymously"
+#~ msgstr "匿名访问 LDAP 服务器"
+
+#~ msgid ""
+#~ "Enter password for calendar %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "输入日历 %s 的密码(用户 %s)\n"
+#~ "原因：%s"
+
+#~ msgid "Enter password for calendar %s (user %s)"
+#~ msgstr "输入日历 %s 的密码(用户 %s)"
+
+#~ msgid ""
+#~ "Enter password for task list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "输入任务列表 %s 的密码(用户 %s)\n"
+#~ "原因：%s"
+
+#~ msgid "Enter password for task list %s (user %s)"
+#~ msgstr "输入任务列表 %s 的密码(用户 %s)"
+
+#~ msgid ""
+#~ "Enter password for memo list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr ""
+#~ "输入备忘 %s 的密码(用户 %s)\n"
+#~ "原因：%s"
+
+#~ msgid "Enter password for memo list %s (user %s)"
+#~ msgstr "输入备忘 %s 的密码(用户 %s)"
+
+#~ msgid "Enter Passphrase"
+#~ msgstr "输入口令"
+
+#~ msgid "Enter Password"
+#~ msgstr "输入密码"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
