[evolution-data-server] update zh_CN translation



commit 6fba25634dbb5d7856f087b658877d2b7d2ccd6b
Author: YunQiang Su <yqsu src gnome org>
Date:   Tue Jul 29 16:42:26 2014 +0800

    update zh_CN translation

 po/zh_CN.po | 1688 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 851 insertions(+), 837 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 61fb283..c63c4b0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -21,8 +21,8 @@ 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: 2014-07-29 04:28+0000\n"
-"PO-Revision-Date: 2014-07-29 16:34+0800\n"
+"POT-Creation-Date: 2014-07-29 08:37+0000\n"
+"PO-Revision-Date: 2014-07-29 16:42+0800\n"
 "Last-Translator: Yunqiang Su <wzssyqa gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
@@ -72,30 +72,31 @@ msgid "Tried to modify contact '%s' with out of sync revision"
 msgstr "试图修改失去同步的联系人“%s”"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:1472
-#: ../addressbook/backends/file/e-book-backend-file.c:1555
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077
-#: ../addressbook/libedata-book/e-book-sqlite.c:6711
+#: ../addressbook/backends/file/e-book-backend-file.c:1557
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3076
+#: ../addressbook/libedata-book/e-book-sqlite.c:6907
+#: ../addressbook/libedata-book/e-book-sqlite.c:6976
 #, c-format
 msgid "Contact '%s' not found"
 msgstr "未找到联系人“%s”"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1615
-#: ../addressbook/backends/file/e-book-backend-file.c:1696
+#: ../addressbook/backends/file/e-book-backend-file.c:1617
+#: ../addressbook/backends/file/e-book-backend-file.c:1698
 #, c-format
 msgid "Query '%s' not supported"
 msgstr "不支持查询“%s”"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1624
-#: ../addressbook/backends/file/e-book-backend-file.c:1705
+#: ../addressbook/backends/file/e-book-backend-file.c:1626
+#: ../addressbook/backends/file/e-book-backend-file.c:1707
 #, c-format
 msgid "Invalid Query '%s'"
 msgstr "无效的查询:“%s”"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1970
+#: ../addressbook/backends/file/e-book-backend-file.c:1972
 msgid "Requested to delete an unrelated cursor"
 msgstr "请求删除一个无关的 cursor"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2041
+#: ../addressbook/backends/file/e-book-backend-file.c:2043
 #, c-format
 msgid "Failed to rename old database from '%s' to '%s': %s"
 msgstr "无法将旧数据库“ %s” 改名为 “%s”:%s"
@@ -103,48 +104,48 @@ msgstr "无法将旧数据库“ %s” 改名为 “%s”:%s"
 #: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:148
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:1172
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:4248
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:419
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:887
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:394
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:862
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:49
 #: ../addressbook/libebook-contacts/e-phone-number.c:56
 #: ../addressbook/libebook/e-book.c:1078
-#: ../addressbook/libebook/e-book-client.c:1882
-#: ../addressbook/libebook/e-book-client.c:2054
-#: ../addressbook/libebook/e-book-client.c:2267
-#: ../addressbook/libebook/e-book-client.c:2398
-#: ../addressbook/libebook/e-book-client.c:2557
-#: ../addressbook/libebook/e-book-client.c:2691
-#: ../addressbook/libebook/e-book-client.c:2822
-#: ../addressbook/libebook/e-book-client.c:2980
-#: ../addressbook/libebook/e-book-client.c:3175
-#: ../addressbook/libebook/e-book-client.c:3393
-#: ../addressbook/libedata-book/e-book-backend-sexp.c:878
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:578
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:621
+#: ../addressbook/libebook/e-book-client.c:1987
+#: ../addressbook/libebook/e-book-client.c:2159
+#: ../addressbook/libebook/e-book-client.c:2372
+#: ../addressbook/libebook/e-book-client.c:2503
+#: ../addressbook/libebook/e-book-client.c:2662
+#: ../addressbook/libebook/e-book-client.c:2796
+#: ../addressbook/libebook/e-book-client.c:2927
+#: ../addressbook/libebook/e-book-client.c:3085
+#: ../addressbook/libebook/e-book-client.c:3280
+#: ../addressbook/libebook/e-book-client.c:3498
+#: ../addressbook/libedata-book/e-book-backend-sexp.c:877
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:575
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:606
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:618
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:270
-#: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276
-#: ../calendar/libecal/e-cal-client.c:3239
-#: ../calendar/libecal/e-cal-client.c:3412
-#: ../calendar/libecal/e-cal-client.c:3676
-#: ../calendar/libecal/e-cal-client.c:3917
-#: ../calendar/libecal/e-cal-client.c:4107
-#: ../calendar/libecal/e-cal-client.c:4299
-#: ../calendar/libecal/e-cal-client.c:4469
-#: ../calendar/libecal/e-cal-client.c:4638
-#: ../calendar/libecal/e-cal-client.c:4841
-#: ../calendar/libecal/e-cal-client.c:4991
-#: ../calendar/libecal/e-cal-client.c:5185
-#: ../calendar/libecal/e-cal-client.c:5338
-#: ../calendar/libecal/e-cal-client.c:5555
-#: ../calendar/libecal/e-cal-client.c:5709
-#: ../calendar/libecal/e-cal-client.c:5935
-#: ../calendar/libecal/e-cal-client.c:6131
-#: ../calendar/libecal/e-cal-client.c:6494
-#: ../calendar/libecal/e-cal-client.c:6708
+#: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:275
+#: ../calendar/libecal/e-cal-client.c:3346
+#: ../calendar/libecal/e-cal-client.c:3519
+#: ../calendar/libecal/e-cal-client.c:3783
+#: ../calendar/libecal/e-cal-client.c:4024
+#: ../calendar/libecal/e-cal-client.c:4214
+#: ../calendar/libecal/e-cal-client.c:4406
+#: ../calendar/libecal/e-cal-client.c:4576
+#: ../calendar/libecal/e-cal-client.c:4745
+#: ../calendar/libecal/e-cal-client.c:4948
+#: ../calendar/libecal/e-cal-client.c:5098
+#: ../calendar/libecal/e-cal-client.c:5292
+#: ../calendar/libecal/e-cal-client.c:5445
+#: ../calendar/libecal/e-cal-client.c:5662
+#: ../calendar/libecal/e-cal-client.c:5816
+#: ../calendar/libecal/e-cal-client.c:6042
+#: ../calendar/libecal/e-cal-client.c:6238
+#: ../calendar/libecal/e-cal-client.c:6601
+#: ../calendar/libecal/e-cal-client.c:6815
 #: ../camel/providers/imapx/camel-imapx-command.c:645
-#: ../camel/providers/imapx/camel-imapx-server.c:4769
-#: ../camel/providers/imapx/camel-imapx-server.c:4778
+#: ../camel/providers/imapx/camel-imapx-server.c:4748
+#: ../camel/providers/imapx/camel-imapx-server.c:4757
 #: ../libedataserver/e-client.c:185
 msgid "Unknown error"
 msgstr "未知的错误"
@@ -160,19 +161,19 @@ msgid "Querying for updated groups…"
 msgstr "查询更新的组..."
 
 #: ../addressbook/backends/google/e-book-backend-google.c:1757
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1433
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4982
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1408
 msgid "The backend does not support bulk additions"
 msgstr "后端不支持批量添加"
 
 #: ../addressbook/backends/google/e-book-backend-google.c:1912
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5120
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1545
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5118
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1520
 msgid "The backend does not support bulk modifications"
 msgstr "后端不支持批量修改"
 
 #: ../addressbook/backends/google/e-book-backend-google.c:2119
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1645
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1620
 msgid "The backend does not support bulk removals"
 msgstr "后端不支持批量删除"
 
@@ -259,90 +260,90 @@ msgstr "执行搜索错误"
 msgid "Downloading contacts (%d)..."
 msgstr "正在下载联系人(%d)..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5065
 msgid "Adding contact to LDAP server..."
 msgstr "正在将联系人添加到 LDAP 服务器..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5142
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5140
 msgid "Modifying contact from LDAP server..."
 msgstr "正在修改 LDAP 服务器上的联系人..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5206
 msgid "Removing contact from LDAP server..."
 msgstr "正在从 LDAP 服务器删除联系人..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5597
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5595
 #, c-format
 msgid "Failed to get the DN for user '%s'"
 msgstr "无法获取用户“%s”的 DN"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:864
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:839
 msgid "Loading Addressbook summary..."
 msgstr "正在加载地址簿概要..."
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:859
 #, 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:903
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:878
 msgid "No response body in webdav PROPFIND result"
 msgstr "在 webdav PROPFIND 结果中无应答主体"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:939
 #, c-format
 msgid "Loading Contacts (%d%%)"
 msgstr "正在加载联系人(%d%%)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1353
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1328
 msgid "Cannot transform SoupURI to string"
 msgstr "无法将 SoupURI 转为字符串"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1474
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1449
 #, c-format
 msgid "Create resource '%s' failed with HTTP status %d (%s)"
 msgstr "创建资源“%s”失败,HTTP 状态码为: %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1576
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1551
 msgid "Contact on server changed -> not modifying"
 msgstr "服务器上的联系人已更改 -> 将不做更改"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1584
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1559
 #, c-format
 msgid "Modify contact failed with HTTP status %d (%s)"
 msgstr "修改联系人失败,HTTP 状态码:%d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1677
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1693
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1652
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1668
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "DELETE 失败,HTTP 状态码:%d"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:24
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:38
 msgid "No such book"
 msgstr "没有该地址簿"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:26
-#: ../addressbook/libedata-book/e-data-book.c:371
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:40
+#: ../addressbook/libedata-book/e-data-book.c:379
 msgid "Contact not found"
 msgstr "找不到联系人"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:28
-#: ../addressbook/libedata-book/e-data-book.c:372
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:42
+#: ../addressbook/libedata-book/e-data-book.c:380
 msgid "Contact ID already exists"
 msgstr "联系人 ID 已经存在"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:30
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:44
 msgid "No such source"
 msgstr "没有该源"
 
-#: ../addressbook/libebook-contacts/e-book-contacts-types.c:32
-#: ../addressbook/libedata-book/e-data-book.c:388
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:46
+#: ../addressbook/libedata-book/e-data-book.c:396
 msgid "No space"
 msgstr "没有空间"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook-contacts/e-contact.c:131
+#: ../addressbook/libebook-contacts/e-contact.c:130
 msgid "Unique ID"
 msgstr "唯一的 ID"
 
@@ -350,12 +351,12 @@ msgstr "唯一的 ID"
 #. * so we can generate its value if necessary in the getter
 #. Translators: This is an EContact field description, in this case it's a
 #. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
-#: ../addressbook/libebook-contacts/e-contact.c:136
+#: ../addressbook/libebook-contacts/e-contact.c:135
 msgid "File Under"
 msgstr "存档于"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook-contacts/e-contact.c:138
+#: ../addressbook/libebook-contacts/e-contact.c:137
 msgid "Book UID"
 msgstr "地址簿 UID"
 
@@ -363,434 +364,434 @@ msgstr "地址簿 UID"
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook-contacts/e-contact.c:144
+#: ../addressbook/libebook-contacts/e-contact.c:143
 msgid "Full Name"
 msgstr "全名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:145
+#: ../addressbook/libebook-contacts/e-contact.c:144
 msgid "Given Name"
 msgstr "名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:146
+#: ../addressbook/libebook-contacts/e-contact.c:145
 msgid "Family Name"
 msgstr "姓"
 
-#: ../addressbook/libebook-contacts/e-contact.c:147
+#: ../addressbook/libebook-contacts/e-contact.c:146
 msgid "Nickname"
 msgstr "昵称"
 
 #. Email fields
-#: ../addressbook/libebook-contacts/e-contact.c:150
+#: ../addressbook/libebook-contacts/e-contact.c:149
 msgid "Email 1"
 msgstr "电子邮件 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:151
+#: ../addressbook/libebook-contacts/e-contact.c:150
 msgid "Email 2"
 msgstr "电子邮件 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:152
+#: ../addressbook/libebook-contacts/e-contact.c:151
 msgid "Email 3"
 msgstr "电子邮件 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:153
+#: ../addressbook/libebook-contacts/e-contact.c:152
 msgid "Email 4"
 msgstr "电子邮件 4"
 
-#: ../addressbook/libebook-contacts/e-contact.c:155
+#: ../addressbook/libebook-contacts/e-contact.c:154
 msgid "Mailer"
 msgstr "邮件程序"
 
 #. Address Labels
-#: ../addressbook/libebook-contacts/e-contact.c:158
+#: ../addressbook/libebook-contacts/e-contact.c:157
 msgid "Home Address Label"
 msgstr "家庭地址标签"
 
-#: ../addressbook/libebook-contacts/e-contact.c:159
+#: ../addressbook/libebook-contacts/e-contact.c:158
 msgid "Work Address Label"
 msgstr "工作地址标签"
 
-#: ../addressbook/libebook-contacts/e-contact.c:160
+#: ../addressbook/libebook-contacts/e-contact.c:159
 msgid "Other Address Label"
 msgstr "其它地址标签"
 
 #. Phone fields
-#: ../addressbook/libebook-contacts/e-contact.c:163
+#: ../addressbook/libebook-contacts/e-contact.c:162
 msgid "Assistant Phone"
 msgstr "助手电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:164
+#: ../addressbook/libebook-contacts/e-contact.c:163
 msgid "Business Phone"
 msgstr "商务电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:165
+#: ../addressbook/libebook-contacts/e-contact.c:164
 msgid "Business Phone 2"
 msgstr "商务电话 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:166
+#: ../addressbook/libebook-contacts/e-contact.c:165
 msgid "Business Fax"
 msgstr "商务传真"
 
-#: ../addressbook/libebook-contacts/e-contact.c:167
+#: ../addressbook/libebook-contacts/e-contact.c:166
 msgid "Callback Phone"
 msgstr "回拨电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:168
+#: ../addressbook/libebook-contacts/e-contact.c:167
 msgid "Car Phone"
 msgstr "车载电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:169
+#: ../addressbook/libebook-contacts/e-contact.c:168
 msgid "Company Phone"
 msgstr "公司电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:170
+#: ../addressbook/libebook-contacts/e-contact.c:169
 msgid "Home Phone"
 msgstr "家庭电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:171
+#: ../addressbook/libebook-contacts/e-contact.c:170
 msgid "Home Phone 2"
 msgstr "家庭电话 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:172
+#: ../addressbook/libebook-contacts/e-contact.c:171
 msgid "Home Fax"
 msgstr "家庭传真"
 
-#: ../addressbook/libebook-contacts/e-contact.c:173
+#: ../addressbook/libebook-contacts/e-contact.c:172
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook-contacts/e-contact.c:174
+#: ../addressbook/libebook-contacts/e-contact.c:173
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:175
+#: ../addressbook/libebook-contacts/e-contact.c:174
 msgid "Other Phone"
 msgstr "其它电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:176
+#: ../addressbook/libebook-contacts/e-contact.c:175
 msgid "Other Fax"
 msgstr "其它传真"
 
-#: ../addressbook/libebook-contacts/e-contact.c:177
+#: ../addressbook/libebook-contacts/e-contact.c:176
 msgid "Pager"
 msgstr "寻呼机"
 
-#: ../addressbook/libebook-contacts/e-contact.c:178
+#: ../addressbook/libebook-contacts/e-contact.c:177
 msgid "Primary Phone"
 msgstr "主要电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:179
+#: ../addressbook/libebook-contacts/e-contact.c:178
 msgid "Radio"
 msgstr "收音机"
 
-#: ../addressbook/libebook-contacts/e-contact.c:180
+#: ../addressbook/libebook-contacts/e-contact.c:179
 msgid "Telex"
 msgstr "电传"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook-contacts/e-contact.c:182
+#: ../addressbook/libebook-contacts/e-contact.c:181
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook-contacts/e-contact.c:185
+#: ../addressbook/libebook-contacts/e-contact.c:184
 msgid "Organization"
 msgstr "组织"
 
-#: ../addressbook/libebook-contacts/e-contact.c:186
+#: ../addressbook/libebook-contacts/e-contact.c:185
 msgid "Organizational Unit"
 msgstr "组织单元"
 
-#: ../addressbook/libebook-contacts/e-contact.c:187
+#: ../addressbook/libebook-contacts/e-contact.c:186
 msgid "Office"
 msgstr "办公室"
 
-#: ../addressbook/libebook-contacts/e-contact.c:188
+#: ../addressbook/libebook-contacts/e-contact.c:187
 msgid "Title"
 msgstr "头衔"
 
-#: ../addressbook/libebook-contacts/e-contact.c:189
+#: ../addressbook/libebook-contacts/e-contact.c:188
 msgid "Role"
 msgstr "角色"
 
-#: ../addressbook/libebook-contacts/e-contact.c:190
+#: ../addressbook/libebook-contacts/e-contact.c:189
 msgid "Manager"
 msgstr "经理"
 
-#: ../addressbook/libebook-contacts/e-contact.c:191
+#: ../addressbook/libebook-contacts/e-contact.c:190
 msgid "Assistant"
 msgstr "助手"
 
 #. Web fields
-#: ../addressbook/libebook-contacts/e-contact.c:194
+#: ../addressbook/libebook-contacts/e-contact.c:193
 msgid "Homepage URL"
 msgstr "个人主页 URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:195
+#: ../addressbook/libebook-contacts/e-contact.c:194
 msgid "Weblog URL"
 msgstr "网络日记 URL"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:198
+#: ../addressbook/libebook-contacts/e-contact.c:197
 msgid "Categories"
 msgstr "类别"
 
 #. Collaboration fields
-#: ../addressbook/libebook-contacts/e-contact.c:201
+#: ../addressbook/libebook-contacts/e-contact.c:200
 msgid "Calendar URI"
 msgstr "日历 URI"
 
-#: ../addressbook/libebook-contacts/e-contact.c:202
+#: ../addressbook/libebook-contacts/e-contact.c:201
 msgid "Free/Busy URL"
 msgstr "空闲/繁忙 URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:203
+#: ../addressbook/libebook-contacts/e-contact.c:202
 msgid "ICS Calendar"
 msgstr "ICS 日历"
 
-#: ../addressbook/libebook-contacts/e-contact.c:204
+#: ../addressbook/libebook-contacts/e-contact.c:203
 msgid "Video Conferencing URL"
 msgstr "视频会议 URL"
 
 #. Misc fields
-#: ../addressbook/libebook-contacts/e-contact.c:207
+#: ../addressbook/libebook-contacts/e-contact.c:206
 msgid "Spouse's Name"
 msgstr "配偶姓名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:208
+#: ../addressbook/libebook-contacts/e-contact.c:207
 msgid "Note"
 msgstr "注释"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:211
+#: ../addressbook/libebook-contacts/e-contact.c:210
 msgid "AIM Home Screen Name 1"
 msgstr "AIM 家庭屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:212
+#: ../addressbook/libebook-contacts/e-contact.c:211
 msgid "AIM Home Screen Name 2"
 msgstr "AIM 家庭屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:213
+#: ../addressbook/libebook-contacts/e-contact.c:212
 msgid "AIM Home Screen Name 3"
 msgstr "AIM 家庭屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:214
+#: ../addressbook/libebook-contacts/e-contact.c:213
 msgid "AIM Work Screen Name 1"
 msgstr "AIM 工作屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:215
+#: ../addressbook/libebook-contacts/e-contact.c:214
 msgid "AIM Work Screen Name 2"
 msgstr "AIM 工作屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:216
+#: ../addressbook/libebook-contacts/e-contact.c:215
 msgid "AIM Work Screen Name 3"
 msgstr "AIM 工作屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:217
+#: ../addressbook/libebook-contacts/e-contact.c:216
 msgid "GroupWise Home Screen Name 1"
 msgstr "GroupWise 家庭屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:218
+#: ../addressbook/libebook-contacts/e-contact.c:217
 msgid "GroupWise Home Screen Name 2"
 msgstr "GroupWise 家庭屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:219
+#: ../addressbook/libebook-contacts/e-contact.c:218
 msgid "GroupWise Home Screen Name 3"
 msgstr "GroupWise 家庭屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:220
+#: ../addressbook/libebook-contacts/e-contact.c:219
 msgid "GroupWise Work Screen Name 1"
 msgstr "GroupWise 工作屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:221
+#: ../addressbook/libebook-contacts/e-contact.c:220
 msgid "GroupWise Work Screen Name 2"
 msgstr "GroupWise 工作屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:222
+#: ../addressbook/libebook-contacts/e-contact.c:221
 msgid "GroupWise Work Screen Name 3"
 msgstr "GroupWise 工作屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:223
+#: ../addressbook/libebook-contacts/e-contact.c:222
 msgid "Jabber Home ID 1"
 msgstr "Jabber 家庭 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:224
+#: ../addressbook/libebook-contacts/e-contact.c:223
 msgid "Jabber Home ID 2"
 msgstr "Jabber 家庭 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:225
+#: ../addressbook/libebook-contacts/e-contact.c:224
 msgid "Jabber Home ID 3"
 msgstr "Jabber 家庭 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:226
+#: ../addressbook/libebook-contacts/e-contact.c:225
 msgid "Jabber Work ID 1"
 msgstr "Jabber 工作 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:227
+#: ../addressbook/libebook-contacts/e-contact.c:226
 msgid "Jabber Work ID 2"
 msgstr "Jabber 工作 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:228
+#: ../addressbook/libebook-contacts/e-contact.c:227
 msgid "Jabber Work ID 3"
 msgstr "Jabber 工作 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:229
+#: ../addressbook/libebook-contacts/e-contact.c:228
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Yahoo! 家庭屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:230
+#: ../addressbook/libebook-contacts/e-contact.c:229
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Yahoo! 家庭屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:231
+#: ../addressbook/libebook-contacts/e-contact.c:230
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Yahoo! 家庭屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:232
+#: ../addressbook/libebook-contacts/e-contact.c:231
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Yahoo! 工作屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:233
+#: ../addressbook/libebook-contacts/e-contact.c:232
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Yahoo! 工作屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:234
+#: ../addressbook/libebook-contacts/e-contact.c:233
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Yahoo! 工作屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:235
+#: ../addressbook/libebook-contacts/e-contact.c:234
 msgid "MSN Home Screen Name 1"
 msgstr "MSN 家庭屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:236
+#: ../addressbook/libebook-contacts/e-contact.c:235
 msgid "MSN Home Screen Name 2"
 msgstr "MSN 家庭屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:237
+#: ../addressbook/libebook-contacts/e-contact.c:236
 msgid "MSN Home Screen Name 3"
 msgstr "MSN 家庭屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:238
+#: ../addressbook/libebook-contacts/e-contact.c:237
 msgid "MSN Work Screen Name 1"
 msgstr "MSN 工作屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:239
+#: ../addressbook/libebook-contacts/e-contact.c:238
 msgid "MSN Work Screen Name 2"
 msgstr "MSN 工作屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:240
+#: ../addressbook/libebook-contacts/e-contact.c:239
 msgid "MSN Work Screen Name 3"
 msgstr "MSN 工作屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:241
+#: ../addressbook/libebook-contacts/e-contact.c:240
 msgid "ICQ Home ID 1"
 msgstr "ICQ 家庭 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:242
+#: ../addressbook/libebook-contacts/e-contact.c:241
 msgid "ICQ Home ID 2"
 msgstr "ICQ 家庭 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:243
+#: ../addressbook/libebook-contacts/e-contact.c:242
 msgid "ICQ Home ID 3"
 msgstr "ICQ 家庭 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:244
+#: ../addressbook/libebook-contacts/e-contact.c:243
 msgid "ICQ Work ID 1"
 msgstr "ICQ 工作 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:245
+#: ../addressbook/libebook-contacts/e-contact.c:244
 msgid "ICQ Work ID 2"
 msgstr "ICQ 工作 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:246
+#: ../addressbook/libebook-contacts/e-contact.c:245
 msgid "ICQ Work ID 3"
 msgstr "ICQ 工作 ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook-contacts/e-contact.c:249
+#: ../addressbook/libebook-contacts/e-contact.c:248
 msgid "Last Revision"
 msgstr "上次修订"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * virtual field, which returns either name of the contact or the organization
 #. * name, recognized by multiple other fields, where the first filled is used.
-#: ../addressbook/libebook-contacts/e-contact.c:253
+#: ../addressbook/libebook-contacts/e-contact.c:252
 msgid "Name or Org"
 msgstr "名称或组织"
 
 #. Address fields
-#: ../addressbook/libebook-contacts/e-contact.c:256
+#: ../addressbook/libebook-contacts/e-contact.c:255
 msgid "Address List"
 msgstr "地址列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:257
+#: ../addressbook/libebook-contacts/e-contact.c:256
 msgid "Home Address"
 msgstr "家庭地址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:258
+#: ../addressbook/libebook-contacts/e-contact.c:257
 msgid "Work Address"
 msgstr "办公地址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:259
+#: ../addressbook/libebook-contacts/e-contact.c:258
 msgid "Other Address"
 msgstr "其它地址"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:262
+#: ../addressbook/libebook-contacts/e-contact.c:261
 msgid "Category List"
 msgstr "类别列表"
 
 #. Photo/Logo
-#: ../addressbook/libebook-contacts/e-contact.c:265
+#: ../addressbook/libebook-contacts/e-contact.c:264
 msgid "Photo"
 msgstr "照片"
 
-#: ../addressbook/libebook-contacts/e-contact.c:266
+#: ../addressbook/libebook-contacts/e-contact.c:265
 msgid "Logo"
 msgstr "标志"
 
 #. Translators: This is an EContact field description, in this case it's a name
 #. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
-#: ../addressbook/libebook-contacts/e-contact.c:270
+#: ../addressbook/libebook-contacts/e-contact.c:269
 msgid "Name"
 msgstr "姓名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:271
+#: ../addressbook/libebook-contacts/e-contact.c:270
 msgid "Email List"
 msgstr "邮件列表"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:274
+#: ../addressbook/libebook-contacts/e-contact.c:273
 msgid "AIM Screen Name List"
 msgstr "AIM 屏幕名列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:275
+#: ../addressbook/libebook-contacts/e-contact.c:274
 msgid "GroupWise ID List"
 msgstr "GroupWise ID 列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:276
+#: ../addressbook/libebook-contacts/e-contact.c:275
 msgid "Jabber ID List"
 msgstr "Jabber ID 列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:277
+#: ../addressbook/libebook-contacts/e-contact.c:276
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! 屏幕名列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:278
+#: ../addressbook/libebook-contacts/e-contact.c:277
 msgid "MSN Screen Name List"
 msgstr "MSN 屏幕名列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:279
+#: ../addressbook/libebook-contacts/e-contact.c:278
 msgid "ICQ ID List"
 msgstr "ICQ ID 列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:281
+#: ../addressbook/libebook-contacts/e-contact.c:280
 msgid "Wants HTML Mail"
 msgstr "想要 HTML 邮件"
 
 #. Translators: This is an EContact field description, in this case it's a
 #. * field describing whether it's a Contact list (list of email addresses) or a
 #. * regular contact for one person/organization/...
-#: ../addressbook/libebook-contacts/e-contact.c:286
+#: ../addressbook/libebook-contacts/e-contact.c:285
 msgid "List"
 msgstr "列表"
 
@@ -798,127 +799,127 @@ msgstr "列表"
 #. * used to determine whether when sending to Contact lists the addresses should be
 #. * shown or not to other recipients - basically whether to use BCC field or CC
 #. * message header when sending messages to this Contact list.
-#: ../addressbook/libebook-contacts/e-contact.c:291
+#: ../addressbook/libebook-contacts/e-contact.c:290
 msgid "List Shows Addresses"
 msgstr "列表显示地址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:293
+#: ../addressbook/libebook-contacts/e-contact.c:292
 msgid "Birth Date"
 msgstr "生日"
 
-#: ../addressbook/libebook-contacts/e-contact.c:294
+#: ../addressbook/libebook-contacts/e-contact.c:293
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:893
 msgid "Anniversary"
 msgstr "周年纪念日"
 
 #. Security fields
-#: ../addressbook/libebook-contacts/e-contact.c:297
+#: ../addressbook/libebook-contacts/e-contact.c:296
 msgid "X.509 Certificate"
 msgstr "X.509 证书"
 
-#: ../addressbook/libebook-contacts/e-contact.c:299
+#: ../addressbook/libebook-contacts/e-contact.c:298
 msgid "Gadu-Gadu Home ID 1"
 msgstr "Gadu-Gadu 家庭 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:300
+#: ../addressbook/libebook-contacts/e-contact.c:299
 msgid "Gadu-Gadu Home ID 2"
 msgstr "Gadu-Gadu 家庭 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:301
+#: ../addressbook/libebook-contacts/e-contact.c:300
 msgid "Gadu-Gadu Home ID 3"
 msgstr "Gadu-Gadu 家庭 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:302
+#: ../addressbook/libebook-contacts/e-contact.c:301
 msgid "Gadu-Gadu Work ID 1"
 msgstr "Gadu-Gadu 工作 ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:303
+#: ../addressbook/libebook-contacts/e-contact.c:302
 msgid "Gadu-Gadu Work ID 2"
 msgstr "Gadu-Gadu 工作 ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:304
+#: ../addressbook/libebook-contacts/e-contact.c:303
 msgid "Gadu-Gadu Work ID 3"
 msgstr "Gadu-Gadu 工作 ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:305
+#: ../addressbook/libebook-contacts/e-contact.c:304
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID 列表"
 
 #. Geo information
-#: ../addressbook/libebook-contacts/e-contact.c:308
+#: ../addressbook/libebook-contacts/e-contact.c:307
 msgid "Geographic Information"
 msgstr "地理信息"
 
-#: ../addressbook/libebook-contacts/e-contact.c:310
+#: ../addressbook/libebook-contacts/e-contact.c:309
 msgid "Telephone"
 msgstr "电话"
 
-#: ../addressbook/libebook-contacts/e-contact.c:312
+#: ../addressbook/libebook-contacts/e-contact.c:311
 msgid "Skype Home Name 1"
 msgstr "Skype 家庭屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:313
+#: ../addressbook/libebook-contacts/e-contact.c:312
 msgid "Skype Home Name 2"
 msgstr "Skype 家庭屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:314
+#: ../addressbook/libebook-contacts/e-contact.c:313
 msgid "Skype Home Name 3"
 msgstr "Skype 家庭屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:315
+#: ../addressbook/libebook-contacts/e-contact.c:314
 msgid "Skype Work Name 1"
 msgstr "Skype 工作屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:316
+#: ../addressbook/libebook-contacts/e-contact.c:315
 msgid "Skype Work Name 2"
 msgstr "Skype 工作屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:317
+#: ../addressbook/libebook-contacts/e-contact.c:316
 msgid "Skype Work Name 3"
 msgstr "Skype 工作屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:318
+#: ../addressbook/libebook-contacts/e-contact.c:317
 msgid "Skype Name List"
 msgstr "Skype 屏幕名列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:320
+#: ../addressbook/libebook-contacts/e-contact.c:319
 msgid "SIP address"
 msgstr "SIP 地址"
 
-#: ../addressbook/libebook-contacts/e-contact.c:322
+#: ../addressbook/libebook-contacts/e-contact.c:321
 msgid "Google Talk Home Name 1"
 msgstr "Google Talk 家庭屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:323
+#: ../addressbook/libebook-contacts/e-contact.c:322
 msgid "Google Talk Home Name 2"
 msgstr "Google Talk 家庭屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:324
+#: ../addressbook/libebook-contacts/e-contact.c:323
 msgid "Google Talk Home Name 3"
 msgstr "Google Talk 家庭屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:325
+#: ../addressbook/libebook-contacts/e-contact.c:324
 msgid "Google Talk Work Name 1"
 msgstr "Google Talk 工作屏幕名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:326
+#: ../addressbook/libebook-contacts/e-contact.c:325
 msgid "Google Talk Work Name 2"
 msgstr "Google Talk 工作屏幕名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:327
+#: ../addressbook/libebook-contacts/e-contact.c:326
 msgid "Google Talk Work Name 3"
 msgstr "Google Talk 工作屏幕名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:328
+#: ../addressbook/libebook-contacts/e-contact.c:327
 msgid "Google Talk Name List"
 msgstr "Google Talk 姓名列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:330
+#: ../addressbook/libebook-contacts/e-contact.c:329
 msgid "Twitter Name List"
 msgstr "Twitter 姓名列表"
 
-#: ../addressbook/libebook-contacts/e-contact.c:1654
-#: ../addressbook/libebook/e-destination.c:920
+#: ../addressbook/libebook-contacts/e-contact.c:1653
+#: ../addressbook/libebook/e-destination.c:918
 msgid "Unnamed List"
 msgstr "未命名的列表"
 
@@ -951,49 +952,55 @@ msgstr "电话号码太短"
 msgid "Text is too long for a phone number"
 msgstr "电话号码太长"
 
-#: ../addressbook/libebook/e-book-client.c:807
+#: ../addressbook/libebook/e-book-client.c:890
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "未知的地址簿属性“%s”"
 
-#: ../addressbook/libebook/e-book-client.c:822
+#: ../addressbook/libebook/e-book-client.c:905
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "无法更改地址簿属性“%s”的值"
 
-#: ../addressbook/libebook/e-book-client.c:1207
-#: ../addressbook/libebook/e-book-client.c:1382
-#: ../addressbook/libebook/e-book-client.c:1649
-#: ../calendar/libecal/e-cal-client.c:1530
-#: ../calendar/libecal/e-cal-client.c:1712
+#: ../addressbook/libebook/e-book-client.c:1303
+#: ../addressbook/libebook/e-book-client.c:1487
+#: ../addressbook/libebook/e-book-client.c:1754
+#: ../calendar/libecal/e-cal-client.c:1628
+#: ../calendar/libecal/e-cal-client.c:1819
 #, c-format
 msgid "Unable to connect to '%s': "
 msgstr "无法连接到“%s”:"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:899
-#: ../addressbook/libedata-book/e-book-sqlite.c:2163
+#: ../addressbook/libebook/e-book-client-view.c:892
+#: ../calendar/libecal/e-cal-client-view.c:705
+#, c-format
+msgid "Client disappeared"
+msgstr "客户端消失"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:898
+#: ../addressbook/libedata-book/e-book-sqlite.c:2173
 #, c-format
 msgid "Error introspecting unknown summary field '%s'"
 msgstr "检查未知概要信息字段“%s”出错"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1509
-#: ../addressbook/libedata-book/e-book-sqlite.c:1319
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1508
+#: ../addressbook/libedata-book/e-book-sqlite.c:1329
 msgid "Error parsing regular expression"
 msgstr "执行搜索表达式错误"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1554
-#: ../addressbook/libedata-book/e-book-sqlite.c:1803 ../camel/camel-db.c:545
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1553
+#: ../addressbook/libedata-book/e-book-sqlite.c:1813 ../camel/camel-db.c:542
 #, c-format
 msgid "Insufficient memory"
 msgstr "内存不足"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1691
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1690
 #, c-format
 msgid "Invalid contact field '%d' specified in summary"
 msgstr "概要中的联系人字段“%d”无效"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1725
-#: ../addressbook/libedata-book/e-book-sqlite.c:557
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1724
+#: ../addressbook/libedata-book/e-book-sqlite.c:567
 #, c-format
 msgid ""
 "Contact field '%s' of type '%s' specified in summary, but only boolean, "
@@ -1002,95 +1009,95 @@ msgstr ""
 "概要中定义了“%2$s”类型的联系人字段“%1$s”,但是程序只持布尔值、字符串和字符串"
 "列表类型。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3065
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4161
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3064
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4160
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. vcards cannot be returned."
 msgstr "缓存中没有保存完整的 search_contacts,无法返回电子名片。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385
-#: ../addressbook/libedata-book/e-book-sqlite.c:5369
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4291
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4384
+#: ../addressbook/libedata-book/e-book-sqlite.c:5384
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr "查询中包含不支持的元素"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4296
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4295
 #, c-format
 msgid "Invalid Query"
 msgstr "无效的查询"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4320
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4319
 #, c-format
 msgid ""
 "Full search_contacts are not stored in cache. Hence only summary query is "
 "supported."
 msgstr "缓存中没有保存完整的 search_contacts,所以只支持概要查询。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4389
-#: ../addressbook/libedata-book/e-data-book.c:383
-#: ../addressbook/libedata-book/e-data-book.c:1028
-#: ../calendar/libedata-cal/e-data-cal.c:420
-#: ../calendar/libedata-cal/e-data-cal.c:1307 ../libedataserver/e-client.c:172
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4388
+#: ../addressbook/libedata-book/e-data-book.c:391
+#: ../addressbook/libedata-book/e-data-book.c:1096
+#: ../calendar/libedata-cal/e-data-cal.c:428
+#: ../calendar/libedata-cal/e-data-cal.c:1375 ../libedataserver/e-client.c:172
 #, c-format
 msgid "Invalid query"
 msgstr "无效的查询"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4432
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4431
 #, c-format
 msgid ""
 "Full vcards are not stored in cache. Hence only summary query is supported."
 msgstr "缓存中没有保存完整的电子名片,所以只支持概要查询。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5255
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5254
 #, c-format
 msgid "Unable to remove the db file: errno %d"
 msgstr "无法删除数据库文件:错误代码 %d"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6042
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6442
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6041
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6441
 #, c-format
 msgid "Only summary queries are supported by EbSdbCursor"
 msgstr "EbSdbCursor 只支持概要查询"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6049
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6048
 #, c-format
 msgid "At least one sort field must be specified to use an EbSdbCursor"
 msgstr "使用 EbSdbCursor 时必须指定至少一个排序字段"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6063
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6062
 #, c-format
 msgid "Cannot sort by a field that is not in the summary"
 msgstr "无法按不在概要中的字段排序"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6070
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6069
 #, c-format
 msgid "Cannot sort by a field which may have multiple values"
 msgstr "无法按可能有多个值的字段排序"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203
-#: ../addressbook/libedata-book/e-book-sqlite.c:7381
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6202
+#: ../addressbook/libedata-book/e-book-sqlite.c:7681
 #, c-format
 msgid ""
 "Tried to step a cursor in reverse, but cursor is already at the beginning of "
 "the contact list"
 msgstr "尝试对 cursor 反向步进,但 cursor 已位于联系人列表的开头"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
-#: ../addressbook/libedata-book/e-book-sqlite.c:7389
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6210
+#: ../addressbook/libedata-book/e-book-sqlite.c:7689
 #, c-format
 msgid ""
 "Tried to step a cursor forwards, but cursor is already at the end of the "
 "contact list"
 msgstr "尝试向前步进 cursor,但 cursor 已位于联系人列表的末尾"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:524
+#: ../addressbook/libedata-book/e-book-sqlite.c:534
 #, c-format
 msgid "Unsupported contact field '%d' specified in summary"
 msgstr "不支持概要中指定的联系人字段“%d”"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:1876
+#: ../addressbook/libedata-book/e-book-sqlite.c:1886
 msgid ""
 "Cannot upgrade contacts database from a legacy database with more than one "
 "addressbook. Delete one of the entries in the 'folders' table first."
@@ -1098,182 +1105,182 @@ msgstr ""
 "无法从包含多于一个地址簿的旧数据库升级联系人数据库。请先删除“folders”表中的一"
 "条记录。"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5362
+#: ../addressbook/libedata-book/e-book-sqlite.c:5377
 #, c-format
 msgid "Invalid query: %s"
 msgstr "无效的查询:%s"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:5537
+#: ../addressbook/libedata-book/e-book-sqlite.c:5552
 msgid "Invalid query for EbSqlCursor"
 msgstr "无效的 EbSqlCursor 查询"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7203
+#: ../addressbook/libedata-book/e-book-sqlite.c:7503
 msgid "At least one sort field must be specified to use an EbSqlCursor"
 msgstr "要使用 EbSqlCursor 至少要指定一个排序字段"
 
-#: ../addressbook/libedata-book/e-book-sqlite.c:7221
+#: ../addressbook/libedata-book/e-book-sqlite.c:7521
 msgid "Cannot sort by a field that is not a string type"
 msgstr "无法按非字符串类型的字段排序"
 
-#: ../addressbook/libedata-book/e-data-book.c:367
-#: ../calendar/libedata-cal/e-data-cal.c:401
+#: ../addressbook/libedata-book/e-data-book.c:375
+#: ../calendar/libedata-cal/e-data-cal.c:409
 msgid "Success"
 msgstr "成功"
 
-#: ../addressbook/libedata-book/e-data-book.c:368
-#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:402
+#: ../addressbook/libedata-book/e-data-book.c:376
+#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:410
 #: ../libedataserver/e-client.c:139
 msgid "Backend is busy"
 msgstr "后端繁忙"
 
-#: ../addressbook/libedata-book/e-data-book.c:369
-#: ../calendar/libedata-cal/e-data-cal.c:403 ../libedataserver/e-client.c:149
+#: ../addressbook/libedata-book/e-data-book.c:377
+#: ../calendar/libedata-cal/e-data-cal.c:411 ../libedataserver/e-client.c:149
 msgid "Repository offline"
 msgstr "仓库离线"
 
-#: ../addressbook/libedata-book/e-data-book.c:370
-#: ../calendar/libecal/e-cal.c:2316 ../calendar/libedata-cal/e-data-cal.c:404
+#: ../addressbook/libedata-book/e-data-book.c:378
+#: ../calendar/libecal/e-cal.c:2316 ../calendar/libedata-cal/e-data-cal.c:412
 #: ../libedataserver/e-client.c:156
 msgid "Permission denied"
 msgstr "没有权限"
 
-#: ../addressbook/libedata-book/e-data-book.c:373
-#: ../calendar/libedata-cal/e-data-cal.c:409
+#: ../addressbook/libedata-book/e-data-book.c:381
+#: ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Authentication Failed"
 msgstr "认证失败"
 
-#: ../addressbook/libedata-book/e-data-book.c:374
-#: ../calendar/libedata-cal/e-data-cal.c:410
+#: ../addressbook/libedata-book/e-data-book.c:382
+#: ../calendar/libedata-cal/e-data-cal.c:418
 msgid "Authentication Required"
 msgstr "需要认证"
 
-#: ../addressbook/libedata-book/e-data-book.c:375
-#: ../calendar/libedata-cal/e-data-cal.c:411
+#: ../addressbook/libedata-book/e-data-book.c:383
+#: ../calendar/libedata-cal/e-data-cal.c:419
 msgid "Unsupported field"
 msgstr "不支持的字段"
 
-#: ../addressbook/libedata-book/e-data-book.c:376
-#: ../calendar/libedata-cal/e-data-cal.c:413 ../libedataserver/e-client.c:164
+#: ../addressbook/libedata-book/e-data-book.c:384
+#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:164
 msgid "Unsupported authentication method"
 msgstr "不支持的身份认证方式"
 
-#: ../addressbook/libedata-book/e-data-book.c:377
-#: ../calendar/libedata-cal/e-data-cal.c:414 ../libedataserver/e-client.c:166
+#: ../addressbook/libedata-book/e-data-book.c:385
+#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:166
 msgid "TLS not available"
 msgstr "TLS 不可用"
 
-#: ../addressbook/libedata-book/e-data-book.c:378
+#: ../addressbook/libedata-book/e-data-book.c:386
 msgid "Address book does not exist"
 msgstr "地址簿不存在"
 
-#: ../addressbook/libedata-book/e-data-book.c:379
+#: ../addressbook/libedata-book/e-data-book.c:387
 msgid "Book removed"
 msgstr "地址簿已删除"
 
-#: ../addressbook/libedata-book/e-data-book.c:380
-#: ../calendar/libedata-cal/e-data-cal.c:417
+#: ../addressbook/libedata-book/e-data-book.c:388
+#: ../calendar/libedata-cal/e-data-cal.c:425
 msgid "Not available in offline mode"
 msgstr "在离线模式中无法使用"
 
-#: ../addressbook/libedata-book/e-data-book.c:381
-#: ../calendar/libedata-cal/e-data-cal.c:418 ../libedataserver/e-client.c:168
+#: ../addressbook/libedata-book/e-data-book.c:389
+#: ../calendar/libedata-cal/e-data-cal.c:426 ../libedataserver/e-client.c:168
 msgid "Search size limit exceeded"
 msgstr "超过搜索大小限制"
 
-#: ../addressbook/libedata-book/e-data-book.c:382
-#: ../calendar/libedata-cal/e-data-cal.c:419 ../libedataserver/e-client.c:170
+#: ../addressbook/libedata-book/e-data-book.c:390
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:170
 msgid "Search time limit exceeded"
 msgstr "超过搜索时间限制"
 
-#: ../addressbook/libedata-book/e-data-book.c:384
-#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:174
+#: ../addressbook/libedata-book/e-data-book.c:392
+#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:174
 msgid "Query refused"
 msgstr "查询被拒绝"
 
-#: ../addressbook/libedata-book/e-data-book.c:385
-#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:160
+#: ../addressbook/libedata-book/e-data-book.c:393
+#: ../calendar/libedata-cal/e-data-cal.c:430 ../libedataserver/e-client.c:160
 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:387
-#: ../calendar/libedata-cal/e-data-cal.c:424
+#: ../addressbook/libedata-book/e-data-book.c:395
+#: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Invalid server version"
 msgstr "无效的服务器版本"
 
-#: ../addressbook/libedata-book/e-data-book.c:389
-#: ../calendar/libecal/e-cal.c:2300 ../calendar/libedata-cal/e-data-cal.c:425
+#: ../addressbook/libedata-book/e-data-book.c:397
+#: ../calendar/libecal/e-cal.c:2300 ../calendar/libedata-cal/e-data-cal.c:433
 #: ../libedataserver/e-client.c:137
 msgid "Invalid argument"
 msgstr "无效参数"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:391
+#: ../addressbook/libedata-book/e-data-book.c:399
 #: ../calendar/libecal/e-cal.c:1059 ../calendar/libecal/e-cal.c:1427
 #: ../calendar/libecal/e-cal.c:1907 ../calendar/libecal/e-cal.c:2339
-#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:162
+#: ../calendar/libedata-cal/e-data-cal.c:435 ../libedataserver/e-client.c:162
 #, c-format
 msgid "Not supported"
 msgstr "不支持"
 
-#: ../addressbook/libedata-book/e-data-book.c:392
-#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:180
+#: ../addressbook/libedata-book/e-data-book.c:400
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:180
 msgid "Backend is not opened yet"
 msgstr "后端尚未打开"
 
-#: ../addressbook/libedata-book/e-data-book.c:393
+#: ../addressbook/libedata-book/e-data-book.c:401
 #: ../libedataserver/e-client.c:182
 msgid "Object is out of sync"
 msgstr "目标尚未同步"
 
-#: ../addressbook/libedata-book/e-data-book.c:401
-#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:178
+#: ../addressbook/libedata-book/e-data-book.c:409
+#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:178
 msgid "Other error"
 msgstr "其他错误"
 
-#: ../addressbook/libedata-book/e-data-book.c:1053
-#: ../calendar/libedata-cal/e-data-cal.c:1332
+#: ../addressbook/libedata-book/e-data-book.c:1121
+#: ../calendar/libedata-cal/e-data-cal.c:1400
 msgid "Invalid query: "
 msgstr "无效的查询:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1272
+#: ../addressbook/libedata-book/e-data-book.c:1340
 msgid "Cannot open book: "
 msgstr "无法打开地址簿:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1309
+#: ../addressbook/libedata-book/e-data-book.c:1377
 msgid "Cannot refresh address book: "
 msgstr "无法刷新地址薄:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1340
+#: ../addressbook/libedata-book/e-data-book.c:1408
 msgid "Cannot get contact: "
 msgstr "无法获取联系人:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1378
+#: ../addressbook/libedata-book/e-data-book.c:1446
 msgid "Cannot get contact list: "
 msgstr "无法获取联系人列表:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1430
+#: ../addressbook/libedata-book/e-data-book.c:1498
 msgid "Cannot get contact list uids: "
 msgstr "无法获取联系人列表 UID:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1477
+#: ../addressbook/libedata-book/e-data-book.c:1545
 msgid "Cannot add contact: "
 msgstr "无法添加联系人:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1526
+#: ../addressbook/libedata-book/e-data-book.c:1594
 msgid "Cannot modify contacts: "
 msgstr "无法修改联系人:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1568
+#: ../addressbook/libedata-book/e-data-book.c:1636
 msgid "Cannot remove contacts: "
 msgstr "无法移除联系人:"
 
@@ -1301,53 +1308,35 @@ msgstr "移动 cursor 时修订失去同步"
 msgid "Alphabetic index was set for incorrect locale"
 msgstr "对错误的区域设置了字母表索引"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:289
-#: ../calendar/libedata-cal/e-data-cal-factory.c:285
-#, c-format
-msgid "No backend name in source '%s'"
-msgstr "源文件“%s”中无后端名称"
-
-#: ../addressbook/libedata-book/e-data-book-factory.c:377
-#: ../calendar/libedata-cal/e-data-cal-factory.c:339
-#, c-format
-msgid "Missing source UID"
-msgstr "缺少源 UID"
-
-#: ../addressbook/libedata-book/e-data-book-factory.c:388
-#: ../calendar/libedata-cal/e-data-cal-factory.c:349
-#, c-format
-msgid "No such source for UID '%s'"
-msgstr "没有 UID “%s”的源"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576
+#: ../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:607
+#: ../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:618
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:615
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "返回了意外的 HTTP 状态代码 %d(%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:637
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:634
 msgid "CalDAV backend is not loaded yet"
 msgstr "CalDAV 后端尚未加载"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1079
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1076
 msgid "Invalid Redirect URL"
 msgstr "无效的重定向 URL"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2882
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2850
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "无法创建本地缓存文件夹“%s”"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2934
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2902
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1356,27 +1345,27 @@ msgstr ""
 "服务器不可用,日历将以只读模式打开。\n"
 "错误消息:%s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3968
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3936
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV 不支持批量添加"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4071
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4039
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV 不支持批量修改"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4215
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV 不支持批量删除"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4914
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4882
 msgid "Calendar doesn't support Free/Busy"
 msgstr "日历不支持空闲/繁忙"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4923
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4891
 msgid "Schedule outbox url not found"
 msgstr "未找到定时发件箱 url"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5020
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4988
 msgid "Unexpected result in schedule-response"
 msgstr "定时响应的结果异常"
 
@@ -1403,27 +1392,27 @@ msgstr "无法保存日历数据:URI 格式错误。"
 msgid "Cannot save calendar data"
 msgstr "无法保存日历数据"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:491
+#: ../calendar/backends/http/e-cal-backend-http.c:489
 #, c-format
 msgid "Malformed URI: %s"
 msgstr "URI 格式错误:%s"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:582
+#: ../calendar/backends/http/e-cal-backend-http.c:555
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "已重定向到无效 URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:625
+#: ../calendar/backends/http/e-cal-backend-http.c:598
 #, c-format
 msgid "Bad file format."
 msgstr "无效的文件格式。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:635
+#: ../calendar/backends/http/e-cal-backend-http.c:608
 #, c-format
 msgid "Not a calendar."
 msgstr "不是日历。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:925
+#: ../calendar/backends/http/e-cal-backend-http.c:897
 #: ../calendar/backends/weather/e-cal-backend-weather.c:536
 msgid "Could not create cache file"
 msgstr "无法创建缓存文件"
@@ -1499,17 +1488,17 @@ msgstr "天气预报"
 msgid "Repository is offline"
 msgstr "仓库离线"
 
-#: ../calendar/libecal/e-cal.c:2306 ../calendar/libecal/e-cal-client.c:263
+#: ../calendar/libecal/e-cal.c:2306 ../calendar/libecal/e-cal-client.c:262
 msgid "No such calendar"
 msgstr "没有这样的日历"
 
-#: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:265
-#: ../calendar/libedata-cal/e-data-cal.c:406
+#: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:264
+#: ../calendar/libedata-cal/e-data-cal.c:414
 msgid "Object not found"
 msgstr "找不到对象"
 
-#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:267
-#: ../calendar/libedata-cal/e-data-cal.c:407
+#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:266
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Invalid object"
 msgstr "无效对象"
 
@@ -1525,8 +1514,8 @@ msgstr "URI 已经载入"
 msgid "Unknown User"
 msgstr "未知用户"
 
-#: ../calendar/libecal/e-cal.c:2320 ../calendar/libecal/e-cal-client.c:271
-#: ../calendar/libedata-cal/e-data-cal.c:408
+#: ../calendar/libecal/e-cal.c:2320 ../calendar/libecal/e-cal-client.c:270
+#: ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Object ID already exists"
 msgstr "对象 ID 已经存在"
 
@@ -1547,7 +1536,7 @@ msgid "Authentication failed"
 msgstr "认证失败"
 
 #: ../calendar/libecal/e-cal.c:2330
-#: ../camel/providers/smtp/camel-smtp-transport.c:921
+#: ../camel/providers/smtp/camel-smtp-transport.c:920
 #: ../libedataserver/e-client.c:147
 msgid "Authentication required"
 msgstr "必须认证"
@@ -1560,22 +1549,22 @@ msgstr "发生了一个 D-Bus 异常"
 msgid "No error"
 msgstr "无错误"
 
-#: ../calendar/libecal/e-cal-client.c:269
-#: ../calendar/libedata-cal/e-data-cal.c:416
+#: ../calendar/libecal/e-cal-client.c:268
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Unknown user"
 msgstr "未知用户"
 
-#: ../calendar/libecal/e-cal-client.c:273
-#: ../calendar/libedata-cal/e-data-cal.c:405
+#: ../calendar/libecal/e-cal-client.c:272
+#: ../calendar/libedata-cal/e-data-cal.c:413
 msgid "Invalid range"
 msgstr "无效范围"
 
-#: ../calendar/libecal/e-cal-client.c:936
+#: ../calendar/libecal/e-cal-client.c:1021
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "未知的日历属性“%s”"
 
-#: ../calendar/libecal/e-cal-client.c:951
+#: ../calendar/libecal/e-cal-client.c:1036
 #, c-format
 msgid "Cannot change value of calendar property '%s'"
 msgstr "无法更改日历属性的值“%s”"
@@ -1838,113 +1827,113 @@ msgstr "“%s”的第一个参数必须是 ISO 8601 日期/时间字符串"
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "“%s”的第二个参数应该是整数"
 
-#: ../calendar/libedata-cal/e-data-cal.c:412
+#: ../calendar/libedata-cal/e-data-cal.c:420
 msgid "Unsupported method"
 msgstr "不支持的方式"
 
-#: ../calendar/libedata-cal/e-data-cal.c:415
+#: ../calendar/libedata-cal/e-data-cal.c:423
 msgid "Calendar does not exist"
 msgstr "日历不存在"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1503
+#: ../calendar/libedata-cal/e-data-cal.c:1571
 msgid "Cannot open calendar: "
 msgstr "无法打开日历:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1540
+#: ../calendar/libedata-cal/e-data-cal.c:1608
 msgid "Cannot refresh calendar: "
 msgstr "无法刷新日历:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1581
+#: ../calendar/libedata-cal/e-data-cal.c:1649
 msgid "Cannot retrieve calendar object path: "
 msgstr "无法获取日历对象的路径:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1633
+#: ../calendar/libedata-cal/e-data-cal.c:1701
 msgid "Cannot retrieve calendar object list: "
 msgstr "无法获取日历对象的列表:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1684
+#: ../calendar/libedata-cal/e-data-cal.c:1752
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "无法获取日历空闲/繁忙列表:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1727
+#: ../calendar/libedata-cal/e-data-cal.c:1795
 msgid "Cannot create calendar object: "
 msgstr "无法创建日历对象:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1795
+#: ../calendar/libedata-cal/e-data-cal.c:1863
 msgid "Cannot modify calendar object: "
 msgstr "无法修改日历对象:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1873
+#: ../calendar/libedata-cal/e-data-cal.c:1941
 msgid "Cannot remove calendar object: "
 msgstr "无法移除日历对象:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1959
+#: ../calendar/libedata-cal/e-data-cal.c:2027
 msgid "Cannot receive calendar objects: "
 msgstr "无法接收日历对象:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2002
+#: ../calendar/libedata-cal/e-data-cal.c:2070
 msgid "Cannot send calendar objects: "
 msgstr "无法发送日历对象:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2054
+#: ../calendar/libedata-cal/e-data-cal.c:2122
 msgid "Could not retrieve attachment uris: "
 msgstr "无法获取附件 URI:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2099
+#: ../calendar/libedata-cal/e-data-cal.c:2167
 msgid "Could not discard reminder: "
 msgstr "无法取消提醒:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2140
+#: ../calendar/libedata-cal/e-data-cal.c:2208
 msgid "Could not retrieve calendar time zone: "
 msgstr "无法获取日历时区:"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2180
+#: ../calendar/libedata-cal/e-data-cal.c:2248
 msgid "Could not add calendar time zone: "
 msgstr "无法添加日历时区:"
 
-#: ../camel/camel-cipher-context.c:200
+#: ../camel/camel-cipher-context.c:199
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "该密码不支持签名"
 
-#: ../camel/camel-cipher-context.c:213
+#: ../camel/camel-cipher-context.c:212
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "该密码不支持验证"
 
-#: ../camel/camel-cipher-context.c:229
+#: ../camel/camel-cipher-context.c:228
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "该密码不支持加密"
 
-#: ../camel/camel-cipher-context.c:243
+#: ../camel/camel-cipher-context.c:242
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "该密码不支持解密"
 
-#: ../camel/camel-cipher-context.c:359
+#: ../camel/camel-cipher-context.c:358
 msgid "Signing message"
 msgstr "签名消息"
 
-#: ../camel/camel-cipher-context.c:649
+#: ../camel/camel-cipher-context.c:648
 msgid "Encrypting message"
 msgstr "加密消息"
 
-#: ../camel/camel-cipher-context.c:821
+#: ../camel/camel-cipher-context.c:820
 msgid "Decrypting message"
 msgstr "解密消息"
 
@@ -1962,7 +1951,7 @@ msgstr "清空缓存文件"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "无法删除缓存条目:%s:%s"
 
-#: ../camel/camel-filter-driver.c:914 ../camel/camel-filter-search.c:795
+#: ../camel/camel-filter-driver.c:914 ../camel/camel-filter-search.c:797
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "创建子进程“%s”失败:%s"
@@ -2039,71 +2028,76 @@ msgstr "解析过滤规则“%s”出错:%s:%s"
 msgid "Error executing filter '%s': %s: %s"
 msgstr "执行过滤规则“%s”错误:%s:%s"
 
-#: ../camel/camel-filter-search.c:136
+#: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
 msgstr "获取消息失败"
 
-#: ../camel/camel-filter-search.c:535
+#: ../camel/camel-filter-search.c:537
 msgid "Invalid arguments to (system-flag)"
 msgstr "(system-flag)参数无效"
 
-#: ../camel/camel-filter-search.c:553
+#: ../camel/camel-filter-search.c:555
 msgid "Invalid arguments to (user-tag)"
 msgstr "(user-tag)参数无效"
 
-#: ../camel/camel-filter-search.c:1075 ../camel/camel-filter-search.c:1086
+#: ../camel/camel-filter-search.c:1064
+#| msgid "Invalid arguments to (system-flag)"
+msgid "Invalid arguments to (message-location)"
+msgstr "(message-location)参数无效"
+
+#: ../camel/camel-filter-search.c:1142 ../camel/camel-filter-search.c:1153
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "执行过滤规则搜索错误:%s:%s"
 
-#: ../camel/camel-folder.c:323
+#: ../camel/camel-folder.c:321
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "在“%s”中学习新的垃圾邮件"
 
-#: ../camel/camel-folder.c:363
+#: ../camel/camel-folder.c:361
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "在“%s”中学习新的有害邮件"
 
-#: ../camel/camel-folder.c:411
+#: ../camel/camel-folder.c:409
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "在“%s”中过滤新消息"
 
-#: ../camel/camel-folder.c:1011
+#: ../camel/camel-folder.c:1009
 #: ../camel/providers/local/camel-maildir-folder.c:330
 msgid "Moving messages"
 msgstr "移动消息"
 
-#: ../camel/camel-folder.c:1014
+#: ../camel/camel-folder.c:1012
 msgid "Copying messages"
 msgstr "复制消息"
 
-#: ../camel/camel-folder.c:1056
+#: ../camel/camel-folder.c:1054
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "文件夹“%s”不支持配额信息"
 
-#: ../camel/camel-folder.c:2862
+#: ../camel/camel-folder.c:2860
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "正在销毁文件夹“%s”"
 
-#: ../camel/camel-folder.c:2990
+#: ../camel/camel-folder.c:2988
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "正在获取 %2$s 中的消息“%1$s”"
 
-#: ../camel/camel-folder.c:3181
+#: ../camel/camel-folder.c:3179
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "正在获取“%s”的配额信息"
 
-#: ../camel/camel-folder.c:3478
+#: ../camel/camel-folder.c:3476
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "正在刷新文件夹“%s”"
@@ -2156,18 +2150,18 @@ msgstr ""
 "执行搜索表达式错误:%s:\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:721 ../camel/camel-gpg-context.c:726
-#: ../camel/camel-gpg-context.c:1383
+#: ../camel/camel-gpg-context.c:720 ../camel/camel-gpg-context.c:725
+#: ../camel/camel-gpg-context.c:1382
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "执行 gpg 失败:%s"
 
-#: ../camel/camel-gpg-context.c:726
-#: ../camel/providers/smtp/camel-smtp-transport.c:924
+#: ../camel/camel-gpg-context.c:725
+#: ../camel/providers/smtp/camel-smtp-transport.c:923
 msgid "Unknown"
 msgstr "未知"
 
-#: ../camel/camel-gpg-context.c:791
+#: ../camel/camel-gpg-context.c:790
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2178,17 +2172,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:826
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "解析 gpg userid 提示失败。"
 
-#: ../camel/camel-gpg-context.c:852 ../camel/camel-gpg-context.c:867
+#: ../camel/camel-gpg-context.c:851 ../camel/camel-gpg-context.c:866
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "解析 gpg 密码句请求失败。"
 
-#: ../camel/camel-gpg-context.c:888
+#: ../camel/camel-gpg-context.c:887
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2197,7 +2191,7 @@ msgstr ""
 "您需要一个 PIN 用来解锁您的智能卡:\n"
 "“%s”"
 
-#: ../camel/camel-gpg-context.c:892
+#: ../camel/camel-gpg-context.c:891
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2206,80 +2200,80 @@ msgstr ""
 "您需要一个密码句用来解锁以下用户:\n"
 "“%s”"
 
-#: ../camel/camel-gpg-context.c:898
+#: ../camel/camel-gpg-context.c:897
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG 对“%s”的意外响应"
 
-#: ../camel/camel-gpg-context.c:910
+#: ../camel/camel-gpg-context.c:909
 msgid ""
 "Note the encrypted content doesn't contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
 msgstr "请注意加密的内容里不包含收件人信息,因此可能会请求输出每个私钥的口令。"
 
-#: ../camel/camel-gpg-context.c:941 ../camel/camel-net-utils.c:522
+#: ../camel/camel-gpg-context.c:940 ../camel/camel-net-utils.c:522
 #: ../camel/providers/nntp/camel-nntp-summary.c:401
 #: ../libedataserver/e-client.c:158
 #, c-format
 msgid "Cancelled"
 msgstr "已取消"
 
-#: ../camel/camel-gpg-context.c:962
+#: ../camel/camel-gpg-context.c:961
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "解锁密钥失败:给出了 3 个错误的密码句。"
 
-#: ../camel/camel-gpg-context.c:975
+#: ../camel/camel-gpg-context.c:974
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "来自 GnuPG 的意外应答:%s"
 
-#: ../camel/camel-gpg-context.c:1106
+#: ../camel/camel-gpg-context.c:1105
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "加密失败:没有指定有效的收件人。"
 
-#: ../camel/camel-gpg-context.c:1658 ../camel/camel-smime-context.c:844
+#: ../camel/camel-gpg-context.c:1657 ../camel/camel-smime-context.c:843
 msgid "Could not generate signing data: "
 msgstr "无法生成签名数据:"
 
-#: ../camel/camel-gpg-context.c:1708 ../camel/camel-gpg-context.c:1920
-#: ../camel/camel-gpg-context.c:2030 ../camel/camel-gpg-context.c:2179
+#: ../camel/camel-gpg-context.c:1707 ../camel/camel-gpg-context.c:1919
+#: ../camel/camel-gpg-context.c:2029 ../camel/camel-gpg-context.c:2178
 msgid "Failed to execute gpg."
 msgstr "执行 gpg 失败。"
 
-#: ../camel/camel-gpg-context.c:1791 ../camel/camel-gpg-context.c:1799
-#: ../camel/camel-gpg-context.c:1807 ../camel/camel-gpg-context.c:1827
-#: ../camel/camel-smime-context.c:973 ../camel/camel-smime-context.c:987
-#: ../camel/camel-smime-context.c:996
+#: ../camel/camel-gpg-context.c:1790 ../camel/camel-gpg-context.c:1798
+#: ../camel/camel-gpg-context.c:1806 ../camel/camel-gpg-context.c:1826
+#: ../camel/camel-smime-context.c:972 ../camel/camel-smime-context.c:986
+#: ../camel/camel-smime-context.c:995
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "无法校验消息签名:消息格式不对"
 
-#: ../camel/camel-gpg-context.c:1873
+#: ../camel/camel-gpg-context.c:1872
 msgid "Cannot verify message signature: "
 msgstr "无法校验消息签名:"
 
-#: ../camel/camel-gpg-context.c:1996
+#: ../camel/camel-gpg-context.c:1995
 msgid "Could not generate encrypting data: "
 msgstr "无法生成加密数据:"
 
-#: ../camel/camel-gpg-context.c:2049
+#: ../camel/camel-gpg-context.c:2048
 msgid "This is a digitally encrypted message part"
 msgstr "这是消息的数字加密部分"
 
-#: ../camel/camel-gpg-context.c:2105 ../camel/camel-gpg-context.c:2114
-#: ../camel/camel-gpg-context.c:2137
+#: ../camel/camel-gpg-context.c:2104 ../camel/camel-gpg-context.c:2113
+#: ../camel/camel-gpg-context.c:2136
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "无法解密消息:消息格式不对"
 
-#: ../camel/camel-gpg-context.c:2125
+#: ../camel/camel-gpg-context.c:2124
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "解密 MIME 部分失败:协议错误"
 
-#: ../camel/camel-gpg-context.c:2220 ../camel/camel-smime-context.c:1289
+#: ../camel/camel-gpg-context.c:2219 ../camel/camel-smime-context.c:1288
 msgid "Encrypted content"
 msgstr "加密内容"
 
@@ -2327,56 +2321,56 @@ msgstr "无法锁定“%s”:lock-helper 协议错误"
 msgid "Could not lock '%s'"
 msgstr "无法锁定“%s”"
 
-#: ../camel/camel-movemail.c:109
+#: ../camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "无法检查邮件文件 %s:%s"
 
-#: ../camel/camel-movemail.c:123
+#: ../camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "无法打开邮件文件 %s:%s"
 
-#: ../camel/camel-movemail.c:133
+#: ../camel/camel-movemail.c:131
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "无法打开临时邮件文件 %s:%s"
 
-#: ../camel/camel-movemail.c:163
+#: ../camel/camel-movemail.c:161
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "将邮件存储到临时文件 %s 失败:%s"
 
-#: ../camel/camel-movemail.c:197
+#: ../camel/camel-movemail.c:195
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "无法创建管道:%s"
 
-#: ../camel/camel-movemail.c:211
+#: ../camel/camel-movemail.c:209
 #, c-format
 msgid "Could not fork: %s"
 msgstr "无法创建进程:%s"
 
-#: ../camel/camel-movemail.c:249
+#: ../camel/camel-movemail.c:247
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "移动邮件程序失败:%s"
 
-#: ../camel/camel-movemail.c:250
+#: ../camel/camel-movemail.c:248
 msgid "(Unknown error)"
 msgstr "(未知的错误)"
 
-#: ../camel/camel-movemail.c:277
+#: ../camel/camel-movemail.c:275
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "阅读邮件文件错误:%s"
 
-#: ../camel/camel-movemail.c:290
+#: ../camel/camel-movemail.c:288
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "写入邮件临时文件错误:%s"
 
-#: ../camel/camel-movemail.c:497 ../camel/camel-movemail.c:566
+#: ../camel/camel-movemail.c:495 ../camel/camel-movemail.c:564
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "复制邮件临时文件错误:%s"
@@ -2415,62 +2409,62 @@ msgstr "主机“%s”查找失败,请检查主机名是否存在拼写错误
 msgid "Host lookup '%s' failed: %s"
 msgstr "查找主机“%s”失败:%s"
 
-#: ../camel/camel-offline-folder.c:90
+#: ../camel/camel-offline-folder.c:89
 msgid "Downloading new messages for offline mode"
 msgstr "下载新消息以进行离线操作"
 
-#: ../camel/camel-offline-folder.c:209
+#: ../camel/camel-offline-folder.c:208
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "正在将文件夹“%s”中的消息同步到磁盘"
 
-#: ../camel/camel-offline-folder.c:266
+#: ../camel/camel-offline-folder.c:265
 msgid "Copy folder content locally for _offline operation"
 msgstr "将文件夹内容复制到本地以进行离线操作(_O)"
 
-#: ../camel/camel-provider.c:56
+#: ../camel/camel-provider.c:55
 msgid "Virtual folder email provider"
 msgstr "虚拟文件夹电子邮件提供者"
 
-#: ../camel/camel-provider.c:58
+#: ../camel/camel-provider.c:57
 msgid "For reading mail as a query of another set of folders"
 msgstr "关于将读入邮件作为对另一组文件夹的查询"
 
-#: ../camel/camel-provider.c:261
+#: ../camel/camel-provider.c:260
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "无法载入 %s:本系统不支持模块载入。"
 
-#: ../camel/camel-provider.c:270
+#: ../camel/camel-provider.c:269
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "无法载入 %s:%s"
 
-#: ../camel/camel-provider.c:279
+#: ../camel/camel-provider.c:278
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "无法载入 %s:模块中没有初始化代码。"
 
-#: ../camel/camel-provider.c:427 ../camel/camel-session.c:424
+#: ../camel/camel-provider.c:426 ../camel/camel-session.c:422
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "协议“%s”没有可用的提供者"
 
-#: ../camel/camel-sasl-anonymous.c:33
-#: ../camel/providers/nntp/camel-nntp-provider.c:83
+#: ../camel/camel-sasl-anonymous.c:32
+#: ../camel/providers/nntp/camel-nntp-provider.c:82
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../camel/camel-sasl-anonymous.c:35
+#: ../camel/camel-sasl-anonymous.c:34
 msgid "This option will connect to the server using an anonymous login."
 msgstr "该选项将连接到匿名登录的服务器上。"
 
-#: ../camel/camel-sasl-anonymous.c:68
+#: ../camel/camel-sasl-anonymous.c:67
 #, c-format
 msgid "Authentication failed."
 msgstr "认证失败。"
 
-#: ../camel/camel-sasl-anonymous.c:79
+#: ../camel/camel-sasl-anonymous.c:78
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2479,7 +2473,7 @@ msgstr ""
 "无效的电子邮件跟踪信息:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:93
+#: ../camel/camel-sasl-anonymous.c:92
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2488,7 +2482,7 @@ msgstr ""
 "无效的诲涩跟踪信息:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:107
+#: ../camel/camel-sasl-anonymous.c:106
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2497,136 +2491,141 @@ msgstr ""
 "无效的跟踪信息:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:44
+#: ../camel/camel-sasl-cram-md5.c:43
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:46
+#: ../camel/camel-sasl-cram-md5.c:45
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr "如果服务器支持的话,该选项将用安全 CRAM-MD5 密码连接到服务器。"
 
-#: ../camel/camel-sasl-digest-md5.c:57
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:59
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr "如果服务器支持的话,该选项将用安全 DIGEST-MD5 密码连接到服务器。"
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:852
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "服务器质询过长 (>2048 字节)"
 
-#: ../camel/camel-sasl-digest-md5.c:864
+#: ../camel/camel-sasl-digest-md5.c:863
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "服务器质询无效\n"
 
-#: ../camel/camel-sasl-digest-md5.c:872
+#: ../camel/camel-sasl-digest-md5.c:871
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "服务器质询含有无效的“品质保护”标志"
 
-#: ../camel/camel-sasl-digest-md5.c:905
+#: ../camel/camel-sasl-digest-md5.c:904
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "服务器应答不含有认证数据"
 
-#: ../camel/camel-sasl-digest-md5.c:926
+#: ../camel/camel-sasl-digest-md5.c:925
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "服务器应达含有不完整的认证数据"
 
-#: ../camel/camel-sasl-digest-md5.c:939
+#: ../camel/camel-sasl-digest-md5.c:938
 #, c-format
 msgid "Server response does not match"
 msgstr "服务器应答不匹配"
 
-#: ../camel/camel-sasl-gssapi.c:89
+#: ../camel/camel-sasl-gssapi.c:94
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:91
+#: ../camel/camel-sasl-gssapi.c:96
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "该选项将用 Kerberos 5 认证连接到服务器。"
 
-#: ../camel/camel-sasl-gssapi.c:134
+#: ../camel/camel-sasl-gssapi.c:148
+#, c-format
+msgid "(Unknown GSSAPI mechanism code: %x)"
+msgstr "(未知 GSSAPI 机制代码: %x)"
+
+#: ../camel/camel-sasl-gssapi.c:181
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr "所提供的证书不支持指定的机制,或者无法被实现所识别。"
 
-#: ../camel/camel-sasl-gssapi.c:139
+#: ../camel/camel-sasl-gssapi.c:186
 msgid "The provided target_name parameter was ill-formed."
 msgstr "提供的 target_name 参数格式不对。"
 
-#: ../camel/camel-sasl-gssapi.c:142
+#: ../camel/camel-sasl-gssapi.c:189
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "提供的 target_name 参数包含无效或不支持的名称类型。"
 
-#: ../camel/camel-sasl-gssapi.c:146
+#: ../camel/camel-sasl-gssapi.c:193
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr ""
 "input_token 包含的通道绑定与通过 input_chan_bindings 参数指定的通道不同。"
 
-#: ../camel/camel-sasl-gssapi.c:151
+#: ../camel/camel-sasl-gssapi.c:198
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "input_token 包含无效的签名,或者无法验证签名。"
 
-#: ../camel/camel-sasl-gssapi.c:155
+#: ../camel/camel-sasl-gssapi.c:202
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 msgstr "提供的证书由于上下文的原因无效,或者证书句柄没有引用证书。"
 
-#: ../camel/camel-sasl-gssapi.c:160
+#: ../camel/camel-sasl-gssapi.c:207
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "提供的上下文句柄所引用的上下文无效。"
 
-#: ../camel/camel-sasl-gssapi.c:163
+#: ../camel/camel-sasl-gssapi.c:210
 msgid "The consistency checks performed on the input_token failed."
 msgstr "对 input_token 执行完整性检查失败。"
 
-#: ../camel/camel-sasl-gssapi.c:166
+#: ../camel/camel-sasl-gssapi.c:213
 msgid "The consistency checks performed on the credential failed."
 msgstr "对证书执行完整性检查失败。"
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:216
 msgid "The referenced credentials have expired."
 msgstr "引用的证书已过期。"
 
-#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:352
-#: ../camel/camel-sasl-gssapi.c:400 ../camel/camel-sasl-gssapi.c:417
-#: ../camel/providers/smtp/camel-smtp-transport.c:622
+#: ../camel/camel-sasl-gssapi.c:222 ../camel/camel-sasl-gssapi.c:402
+#: ../camel/camel-sasl-gssapi.c:451 ../camel/camel-sasl-gssapi.c:468
+#: ../camel/providers/smtp/camel-smtp-transport.c:621
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "来自服务器的无效认证应答。"
 
-#: ../camel/camel-sasl-gssapi.c:429
+#: ../camel/camel-sasl-gssapi.c:480
 #, c-format
 msgid "Unsupported security layer."
 msgstr "不支持的安全层。"
 
-#: ../camel/camel-sasl-login.c:38
+#: ../camel/camel-sasl-login.c:37
 msgid "Login"
 msgstr "Login"
 
-#: ../camel/camel-sasl-login.c:40 ../camel/camel-sasl-plain.c:44
+#: ../camel/camel-sasl-login.c:39 ../camel/camel-sasl-plain.c:43
 msgid "This option will connect to the server using a simple password."
 msgstr "该选项将以普通密码连接到服务器。"
 
-#: ../camel/camel-sasl-login.c:108
+#: ../camel/camel-sasl-login.c:107
 #, c-format
 msgid "Unknown authentication state."
 msgstr "未知的认证状态。"
@@ -2641,293 +2640,293 @@ msgid ""
 "Password Authentication."
 msgstr "该选项将使用 NTLM / Secure 口令认证连接到基于 Windows 的服务器。"
 
-#: ../camel/camel-sasl-plain.c:42
+#: ../camel/camel-sasl-plain.c:41
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:44
+#: ../camel/camel-sasl-popb4smtp.c:43
 msgid "POP before SMTP"
 msgstr "在 SMTP 之前 POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:45
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "该选项将在尝试 SMTP 之前允许 POP 连接"
 
-#: ../camel/camel-sasl-popb4smtp.c:82
+#: ../camel/camel-sasl-popb4smtp.c:81
 msgid "POP Source UID"
 msgstr "POP 源 UID"
 
-#: ../camel/camel-sasl-popb4smtp.c:96
+#: ../camel/camel-sasl-popb4smtp.c:95
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "以未知的传输进行 SMTP 认证授权之前的 POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117
+#: ../camel/camel-sasl-popb4smtp.c:107 ../camel/camel-sasl-popb4smtp.c:116
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "试图通过 %s 服务在 SMTP 认证之前进行 POP"
 
-#: ../camel/camel-search-private.c:114
+#: ../camel/camel-search-private.c:113
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "常规表达式编译失败:%s:%s"
 
-#: ../camel/camel-session.c:433
+#: ../camel/camel-session.c:431
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "为协议“%s”注册的 GType 无效"
 
-#: ../camel/camel-session.c:502
-#: ../camel/providers/imapx/camel-imapx-server.c:4719
-#: ../camel/providers/pop3/camel-pop3-store.c:311
-#: ../camel/providers/pop3/camel-pop3-store.c:757
-#: ../camel/providers/smtp/camel-smtp-transport.c:515
+#: ../camel/camel-session.c:500
+#: ../camel/providers/imapx/camel-imapx-server.c:4698
+#: ../camel/providers/pop3/camel-pop3-store.c:309
+#: ../camel/providers/pop3/camel-pop3-store.c:755
+#: ../camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
 msgid "No support for %s authentication"
 msgstr "不支持 %s 认证"
 
-#: ../camel/camel-session.c:517
+#: ../camel/camel-session.c:515
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s 认证失败"
 
-#: ../camel/camel-session.c:586
+#: ../camel/camel-session.c:584
 msgid "Forwarding messages is not supported"
 msgstr "不支持转发消息"
 
-#: ../camel/camel-smime-context.c:349 ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1075
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "无法找到‘%s’的证书"
 
-#: ../camel/camel-smime-context.c:377
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
 msgstr "无法创建 CMS 消息"
 
-#: ../camel/camel-smime-context.c:382
+#: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
 msgstr "无法创建 CMS 签名数据"
 
-#: ../camel/camel-smime-context.c:388
+#: ../camel/camel-smime-context.c:387
 msgid "Cannot attach CMS signed data"
 msgstr "无法附加 CMS 签名数据"
 
-#: ../camel/camel-smime-context.c:395
+#: ../camel/camel-smime-context.c:394
 msgid "Cannot attach CMS data"
 msgstr "无法附加 CMS 数据"
 
-#: ../camel/camel-smime-context.c:401
+#: ../camel/camel-smime-context.c:400
 msgid "Cannot create CMS Signer information"
 msgstr "无法创建 CMS 签名者信息"
 
-#: ../camel/camel-smime-context.c:407
+#: ../camel/camel-smime-context.c:406
 msgid "Cannot find certificate chain"
 msgstr "找不到证书链"
 
-#: ../camel/camel-smime-context.c:413
+#: ../camel/camel-smime-context.c:412
 msgid "Cannot add CMS Signing time"
 msgstr "无法添加 CMS 签名时间"
 
-#: ../camel/camel-smime-context.c:437 ../camel/camel-smime-context.c:452
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "“%s”的加密证书不存在"
 
-#: ../camel/camel-smime-context.c:459
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "无法添加 SMIMEEncKeyPrefs 属性"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:463
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "无法添加 MS SMIMEEncKeyPrefs 属性"
 
-#: ../camel/camel-smime-context.c:469
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot add encryption certificate"
 msgstr "无法添加加密证书"
 
-#: ../camel/camel-smime-context.c:475
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot add CMS Signer information"
 msgstr "无法添加 CMS 签名者信息"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:507
 msgid "Unverified"
 msgstr "未校验"
 
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:509
 msgid "Good signature"
 msgstr "完好签名"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:511
 msgid "Bad signature"
 msgstr "无效签名"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:513
 msgid "Content tampered with or altered in transit"
 msgstr "内容在传送过程中被篡改"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:515
 msgid "Signing certificate not found"
 msgstr "签名证书找不到"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:517
 msgid "Signing certificate not trusted"
 msgstr "签名证书不可信"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:519
 msgid "Signature algorithm unknown"
 msgstr "签名算法未知"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:521
 msgid "Signature algorithm unsupported"
 msgstr "签名算法不支持"
 
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:523
 msgid "Malformed signature"
 msgstr "签名格式不对"
 
-#: ../camel/camel-smime-context.c:526
+#: ../camel/camel-smime-context.c:525
 msgid "Processing error"
 msgstr "处理错误"
 
-#: ../camel/camel-smime-context.c:571
+#: ../camel/camel-smime-context.c:570
 msgid "No signed data in signature"
 msgstr "签名中没有签名数据"
 
-#: ../camel/camel-smime-context.c:576
+#: ../camel/camel-smime-context.c:575
 msgid "Digests missing from enveloped data"
 msgstr "信封数据缺少摘要"
 
-#: ../camel/camel-smime-context.c:589 ../camel/camel-smime-context.c:600
+#: ../camel/camel-smime-context.c:588 ../camel/camel-smime-context.c:599
 msgid "Cannot calculate digests"
 msgstr "无法计算摘要"
 
-#: ../camel/camel-smime-context.c:607 ../camel/camel-smime-context.c:611
+#: ../camel/camel-smime-context.c:606 ../camel/camel-smime-context.c:610
 msgid "Cannot set message digests"
 msgstr "无法设置消息摘要"
 
-#: ../camel/camel-smime-context.c:621 ../camel/camel-smime-context.c:626
+#: ../camel/camel-smime-context.c:620 ../camel/camel-smime-context.c:625
 msgid "Certificate import failed"
 msgstr "证书导入失败"
 
-#: ../camel/camel-smime-context.c:636
+#: ../camel/camel-smime-context.c:635
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "只有证书的消息,无法校验证书"
 
-#: ../camel/camel-smime-context.c:639
+#: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "只有证书的消息,证书已导入并校验"
 
-#: ../camel/camel-smime-context.c:643
+#: ../camel/camel-smime-context.c:642
 msgid "Cannot find signature digests"
 msgstr "找不到签名摘要"
 
-#: ../camel/camel-smime-context.c:660
+#: ../camel/camel-smime-context.c:659
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "签名者:%s <%s>:%s\n"
 
-#: ../camel/camel-smime-context.c:856 ../camel/camel-smime-context.c:1150
+#: ../camel/camel-smime-context.c:855 ../camel/camel-smime-context.c:1149
 msgid "Cannot create encoder context"
 msgstr "无法创建编码器上下文"
 
-#: ../camel/camel-smime-context.c:862
+#: ../camel/camel-smime-context.c:861
 msgid "Failed to add data to CMS encoder"
 msgstr "将数据添加到 CMS 编码器失败"
 
-#: ../camel/camel-smime-context.c:867 ../camel/camel-smime-context.c:1167
+#: ../camel/camel-smime-context.c:866 ../camel/camel-smime-context.c:1166
 msgid "Failed to encode data"
 msgstr "编码数据失败"
 
-#: ../camel/camel-smime-context.c:1015 ../camel/camel-smime-context.c:1264
+#: ../camel/camel-smime-context.c:1014 ../camel/camel-smime-context.c:1263
 msgid "Decoder failed"
 msgstr "解码器失败"
 
-#: ../camel/camel-smime-context.c:1084
+#: ../camel/camel-smime-context.c:1083
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "找不到公共批量加密算法"
 
-#: ../camel/camel-smime-context.c:1092
+#: ../camel/camel-smime-context.c:1091
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "无法为加密批量密钥分配密钥槽"
 
-#: ../camel/camel-smime-context.c:1103
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot create CMS Message"
 msgstr "无法创建 CMS 消息"
 
-#: ../camel/camel-smime-context.c:1109
+#: ../camel/camel-smime-context.c:1108
 msgid "Cannot create CMS Enveloped data"
 msgstr "无法创建 CMS 信封数据"
 
-#: ../camel/camel-smime-context.c:1115
+#: ../camel/camel-smime-context.c:1114
 msgid "Cannot attach CMS Enveloped data"
 msgstr "无法附加 CMS 信封数据"
 
-#: ../camel/camel-smime-context.c:1121
+#: ../camel/camel-smime-context.c:1120
 msgid "Cannot attach CMS data object"
 msgstr "无法附加 CMS 数据对象"
 
-#: ../camel/camel-smime-context.c:1130
+#: ../camel/camel-smime-context.c:1129
 msgid "Cannot create CMS Recipient information"
 msgstr "无法创建 CMS 收件人信息"
 
-#: ../camel/camel-smime-context.c:1135
+#: ../camel/camel-smime-context.c:1134
 msgid "Cannot add CMS Recipient information"
 msgstr "无法添加 CMS 收件人信息"
 
-#: ../camel/camel-smime-context.c:1161
+#: ../camel/camel-smime-context.c:1160
 msgid "Failed to add data to encoder"
 msgstr "将数据添加到编码器失败"
 
-#: ../camel/camel-smime-context.c:1271
+#: ../camel/camel-smime-context.c:1270
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME 解密:没有找到加密内容"
 
-#: ../camel/camel-store.c:1232
+#: ../camel/camel-store.c:1230
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "打开文件夹“%s”"
 
-#: ../camel/camel-store.c:1523
+#: ../camel/camel-store.c:1521
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "扫描“%s”中的文件夹"
 
-#: ../camel/camel-store.c:1551 ../camel/camel-store.c:1596
-#: ../camel/camel-vtrash-folder.c:46
+#: ../camel/camel-store.c:1549 ../camel/camel-store.c:1594
+#: ../camel/camel-vtrash-folder.c:45
 msgid "Trash"
 msgstr "回收站"
 
-#: ../camel/camel-store.c:1565 ../camel/camel-store.c:1613
-#: ../camel/camel-vtrash-folder.c:48
+#: ../camel/camel-store.c:1563 ../camel/camel-store.c:1611
+#: ../camel/camel-vtrash-folder.c:47
 msgid "Junk"
 msgstr "垃圾"
 
-#: ../camel/camel-store.c:2214
+#: ../camel/camel-store.c:2212
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "无法创建文件夹:%s:文件夹已存在"
 
-#: ../camel/camel-store.c:2221
+#: ../camel/camel-store.c:2219
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "创建文件夹“%s”"
 
-#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:410
+#: ../camel/camel-store.c:2396 ../camel/camel-vee-store.c:410
 #: ../camel/providers/local/camel-maildir-store.c:321
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "无法删除文件夹:%s:无效操作"
 
-#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:461
+#: ../camel/camel-store.c:2586 ../camel/camel-vee-store.c:461
 #: ../camel/providers/local/camel-maildir-store.c:872
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "无法重命名文件夹:%s:无效操作"
 
-#: ../camel/camel-stream.c:285 ../camel/camel-stream.c:336
+#: ../camel/camel-stream.c:283 ../camel/camel-stream.c:334
 #, c-format
 msgid "Stream type '%s' is not seekable"
 msgstr "流类型“%s”是无法定位的"
@@ -2936,16 +2935,16 @@ msgstr "流类型“%s”是无法定位的"
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "CamelStreamFilter 只支持重设到开始"
 
-#: ../camel/camel-stream-null.c:76
+#: ../camel/camel-stream-null.c:74
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "CamelHttpStream 只支持重设到开始"
 
-#: ../camel/camel-stream-process.c:280
+#: ../camel/camel-stream-process.c:278
 #, c-format
 msgid "Connection cancelled"
 msgstr "连接已取消"
 
-#: ../camel/camel-stream-process.c:285
+#: ../camel/camel-stream-process.c:283
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "无法使用命令“%s”连接:%s"
@@ -2960,7 +2959,7 @@ msgstr "正在订阅文件夹“%s”"
 msgid "Unsubscribing from folder '%s'"
 msgstr "正在取消订阅文件夹“%s”"
 
-#: ../camel/camel-url.c:329
+#: ../camel/camel-url.c:327
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "无法解析 URL“%s”"
@@ -3009,11 +3008,11 @@ msgstr "无法重命名文件夹:%s:没有该文件夹"
 msgid "Enable _Unmatched folder"
 msgstr "启用不匹配的文件夹(_U)"
 
-#: ../camel/camel-vtrash-folder.c:47
+#: ../camel/camel-vtrash-folder.c:46
 msgid "Cannot copy messages to the Trash folder"
 msgstr "无法将消息复制到回收站文件夹"
 
-#: ../camel/camel-vtrash-folder.c:49
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Cannot copy messages to the Junk folder"
 msgstr "无法将消息复制到垃圾邮件文件夹"
 
@@ -3082,17 +3081,15 @@ msgid "_Listen for server change notifications"
 msgstr "监听服务器变化提醒(_L)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:49
-#| msgid "Lost connection to IMAP server"
 msgid "Connection to Server"
 msgstr "到服务器的连接"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:51
-#| msgid "Numbe_r of cached connections to use"
 msgid "Numbe_r of concurrent connections to use"
 msgstr "使用的并发连接的数目(_R)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:54
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Folders"
 msgstr "文件夹"
 
@@ -3112,12 +3109,12 @@ msgstr "命名空间:"
 #: ../camel/providers/local/camel-local-provider.c:39
 #: ../camel/providers/local/camel-local-provider.c:79
 #: ../camel/providers/local/camel-local-provider.c:99
-#: ../camel/providers/nntp/camel-nntp-provider.c:39
+#: ../camel/providers/nntp/camel-nntp-provider.c:38
 msgid "Options"
 msgstr "选项"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:66
-#: ../camel/providers/nntp/camel-nntp-provider.c:41
+#: ../camel/providers/nntp/camel-nntp-provider.c:40
 msgid "Apply _filters to new messages in all folders"
 msgstr "对所有文件夹中的新消息应用过滤规则(_F)"
 
@@ -3130,12 +3127,14 @@ msgid "Check new messages for _Junk contents"
 msgstr "检查新消息的垃圾内容(_J)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:72
-msgid "Only check for Junk messages in the IN_BOX folder"
+#| msgid "Only check for Junk messages in the IN_BOX folder"
+msgid "Only check for Junk messages in the In_box folder"
 msgstr "仅在收件箱中检查垃圾邮件(_B)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "Automatically synchroni_ze remote mail locally"
-msgstr "自动将远程邮件同步到本地(_Z)"
+#| msgid "Automatically synchroni_ze remote mail locally"
+msgid "Synchroni_ze remote mail locally in all folders"
+msgstr "将远程邮件同步到本地(_Z)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Default IMAP port"
@@ -3153,169 +3152,169 @@ msgstr "IMAP+"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP 服务器上的邮件的读写。"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1009
-#: ../camel/providers/imapx/camel-imapx-server.c:1016
+#: ../camel/providers/imapx/camel-imapx-server.c:1001
+#: ../camel/providers/imapx/camel-imapx-server.c:1008
 #, c-format
 msgid "Not authenticated"
 msgstr "没有验证"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1713
+#: ../camel/providers/imapx/camel-imapx-server.c:1705
 msgid "Server disconnected"
 msgstr "服务器断开连接"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2205
+#: ../camel/providers/imapx/camel-imapx-server.c:2197
 msgid "Error writing to cache stream"
 msgstr "写入缓存流错误"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3550
+#: ../camel/providers/imapx/camel-imapx-server.c:3542
 msgid "Error performing IDLE"
 msgstr "执行 IDLE 命令出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4558
+#: ../camel/providers/imapx/camel-imapx-server.c:4539
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4559
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/imapx/camel-imapx-server.c:4540
+#: ../camel/providers/smtp/camel-smtp-transport.c:214
 msgid "STARTTLS not supported"
 msgstr "不支持 STARTTLS"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4619
+#: ../camel/providers/imapx/camel-imapx-server.c:4600
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "以安全模式连接到 IMAP 服务器 %s 失败:"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4708
+#: ../camel/providers/imapx/camel-imapx-server.c:4687
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "IMAP 服务器 %s 不支持 %s 认证"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4738
-#: ../camel/providers/nntp/camel-nntp-store.c:394
-#: ../camel/providers/nntp/camel-nntp-store.c:531
+#: ../camel/providers/imapx/camel-imapx-server.c:4717
+#: ../camel/providers/nntp/camel-nntp-store.c:393
+#: ../camel/providers/nntp/camel-nntp-store.c:530
 msgid "Cannot authenticate without a username"
 msgstr "无法进行无用户名的认证"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4747
-#: ../camel/providers/nntp/camel-nntp-store.c:540
-#: ../camel/providers/pop3/camel-pop3-store.c:678
-#: ../camel/providers/pop3/camel-pop3-store.c:699
+#: ../camel/providers/imapx/camel-imapx-server.c:4726
+#: ../camel/providers/nntp/camel-nntp-store.c:539
+#: ../camel/providers/pop3/camel-pop3-store.c:676
+#: ../camel/providers/pop3/camel-pop3-store.c:697
 msgid "Authentication password not available"
 msgstr "密码认证不可用"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:4983
-#: ../camel/providers/imapx/camel-imapx-server.c:5042
+#: ../camel/providers/imapx/camel-imapx-server.c:4962
+#: ../camel/providers/imapx/camel-imapx-server.c:5021
 msgid "Error fetching message"
 msgstr "取回消息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5035
+#: ../camel/providers/imapx/camel-imapx-server.c:5014
 msgid "Failed to close the tmp stream"
 msgstr "无法关闭临时流"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5071
+#: ../camel/providers/imapx/camel-imapx-server.c:5050
 msgid "Failed to copy the tmp file"
 msgstr "无法复制临时文件"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5212
+#: ../camel/providers/imapx/camel-imapx-server.c:5191
 msgid "Error moving messages"
 msgstr "移动消息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5216
+#: ../camel/providers/imapx/camel-imapx-server.c:5195
 msgid "Error copying messages"
 msgstr "复制消息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5438
+#: ../camel/providers/imapx/camel-imapx-server.c:5417
 msgid "Error appending message"
 msgstr "追加消息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5674
+#: ../camel/providers/imapx/camel-imapx-server.c:5653
 msgid "Error fetching message headers"
 msgstr "取回消息头出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5841
+#: ../camel/providers/imapx/camel-imapx-server.c:5820
 msgid "Error retrieving message"
 msgstr "收取消息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5975
-#: ../camel/providers/imapx/camel-imapx-server.c:6204
+#: ../camel/providers/imapx/camel-imapx-server.c:5954
+#: ../camel/providers/imapx/camel-imapx-server.c:6183
 #, c-format
 msgid "Fetching summary information for new messages in '%s'"
 msgstr "获取“%s”中新消息的概要信息"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6027
+#: ../camel/providers/imapx/camel-imapx-server.c:6006
 #, c-format
 msgid "Scanning for changed messages in '%s'"
 msgstr "扫描“%s”中更改了的消息"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6079
+#: ../camel/providers/imapx/camel-imapx-server.c:6058
 msgid "Error fetching new messages"
 msgstr "取回新消息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6352
+#: ../camel/providers/imapx/camel-imapx-server.c:6331
 msgid "Error refreshing folder"
 msgstr "刷新文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6502
+#: ../camel/providers/imapx/camel-imapx-server.c:6481
 msgid "Error expunging message"
 msgstr "销毁消息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6617
-#: ../camel/providers/imapx/camel-imapx-server.c:6642
+#: ../camel/providers/imapx/camel-imapx-server.c:6596
+#: ../camel/providers/imapx/camel-imapx-server.c:6621
 msgid "Error fetching folders"
 msgstr "取回文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6722
+#: ../camel/providers/imapx/camel-imapx-server.c:6701
 msgid "Error creating folder"
 msgstr "创建文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6774
+#: ../camel/providers/imapx/camel-imapx-server.c:6753
 msgid "Error deleting folder"
 msgstr "删除文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6850
+#: ../camel/providers/imapx/camel-imapx-server.c:6829
 msgid "Error renaming folder"
 msgstr "重命名文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6924
+#: ../camel/providers/imapx/camel-imapx-server.c:6903
 msgid "Error subscribing to folder"
 msgstr "订阅文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:6990
+#: ../camel/providers/imapx/camel-imapx-server.c:6969
 msgid "Error unsubscribing from folder"
 msgstr "取消订阅文件夹出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7052
+#: ../camel/providers/imapx/camel-imapx-server.c:7031
 msgid "Error retrieving quota information"
 msgstr "获取配额信息出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7104
+#: ../camel/providers/imapx/camel-imapx-server.c:7083
 msgid "Search failed"
 msgstr "搜索失败"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7166
+#: ../camel/providers/imapx/camel-imapx-server.c:7145
 msgid "Error performing NOOP"
 msgstr "执行 NOOP 出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:7273
+#: ../camel/providers/imapx/camel-imapx-server.c:7252
 msgid "Error syncing changes"
 msgstr "同步变更出错"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:8258
+#: ../camel/providers/imapx/camel-imapx-server.c:8233
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "无法获取消息 ID %s:%s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:8259
+#: ../camel/providers/imapx/camel-imapx-server.c:8234
 msgid "No such message available."
 msgstr "没有该消息。"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:8466
-#: ../camel/providers/imapx/camel-imapx-server.c:8487
+#: ../camel/providers/imapx/camel-imapx-server.c:8441
+#: ../camel/providers/imapx/camel-imapx-server.c:8462
 msgid "Cannot create spool file: "
 msgstr "无法创建离线文件:"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:9228
+#: ../camel/providers/imapx/camel-imapx-server.c:9203
 msgid "IMAP server does not support quotas"
 msgstr "IMAP 服务器不支持配额"
 
@@ -3341,8 +3340,8 @@ msgid "IMAP service for %s on %s"
 msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
 
 #: ../camel/providers/imapx/camel-imapx-store.c:836
-#: ../camel/providers/nntp/camel-nntp-provider.c:93
-#: ../camel/providers/pop3/camel-pop3-provider.c:81
+#: ../camel/providers/nntp/camel-nntp-provider.c:92
+#: ../camel/providers/pop3/camel-pop3-provider.c:80
 msgid "Password"
 msgstr "密码"
 
@@ -3372,41 +3371,47 @@ msgid ""
 msgstr "文件夹名“%s”无效,原因是其中含有字符“%c”"
 
 #: ../camel/providers/imapx/camel-imapx-store.c:2689
-#: ../camel/providers/nntp/camel-nntp-store.c:1250
-#: ../camel/providers/pop3/camel-pop3-folder.c:450
-#: ../camel/providers/pop3/camel-pop3-folder.c:593
-#: ../camel/providers/pop3/camel-pop3-folder.c:789
-#: ../camel/providers/pop3/camel-pop3-folder.c:987
-#: ../camel/providers/pop3/camel-pop3-store.c:299
-#: ../camel/providers/pop3/camel-pop3-store.c:528
-#: ../camel/providers/pop3/camel-pop3-store.c:576
-#: ../camel/providers/pop3/camel-pop3-store.c:668
-#: ../camel/providers/pop3/camel-pop3-store.c:1072
+#: ../camel/providers/nntp/camel-nntp-store.c:1249
+#: ../camel/providers/pop3/camel-pop3-folder.c:448
+#: ../camel/providers/pop3/camel-pop3-folder.c:591
+#: ../camel/providers/pop3/camel-pop3-folder.c:787
+#: ../camel/providers/pop3/camel-pop3-folder.c:985
+#: ../camel/providers/pop3/camel-pop3-store.c:297
+#: ../camel/providers/pop3/camel-pop3-store.c:526
+#: ../camel/providers/pop3/camel-pop3-store.c:574
+#: ../camel/providers/pop3/camel-pop3-store.c:666
+#: ../camel/providers/pop3/camel-pop3-store.c:1070
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "您必须在线工作以便完成该操作"
 
-#: ../camel/providers/local/camel-local-folder.c:195
+#: ../camel/providers/imapx/camel-imapx-store.c:2694
+#, c-format
+#| msgid "You must be working online to complete this operation"
+msgid "You must be working online to complete this operation (%s)"
+msgstr "您必须在线工作以便完成该操作 (%s)"
+
+#: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:205
-#: ../camel/providers/local/camel-local-folder.c:214
+#: ../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:223
+#: ../camel/providers/local/camel-local-folder.c:222
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:500
+#: ../camel/providers/local/camel-local-folder.c:499
 msgid "_Index message body data"
 msgstr "索引消息正文(_I)"
 
-#: ../camel/providers/local/camel-local-folder.c:730
+#: ../camel/providers/local/camel-local-folder.c:729
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3915,17 +3920,17 @@ msgstr "内部错误:UID 的格式无效:%s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:292
 #: ../camel/providers/nntp/camel-nntp-folder.c:297
-#: ../camel/providers/pop3/camel-pop3-folder.c:546
-#: ../camel/providers/pop3/camel-pop3-folder.c:945
+#: ../camel/providers/pop3/camel-pop3-folder.c:544
+#: ../camel/providers/pop3/camel-pop3-folder.c:943
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "无法获取消息 %s:%s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:304
 #: ../camel/providers/nntp/camel-nntp-folder.c:624
-#: ../camel/providers/pop3/camel-pop3-folder.c:476
-#: ../camel/providers/pop3/camel-pop3-folder.c:536
-#: ../camel/providers/pop3/camel-pop3-folder.c:555
+#: ../camel/providers/pop3/camel-pop3-folder.c:474
+#: ../camel/providers/pop3/camel-pop3-folder.c:534
+#: ../camel/providers/pop3/camel-pop3-folder.c:553
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "无法获取消息 %s:"
@@ -3950,59 +3955,59 @@ msgstr "该消息目前不可用"
 msgid "You cannot copy messages from a NNTP folder"
 msgstr "您不能从 NNTP 文件夹复制信息"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:45
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "以短格式显示文件夹(如 c.o.linux 而不是 comp.os.linux)(_S)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:49
+#: ../camel/providers/nntp/camel-nntp-provider.c:48
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "在订阅对话框中显示相对文件夹名称(_D)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:54
 msgid "Default NNTP port"
 msgstr "默认的 NNTP 端口"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:56
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "NNTP over SSL"
 msgstr "NNTP (SSL 加密)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:61
 msgid "USENET news"
 msgstr "USENET 新闻"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:64
+#: ../camel/providers/nntp/camel-nntp-provider.c:63
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "这是一个读取 USENET 新闻组和向 USENET 新闻组发布邮件的提供者。"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:85
+#: ../camel/providers/nntp/camel-nntp-provider.c:84
 msgid ""
 "This option will connect to the NNTP server anonymously, without "
 "authentication."
 msgstr "该选项将放弃认证,匿名连接 NNTP 服务器。"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:95
+#: ../camel/providers/nntp/camel-nntp-provider.c:94
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr "该选项将以明文密码向进行 NNTP 服务器进行认证。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:371
+#: ../camel/providers/nntp/camel-nntp-store.c:370
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "无法阅读来自 %s 的欢迎信息:"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:379
+#: ../camel/providers/nntp/camel-nntp-store.c:378
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP 服务器 %s 返回错误码 %d:%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:449
+#: ../camel/providers/nntp/camel-nntp-store.c:448
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET 新闻 %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1151
+#: ../camel/providers/nntp/camel-nntp-store.c:1150
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4013,22 +4018,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1267
+#: ../camel/providers/nntp/camel-nntp-store.c:1266
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "您无法在新闻存储中创建文件夹:应该订阅。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1283
+#: ../camel/providers/nntp/camel-nntp-store.c:1282
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "您无法在新闻存储中重命名文件夹。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#: ../camel/providers/nntp/camel-nntp-store.c:1305
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "您无法在新闻存储中删除文件夹:应该退订。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1516
+#: ../camel/providers/nntp/camel-nntp-store.c:1515
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4039,7 +4044,7 @@ msgstr ""
 "\n"
 "没有这样的新闻组。选中项目可能是父文件夹。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1583
+#: ../camel/providers/nntp/camel-nntp-store.c:1582
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4050,16 +4055,16 @@ msgstr ""
 "\n"
 "新闻组不存在!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2009
+#: ../camel/providers/nntp/camel-nntp-store.c:2008
 msgid "NNTP Command failed: "
 msgstr "NNTP 命令失败:"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2106
+#: ../camel/providers/nntp/camel-nntp-store.c:2105
 #, c-format
 msgid "Not connected."
 msgstr "未连接。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2200
+#: ../camel/providers/nntp/camel-nntp-store.c:2199
 #, c-format
 msgid "No such folder: %s"
 msgstr "没有文件夹:%s"
@@ -4085,81 +4090,81 @@ msgstr "来自 head 的意外服务器应答:%s"
 msgid "Operation failed: %s"
 msgstr "操作失败:%s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:359
-#: ../camel/providers/pop3/camel-pop3-folder.c:442
+#: ../camel/providers/pop3/camel-pop3-folder.c:357
+#: ../camel/providers/pop3/camel-pop3-folder.c:440
 #, c-format
 msgid "No message with UID %s"
 msgstr "没有 UID 为 %s 的消息"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:458
+#: ../camel/providers/pop3/camel-pop3-folder.c:456
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "正在获取 POP 消息 %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:547
+#: ../camel/providers/pop3/camel-pop3-folder.c:545
 msgid "Unknown reason"
 msgstr "未知原因"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:598
+#: ../camel/providers/pop3/camel-pop3-folder.c:596
 msgid "Retrieving POP summary"
 msgstr "正在获取 POP 概要"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:659
-#: ../camel/providers/pop3/camel-pop3-folder.c:662
-#: ../camel/providers/pop3/camel-pop3-folder.c:675
-#: ../camel/providers/pop3/camel-pop3-folder.c:688
-#: ../camel/providers/pop3/camel-pop3-folder.c:702
+#: ../camel/providers/pop3/camel-pop3-folder.c:657
+#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/pop3/camel-pop3-folder.c:673
+#: ../camel/providers/pop3/camel-pop3-folder.c:686
+#: ../camel/providers/pop3/camel-pop3-folder.c:700
 msgid "Cannot get POP summary: "
 msgstr "无法获取 POP 概要:"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:766
+#: ../camel/providers/pop3/camel-pop3-folder.c:764
 msgid "Expunging old messages"
 msgstr "销毁旧消息"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:794
+#: ../camel/providers/pop3/camel-pop3-folder.c:792
 msgid "Expunging deleted messages"
 msgstr "彻底销毁已删除的消息"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:37
+#: ../camel/providers/pop3/camel-pop3-provider.c:36
 msgid "Message Storage"
 msgstr "消息存储"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:39
+#: ../camel/providers/pop3/camel-pop3-provider.c:38
 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:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:42
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "%s 天之后删除(_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 msgid "Delete _expunged from local Inbox"
 msgstr "从本地的收件箱中删除已在远端清除的邮件(_E)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
 msgid "Disable _support for all POP3 extensions"
 msgstr "禁用所有 POP3 扩展的支持(_S)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:53
+#: ../camel/providers/pop3/camel-pop3-provider.c:52
 msgid "Default POP3 port"
 msgstr "默认的 POP3 端口"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:54
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "POP3 over SSL"
 msgstr "POP3 (SSL 加密)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:61
+#: ../camel/providers/pop3/camel-pop3-provider.c:60
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:63
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "关于连接到 POP 服务器和从 POP 服务器下载邮件。"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4167,7 +4172,7 @@ msgstr ""
 "该选项使 Evolution 在连接到 POP 服务器时使用明文密码。这是许多 POP 服务器唯一"
 "支持的选项。"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:93
+#: ../camel/providers/pop3/camel-pop3-provider.c:92
 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 "
@@ -4177,57 +4182,57 @@ msgstr ""
 "能的服务器,也不一定能使所有用户工作。"
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:97
+#: ../camel/providers/pop3/camel-pop3-store.c:95
 msgid ": "
 msgstr ":"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:164
+#: ../camel/providers/pop3/camel-pop3-store.c:162
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "从 POP 服务器 %s 读取欢迎词失败"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:179
+#: ../camel/providers/pop3/camel-pop3-store.c:177
 #, 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:180
+#: ../camel/providers/pop3/camel-pop3-store.c:178
 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:201
+#: ../camel/providers/pop3/camel-pop3-store.c:199
 #, 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:219
+#: ../camel/providers/pop3/camel-pop3-store.c:217
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "以安全模式连接到 POP 服务器 %s 失败:"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:360
+#: ../camel/providers/pop3/camel-pop3-store.c:358
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "无法登录到 POP 服务器 %s:SASL 协议错误"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:382
+#: ../camel/providers/pop3/camel-pop3-store.c:380
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "无法认证 POP 服务器 %s:"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:490
+#: ../camel/providers/pop3/camel-pop3-store.c:488
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 服务器 %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:493
+#: ../camel/providers/pop3/camel-pop3-store.c:491
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "%2$s 为 %1$s 提供的 POP 服务"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:713
+#: ../camel/providers/pop3/camel-pop3-store.c:711
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4236,7 +4241,7 @@ msgstr ""
 "无法连接到 POP 服务器 %s:\t接收到非法的 APOP ID。可能是冒名攻击。请联系您的"
 "管理员。"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:768
+#: ../camel/providers/pop3/camel-pop3-store.c:766
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4247,7 +4252,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:783
+#: ../camel/providers/pop3/camel-pop3-store.c:781
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4256,316 +4261,316 @@ msgstr ""
 "无法连接到 POP 服务器 %s。\n"
 "发送用户名错误%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:865
+#: ../camel/providers/pop3/camel-pop3-store.c:863
 #, c-format
 msgid "No such folder '%s'."
 msgstr "没有文件夹“%s”。"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:882
+#: ../camel/providers/pop3/camel-pop3-store.c:880
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 的存储没有文件夹结构"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:34
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:33
 #: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:35
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr "将邮件传递到本地系统的“sendmail”来发送邮件。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:46
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
 msgid "Mail delivery via the sendmail program"
 msgstr "通过 sendmail 程序发送邮件"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:138
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:136
 #, c-format
 msgid "Failed to read From address"
 msgstr "读取 From(来自) 地址失败"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:155
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
 #, c-format
 msgid "Message send in offline mode is disabled"
 msgstr "禁止在离线模式发送信息"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:183
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:181
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "无法解析收件人列表"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:200
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "Could not parse arguments"
 msgstr "无法解析参数"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:231
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, c-format
 msgid "Could not create pipe to '%s': %s: mail not sent"
 msgstr "无法创建到“%s”的管道:%s:邮件未发送"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:256
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:254
 #, c-format
 msgid "Could not fork '%s': %s: mail not sent"
 msgstr "无法 fork “%s”进程:%s:邮件未发送"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:305
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:303
 msgid "Could not send message: "
 msgstr "无法发送消息:"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:335
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:333
 #, c-format
 msgid "'%s' exited with signal %s: mail not sent."
 msgstr "“%s”以信号 %s 退出:邮件未发送。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:345
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:343
 #, c-format
 msgid "Could not execute '%s': mail not sent."
 msgstr "无法执行“%s”:邮件未发送。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:350
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:348
 #, c-format
 msgid "'%s' exited with status %d: mail not sent."
 msgstr "“%s”以状态码 %d 退出:邮件未发送。"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:40
+#: ../camel/providers/smtp/camel-smtp-provider.c:39
 msgid "Default SMTP port"
 msgstr "默认的 SMTP 端口"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:40
 msgid "SMTP over SSL"
 msgstr "SMTP (SSL 加密)"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:42
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
 msgid "Message submission port"
 msgstr "消息提交端口"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:48
+#: ../camel/providers/smtp/camel-smtp-provider.c:47
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:50
+#: ../camel/providers/smtp/camel-smtp-provider.c:49
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "要投递邮件,应该使用 SMTP 连接到远程的邮件交换服务器。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Welcome response error: "
 msgstr "欢迎应答错误:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
 #, 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:224
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
-#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:223
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:245
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:265
+#: ../camel/providers/smtp/camel-smtp-transport.c:264
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "以安全模式连接 SMTP 服务器 %s 失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:356
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP 服务器 %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:360
+#: ../camel/providers/smtp/camel-smtp-transport.c:359
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "通过 %s 发送 SMTP 邮件"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:434
+#: ../camel/providers/smtp/camel-smtp-transport.c:433
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP 服务器 %s 不支持 %s 认证。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/smtp/camel-smtp-transport.c:505
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr "未指定 SASL 机制"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:536
-#: ../camel/providers/smtp/camel-smtp-transport.c:547
-#: ../camel/providers/smtp/camel-smtp-transport.c:560
+#: ../camel/providers/smtp/camel-smtp-transport.c:535
+#: ../camel/providers/smtp/camel-smtp-transport.c:546
+#: ../camel/providers/smtp/camel-smtp-transport.c:559
 msgid "AUTH command failed: "
 msgstr "AUTH 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
+#: ../camel/providers/smtp/camel-smtp-transport.c:700
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "无法发送消息:服务未连接。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:708
+#: ../camel/providers/smtp/camel-smtp-transport.c:707
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "无法发送消息:发件人地址不合法。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:712
+#: ../camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Sending message"
 msgstr "正在发送消息"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:736
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "无法发送消息:没有定义收件人。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:750
+#: ../camel/providers/smtp/camel-smtp-transport.c:749
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "无法发送消息:一个或多个非法收件人"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:871
+#: ../camel/providers/smtp/camel-smtp-transport.c:870
 msgid "Syntax error, command unrecognized"
 msgstr "语法错误,命令无法识别"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:873
+#: ../camel/providers/smtp/camel-smtp-transport.c:872
 msgid "Syntax error in parameters or arguments"
 msgstr "参数语法错误"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:875
+#: ../camel/providers/smtp/camel-smtp-transport.c:874
 msgid "Command not implemented"
 msgstr "命令尚未实现"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:877
+#: ../camel/providers/smtp/camel-smtp-transport.c:876
 msgid "Command parameter not implemented"
 msgstr "命令参数尚未实现"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:879
+#: ../camel/providers/smtp/camel-smtp-transport.c:878
 msgid "System status, or system help reply"
 msgstr "系统状态,或系统求助就绪"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:881
+#: ../camel/providers/smtp/camel-smtp-transport.c:880
 msgid "Help message"
 msgstr "帮助消息"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:883
+#: ../camel/providers/smtp/camel-smtp-transport.c:882
 msgid "Service ready"
 msgstr "服务就绪"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:885
+#: ../camel/providers/smtp/camel-smtp-transport.c:884
 msgid "Service closing transmission channel"
 msgstr "服务正在关闭传输通道"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:887
+#: ../camel/providers/smtp/camel-smtp-transport.c:886
 msgid "Service not available, closing transmission channel"
 msgstr "服务不可用,正在关闭传输通道"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:889
+#: ../camel/providers/smtp/camel-smtp-transport.c:888
 msgid "Requested mail action okay, completed"
 msgstr "邮件动作请求确认,已完成"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:891
+#: ../camel/providers/smtp/camel-smtp-transport.c:890
 msgid "User not local; will forward to <forward-path>"
 msgstr "用户不在本地;将转发到 <转发路径>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:893
+#: ../camel/providers/smtp/camel-smtp-transport.c:892
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "邮件动作请求未发生:邮箱无效"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:895
+#: ../camel/providers/smtp/camel-smtp-transport.c:894
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "动作请求未发生:邮箱无效"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:897
+#: ../camel/providers/smtp/camel-smtp-transport.c:896
 msgid "Requested action aborted: error in processing"
 msgstr "动作请求已放弃:处理出错"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:899
+#: ../camel/providers/smtp/camel-smtp-transport.c:898
 msgid "User not local; please try <forward-path>"
 msgstr "用户不在本地;请尝试 <转发路径>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:901
+#: ../camel/providers/smtp/camel-smtp-transport.c:900
 msgid "Requested action not taken: insufficient system storage"
 msgstr "动作请求未发生:系统存储空间不足"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:903
+#: ../camel/providers/smtp/camel-smtp-transport.c:902
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "邮件动作请求已放弃:存储分配超额"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:905
+#: ../camel/providers/smtp/camel-smtp-transport.c:904
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "动作请求未发生:不允许的邮件箱名称"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:907
+#: ../camel/providers/smtp/camel-smtp-transport.c:906
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "开始输入邮件;以 <CRLF>.<CRLF> 结束"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:909
+#: ../camel/providers/smtp/camel-smtp-transport.c:908
 msgid "Transaction failed"
 msgstr "传送失败"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:913
+#: ../camel/providers/smtp/camel-smtp-transport.c:912
 msgid "A password transition is needed"
 msgstr "必须传输密码"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:915
+#: ../camel/providers/smtp/camel-smtp-transport.c:914
 msgid "Authentication mechanism is too weak"
 msgstr "认证机制太弱"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:917
+#: ../camel/providers/smtp/camel-smtp-transport.c:916
 msgid "Encryption required for requested authentication mechanism"
 msgstr "请求的认证机制必须加密"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:919
+#: ../camel/providers/smtp/camel-smtp-transport.c:918
 msgid "Temporary authentication failure"
 msgstr "临时认证失败"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1207
+#: ../camel/providers/smtp/camel-smtp-transport.c:1206
 msgid "SMTP Greeting"
 msgstr "SMTP 欢迎"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1217
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#: ../camel/providers/smtp/camel-smtp-transport.c:1239
+#: ../camel/providers/smtp/camel-smtp-transport.c:1216
+#: ../camel/providers/smtp/camel-smtp-transport.c:1230
+#: ../camel/providers/smtp/camel-smtp-transport.c:1238
 msgid "HELO command failed: "
 msgstr "HELO 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:1329
-#: ../camel/providers/smtp/camel-smtp-transport.c:1339
+#: ../camel/providers/smtp/camel-smtp-transport.c:1313
+#: ../camel/providers/smtp/camel-smtp-transport.c:1328
+#: ../camel/providers/smtp/camel-smtp-transport.c:1338
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1366
+#: ../camel/providers/smtp/camel-smtp-transport.c:1365
 msgid "RCPT TO command failed: "
 msgstr "RSET 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1383
-#: ../camel/providers/smtp/camel-smtp-transport.c:1393
+#: ../camel/providers/smtp/camel-smtp-transport.c:1382
+#: ../camel/providers/smtp/camel-smtp-transport.c:1392
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> 失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1436
-#: ../camel/providers/smtp/camel-smtp-transport.c:1447
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
-#: ../camel/providers/smtp/camel-smtp-transport.c:1517
-#: ../camel/providers/smtp/camel-smtp-transport.c:1537
-#: ../camel/providers/smtp/camel-smtp-transport.c:1551
-#: ../camel/providers/smtp/camel-smtp-transport.c:1560
+#: ../camel/providers/smtp/camel-smtp-transport.c:1435
+#: ../camel/providers/smtp/camel-smtp-transport.c:1446
+#: ../camel/providers/smtp/camel-smtp-transport.c:1457
+#: ../camel/providers/smtp/camel-smtp-transport.c:1516
+#: ../camel/providers/smtp/camel-smtp-transport.c:1536
+#: ../camel/providers/smtp/camel-smtp-transport.c:1550
+#: ../camel/providers/smtp/camel-smtp-transport.c:1559
 msgid "DATA command failed: "
 msgstr "DATP 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1585
-#: ../camel/providers/smtp/camel-smtp-transport.c:1600
-#: ../camel/providers/smtp/camel-smtp-transport.c:1609
+#: ../camel/providers/smtp/camel-smtp-transport.c:1584
+#: ../camel/providers/smtp/camel-smtp-transport.c:1599
+#: ../camel/providers/smtp/camel-smtp-transport.c:1608
 msgid "RSET command failed: "
 msgstr "RSET 命令失败:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1634
-#: ../camel/providers/smtp/camel-smtp-transport.c:1648
-#: ../camel/providers/smtp/camel-smtp-transport.c:1655
+#: ../camel/providers/smtp/camel-smtp-transport.c:1633
+#: ../camel/providers/smtp/camel-smtp-transport.c:1647
+#: ../camel/providers/smtp/camel-smtp-transport.c:1654
 msgid "QUIT command failed: "
 msgstr "QUIT 命令失败:"
 
@@ -4705,11 +4710,6 @@ msgstr "%s 不支持创建远程资源"
 msgid "%s does not support deleting remote resources"
 msgstr "%s 不支持删除远程资源"
 
-#: ../libebackend/e-data-factory.c:303
-#, c-format
-msgid "No backend factory for hash key '%s'"
-msgstr "散列键“%s”没有对应的后端工厂"
-
 #: ../libebackend/e-server-side-source.c:133
 #, c-format
 msgid "Data source is missing a [%s] group"
@@ -4752,129 +4752,134 @@ msgstr "数据源“%s”不支持 OAuth 2.0 认证"
 msgid "File must have a '.source' extension"
 msgstr "文件扩展名必须为“.source”"
 
-#: ../libebackend/e-source-registry-server.c:531
+#: ../libebackend/e-source-registry-server.c:529
 #: ../libedataserver/e-source-registry.c:1957
 msgid "The user declined to authenticate"
 msgstr "用户拒绝认证"
 
-#: ../libebackend/e-source-registry-server.c:800
+#: ../libebackend/e-source-registry-server.c:795
 #, c-format
 msgid "UID '%s' is already in use"
 msgstr "UID“%s” 已在使用"
 
+#: ../libebackend/e-subprocess-factory.c:285
+#, c-format
+msgid "No such source for UID '%s'"
+msgstr "没有 UID “%s”的源"
+
 #: ../libebackend/e-user-prompter-server.c:305
 #, c-format
 msgid "Extension dialog '%s' not found."
 msgstr "扩展对话框“%s”未找到。"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "周年纪念日"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "生日"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "商务"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "完成"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "最爱"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "礼物"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:55
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "目标"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "假日"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:57
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "假日卡"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "亲密联系人"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "想法"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "International"
 msgstr "国际"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "关键客户"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:63
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "杂类"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:64
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "个人"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:65
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "通电话"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "状态"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "策略"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "供应商"
 
-#: ../libedataserver/e-categories.c:69
+#: ../libedataserver/e-categories.c:70
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "时间和花费"
 
-#: ../libedataserver/e-categories.c:70
+#: ../libedataserver/e-categories.c:71
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:71
+#: ../libedataserver/e-categories.c:72
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "等候"
@@ -4979,28 +4984,28 @@ msgstr "签名脚本必须为本地文件"
 msgid "Source '%s' does not support proxy lookups"
 msgstr "数据源“%s”不支持代理查找"
 
-#: ../libedataserver/e-source-webdav.c:1555
+#: ../libedataserver/e-source-webdav.c:1560
 #, c-format
 msgid ""
 "SSL certificate for host '%s', used by address book '%s', is not trusted. Do "
 "you wish to accept it?"
 msgstr "地址簿“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任,您是否想要接受它?"
 
-#: ../libedataserver/e-source-webdav.c:1564
+#: ../libedataserver/e-source-webdav.c:1569
 #, c-format
 msgid ""
 "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you "
 "wish to accept it?"
 msgstr "日历“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任,您是否想要接受它?"
 
-#: ../libedataserver/e-source-webdav.c:1573
+#: ../libedataserver/e-source-webdav.c:1578
 #, c-format
 msgid ""
 "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do "
 "you wish to accept it?"
 msgstr "备忘录“%2$s”所使用的主机“%1$s”的 SSL 证书不受信任,您是否想要接受它?"
 
-#: ../libedataserver/e-source-webdav.c:1582
+#: ../libedataserver/e-source-webdav.c:1587
 #, c-format
 msgid ""
 "SSL certificate for host '%s', used by task list '%s', is not trusted. Do "
@@ -5012,7 +5017,7 @@ msgstr ""
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1961
+#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1971
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y-%m-%d %A%p%I:%M:%S"
 
@@ -5020,7 +5025,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:1667 ../libedataserver/e-time-utils.c:1952
+#: ../libedataserver/e-time-utils.c:1677 ../libedataserver/e-time-utils.c:1962
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y-%m-%d %A %H:%M:%S"
 
@@ -5028,7 +5033,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:1672 ../libedataserver/e-time-utils.c:1957
+#: ../libedataserver/e-time-utils.c:1682 ../libedataserver/e-time-utils.c:1967
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y-%m-%d %A%p%I:%M"
 
@@ -5036,78 +5041,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:1677 ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1687 ../libedataserver/e-time-utils.c:1958
 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:1682
+#: ../libedataserver/e-time-utils.c:1692
 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:1687
+#: ../libedataserver/e-time-utils.c:1697
 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:1690 ../libedataserver/e-time-utils.c:1810
-#: ../libedataserver/e-time-utils.c:1943
+#: ../libedataserver/e-time-utils.c:1700 ../libedataserver/e-time-utils.c:1820
+#: ../libedataserver/e-time-utils.c:1953
 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:1697
+#: ../libedataserver/e-time-utils.c:1707
 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:1701
+#: ../libedataserver/e-time-utils.c:1711
 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:1706
+#: ../libedataserver/e-time-utils.c:1716
 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:1711
+#: ../libedataserver/e-time-utils.c:1721
 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:1716
+#: ../libedataserver/e-time-utils.c:1726
 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:1721
+#: ../libedataserver/e-time-utils.c:1731
 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:1724 ../libedataserver/e-time-utils.c:1813
+#: ../libedataserver/e-time-utils.c:1734 ../libedataserver/e-time-utils.c:1823
 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:1884 ../libedataserver/e-time-utils.c:2005
+#: ../libedataserver/e-time-utils.c:1894 ../libedataserver/e-time-utils.c:2015
 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:1888 ../libedataserver/e-time-utils.c:1997
+#: ../libedataserver/e-time-utils.c:1898 ../libedataserver/e-time-utils.c:2007
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5115,25 +5120,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:1893 ../libedataserver/e-time-utils.c:2002
+#: ../libedataserver/e-time-utils.c:1903 ../libedataserver/e-time-utils.c:2012
 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:1897 ../libedataserver/e-time-utils.c:1994
+#: ../libedataserver/e-time-utils.c:1907 ../libedataserver/e-time-utils.c:2004
 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:1901
+#: ../libedataserver/e-time-utils.c:1911
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1905
+#: ../libedataserver/e-time-utils.c:1915
 msgid "%I %p"
 msgstr "%p%I"
 
@@ -5264,12 +5269,12 @@ msgstr "临时接受(_T)"
 msgid "_Accept Permanently"
 msgstr "永久接受(_A)"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:160
+#: ../modules/trust-prompt/trust-prompt-gtk.c:159
 #, c-format
 msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
 msgstr "“%s” 的 SSL 证书不受信任。您是否想要接受它?"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:175
+#: ../modules/trust-prompt/trust-prompt-gtk.c:174
 msgid "Reason:"
 msgstr "原因:"
 
@@ -5412,6 +5417,15 @@ msgstr "不从先前版本的 Evolution 迁移用户数据"
 msgid "_Dismiss"
 msgstr "解除(_D)"
 
+#~ msgid "No backend name in source '%s'"
+#~ msgstr "源文件“%s”中无后端名称"
+
+#~ msgid "Missing source UID"
+#~ msgstr "缺少源 UID"
+
+#~ msgid "No backend factory for hash key '%s'"
+#~ msgstr "散列键“%s”没有对应的后端工厂"
+
 #~ msgid "No host information available"
 #~ msgstr "无可用的主机信息"
 


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