summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYinghua Wang <wantinghard@gmail.com>2010-09-06 21:21:47 +0800
committerAron Xu <aronxu@gnome.org>2010-09-06 21:21:47 +0800
commit6c5e149e755943582dae06725b0566169160cc5e (patch)
treec21fa75c46a03c3c0975dcf0c7531a013fbf0b50
parentdd05be77605c86821d8f80eecc58b1a225fd5de5 (diff)
downloadevolution-data-server-6c5e149e755943582dae06725b0566169160cc5e.tar.gz
Update Simplified Chinese translation.
-rw-r--r--po/zh_CN.po2447
1 files changed, 1309 insertions, 1138 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c06198065..c37b3c5b3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,14 +10,16 @@
# Partly comes from Sun_l10n group, 2003.
# Yang Zhang <zyangmath@gmail.com>, 2008.
# Aron Xu <happyaron.xu@gmail.com>, 2009.
+# Yinghua Wang <wantinghard@gmail.com>, 2010
#
msgid ""
msgstr ""
"Project-Id-Version: evolution-data-server master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-30 13:09+0800\n"
-"PO-Revision-Date: 2008-08-30 13:21+0800\n"
-"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=evolution-data-server&component=Misc.\n"
+"POT-Creation-Date: 2010-09-01 00:36+0000\n"
+"PO-Revision-Date: 2010-08-10 10:04+0800\n"
+"Last-Translator: Yinghua Wang <wantinghard@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -33,16 +35,16 @@ msgstr "正在载入..."
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4553
#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
msgid "Searching..."
msgstr "正在搜索..."
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4717
#, c-format
msgid "Downloading contacts (%d)... "
-msgstr "正在下载联系人(%d 位)..."
+msgstr "正在下载联系人(%d)..."
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
@@ -51,867 +53,921 @@ msgstr "正在下载联系人(%d 位)..."
msgid "Updating contacts cache (%d)... "
msgstr "正在更新联系人缓存(%d)..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:788
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:818
msgid "Using Distinguished Name (DN)"
msgstr "使用已识别的姓名 (DN)"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:821
msgid "Using Email Address"
msgstr "使用电子邮件地址"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1098
msgid "Reconnecting to LDAP server..."
msgstr "正在重新连接 LDAP 服务器..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1740
msgid "Adding contact to LDAP server..."
msgstr "正在将联系人添加到 LDAP 服务器..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1874
msgid "Removing contact from LDAP server..."
msgstr "正在从 LDAP 服务器删除联系人..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2311
msgid "Modifying contact from LDAP server..."
msgstr "正在修改 LDAP 服务器上的联系人..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4414
msgid "Receiving LDAP search results..."
msgstr "正在接收 LDAP 的搜索结果..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
msgid "Error performing search"
msgstr "执行搜索错误"
-#: ../addressbook/libebook/e-book.c:1837
-#, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s:gconf 中没有存储自身联系人的 UID"
-
-#: ../addressbook/libebook/e-book.c:1967
+#: ../addressbook/libebook/e-book.c:2152
#, c-format
msgid "%s: there was no source for uid `%s' stored in gconf."
msgstr "%s:gconf 中没有存储 uid“%s”的源。"
#. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
msgid "Unique ID"
msgstr "唯一的 ID"
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
msgid "File Under"
msgstr "存档于"
#. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:118
msgid "Book URI"
-msgstr "订阅 URI"
+msgstr "地址簿 URI"
#. Name fields
#. FN isn't really a structured field - we use a getter/setter
#. so we can set the N property (since evo 1.4 works fine with
#. vcards that don't even have a N attribute. *sigh*)
-#: ../addressbook/libebook/e-contact.c:122
+#: ../addressbook/libebook/e-contact.c:124
msgid "Full Name"
msgstr "全名"
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
msgid "Given Name"
msgstr "名"
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
msgid "Family Name"
msgstr "姓"
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
msgid "Nickname"
msgstr "昵称"
#. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
msgid "Email 1"
msgstr "电子邮件 1"
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
msgid "Email 2"
msgstr "电子邮件 2"
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
msgid "Email 3"
msgstr "电子邮件 3"
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
msgid "Email 4"
msgstr "电子邮件 4"
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
msgid "Mailer"
msgstr "邮件程序"
#. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
msgid "Home Address Label"
msgstr "家庭地址标签"
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
msgid "Work Address Label"
msgstr "工作地址标签"
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
msgid "Other Address Label"
msgstr "其它地址标签"
#. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
msgid "Assistant Phone"
msgstr "助手电话"
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
msgid "Business Phone"
msgstr "商务电话"
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
msgid "Business Phone 2"
msgstr "商务电话 2"
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
msgid "Business Fax"
msgstr "商务传真"
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
msgid "Callback Phone"
msgstr "回拨电话"
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
msgid "Car Phone"
msgstr "车载电话"
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
msgid "Company Phone"
msgstr "公司电话"
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
msgid "Home Phone"
msgstr "家庭电话"
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
msgid "Home Phone 2"
msgstr "家庭电话 2"
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
msgid "Home Fax"
msgstr "家庭传真"
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
msgid "ISDN"
msgstr "ISDN"
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
msgid "Mobile Phone"
msgstr "移动电话"
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
msgid "Other Phone"
msgstr "其它电话"
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
msgid "Other Fax"
msgstr "其它传真"
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
msgid "Pager"
msgstr "寻呼机"
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
msgid "Primary Phone"
msgstr "主要电话"
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
msgid "Radio"
msgstr "收音机"
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
msgid "Telex"
msgstr "电传"
#. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
msgid "TTY"
msgstr "TTY"
#. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
msgid "Organization"
msgstr "组织"
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
msgid "Organizational Unit"
msgstr "组织单元"
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
msgid "Office"
msgstr "办公室"
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
msgid "Title"
msgstr "头衔"
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
msgid "Role"
msgstr "角色"
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
msgid "Manager"
msgstr "经理"
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
msgid "Assistant"
msgstr "助手"
#. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
msgid "Homepage URL"
msgstr "个人主页 URL"
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
msgid "Weblog URL"
msgstr "网络日记 URL"
#. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:632
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:671
msgid "Categories"
msgstr "类别"
#. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
msgid "Calendar URI"
msgstr "日历 URI"
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
msgid "Free/Busy URL"
msgstr "空闲/繁忙 URL"
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
msgid "ICS Calendar"
msgstr "ICS 日历"
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
msgid "Video Conferencing URL"
msgstr "视频会议 URL"
#. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
msgid "Spouse's Name"
msgstr "配偶姓名"
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
msgid "Note"
msgstr "注释"
#. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:191
msgid "AIM Home Screen Name 1"
msgstr "AIM 家庭屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
msgid "AIM Home Screen Name 2"
msgstr "AIM 家庭屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
msgid "AIM Home Screen Name 3"
msgstr "AIM 家庭屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
msgid "AIM Work Screen Name 1"
msgstr "AIM 工作屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:195
msgid "AIM Work Screen Name 2"
msgstr "AIM 工作屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:196
msgid "AIM Work Screen Name 3"
msgstr "AIM 工作屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
msgid "GroupWise Home Screen Name 1"
msgstr "GroupWise 家庭屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
msgid "GroupWise Home Screen Name 2"
msgstr "GroupWise 家庭屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:199
msgid "GroupWise Home Screen Name 3"
msgstr "GroupWise 家庭屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:200
msgid "GroupWise Work Screen Name 1"
msgstr "GroupWise 工作屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
msgid "GroupWise Work Screen Name 2"
msgstr "GroupWise 工作屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
msgid "GroupWise Work Screen Name 3"
msgstr "GroupWise 工作屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:203
msgid "Jabber Home Id 1"
msgstr "Jabber 家庭 Id 1"
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:204
msgid "Jabber Home Id 2"
msgstr "Jabber 家庭 Id 2"
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:205
msgid "Jabber Home Id 3"
msgstr "Jabber 家庭 Id 3"
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:206
msgid "Jabber Work Id 1"
msgstr "Jabber 工作 Id 1"
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:207
msgid "Jabber Work Id 2"
msgstr "Jabber 工作 Id 2"
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:208
msgid "Jabber Work Id 3"
msgstr "Jabber 工作 Id 3"
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:209
msgid "Yahoo! Home Screen Name 1"
msgstr "Yahoo! 家庭屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
msgid "Yahoo! Home Screen Name 2"
msgstr "Yahoo! 家庭屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
msgid "Yahoo! Home Screen Name 3"
msgstr "Yahoo! 家庭屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
msgid "Yahoo! Work Screen Name 1"
msgstr "Yahoo! 工作屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
msgid "Yahoo! Work Screen Name 2"
msgstr "Yahoo! 工作屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
msgid "Yahoo! Work Screen Name 3"
msgstr "Yahoo! 工作屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
msgid "MSN Home Screen Name 1"
msgstr "MSN 家庭屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
msgid "MSN Home Screen Name 2"
msgstr "MSN 家庭屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
msgid "MSN Home Screen Name 3"
msgstr "MSN 家庭屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
msgid "MSN Work Screen Name 1"
msgstr "MSN 工作屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
msgid "MSN Work Screen Name 2"
msgstr "MSN 工作屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
msgid "MSN Work Screen Name 3"
msgstr "MSN 工作屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:221
msgid "ICQ Home Id 1"
msgstr "ICQ 家庭 Id 1"
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:222
msgid "ICQ Home Id 2"
msgstr "ICQ 家庭 Id 2"
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:223
msgid "ICQ Home Id 3"
msgstr "ICQ 家庭 Id 3"
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:224
msgid "ICQ Work Id 1"
msgstr "ICQ 工作 Id 1"
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:225
msgid "ICQ Work Id 2"
msgstr "ICQ 工作 Id 2"
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:226
msgid "ICQ Work Id 3"
msgstr "ICQ 工作 Id 3"
#. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
msgid "Last Revision"
msgstr "上次修订"
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
msgid "Name or Org"
msgstr "名称或组织"
#. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
msgid "Address List"
msgstr "地址列表"
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
msgid "Home Address"
msgstr "家庭地址"
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
msgid "Work Address"
msgstr "办公地址"
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
msgid "Other Address"
msgstr "其它地址"
#. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
msgid "Category List"
msgstr "类别列表"
#. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
msgid "Photo"
msgstr "照片"
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:243
msgid "Logo"
msgstr "标志"
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:245
msgid "Name"
msgstr "姓名"
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
msgid "Email List"
msgstr "邮件列表"
#. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:249
msgid "AIM Screen Name List"
msgstr "AIM 屏幕名列表"
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:250
msgid "GroupWise Id List"
msgstr "GroupWise Id 列表"
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:251
msgid "Jabber Id List"
msgstr "Jabber Id 列表"
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:252
msgid "Yahoo! Screen Name List"
msgstr "Yahoo! 屏幕名列表"
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:253
msgid "MSN Screen Name List"
msgstr "MSN 屏幕名列表"
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:254
msgid "ICQ Id List"
msgstr "ICQ Id 列表"
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:256
msgid "Wants HTML Mail"
msgstr "想要 HTML 邮件"
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
msgid "List"
msgstr "列表"
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
msgid "List Show Addresses"
msgstr "列表显示地址"
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
msgid "Birth Date"
msgstr "生日"
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:45
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
+#: ../libedataserver/e-categories.c:42
msgid "Anniversary"
msgstr "周年纪念日"
#. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:265
msgid "X.509 Certificate"
msgstr "X.509 证书"
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:267
msgid "Gadu-Gadu Home Id 1"
msgstr "Gadu-Gadu 家庭 Id 1"
-#: ../addressbook/libebook/e-contact.c:266
+#: ../addressbook/libebook/e-contact.c:268
msgid "Gadu-Gadu Home Id 2"
msgstr "Gadu-Gadu 家庭 Id 2"
-#: ../addressbook/libebook/e-contact.c:267
+#: ../addressbook/libebook/e-contact.c:269
msgid "Gadu-Gadu Home Id 3"
msgstr "Gadu-Gadu 家庭 Id 3"
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:270
msgid "Gadu-Gadu Work Id 1"
msgstr "Gadu-Gadu 工作 Id 1"
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:271
msgid "Gadu-Gadu Work Id 2"
msgstr "Gadu-Gadu 工作 Id 2"
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:272
msgid "Gadu-Gadu Work Id 3"
msgstr "Gadu-Gadu 工作 Id 3"
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:273
msgid "Gadu-Gadu Id List"
msgstr "Gadu-Gadu ID 列表"
#. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
msgid "Geographic Information"
msgstr "地理信息"
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
msgid "Telephone"
msgstr "电话"
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
msgid "Skype Home Name 1"
msgstr "Skype 家庭屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
msgid "Skype Home Name 2"
msgstr "Skype 家庭屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
msgid "Skype Home Name 3"
msgstr "Skype 家庭屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
msgid "Skype Work Name 1"
msgstr "Skype 工作屏幕名 1"
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
msgid "Skype Work Name 2"
msgstr "Skype 工作屏幕名 2"
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
msgid "Skype Work Name 3"
msgstr "Skype 工作屏幕名 3"
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
msgid "Skype Name List"
msgstr "Skype 屏幕名列表"
-#: ../addressbook/libebook/e-contact.c:286
-#, fuzzy
+#: ../addressbook/libebook/e-contact.c:288
msgid "SIP address"
-msgstr "家庭地址"
+msgstr "SIP 地址"
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1515
+#: ../addressbook/libebook/e-destination.c:739
msgid "Unnamed List"
msgstr "未命名的列表"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:46
+#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#, c-format
+msgid "Empty URI"
+msgstr "空 URI"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:305
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:324
+#: ../calendar/libedata-cal/e-data-cal-factory.c:333
+#, c-format
+msgid "Invalid source"
+msgstr "无效来源。"
+
+#: ../addressbook/libedata-book/e-data-book.c:301
+msgid "Cannot open book"
+msgstr "无法打开地址簿"
+
+#: ../addressbook/libedata-book/e-data-book.c:319
+msgid "Cannot remove book"
+msgstr "无法移除地址簿"
+
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../addressbook/libedata-book/e-data-book.c:346
+msgid "Cannot get contact"
+msgstr "无法获取联系人"
+
+#: ../addressbook/libedata-book/e-data-book.c:358
+msgid "Empty query"
+msgstr "空查询"
+
+#: ../addressbook/libedata-book/e-data-book.c:402
+msgid "Cannot authenticate user"
+msgstr "无法认证用户"
+
+#: ../addressbook/libedata-book/e-data-book.c:414
+#: ../addressbook/libedata-book/e-data-book.c:429
+msgid "Cannot add contact"
+msgstr "无法添加联系人"
+
+#: ../addressbook/libedata-book/e-data-book.c:444
+#: ../addressbook/libedata-book/e-data-book.c:459
+msgid "Cannot modify contact"
+msgstr "无法修改联系人"
+
+#: ../addressbook/libedata-book/e-data-book.c:494
+msgid "Cannot remove contacts"
+msgstr "无法删除联系人"
+
+#: ../addressbook/libedata-book/e-data-book.c:569
+#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+msgid "Invalid query"
+msgstr "无效的查询"
+
+#: ../addressbook/libedata-book/e-data-book.c:598
+msgid "Cannot get changes"
+msgstr "无法获取更改"
+
+#: ../addressbook/libedata-book/e-data-book.c:699
+msgid "Cannot complete operation"
+msgstr "无法完成操作"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: ../libedataserver/e-categories.c:43
msgid "Birthday"
msgstr "生日"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
#, c-format
msgid "Birthday: %s"
msgstr "生日:%s"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
#, c-format
msgid "Anniversary: %s"
msgstr "周年:%s"
-#: ../calendar/backends/file/e-cal-backend-file.c:234
+#: ../calendar/backends/file/e-cal-backend-file.c:236
msgid "Cannot save calendar data: Malformed URI."
msgstr "无法保存日历数据:URI 格式错误。"
-#: ../calendar/backends/file/e-cal-backend-file.c:241
-#: ../calendar/backends/file/e-cal-backend-file.c:247
+#: ../calendar/backends/file/e-cal-backend-file.c:243
+#: ../calendar/backends/file/e-cal-backend-file.c:249
msgid "Cannot save calendar data"
msgstr "无法保存日历数据"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
msgid "Could not create thread for getting deltas"
msgstr "无法为获得差异创建线索"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:376
-#: ../calendar/backends/google/e-cal-backend-google.c:1189
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1080
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1381
-#: ../calendar/backends/http/e-cal-backend-http.c:673
-#: ../calendar/backends/weather/e-cal-backend-weather.c:486
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
+#: ../calendar/backends/google/e-cal-backend-google.c:1144
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1087
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1385
+#: ../calendar/backends/http/e-cal-backend-http.c:678
+#: ../calendar/backends/weather/e-cal-backend-weather.c:492
msgid "Could not create cache file"
msgstr "无法创建缓存文件"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1093
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1100
msgid "Could not create thread for populating cache"
msgstr "无法创建增殖缓存创建线索"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1118
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2116
msgid "Reply Requested: by "
msgstr "请求回复:由"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1123
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2121
msgid "Reply Requested: When convenient"
msgstr "请求回复:方便时"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:293
#, c-format
msgid "Loading %s items"
-msgstr "装入 %s 项"
+msgstr "载入 %s 项"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:926
msgid "Calendar"
msgstr "日历"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:984
msgid "Invalid server URI"
msgstr "无效的服务器 URI"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:995
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1098
-#: ../calendar/libecal/e-cal.c:5117
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1291
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1327
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
-#: ../camel/providers/groupwise/camel-groupwise-store.c:598
-#: ../camel/providers/groupwise/camel-groupwise-store.c:773
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1003
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1012
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1105
+#: ../calendar/libecal/e-cal.c:4026
+#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1334
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1370
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1385
+#: ../camel/providers/groupwise/camel-groupwise-store.c:591
+#: ../camel/providers/groupwise/camel-groupwise-store.c:766
#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
msgid "Authentication failed"
msgstr "认证失败"
-#: ../calendar/backends/http/e-cal-backend-http.c:330
+#: ../calendar/backends/http/e-cal-backend-http.c:335
msgid "Redirected to Invalid URI"
msgstr "已重定向到无效 URI"
-#: ../calendar/backends/http/e-cal-backend-http.c:353
+#: ../calendar/backends/http/e-cal-backend-http.c:358
msgid "Bad file format."
msgstr "无效的文件格式。"
-#: ../calendar/backends/http/e-cal-backend-http.c:360
+#: ../calendar/backends/http/e-cal-backend-http.c:365
msgid "Not a calendar."
msgstr "不是日历。"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:150
+#: ../calendar/backends/weather/e-cal-backend-weather.c:152
msgid "Could not retrieve weather data"
msgstr "无法获取天气数据"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
msgid "Weather: Fog"
msgstr "天气:雾"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-msgid "Weather: Cloudy"
-msgstr "天气:多云"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
msgid "Weather: Cloudy Night"
msgstr "天气:多云夜晚"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+msgid "Weather: Cloudy"
+msgstr "天气:多云"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
msgid "Weather: Overcast"
msgstr "天气:阴天"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
msgid "Weather: Showers"
msgstr "天气:阵雨"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
msgid "Weather: Snow"
msgstr "天气:雪"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Sunny"
-msgstr "天气:晴"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
msgid "Weather: Clear Night"
msgstr "天气:晴朗夜晚"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+msgid "Weather: Sunny"
+msgstr "天气:晴"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
msgid "Weather: Thunderstorms"
msgstr "天气:暴风雨"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:400
+#: ../calendar/backends/weather/e-cal-backend-weather.c:405
msgid "Forecast"
msgstr "天气预报"
-#: ../calendar/libecal/e-cal-component.c:1320
+#: ../calendar/libecal/e-cal-component.c:1286
msgid "Untitled appointment"
msgstr "无标题约会"
-#: ../calendar/libecal/e-cal-recur.c:3945
+#: ../calendar/libecal/e-cal-recur.c:3951
msgid "1st"
msgstr "1日"
-#: ../calendar/libecal/e-cal-recur.c:3946
+#: ../calendar/libecal/e-cal-recur.c:3952
msgid "2nd"
msgstr "2日"
-#: ../calendar/libecal/e-cal-recur.c:3947
+#: ../calendar/libecal/e-cal-recur.c:3953
msgid "3rd"
msgstr "3日"
-#: ../calendar/libecal/e-cal-recur.c:3948
+#: ../calendar/libecal/e-cal-recur.c:3954
msgid "4th"
msgstr "4日"
-#: ../calendar/libecal/e-cal-recur.c:3949
+#: ../calendar/libecal/e-cal-recur.c:3955
msgid "5th"
msgstr "5日"
-#: ../calendar/libecal/e-cal-recur.c:3950
+#: ../calendar/libecal/e-cal-recur.c:3956
msgid "6th"
msgstr "6日"
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3957
msgid "7th"
msgstr "7日"
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3958
msgid "8th"
msgstr "8日"
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3959
msgid "9th"
msgstr "9日"
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3960
msgid "10th"
msgstr "10日"
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3961
msgid "11th"
msgstr "11日"
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3962
msgid "12th"
msgstr "12日"
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3963
msgid "13th"
msgstr "13日"
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3964
msgid "14th"
msgstr "14日"
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3965
msgid "15th"
msgstr "15日"
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3966
msgid "16th"
msgstr "16日"
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3967
msgid "17th"
msgstr "17日"
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3968
msgid "18th"
msgstr "18八日"
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3969
msgid "19th"
msgstr "19日"
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3970
msgid "20th"
msgstr "20日"
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:3971
msgid "21st"
msgstr "21日"
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:3972
msgid "22nd"
msgstr "22日"
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:3973
msgid "23rd"
msgstr "23日"
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:3974
msgid "24th"
msgstr "24日"
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:3975
msgid "25th"
msgstr "25日"
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:3976
msgid "26th"
msgstr "26日"
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:3977
msgid "27th"
msgstr "27日"
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:3978
msgid "28th"
msgstr "28日"
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:3979
msgid "29th"
msgstr "29日"
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:3980
msgid "30th"
msgstr "30日"
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:3981
msgid "31st"
msgstr "31日"
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:712
+#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:715
msgid "High"
msgstr "高"
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:714
+#: ../calendar/libecal/e-cal-util.c:690 ../calendar/libecal/e-cal-util.c:717
msgid "Normal"
msgstr "中"
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:692 ../calendar/libecal/e-cal-util.c:719
msgid "Low"
msgstr "低"
#. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:710
+#: ../calendar/libecal/e-cal-util.c:713
msgid "Undefined"
msgstr "未定义"
-#: ../calendar/libecal/e-cal.c:1693 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1179 ../libedataserverui/e-book-auth-util.c:199
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "为 %s 输入密码 (用户 %s)"
@@ -920,94 +976,94 @@ msgstr "为 %s 输入密码 (用户 %s)"
#. This password prompt will be prompted rarely. Since the key that is passed to
#. the auth_func corresponds to the parent user.
#.
-#: ../calendar/libecal/e-cal.c:1707
+#: ../calendar/libecal/e-cal.c:1193
#, c-format
msgid "Enter password for %s to enable proxy for user %s"
msgstr "输入 %s 的密码,以便为用户 %s 启用代理服务器"
-#: ../calendar/libecal/e-cal.c:5089
+#: ../calendar/libecal/e-cal.c:3998
msgid "Invalid argument"
msgstr "无效参数"
-#: ../calendar/libecal/e-cal.c:5091
+#: ../calendar/libecal/e-cal.c:4000
msgid "Backend is busy"
msgstr "后台繁忙"
-#: ../calendar/libecal/e-cal.c:5093
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4002
+#: ../calendar/libedata-cal/e-cal-backend-util.c:107
msgid "Repository is offline"
msgstr "仓库离线"
-#: ../calendar/libecal/e-cal.c:5095
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4004
+#: ../calendar/libedata-cal/e-cal-backend-util.c:131
msgid "No such calendar"
msgstr "没有这样的日历"
-#: ../calendar/libecal/e-cal.c:5097
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../calendar/libecal/e-cal.c:4006
+#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../servers/groupwise/e-gw-connection.c:235
msgid "Object not found"
msgstr "找不到对象"
-#: ../calendar/libecal/e-cal.c:5099
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../calendar/libecal/e-cal.c:4008
+#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../servers/groupwise/e-gw-connection.c:229
msgid "Invalid object"
msgstr "无效对象"
-#: ../calendar/libecal/e-cal.c:5101
+#: ../calendar/libecal/e-cal.c:4010
msgid "URI not loaded"
-msgstr "URI 未装入"
+msgstr "URI 未载入"
-#: ../calendar/libecal/e-cal.c:5103
+#: ../calendar/libecal/e-cal.c:4012
msgid "URI already loaded"
msgstr "URI 已经载入"
-#: ../calendar/libecal/e-cal.c:5105
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:573
+#: ../calendar/libecal/e-cal.c:4014
+#: ../calendar/libedata-cal/e-cal-backend-util.c:109
msgid "Permission denied"
msgstr "没有权限"
-#: ../calendar/libecal/e-cal.c:5107
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:4016
+#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../servers/groupwise/e-gw-connection.c:237
msgid "Unknown User"
msgstr "未知用户"
-#: ../calendar/libecal/e-cal.c:5109
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4018
+#: ../calendar/libedata-cal/e-cal-backend-util.c:117
msgid "Object ID already exists"
msgstr "对象 ID 已经存在"
-#: ../calendar/libecal/e-cal.c:5111
+#: ../calendar/libecal/e-cal.c:4020
msgid "Protocol not supported"
msgstr "不支持的协议"
-#: ../calendar/libecal/e-cal.c:5113
+#: ../calendar/libecal/e-cal.c:4022
msgid "Operation has been canceled"
msgstr "操作已取消"
-#: ../calendar/libecal/e-cal.c:5115
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4024
+#: ../calendar/libedata-cal/e-cal-backend-util.c:145
msgid "Could not cancel operation"
msgstr "无法取消操作"
-#: ../calendar/libecal/e-cal.c:5119
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../calendar/libecal/e-cal.c:4028
+#: ../calendar/libedata-cal/e-cal-backend-util.c:121
#: ../camel/providers/smtp/camel-smtp-transport.c:217
msgid "Authentication required"
msgstr "必须认证"
-#: ../calendar/libecal/e-cal.c:5121
+#: ../calendar/libecal/e-cal.c:4030
msgid "A CORBA exception has occurred"
msgstr "发生了 CORBA 异常"
-#: ../calendar/libecal/e-cal.c:5123
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
+#: ../calendar/libecal/e-cal.c:4032
+#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../camel/camel-net-utils.c:523
#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
#: ../camel/providers/imap/camel-imap-command.c:432
-#: ../camel/providers/imap/camel-imap-store.c:743
+#: ../camel/providers/imap/camel-imap-store.c:741
#: ../camel/providers/imap4/camel-imap4-engine.c:1547
#: ../camel/providers/imap4/camel-imap4-engine.c:1585
#: ../camel/providers/imap4/camel-imap4-engine.c:1629
@@ -1015,91 +1071,87 @@ msgstr "发生了 CORBA 异常"
#: ../camel/providers/imap4/camel-imap4-store.c:311
#: ../camel/providers/imap4/camel-imap4-store.c:818
#: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:552
-#: ../camel/providers/pop3/camel-pop3-store.c:559
-#: ../camel/providers/pop3/camel-pop3-store.c:565
-#: ../servers/exchange/storage/e-storage.c:587
-#: ../servers/groupwise/e-gw-connection.c:241
+#: ../camel/providers/pop3/camel-pop3-store.c:584
+#: ../servers/groupwise/e-gw-connection.c:243
msgid "Unknown error"
msgstr "未知的错误"
-#: ../calendar/libecal/e-cal.c:5125
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:555
+#: ../calendar/libecal/e-cal.c:4034
+#: ../calendar/libedata-cal/e-cal-backend-util.c:105
msgid "No error"
msgstr "无错误"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
#, c-format
msgid "\"%s\" expects no arguments"
msgstr "“%s”不需要参数"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
#, c-format
msgid "\"%s\" expects one argument"
msgstr "“%s”需要一个参数"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
#, c-format
msgid "\"%s\" expects the first argument to be a string"
msgstr "“%s”需要第一个参数是字符串"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
#, c-format
msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
msgstr "“%s”的第一个参数必须是 ISO 8601 日期/时间字符串"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
#, c-format
msgid "\"%s\" expects two arguments"
msgstr "“%s”需要两个参数"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
#, c-format
msgid "\"%s\" expects the first argument to be a time_t"
msgstr "“%s”的第一个参数应该是 time_t"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
#, c-format
msgid "\"%s\" expects the second argument to be an integer"
msgstr "“%s”的第二个参数应该是整数"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
#, c-format
msgid "\"%s\" expects the second argument to be a time_t"
msgstr "“%s”的第一个参数应该是 time_t"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
#, c-format
msgid "\"%s\" expects the second argument to be a string"
msgstr "“%s”的第二个参数应该是字符串"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
#, c-format
msgid ""
"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1110,62 +1162,188 @@ msgstr ""
"是“any”、“summary”、“description”、“location”、“attendee”、“organizer”、“classification”之"
"一"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
#, c-format
msgid "\"%s\" expects at least one argument"
msgstr "“%s”至少需要一个参数"
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
#, c-format
msgid ""
"\"%s\" expects all arguments to be strings or one and only one argument to "
"be a boolean false (#f)"
msgstr "“%s”的所有参数都应该为字符串或者它唯一的参数为布尔假 (#f)"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-cal-backend-util.c:111
msgid "Invalid range"
msgstr "无效范围"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../calendar/libedata-cal/e-cal-backend-util.c:123
msgid "Unsupported field"
msgstr "不支持的域"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-cal-backend-util.c:125
msgid "Unsupported method"
msgstr "不支持的方式"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#: ../calendar/libedata-cal/e-cal-backend-util.c:127
msgid "Unsupported authentication method"
msgstr "不支持的身份验证方式"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
+#: ../calendar/libedata-cal/e-cal-backend-util.c:129
msgid "TLS not available"
msgstr "TLS 不可用"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../calendar/libedata-cal/e-cal-backend-util.c:135
msgid "Offline mode unavailable"
msgstr "离线模式不可用"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
+#: ../calendar/libedata-cal/e-cal-backend-util.c:137
msgid "Search size limit exceeded"
msgstr "超过搜索大小限制"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
msgid "Search time limit exceeded"
msgstr "超过搜索时间限制"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "无效的查询"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+#: ../calendar/libedata-cal/e-cal-backend-util.c:143
msgid "Query refused"
msgstr "查询被拒绝"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../calendar/libedata-cal/e-cal-backend-util.c:150
msgid "Invalid server version"
msgstr "无效的服务器版本"
+#: ../calendar/libedata-cal/e-data-cal.c:501
+#, c-format
+msgid "Cannot retrieve calendar address"
+msgstr "无法获取日历地址"
+
+#: ../calendar/libedata-cal/e-data-cal.c:519
+#, c-format
+msgid "Cannot retrieve calendar alarm e-mail address"
+msgstr "无法获取日历提醒电子邮件地址"
+
+#: ../calendar/libedata-cal/e-data-cal.c:537
+#, c-format
+msgid "Cannot retrieve calendar's ldap attribute"
+msgstr "无法获取日历的 ldap 属性"
+
+#: ../calendar/libedata-cal/e-data-cal.c:555
+#, c-format
+msgid "Cannot retrieve calendar scheduling information"
+msgstr "无法获取日历的日程信息"
+
+#: ../calendar/libedata-cal/e-data-cal.c:572
+#, c-format
+msgid "Cannot open calendar"
+msgstr "无法打开日历"
+
+#: ../calendar/libedata-cal/e-data-cal.c:591
+#, c-format
+msgid "Cannot refresh calendar"
+msgstr "无法刷新日历"
+
+#: ../calendar/libedata-cal/e-data-cal.c:608
+#, c-format
+msgid "Cannot remove calendar"
+msgstr "无法删除日历"
+
+#: ../calendar/libedata-cal/e-data-cal.c:627
+#, c-format
+msgid "Cannot create calendar object"
+msgstr "无法创建日历对象"
+
+#: ../calendar/libedata-cal/e-data-cal.c:649
+#, c-format
+msgid "Cannot modify calendar object"
+msgstr "无法修改日历对象"
+
+#: ../calendar/libedata-cal/e-data-cal.c:673
+#, c-format
+msgid "Cannot remove calendar object"
+msgstr "无法删除日历对象"
+
+#: ../calendar/libedata-cal/e-data-cal.c:692
+#, c-format
+msgid "Cannot receive calendar objects"
+msgstr "无法获取日历对象"
+
+#: ../calendar/libedata-cal/e-data-cal.c:709
+#, c-format
+msgid "Cannot discard calendar alarm"
+msgstr "无法忽略日历提醒"
+
+#: ../calendar/libedata-cal/e-data-cal.c:728
+#, c-format
+msgid "Cannot send calendar objects"
+msgstr "无法发送日历对象"
+
+#: ../calendar/libedata-cal/e-data-cal.c:763
+#, c-format
+msgid "Cannot retrieve default calendar object path"
+msgstr "无法获取日历对象的默认路径"
+
+#: ../calendar/libedata-cal/e-data-cal.c:781
+#, c-format
+msgid "Cannot retrieve calendar object path"
+msgstr "无法获取日历对象路径"
+
+#: ../calendar/libedata-cal/e-data-cal.c:799
+#, c-format
+msgid "Cannot retrieve calendar object list"
+msgstr "无法获取日历对象列表"
+
+#: ../calendar/libedata-cal/e-data-cal.c:837
+#, c-format
+msgid "Could not retrieve attachment list"
+msgstr "无法获取附件列表"
+
+#: ../calendar/libedata-cal/e-data-cal.c:859
+#, c-format
+msgid "Could not complete calendar query"
+msgstr "无法完成日历查询"
+
+#: ../calendar/libedata-cal/e-data-cal.c:877
+#, c-format
+msgid "Could not retrieve calendar time zone"
+msgstr "无法获取日历时区"
+
+#: ../calendar/libedata-cal/e-data-cal.c:895
+#, c-format
+msgid "Could not add calendar time zone"
+msgstr "无法添加日历时区"
+
+#: ../calendar/libedata-cal/e-data-cal.c:912
+#, c-format
+msgid "Could not set default calendar time zone"
+msgstr "无法设置默认日历时区"
+
+#: ../calendar/libedata-cal/e-data-cal.c:933
+#, c-format
+msgid "Cannot retrieve calendar changes"
+msgstr "无法获取日历更改"
+
+#: ../calendar/libedata-cal/e-data-cal.c:983
+#, c-format
+msgid "Cannot retrieve calendar free/busy list"
+msgstr "无法获取日历空闲/繁忙列表"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:340
+#, c-format
+msgid "Invalid URI"
+msgstr "无效的 URI"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:351
+#, fuzzy, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "无对应 '%2$s' 的 '%1$s' 的后端工厂"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:391
+#, c-format
+msgid "Could not instantiate backend"
+msgstr "无法实例化后端"
+
#: ../camel/camel-cipher-context.c:102
msgid "Signing is not supported by this cipher"
msgstr "该密码不支持签名"
@@ -1206,16 +1384,16 @@ msgstr "您不能用此密码导入密钥"
msgid "You may not export keys with this cipher"
msgstr "您不能用此密码导出密钥"
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-data-cache.c:135
msgid "Unable to create cache path"
msgstr "无法创建缓冲路径"
-#: ../camel/camel-data-cache.c:402
+#: ../camel/camel-data-cache.c:403
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "无法删除缓冲条目:%s:%s"
-#: ../camel/camel-db.c:412
+#: ../camel/camel-db.c:459
msgid "Insufficient memory"
msgstr "内存不足"
@@ -1250,7 +1428,7 @@ msgstr "重新与服务器同步"
msgid "Copy folder content locally for offline operation"
msgstr "将文件夹内容复制到本地以进行脱机操作"
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:106
msgid "Downloading new messages for offline mode"
msgstr "下载新信件以进行脱机操作"
@@ -1260,11 +1438,15 @@ msgid "Preparing folder '%s' for offline"
msgstr "准备脱机文件夹“%s”"
#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:223
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:3014
+#: ../camel/providers/groupwise/camel-groupwise-store.c:216
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imap/camel-imap-store.c:1843
+#: ../camel/providers/imap/camel-imap-store.c:2280
+#: ../camel/providers/imap/camel-imap-store.c:3089
+#: ../camel/providers/imapx/camel-imapx-store.c:170
+#: ../camel/providers/imapx/camel-imapx-store.c:676
+#: ../camel/providers/imapx/camel-imapx-store.c:732
+#: ../camel/providers/imapx/camel-imapx-store.c:784
msgid "You must be working online to complete this operation"
msgstr "您必须在线工作以便完成该操作"
@@ -1354,8 +1536,8 @@ msgstr "(user-tag)参数无效"
msgid "Error executing filter search: %s: %s"
msgstr "执行过滤规则搜索错误:%s:%s"
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:455
+#: ../camel/camel-folder-search.c:610
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -1364,8 +1546,8 @@ msgstr ""
"无法解析搜索表达式:%s:\n"
"%s"
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:620
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -1374,72 +1556,73 @@ msgstr ""
"执行搜索表达式错误:%s:\n"
"%s"
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:812 ../camel/camel-folder-search.c:854
#, c-format
msgid "(%s) requires a single bool result"
msgstr "(%s) 需要一个布尔结果"
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:907
#, c-format
msgid "(%s) not allowed inside %s"
msgstr "(%s) 不允许在 %s 中使用"
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#: ../camel/camel-folder-search.c:913 ../camel/camel-folder-search.c:920
#, c-format
msgid "(%s) requires a match type string"
msgstr "(%s) 需要一个匹配类型字符串"
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:947
#, c-format
msgid "(%s) expects an array result"
msgstr "(%s) 需要一个数组结果"
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:956
#, c-format
msgid "(%s) requires the folder set"
msgstr "(%s) 需要文件夹集"
-#: ../camel/camel-folder.c:683
+#: ../camel/camel-folder.c:690
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr "不支持的操作:附加信件:为 %s"
-#: ../camel/camel-folder.c:1388
+#: ../camel/camel-folder.c:1401
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr "不支持的操作:按表达式搜索:搜索 %s"
-#: ../camel/camel-folder.c:1429
+#: ../camel/camel-folder.c:1442
#, fuzzy, c-format
msgid "Unsupported operation: count by expression: for %s"
-msgstr "不支持的操作:按表达式搜索:搜索 %s"
+msgstr "不支持的操作:按表达式计数:针对 %s"
-#: ../camel/camel-folder.c:1468
+#: ../camel/camel-folder.c:1483
#, c-format
msgid "Unsupported operation: search by UIDs: for %s"
msgstr "不支持的操作:按 UID 搜索:搜索 %s"
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:1596
+#: ../camel/providers/local/camel-maildir-folder.c:387
msgid "Moving messages"
msgstr "移动信件"
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:1596
msgid "Copying messages"
msgstr "复制信件"
-#: ../camel/camel-folder.c:1922
+#: ../camel/camel-folder.c:1945
msgid "Learning junk"
msgstr "学习垃圾邮件"
-#: ../camel/camel-folder.c:1939
+#: ../camel/camel-folder.c:1963
msgid "Learning non-junk"
msgstr "学习非垃圾邮件"
-#: ../camel/camel-folder.c:1958
+#: ../camel/camel-folder.c:1983
msgid "Filtering new message(s)"
msgstr "过滤新信件"
-#: ../camel/camel-gpg-context.c:752
+#: ../camel/camel-gpg-context.c:760
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -1450,15 +1633,15 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:767
+#: ../camel/camel-gpg-context.c:775
msgid "Failed to parse gpg userid hint."
msgstr "解析 gpg userid 提示失败。"
-#: ../camel/camel-gpg-context.c:791 ../camel/camel-gpg-context.c:805
+#: ../camel/camel-gpg-context.c:799 ../camel/camel-gpg-context.c:813
msgid "Failed to parse gpg passphrase request."
msgstr "解析 gpg 密码句请求失败。"
-#: ../camel/camel-gpg-context.c:825
+#: ../camel/camel-gpg-context.c:833
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
@@ -1467,7 +1650,7 @@ msgstr ""
"您需要一个 PIN 用来解锁您的智能卡:\n"
"“%s”"
-#: ../camel/camel-gpg-context.c:829
+#: ../camel/camel-gpg-context.c:837
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -1476,93 +1659,88 @@ msgstr ""
"您需要一个密码句用来解锁以下用户:\n"
"“%s”"
-#: ../camel/camel-gpg-context.c:834
+#: ../camel/camel-gpg-context.c:842
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr "GnuPG 对“%s”的意外响应"
-#: ../camel/camel-gpg-context.c:859 ../camel/camel-gpg-context.c:1068
+#: ../camel/camel-gpg-context.c:867 ../camel/camel-gpg-context.c:1111
#: ../camel/providers/nntp/camel-nntp-store.c:1313
msgid "Canceled."
msgstr "已取消。"
-#: ../camel/camel-gpg-context.c:873
+#: ../camel/camel-gpg-context.c:881
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr "解锁密钥失败:给出了 3 个错误的密码句。"
-#: ../camel/camel-gpg-context.c:881
+#: ../camel/camel-gpg-context.c:889
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "来自 GnuPG 的意外应答:%s"
-#: ../camel/camel-gpg-context.c:944
+#: ../camel/camel-gpg-context.c:988
msgid "Failed to encrypt: No valid recipients specified."
msgstr "加密失败:没有指定有效的收件人。"
#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1206 ../camel/camel-gpg-context.c:1331
-#: ../camel/camel-gpg-context.c:1853 ../camel/camel-gpg-context.c:1898
+#: ../camel/camel-gpg-context.c:1260 ../camel/camel-gpg-context.c:1385
+#: ../camel/camel-gpg-context.c:1959 ../camel/camel-gpg-context.c:2006
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "执行 gpg 失败:%s"
-#: ../camel/camel-gpg-context.c:1299 ../camel/camel-smime-context.c:602
+#: ../camel/camel-gpg-context.c:1353 ../camel/camel-smime-context.c:605
#, c-format
msgid "Could not generate signing data: %s"
msgstr "无法生成签名数据:%s"
-#: ../camel/camel-gpg-context.c:1346 ../camel/camel-gpg-context.c:1547
-#: ../camel/camel-gpg-context.c:1563 ../camel/camel-gpg-context.c:1643
-#: ../camel/camel-gpg-context.c:1658 ../camel/camel-gpg-context.c:1774
-#: ../camel/camel-gpg-context.c:1789 ../camel/camel-gpg-context.c:1869
-#: ../camel/camel-gpg-context.c:1914
+#: ../camel/camel-gpg-context.c:1402 ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1648 ../camel/camel-gpg-context.c:1730
+#: ../camel/camel-gpg-context.c:1747 ../camel/camel-gpg-context.c:1863
+#: ../camel/camel-gpg-context.c:1880 ../camel/camel-gpg-context.c:1977
+#: ../camel/camel-gpg-context.c:2024
msgid "Failed to execute gpg."
msgstr "执行 gpg 失败。"
-#: ../camel/camel-gpg-context.c:1365
-msgid "This is a digitally signed message part"
-msgstr "这是信件的数字签名部分"
-
-#: ../camel/camel-gpg-context.c:1451 ../camel/camel-gpg-context.c:1457
-#: ../camel/camel-gpg-context.c:1463 ../camel/camel-gpg-context.c:1478
-#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
+#: ../camel/camel-gpg-context.c:1534 ../camel/camel-gpg-context.c:1540
+#: ../camel/camel-gpg-context.c:1546 ../camel/camel-gpg-context.c:1561
+#: ../camel/camel-smime-context.c:929 ../camel/camel-smime-context.c:940
+#: ../camel/camel-smime-context.c:947
msgid "Cannot verify message signature: Incorrect message format"
msgstr "无法校验信件签名:信件格式不对"
-#: ../camel/camel-gpg-context.c:1517
+#: ../camel/camel-gpg-context.c:1600
#, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr "无法校验信件签名:无法创建临时文件:%s"
-#: ../camel/camel-gpg-context.c:1626
+#: ../camel/camel-gpg-context.c:1713
#, c-format
msgid "Could not generate encrypting data: %s"
msgstr "无法生成加密数据:%s"
-#: ../camel/camel-gpg-context.c:1676
+#: ../camel/camel-gpg-context.c:1765
msgid "This is a digitally encrypted message part"
msgstr "这是信件的数字加密部分"
-#: ../camel/camel-gpg-context.c:1729 ../camel/camel-gpg-context.c:1737
-#: ../camel/camel-gpg-context.c:1756
+#: ../camel/camel-gpg-context.c:1818 ../camel/camel-gpg-context.c:1826
+#: ../camel/camel-gpg-context.c:1845
msgid "Cannot decrypt message: Incorrect message format"
msgstr "无法解密信件:信件格式不对"
-#: ../camel/camel-gpg-context.c:1746
+#: ../camel/camel-gpg-context.c:1835
msgid "Failed to decrypt MIME part: protocol error"
msgstr "解密 MIME 部分失败:协议错误"
-#: ../camel/camel-gpg-context.c:1811 ../camel/camel-smime-context.c:1186
+#: ../camel/camel-gpg-context.c:1915 ../camel/camel-smime-context.c:1204
msgid "Encrypted content"
msgstr "加密内容"
-#: ../camel/camel-gpg-context.c:1830
+#: ../camel/camel-gpg-context.c:1936
msgid "Unable to parse message content"
msgstr "无法分析信件内容"
-#: ../camel/camel-gpg-context.c:1854 ../camel/camel-gpg-context.c:1899
-#: ../camel/camel-tcp-stream-openssl.c:627
+#: ../camel/camel-gpg-context.c:1960 ../camel/camel-gpg-context.c:2007
#: ../camel/providers/imap4/camel-imap4-utils.c:614
#: ../camel/providers/smtp/camel-smtp-transport.c:165
#: ../camel/providers/smtp/camel-smtp-transport.c:220
@@ -1667,45 +1845,45 @@ msgstr "复制邮件临时文件错误:%s"
msgid "parse error"
msgstr "解析错误"
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:806
-#: ../camel/providers/pop3/camel-pop3-store.c:446
-#: ../camel/providers/pop3/camel-pop3-store.c:546
+#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:817
+#: ../camel/providers/pop3/camel-pop3-store.c:478
+#: ../camel/providers/pop3/camel-pop3-store.c:578
msgid "Canceled"
msgstr "已取消"
-#: ../camel/camel-net-utils.c:522
+#: ../camel/camel-net-utils.c:523
msgid "cannot create thread"
msgstr "无法创建线索"
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:682
#, c-format
msgid "Resolving: %s"
msgstr "解析:%s"
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:704
msgid "Host lookup failed"
msgstr "主机查阅失败"
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:706
#, c-format
msgid "Host lookup failed: %s: %s"
msgstr "主机查阅失败:%s:%s"
-#: ../camel/camel-net-utils.c:810
+#: ../camel/camel-net-utils.c:821
msgid "Resolving address"
msgstr "解析地址"
-#: ../camel/camel-net-utils.c:830
+#: ../camel/camel-net-utils.c:841
msgid "Name lookup failed"
msgstr "名称查阅失败"
-#: ../camel/camel-net-utils.c:833
+#: ../camel/camel-net-utils.c:844
#, c-format
msgid "Name lookup failed: %s"
msgstr "名称查阅失败:%s"
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:247
#, c-format
msgid "Syncing messages in folder '%s' to disk"
msgstr "正在将文件夹“%s”中的信件同步到磁盘"
@@ -1726,19 +1904,19 @@ msgstr "关于将读入邮件作为对另一组文件夹的查询"
#: ../camel/camel-provider.c:184
#, c-format
msgid "Could not load %s: Module loading not supported on this system."
-msgstr "无法装入 %s:本系统不支持模块装入。"
+msgstr "无法载入 %s:本系统不支持模块载入。"
#: ../camel/camel-provider.c:193
#, c-format
msgid "Could not load %s: %s"
-msgstr "无法装入 %s:%s"
+msgstr "无法载入 %s:%s"
#: ../camel/camel-provider.c:201
#, c-format
msgid "Could not load %s: No initialization code in module."
-msgstr "无法装入 %s:模块中没有初始化代码。"
+msgstr "无法载入 %s:模块中没有初始化代码。"
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
#, c-format
msgid "No provider available for protocol '%s'"
msgstr "协议“%s”没有可用的提供者"
@@ -1826,93 +2004,75 @@ msgstr "服务器应达含有不完整的认证数据"
msgid "Server response does not match"
msgstr "服务器应答不匹配"
-#: ../camel/camel-sasl-gssapi.c:63
+#: ../camel/camel-sasl-gssapi.c:78
msgid "GSSAPI"
msgstr "GSSAPI"
-#: ../camel/camel-sasl-gssapi.c:65
+#: ../camel/camel-sasl-gssapi.c:80
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr "该选项将用 Kerberos 5 认证连接到服务器。"
-#: ../camel/camel-sasl-gssapi.c:159
+#: ../camel/camel-sasl-gssapi.c:174
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
msgstr "所提供的证书不支持指定的机制,或者无法被实现所识别。"
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:179
msgid "The provided target_name parameter was ill-formed."
msgstr "提供的 target_name 参数格式不对。"
-#: ../camel/camel-sasl-gssapi.c:167
+#: ../camel/camel-sasl-gssapi.c:182
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
msgstr "提供的 target_name 参数包含无效或不支持的名称类型。"
-#: ../camel/camel-sasl-gssapi.c:171
+#: ../camel/camel-sasl-gssapi.c:186
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:176
+#: ../camel/camel-sasl-gssapi.c:191
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
msgstr "input_token 包含无效的签名,或者无法验证签名。"
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../camel/camel-sasl-gssapi.c:195
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:185
+#: ../camel/camel-sasl-gssapi.c:200
msgid "The supplied context handle did not refer to a valid context."
msgstr "提供的上下文句柄所引用的上下文无效。"
-#: ../camel/camel-sasl-gssapi.c:188
+#: ../camel/camel-sasl-gssapi.c:203
msgid "The consistency checks performed on the input_token failed."
msgstr "对 input_token 执行完整性检查失败。"
-#: ../camel/camel-sasl-gssapi.c:191
+#: ../camel/camel-sasl-gssapi.c:206
msgid "The consistency checks performed on the credential failed."
msgstr "对证书执行完整性检查失败。"
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:209
msgid "The referenced credentials have expired."
msgstr "引用的证书已过期。"
-#: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
-#: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
-#: ../camel/camel-sasl-kerberos4.c:230
-#: ../camel/providers/imap/camel-imap-store.c:1274
+#: ../camel/camel-sasl-gssapi.c:215 ../camel/camel-sasl-gssapi.c:322
+#: ../camel/camel-sasl-gssapi.c:364 ../camel/camel-sasl-gssapi.c:379
+#: ../camel/providers/imap/camel-imap-store.c:1272
msgid "Bad authentication response from server."
msgstr "来自服务器的无效认证应答。"
-#: ../camel/camel-sasl-gssapi.c:309
+#: ../camel/camel-sasl-gssapi.c:389
msgid "Unsupported security layer."
msgstr "不支持的安全层。"
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "该选项将用 Kerberos 4 认证连接到服务器。"
-
-#: ../camel/camel-sasl-kerberos4.c:173
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"无法获取 Kerberos 标签:\n"
-"%s"
-
#: ../camel/camel-sasl-login.c:36
msgid "Login"
msgstr "Login"
@@ -1959,7 +2119,7 @@ msgstr "以未知的传输进行 SMTP 之前的 POP 授权"
msgid "POP Before SMTP auth using a non-pop source"
msgstr "以非 pop 源进行 SMTP 之前的 POP 授权"
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:147
#, c-format
msgid "Regular expression compilation failed: %s: %s"
msgstr "常规表达式编译失败:%s:%s"
@@ -1979,7 +2139,7 @@ msgstr "URL“%s”需要主机组件"
msgid "URL '%s' needs a path component"
msgstr "URL“%s”需要路径组件"
-#: ../camel/camel-session.c:307
+#: ../camel/camel-session.c:305
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -1988,209 +2148,209 @@ msgstr ""
"无法创建目录 %s:\n"
"%s"
-#: ../camel/camel-session.c:479
+#: ../camel/camel-session.c:484
#, c-format
msgid "Please enter the %s password for %s on host %s."
msgstr "请输入 %2$s@%3$s 的 %1$s 密码"
-#: ../camel/camel-session.c:817
+#: ../camel/camel-session.c:832
msgid "Camel session doesn't support forwarding of a message."
-msgstr ""
+msgstr "Camel 会话不支持信件转发。"
-#: ../camel/camel-smime-context.c:444 ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "无法找到‘%s’的证书"
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:453
msgid "Cannot create CMS message"
msgstr "无法创建 CMS 信件"
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:458
msgid "Cannot create CMS signed data"
msgstr "无法创建 CMS 签名数据"
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:464
msgid "Cannot attach CMS signed data"
msgstr "无法附加 CMS 签名数据"
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:471
msgid "Cannot attach CMS data"
msgstr "无法附加 CMS 数据"
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:477
msgid "Cannot create CMS Signer information"
msgstr "无法创建 CMS 签名者信息"
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:483
msgid "Cannot find certificate chain"
msgstr "找不到证书链"
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:489
msgid "Cannot add CMS Signing time"
msgstr "无法添加 CMS 签名时间"
-#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
#, c-format
msgid "Encryption certificate for '%s' does not exist"
msgstr "“%s”的加密证书不存在"
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:530
msgid "Cannot add SMIMEEncKeyPrefs attribute"
msgstr "无法添加 SMIMEEncKeyPrefs 属性"
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:535
msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
msgstr "无法添加 MS SMIMEEncKeyPrefs 属性"
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:540
msgid "Cannot add encryption certificate"
msgstr "无法添加加密证书"
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:546
msgid "Cannot add CMS Signer information"
msgstr "无法添加 CMS 签名者信息"
-#: ../camel/camel-smime-context.c:613 ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
msgid "Cannot create encoder context"
msgstr "无法创建编码器上下文"
-#: ../camel/camel-smime-context.c:619
+#: ../camel/camel-smime-context.c:622
msgid "Failed to add data to CMS encoder"
msgstr "将数据添加到 CMS 编码器失败"
-#: ../camel/camel-smime-context.c:624 ../camel/camel-smime-context.c:1082
+#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1100
msgid "Failed to encode data"
msgstr "编码数据失败"
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:700
msgid "Unverified"
msgstr "未校验"
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:702
msgid "Good signature"
msgstr "完好签名"
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:704
msgid "Bad signature"
msgstr "无效签名"
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:706
msgid "Content tampered with or altered in transit"
msgstr "内容在传送过程中被篡改"
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:708
msgid "Signing certificate not found"
msgstr "签名证书找不到"
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:710
msgid "Signing certificate not trusted"
msgstr "签名证书不可信"
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:712
msgid "Signature algorithm unknown"
msgstr "签名算法未知"
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:714
msgid "Signature algorithm unsupported"
msgstr "签名算法不支持"
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:716
msgid "Malformed signature"
msgstr "签名格式不对"
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:718
msgid "Processing error"
msgstr "处理错误"
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:772
msgid "No signed data in signature"
msgstr "签名中没有签名数据"
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:777
msgid "Digests missing from enveloped data"
msgstr "信封数据缺少摘要"
-#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
msgid "Cannot calculate digests"
msgstr "无法计算摘要"
-#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
msgid "Cannot set message digests"
msgstr "无法设置信件摘要"
-#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
msgid "Certificate import failed"
msgstr "证书导入失败"
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:836
#, c-format
msgid "Certificate is the only message, cannot verify certificates"
msgstr "只有证书的信件,无法校验证书"
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:839
#, c-format
msgid "Certificate is the only message, certificates imported and verified"
msgstr "只有证书的信件,证书已导入并校验"
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:843
msgid "Cannot find signature digests"
msgstr "找不到签名摘要"
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:859
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "签名者:%s <%s>:%s\n"
-#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1183
msgid "Decoder failed"
msgstr "解码器失败"
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1019
msgid "Cannot find common bulk encryption algorithm"
msgstr "找不到公共批量加密算法"
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1027
msgid "Cannot allocate slot for encryption bulk key"
msgstr "无法为加密批量密钥分配密钥槽"
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1038
msgid "Cannot create CMS Message"
msgstr "无法创建 CMS 信件"
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1044
msgid "Cannot create CMS Enveloped data"
msgstr "无法创建 CMS 信封数据"
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1050
msgid "Cannot attach CMS Enveloped data"
msgstr "无法附加 CMS 信封数据"
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1056
msgid "Cannot attach CMS data object"
msgstr "无法附加 CMS 数据对象"
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1065
msgid "Cannot create CMS Recipient information"
msgstr "无法创建 CMS 收件人信息"
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1070
msgid "Cannot add CMS Recipient information"
msgstr "无法添加 CMS 收件人信息"
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1094
msgid "Failed to add data to encoder"
msgstr "将数据添加到编码器失败"
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1190
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME 解密:没有找到加密内容"
-#: ../camel/camel-smime-context.c:1200
+#: ../camel/camel-smime-context.c:1218
msgid "import keys: unimplemented"
msgstr "导入密钥:尚未实现"
-#: ../camel/camel-smime-context.c:1208
+#: ../camel/camel-smime-context.c:1226
msgid "export keys: unimplemented"
msgstr "导出密钥:尚未实现"
@@ -2235,126 +2395,7 @@ msgstr "回收站"
msgid "Junk"
msgstr "垃圾"
-#: ../camel/camel-tcp-stream-openssl.c:564
-msgid "Unable to get issuer's certificate"
-msgstr "无法获取发行者的证书"
-
-#: ../camel/camel-tcp-stream-openssl.c:566
-msgid "Unable to get Certificate Revocation List"
-msgstr "无法获取证书吊销列表签名"
-
-#: ../camel/camel-tcp-stream-openssl.c:568
-msgid "Unable to decrypt certificate signature"
-msgstr "无法解密认证签名"
-
-#: ../camel/camel-tcp-stream-openssl.c:570
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "无法解密证书吊销列表签名"
-
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to decode issuer's public key"
-msgstr "无法对发行者的公钥进行解码"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Certificate signature failure"
-msgstr "证书签名失败"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Certificate Revocation List signature failure"
-msgstr "证书吊销列表签名失败"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Certificate not yet valid"
-msgstr "证书未生效"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Certificate has expired"
-msgstr "证书已过期"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-#, fuzzy
-msgid "Certificate Revocation List (CRL) not yet valid"
-msgstr "证书吊销列表签名失败"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-#, fuzzy
-msgid "Certificate Revocation List (CRL) has expired"
-msgstr "证书吊销列表签名失败"
-
-#: ../camel/camel-tcp-stream-openssl.c:589
-#, fuzzy
-msgid "Error in Certificate Revocation List (CRL)"
-msgstr "无法获取证书吊销列表签名"
-
-#: ../camel/camel-tcp-stream-openssl.c:591
-msgid "Out of memory"
-msgstr "内存耗尽"
-
-#: ../camel/camel-tcp-stream-openssl.c:593
-msgid "Zero-depth self-signed certificate"
-msgstr "零深度自签名证书"
-
-#: ../camel/camel-tcp-stream-openssl.c:595
-msgid "Self-signed certificate in chain"
-msgstr "链中的自签名证书"
-
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Unable to get issuer's certificate locally"
-msgstr "无法在本地获取发行者的证书"
-
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Unable to verify leaf signature"
-msgstr "无法校验叶子签名"
-
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Certificate chain too long"
-msgstr "证书链过长"
-
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Certificate Revoked"
-msgstr "证书已撤销"
-
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Invalid Certificate Authority (CA)"
-msgstr "无效的证书颁发机构(CA)"
-
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Path length exceeded"
-msgstr "超长的路径长度"
-
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Invalid purpose"
-msgstr "无效目的"
-
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate untrusted"
-msgstr "不信任的证书"
-
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Certificate rejected"
-msgstr "已拒绝的证书"
-
-#: ../camel/camel-tcp-stream-openssl.c:616
-msgid "Subject/Issuer mismatch"
-msgstr "主题/发行者不匹配"
-
-#: ../camel/camel-tcp-stream-openssl.c:618
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID 不匹配"
-
-#: ../camel/camel-tcp-stream-openssl.c:620
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/发行者序列号不匹配"
-
-#: ../camel/camel-tcp-stream-openssl.c:622
-msgid "Key usage does not support certificate signing"
-msgstr "密钥不支持证书签名"
-
-#: ../camel/camel-tcp-stream-openssl.c:625
-msgid "Error in application verification"
-msgstr "应用程序验证错误"
-
-#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:873
+#: ../camel/camel-tcp-stream-ssl.c:870
#, c-format
msgid ""
"Issuer: %s\n"
@@ -2367,35 +2408,16 @@ msgstr ""
"指纹: %s\n"
"签名: %s"
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:876
msgid "GOOD"
msgstr "好"
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:876
msgid "BAD"
msgstr "坏"
-#: ../camel/camel-tcp-stream-openssl.c:700
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"来自 %s 的错误证书:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"您仍然希望接受吗?"
-
#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:883
+#: ../camel/camel-tcp-stream-ssl.c:880
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -2410,7 +2432,7 @@ msgstr ""
"\n"
"您希望接受吗?"
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:924
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -2419,7 +2441,7 @@ msgstr ""
"证书问题:%s\n"
"发行者:%s"
-#: ../camel/camel-tcp-stream-ssl.c:979
+#: ../camel/camel-tcp-stream-ssl.c:976
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -2428,7 +2450,7 @@ msgstr ""
"无效的证书域名:%s\n"
"发行者:%s"
-#: ../camel/camel-tcp-stream-ssl.c:997
+#: ../camel/camel-tcp-stream-ssl.c:994
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -2437,7 +2459,7 @@ msgstr ""
"证书过期:%s\n"
"发行者:%s"
-#: ../camel/camel-tcp-stream-ssl.c:1014
+#: ../camel/camel-tcp-stream-ssl.c:1011
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -2451,17 +2473,18 @@ msgstr ""
msgid "Could not parse URL '%s'"
msgstr "无法解析 URL“%s”"
-#: ../camel/camel-vee-folder.c:580
-#, c-format
+#: ../camel/camel-vee-folder.c:577
+#, fuzzy, c-format
+#| msgid "Error storing '%s': "
msgid "Error storing '%s': %s"
-msgstr "存储“%s”错误:%s"
+msgstr "存储“%s”出错:"
-#: ../camel/camel-vee-folder.c:657
+#: ../camel/camel-vee-folder.c:654
#, c-format
msgid "No such message %s in %s"
msgstr "在 %2$s 中没有信件 %1$s"
-#: ../camel/camel-vee-folder.c:816 ../camel/camel-vee-folder.c:822
+#: ../camel/camel-vee-folder.c:813 ../camel/camel-vee-folder.c:819
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "无法将信件移动或复制到虚拟文件夹中"
@@ -2488,7 +2511,7 @@ msgstr "无法将信件复制到回收站文件夹"
msgid "Cannot copy messages to the Junk folder"
msgstr "无法将信件复制到垃圾邮件文件夹"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -2497,87 +2520,90 @@ msgstr ""
"无法获取信件:%s\n"
" %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:262
-#: ../camel/providers/local/camel-maildir-folder.c:291
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
+#: ../camel/providers/local/camel-maildir-folder.c:264
+#: ../camel/providers/local/camel-maildir-folder.c:293
+#: ../camel/providers/local/camel-maildir-folder.c:401
#: ../camel/providers/local/camel-mbox-folder.c:363
#: ../camel/providers/local/camel-mbox-folder.c:414
#: ../camel/providers/local/camel-mh-folder.c:226
msgid "No such message"
msgstr "没有该信件"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
+#: ../camel/providers/nntp/camel-nntp-folder.c:173
+#: ../camel/providers/nntp/camel-nntp-folder.c:248
+#: ../camel/providers/nntp/camel-nntp-folder.c:408
#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
+#: ../camel/providers/pop3/camel-pop3-folder.c:587
+#: ../camel/providers/pop3/camel-pop3-folder.c:648
+#: ../camel/providers/pop3/camel-pop3-folder.c:666
msgid "User canceled"
msgstr "用户已取消"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
#: ../camel/providers/imap4/camel-imap4-folder.c:819
+#: ../camel/providers/nntp/camel-nntp-folder.c:164
#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:252
+#: ../camel/providers/nntp/camel-nntp-folder.c:175
+#: ../camel/providers/nntp/camel-nntp-folder.c:250
#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/pop3/camel-pop3-folder.c:590
+#: ../camel/providers/pop3/camel-pop3-folder.c:651
+#: ../camel/providers/pop3/camel-pop3-folder.c:658
+#: ../camel/providers/pop3/camel-pop3-folder.c:669
#, c-format
msgid "Cannot get message %s: %s"
msgstr "无法获取信件 %s:%s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2463
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2501
#: ../camel/providers/imap4/camel-imap4-folder.c:837
msgid "This message is not available in offline mode."
msgstr "该信件无法在脱机模式中使用。"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:194
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:201
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1966
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2017
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2004
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2055
msgid "Could not get message"
msgstr "无法获得信件"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
-#: ../camel/providers/imap/camel-imap-folder.c:296
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:982
+#: ../camel/providers/imap/camel-imap-folder.c:295
#, c-format
msgid "Could not load summary for %s"
-msgstr "无法为 %s 装入概要"
+msgstr "无法为 %s 载入概要"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012
-#, fuzzy, c-format
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1055
+#, c-format
msgid "Checking for deleted messages %s"
-msgstr "检查新信件"
+msgstr "检查已删除的新建 %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1330
msgid "Trash Folder Full. Please Empty."
msgstr "回收站文件夹已满。请清空。"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
-#: ../camel/providers/groupwise/camel-groupwise-store.c:633
-#: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3421
-#: ../camel/providers/imap/camel-imap-folder.c:3497
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1559
+#: ../camel/providers/groupwise/camel-groupwise-store.c:626
+#: ../camel/providers/groupwise/camel-groupwise-store.c:756
+#: ../camel/providers/imap/camel-imap-folder.c:3429
+#: ../camel/providers/imap/camel-imap-folder.c:3505
+#: ../camel/providers/imapx/camel-imapx-server.c:3631
+#: ../camel/providers/imapx/camel-imapx-server.c:3750
#, c-format
msgid "Fetching summary information for new messages in %s"
msgstr "从 %s 中的新信件中获取概要信息"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2317
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2355
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2398
#, c-format
msgid "Cannot append message to folder '%s': %s"
msgstr "无法将信件追加到文件夹“%s”:%s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2386
#, c-format
msgid "Cannot create message: %s"
msgstr "无法创建信件:%s"
@@ -2607,12 +2633,14 @@ msgstr "检查新邮件"
#: ../camel/providers/hula/camel-hula-provider.c:50
#: ../camel/providers/imap/camel-imap-provider.c:46
#: ../camel/providers/imap4/camel-imap4-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
msgid "C_heck for new messages in all folders"
msgstr "在所有文件夹中检查新信件(_H)"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
#: ../camel/providers/imap/camel-imap-provider.c:68
#: ../camel/providers/imap4/camel-imap4-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
#: ../camel/providers/local/camel-local-provider.c:46
#: ../camel/providers/local/camel-local-provider.c:86
#: ../camel/providers/local/camel-local-provider.c:106
@@ -2629,6 +2657,7 @@ msgstr "检查新信件的垃圾内容(_U)"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/imapx/camel-imapx-provider.c:86
msgid "Only check for Junk messages in the IN_BOX folder"
msgstr "仅在收件箱中检查垃圾邮件(_B)"
@@ -2641,9 +2670,8 @@ msgid "SOAP Settings"
msgstr "SOAP 设置"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
-#, fuzzy
msgid "Post Office Agent SOAP _Port:"
-msgstr "邮局代理 SOAP 端口:"
+msgstr "邮局代理 SOAP 端口(_P):"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
msgid "Novell GroupWise"
@@ -2657,7 +2685,7 @@ msgstr "访问 Novell GroupWise 服务器"
#: ../camel/providers/hula/camel-hula-provider.c:93
#: ../camel/providers/imap/camel-imap-provider.c:100
#: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
+#: ../camel/providers/imapx/camel-imapx-provider.c:112
#: ../camel/providers/nntp/camel-nntp-provider.c:74
#: ../camel/providers/pop3/camel-pop3-provider.c:74
msgid "Password"
@@ -2672,45 +2700,48 @@ msgstr "该选项将使用纯文本密码连接到 GroupWise 服务器。"
msgid "Host or user not available in url"
msgstr "URL 中的主机或用户不可用"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1358
+#: ../camel/providers/groupwise/camel-groupwise-store.c:197
+#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/imapx/camel-imapx-server.c:2901
msgid "You did not enter a password."
msgstr "您没有输入密码。"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
+#: ../camel/providers/groupwise/camel-groupwise-store.c:312
msgid "Some features may not work correctly with your current server version"
msgstr "某些特性可能无法与您目前的服务器版本共同工作"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:540
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/groupwise/camel-groupwise-store.c:533
+#: ../camel/providers/imap/camel-imap-store.c:1879
+#: ../camel/providers/imap/camel-imap-store.c:2077
+#: ../camel/providers/imapx/camel-imapx-store.c:376
#, c-format
msgid "No such folder %s"
msgstr "没有文件夹 %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1201
msgid "Cannot create GroupWise folders in offline mode."
msgstr "无法在脱机模式下创建 GroupWise 文件夹。"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1215
+#: ../camel/providers/imap/camel-imap-store.c:1954
+#: ../camel/providers/imap/camel-imap-store.c:2355
+#: ../camel/providers/imapx/camel-imapx-store.c:820
msgid "The parent folder is not allowed to contain subfolders"
msgstr "父文件夹不允许含有子文件夹"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
-#, fuzzy, c-format
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1294
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1317
+#, c-format
msgid "Cannot rename GroupWise folder '%s' to '%s'"
msgstr "无法将 GroupWise 文件夹“%s”重命名为“%s”"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1349
#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
#, c-format
msgid "GroupWise server %s"
msgstr "GroupWise 服务器 %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1351
#, c-format
msgid "GroupWise service for %s on %s"
msgstr "%2$s 为 %1$s 提供的 GroupWise 服务"
@@ -2741,27 +2772,32 @@ msgstr "无法发送信件:%s"
#: ../camel/providers/hula/camel-hula-provider.c:48
#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
msgid "Checking for New Mail"
msgstr "检查新邮件"
#: ../camel/providers/hula/camel-hula-provider.c:53
#: ../camel/providers/imap/camel-imap-provider.c:52
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
msgid "Connection to Server"
msgstr "连接服务器"
#: ../camel/providers/hula/camel-hula-provider.c:55
#: ../camel/providers/imap/camel-imap-provider.c:54
+#: ../camel/providers/imapx/camel-imapx-provider.c:60
msgid "_Use custom command to connect to server"
msgstr "使用自定义命令连接到服务器(_U)"
#: ../camel/providers/hula/camel-hula-provider.c:57
#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
msgid "Command:"
msgstr "命令:"
#: ../camel/providers/hula/camel-hula-provider.c:60
#: ../camel/providers/imap/camel-imap-provider.c:60
#: ../camel/providers/imap4/camel-imap4-provider.c:43
+#: ../camel/providers/imapx/camel-imapx-provider.c:70
#: ../camel/providers/nntp/camel-nntp-provider.c:44
msgid "Folders"
msgstr "文件夹"
@@ -2769,12 +2805,14 @@ msgstr "文件夹"
#: ../camel/providers/hula/camel-hula-provider.c:62
#: ../camel/providers/imap/camel-imap-provider.c:62
#: ../camel/providers/imap4/camel-imap4-provider.c:45
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
msgid "_Show only subscribed folders"
msgstr "只显示订阅了的文件夹(_S)"
#: ../camel/providers/hula/camel-hula-provider.c:64
#: ../camel/providers/imap/camel-imap-provider.c:64
#: ../camel/providers/imap4/camel-imap4-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
msgid "O_verride server-supplied folder namespace"
msgstr "覆盖服务器提供的文件夹命名空间(_V)"
@@ -2807,12 +2845,12 @@ msgstr "没有输入流"
#: ../camel/providers/imap/camel-imap-command.c:229
#: ../camel/providers/imap/camel-imap-command.c:278
#: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3051
+#: ../camel/providers/imap/camel-imap-store.c:3126
msgid "Operation cancelled"
msgstr "操作已取消"
#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3056
+#: ../camel/providers/imap/camel-imap-store.c:3131
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "服务器意外地中止了连接:%s"
@@ -2852,65 +2890,68 @@ msgstr "IMAP 服务器应答不含有 %s 信息"
msgid "Unexpected OK response from IMAP server: %s"
msgstr "来自 IMAP 服务器意外的 OK 应答:%s"
-#: ../camel/providers/imap/camel-imap-folder.c:91
+#: ../camel/providers/imap/camel-imap-folder.c:90
msgid "Always check for new mail in this folder"
msgstr "总是检查此文件夹中的新邮件(_B)"
-#: ../camel/providers/imap/camel-imap-folder.c:277
+#: ../camel/providers/imap/camel-imap-folder.c:276
#, c-format
msgid "Could not create directory %s: %s"
msgstr "无法创建目录 %s:%s"
#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:919
+#: ../camel/providers/imap/camel-imap-folder.c:918
+#: ../camel/providers/imapx/camel-imapx-server.c:3668
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "扫描 %s 中更改了的信件"
-#: ../camel/providers/imap/camel-imap-folder.c:1987
+#: ../camel/providers/imap/camel-imap-folder.c:1986
#, c-format
msgid "Unexpected response status '%s' after APPEND command"
msgstr "APPEND 命令后返回了未知的响应状态“%s”"
-#: ../camel/providers/imap/camel-imap-folder.c:2002
+#: ../camel/providers/imap/camel-imap-folder.c:2001
msgid "No response on continuation after APPEND command"
msgstr "APPEND 命令后续无响应"
-#: ../camel/providers/imap/camel-imap-folder.c:2047
+#: ../camel/providers/imap/camel-imap-folder.c:2046
msgid "Unknown error occurred during APPEND command!"
msgstr "在 APPEND 命令时发生了错误!"
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:2877
#, c-format
msgid "Unable to retrieve message: %s"
msgstr "无法获取信件:%s"
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:2912
+#: ../camel/providers/imapx/camel-imapx-server.c:4782
#, c-format
msgid "Cannot get message with message ID %s: %s"
msgstr "无法获取信件 ID %s:%s"
-#: ../camel/providers/imap/camel-imap-folder.c:2914
+#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imapx/camel-imapx-server.c:4783
msgid "No such message available."
msgstr "没有该信件。"
-#: ../camel/providers/imap/camel-imap-folder.c:2975
-#: ../camel/providers/imap/camel-imap-folder.c:3808
-#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/imap/camel-imap-folder.c:2974
+#: ../camel/providers/imap/camel-imap-folder.c:3819
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
msgid "This message is not currently available"
msgstr "该信件目前不可用"
-#: ../camel/providers/imap/camel-imap-folder.c:3624
+#: ../camel/providers/imap/camel-imap-folder.c:3632
#, c-format
msgid "Incomplete server response: no information provided for message %d"
msgstr "不完整的服务器响应:没有为第%d封信提供信息"
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:3640
#, c-format
msgid "Incomplete server response: no UID provided for message %d"
msgstr "不完整的服务器响应:没有为第%d封信提供 UID"
-#: ../camel/providers/imap/camel-imap-folder.c:3846
+#: ../camel/providers/imap/camel-imap-folder.c:3857
msgid "Could not find message body in FETCH response."
msgstr "无法在 FETCH 应答中找到信体。"
@@ -2918,7 +2959,7 @@ msgstr "无法在 FETCH 应答中找到信体。"
#: ../camel/providers/imap/camel-imap-message-cache.c:244
#, c-format
msgid "Could not open cache directory: %s"
-msgstr "无法打开缓冲器目录:%s"
+msgstr "无法打开缓存目录:%s"
#: ../camel/providers/imap/camel-imap-message-cache.c:330
#: ../camel/providers/imap/camel-imap-message-cache.c:387
@@ -2934,25 +2975,30 @@ msgid "Failed to cache %s: %s"
msgstr "缓存 %s 失败:%s"
#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
msgid "Ch_eck for new messages in subscribed folders"
msgstr "在订阅的文件夹中检查新信件(_E)"
#: ../camel/providers/imap/camel-imap-provider.c:66
#: ../camel/providers/imap4/camel-imap4-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:77
msgid "Namespace:"
msgstr "命名空间:"
#: ../camel/providers/imap/camel-imap-provider.c:70
#: ../camel/providers/imap4/camel-imap4-provider.c:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:82
msgid "_Apply filters to new messages in INBOX on this server"
msgstr "应用过滤规则到本服务器上收件箱中的新信件(_A)"
#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:84
msgid "Check new messages for Jun_k contents"
msgstr "检查新信件的垃圾内容(_K)"
#: ../camel/providers/imap/camel-imap-provider.c:76
#: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
msgid "Automatically synchroni_ze remote mail locally"
msgstr "自动将远程邮件同步到本地(_Z)"
@@ -2961,111 +3007,125 @@ msgid "IMAP"
msgstr "IMAP"
#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imapx/camel-imapx-provider.c:98
msgid "For reading and storing mail on IMAP servers."
msgstr "IMAP 服务器上的邮件的读写。"
#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imapx/camel-imapx-provider.c:114
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr "该选项将使用纯文本密码连接到 IMAP 服务器。"
-#: ../camel/providers/imap/camel-imap-store.c:437
+#: ../camel/providers/imap/camel-imap-store.c:435
#: ../camel/providers/imap4/camel-imap4-store.c:210
+#: ../camel/providers/imapx/camel-imapx-store.c:204
#, c-format
msgid "IMAP server %s"
msgstr "IMAP 服务器 %s"
-#: ../camel/providers/imap/camel-imap-store.c:439
+#: ../camel/providers/imap/camel-imap-store.c:437
#: ../camel/providers/imap4/camel-imap4-store.c:212
+#: ../camel/providers/imapx/camel-imapx-store.c:206
#, c-format
msgid "IMAP service for %s on %s"
msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
+#: ../camel/providers/imap/camel-imap-store.c:566
+#: ../camel/providers/imap/camel-imap-store.c:581
#: ../camel/providers/imap4/camel-imap4-store.c:247
#: ../camel/providers/imap4/camel-imap4-store.c:262
#: ../camel/providers/nntp/camel-nntp-store.c:182
#: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:170
-#: ../camel/providers/pop3/camel-pop3-store.c:184
+#: ../camel/providers/pop3/camel-pop3-store.c:192
+#: ../camel/providers/pop3/camel-pop3-store.c:206
#: ../camel/providers/smtp/camel-smtp-transport.c:259
#: ../camel/providers/smtp/camel-smtp-transport.c:274
#, c-format
msgid "Could not connect to %s: %s"
msgstr "无法连接到 %s:%s"
-#: ../camel/providers/imap/camel-imap-store.c:569
+#: ../camel/providers/imap/camel-imap-store.c:567
#: ../camel/providers/imap4/camel-imap4-store.c:248
#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:171
+#: ../camel/providers/pop3/camel-pop3-store.c:193
#: ../camel/providers/smtp/camel-smtp-transport.c:260
msgid "SSL unavailable"
msgstr "SSL 不可用"
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
+#: ../camel/providers/imap/camel-imap-store.c:578
+#: ../camel/providers/imap/camel-imap-store.c:860
+#: ../camel/providers/imapx/camel-imapx-server.c:2595
+#: ../camel/providers/imapx/camel-imapx-server.c:2693
msgid "Connection cancelled"
msgstr "连接已取消"
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
+#: ../camel/providers/imap/camel-imap-store.c:689
+#: ../camel/providers/imap/camel-imap-store.c:708
+#: ../camel/providers/imap/camel-imap-store.c:714
+#: ../camel/providers/imap/camel-imap-store.c:740
#: ../camel/providers/imap4/camel-imap4-store.c:310
#: ../camel/providers/imap4/camel-imap4-store.c:325
#: ../camel/providers/imap4/camel-imap4-store.c:334
+#: ../camel/providers/imapx/camel-imapx-server.c:2764
+#: ../camel/providers/imapx/camel-imapx-server.c:2795
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "以安全模式连接到 IMAP 服务器 %s 失败:%s"
-#: ../camel/providers/imap/camel-imap-store.c:692
+#: ../camel/providers/imap/camel-imap-store.c:690
+#: ../camel/providers/imapx/camel-imapx-server.c:2765
#: ../camel/providers/smtp/camel-smtp-transport.c:332
msgid "STARTTLS not supported"
msgstr "不支持 STARTTLS"
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:709
+#: ../camel/providers/imapx/camel-imapx-server.c:2796
msgid "SSL negotiations failed"
msgstr "SSL 协商失败"
-#: ../camel/providers/imap/camel-imap-store.c:717
+#: ../camel/providers/imap/camel-imap-store.c:715
#: ../camel/providers/imap4/camel-imap4-store.c:335
#: ../camel/providers/smtp/camel-smtp-transport.c:371
msgid "SSL is not available in this build"
msgstr "本次编译中未包含 SSL"
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:863
+#: ../camel/providers/imapx/camel-imapx-server.c:2598
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "无法使用命令“%s”连接:%s"
#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
+#: ../camel/providers/imap/camel-imap-store.c:1051
+#: ../camel/providers/imap/camel-imap-store.c:2451
#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
#: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/local/camel-maildir-folder.c:80
+#: ../camel/providers/imapx/camel-imapx-store.c:428
+#: ../camel/providers/imapx/camel-imapx-store.c:1001
+#: ../camel/providers/local/camel-maildir-folder.c:81
#: ../camel/providers/local/camel-maildir-store.c:219
#: ../camel/providers/local/camel-maildir-store.c:291
#: ../camel/providers/local/camel-maildir-store.c:517
#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:463
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
+#: ../camel/providers/local/camel-spool-store.c:461
msgid "Inbox"
msgstr "收件箱"
-#: ../camel/providers/imap/camel-imap-store.c:1305
+#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imapx/camel-imapx-server.c:2860
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
-#: ../camel/providers/imap/camel-imap-store.c:1315
+#: ../camel/providers/imap/camel-imap-store.c:1313
+#: ../camel/providers/imapx/camel-imapx-server.c:2871
#: ../camel/providers/smtp/camel-smtp-transport.c:506
#, c-format
msgid "No support for authentication type %s"
msgstr "不支持验证类型 %s"
-#: ../camel/providers/imap/camel-imap-store.c:1389
+#: ../camel/providers/imap/camel-imap-store.c:1387
+#: ../camel/providers/imapx/camel-imapx-server.c:2940
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3076,31 +3136,32 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
+#: ../camel/providers/imap/camel-imap-store.c:1891
+#: ../camel/providers/imap/camel-imap-store.c:2293
#: ../camel/providers/imap4/camel-imap4-store.c:954
+#: ../camel/providers/imapx/camel-imapx-store.c:803
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
msgstr "文件夹名“%s”无效,原因是其中含有字符“%c”"
-#: ../camel/providers/imap/camel-imap-store.c:1978
+#: ../camel/providers/imap/camel-imap-store.c:2008
#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
+#: ../camel/providers/local/camel-mbox-store.c:202
#: ../camel/providers/local/camel-mh-store.c:249
#, c-format
msgid "Cannot create folder '%s': folder exists."
msgstr "无法创建文件夹“%s”:文件夹已存在。"
-#: ../camel/providers/imap/camel-imap-store.c:2253
+#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/imapx/camel-imapx-store.c:812
#, c-format
msgid "Unknown parent folder: %s"
msgstr "未知的父文件夹:%s"
-#: ../camel/providers/imap/camel-imap-store.c:3053
-#, fuzzy
+#: ../camel/providers/imap/camel-imap-store.c:3128
msgid "Server unexpectedly disconnected"
-msgstr "服务器意外地中止了连接:%s"
+msgstr "服务器意外断开 "
#: ../camel/providers/imap4/camel-imap4-command.c:572
#: ../camel/providers/imap4/camel-imap4-command.c:579
@@ -3251,10 +3312,9 @@ msgid ""
msgstr "该选项将使用纯文本密码连接到 IMAPv4rev1 服务器。"
#: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/imapp/camel-imapp-store.c:249
#: ../camel/providers/nntp/camel-nntp-store.c:194
#: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/pop3/camel-pop3-store.c:203
#: ../camel/providers/smtp/camel-smtp-transport.c:271
msgid "Connection canceled"
msgstr "连接已取消"
@@ -3267,7 +3327,7 @@ msgid ""
msgstr "以安全模式连接到 IMAP 服务器 %s 失败:服务器不支持 STARTTLS"
#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:276
msgid "TLS negotiations failed"
msgstr "TLS 协商失败"
@@ -3412,37 +3472,33 @@ msgstr "无数据"
msgid "IMAP server %s unexpectedly disconnected: %s"
msgstr "IMAP4 服务器 %s 意外断开连接:%s"
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
-msgid "Message storage"
-msgstr "信件存储"
+#: ../camel/providers/imapx/camel-imapx-folder.c:87
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "无法为 %s 创建文件夹概要"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:95
+#, c-format
+msgid "Could not create cache for %s"
+msgstr "无法为 %s 创建缓存文件"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:50
+msgid "Use I_dle if the server supports it"
+msgstr "若服务器支持,使用 I_dle"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
+msgid "Numbe_r of cached connections to use"
+msgstr "要使用的缓存连接数(_R)"
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
msgid "IMAP+"
msgstr "IMAP+"
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL !!!\n"
-msgstr ""
-"试验性 IMAP 4(.1) 客户端\n"
-"此功能是未测试的代码,不被支持,您应该换用纯 IMAP。\n"
-"\n"
-" !!! 不要对重要邮件使用此功能 !!!\n"
-
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-server.c:2696
#, c-format
msgid "Could not connect to %s (port %s): %s"
msgstr "无法连接到 %s(端口 %s):%s"
-#: ../camel/providers/imapp/camel-imapp-store.c:348
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "无法连接到 %s 上的 POP 服务器"
-
#: ../camel/providers/local/camel-local-folder.c:178
msgid "Index message body data"
msgstr "索引信体数据"
@@ -3456,9 +3512,9 @@ msgstr "~%s (%s)"
#. /var/spool/mail relative path + protocol
#: ../camel/providers/local/camel-local-folder.c:399
#: ../camel/providers/local/camel-local-folder.c:402
-#, fuzzy, c-format
+#, c-format
msgid "mailbox: %s (%s)"
-msgstr "邮件箱:%s (%s)"
+msgstr "邮箱:%s (%s)"
#. a full path + protocol
#: ../camel/providers/local/camel-local-folder.c:406
@@ -3524,53 +3580,53 @@ msgstr ""
msgid "Standard Unix mbox spool directory"
msgstr "标准 Unix mbox spool 目录"
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:128
+#: ../camel/providers/local/camel-local-store.c:163
+#: ../camel/providers/local/camel-local-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:126
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "存储根目录 %s 不是绝对路径"
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:170
#, c-format
msgid "Store root %s is not a regular directory"
msgstr "存储根目录 %s 不是普通目录"
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../camel/providers/local/camel-local-store.c:179
+#: ../camel/providers/local/camel-local-store.c:187
+#: ../camel/providers/local/camel-local-store.c:285
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "无法获取文件夹:%s:%s"
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:199
msgid "Local stores do not have an inbox"
msgstr "本地存储没有收件箱"
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:245
#, c-format
msgid "Local mail file %s"
msgstr "本地邮件文件 %s"
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:340
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "无法将文件夹 %s 改名为 %s:%s"
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:408
#, c-format
msgid "Could not rename '%s': %s"
msgstr "无法重命名“%s”:%s"
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-local-store.c:433
+#: ../camel/providers/local/camel-mbox-store.c:298
#, c-format
msgid "Could not delete folder index file '%s': %s"
msgstr "无法删除文件夹索引文件“%s”:%s"
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:456
+#: ../camel/providers/local/camel-mbox-store.c:322
#, c-format
msgid "Could not delete folder meta file '%s': %s"
msgstr "无法删除文件夹元文件“%s”:%s"
@@ -3579,19 +3635,20 @@ msgstr "无法删除文件夹元文件“%s”:%s"
msgid "Unable to add message to summary: unknown reason"
msgstr "无法将信件添加到概要中:未知的原因"
-#: ../camel/providers/local/camel-maildir-folder.c:228
+#: ../camel/providers/local/camel-maildir-folder.c:230
msgid "Maildir append message canceled"
msgstr "邮件目录附加消息已取消"
-#: ../camel/providers/local/camel-maildir-folder.c:231
+#: ../camel/providers/local/camel-maildir-folder.c:233
#, c-format
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "无法将信件附加到邮件目录文件夹:%s:%s"
-#: ../camel/providers/local/camel-maildir-folder.c:261
-#: ../camel/providers/local/camel-maildir-folder.c:290
-#: ../camel/providers/local/camel-maildir-folder.c:304
-#: ../camel/providers/local/camel-maildir-folder.c:312
+#: ../camel/providers/local/camel-maildir-folder.c:263
+#: ../camel/providers/local/camel-maildir-folder.c:292
+#: ../camel/providers/local/camel-maildir-folder.c:306
+#: ../camel/providers/local/camel-maildir-folder.c:314
+#: ../camel/providers/local/camel-maildir-folder.c:400
#: ../camel/providers/local/camel-mbox-folder.c:362
#: ../camel/providers/local/camel-mbox-folder.c:413
#: ../camel/providers/local/camel-mbox-folder.c:434
@@ -3608,27 +3665,31 @@ msgstr ""
"无法从文件夹 %2$s 获取信件:%1$s\n"
" %3$s"
-#: ../camel/providers/local/camel-maildir-folder.c:313
+#: ../camel/providers/local/camel-maildir-folder.c:315
msgid "Invalid message contents"
msgstr "无效的信件内容"
+#: ../camel/providers/local/camel-maildir-folder.c:418
+msgid "Cannot transfer message to destination folder"
+msgstr "无法将信件转移到目标文件夹"
+
#: ../camel/providers/local/camel-maildir-store.c:148
#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-mbox-store.c:174
+#: ../camel/providers/local/camel-mbox-store.c:186
#, c-format
msgid "Cannot create folder '%s': %s"
msgstr "无法创建文件夹“%s”:%s"
#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
+#: ../camel/providers/local/camel-mbox-store.c:145
#: ../camel/providers/local/camel-mh-store.c:217
#, c-format
msgid "Cannot get folder '%s': %s"
msgstr "无法获取文件夹“%s”:%s"
#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
+#: ../camel/providers/local/camel-mbox-store.c:153
#: ../camel/providers/local/camel-mh-store.c:224
#, c-format
msgid "Cannot get folder '%s': folder does not exist."
@@ -3651,30 +3712,30 @@ msgid "not a maildir directory"
msgstr "不是 maildir 目录"
#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:330
-#: ../camel/providers/local/camel-spool-store.c:344
+#: ../camel/providers/local/camel-spool-store.c:328
+#: ../camel/providers/local/camel-spool-store.c:342
#, c-format
msgid "Could not scan folder '%s': %s"
msgstr "无法扫描文件夹“%s”:%s"
-#: ../camel/providers/local/camel-maildir-summary.c:437
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-summary.c:432
+#: ../camel/providers/local/camel-maildir-summary.c:551
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "无法打开邮件目录路径:%s:%s"
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:544
msgid "Checking folder consistency"
msgstr "检查文件夹一致性"
-#: ../camel/providers/local/camel-maildir-summary.c:658
+#: ../camel/providers/local/camel-maildir-summary.c:637
msgid "Checking for new messages"
msgstr "检查新信件"
-#: ../camel/providers/local/camel-maildir-summary.c:748
-#: ../camel/providers/local/camel-mbox-summary.c:526
-#: ../camel/providers/local/camel-mbox-summary.c:722
-#: ../camel/providers/local/camel-mbox-summary.c:842
+#: ../camel/providers/local/camel-maildir-summary.c:724
+#: ../camel/providers/local/camel-mbox-summary.c:529
+#: ../camel/providers/local/camel-mbox-summary.c:725
+#: ../camel/providers/local/camel-mbox-summary.c:845
#: ../camel/providers/local/camel-spool-summary.c:150
msgid "Storing folder"
msgstr "存储文件夹"
@@ -3708,19 +3769,19 @@ msgstr "文件夹好像已经被不可恢复地破坏了。"
msgid "Message construction failed."
msgstr "信件构建失败。"
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:164
+#: ../camel/providers/local/camel-mbox-store.c:363
msgid "Cannot create a folder by this name."
msgstr "无法以此名称创建文件夹。"
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:196
#, c-format
msgid "Cannot get folder '%s': not a regular file."
msgstr "无法获取文件夹“%s”:不是普通文件"
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:226
+#: ../camel/providers/local/camel-mbox-store.c:237
+#: ../camel/providers/local/camel-mbox-store.c:260
#, c-format
msgid ""
"Could not delete folder '%s':\n"
@@ -3729,120 +3790,120 @@ msgstr ""
"无法删除文件夹“%s”:\n"
"%s"
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:245
#, c-format
msgid "'%s' is not a regular file."
msgstr "“%s”并不是普通文件。"
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:252
#, c-format
msgid "Folder '%s' is not empty. Not deleted."
msgstr "文件夹“%s”非空。没有删除。"
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
+#: ../camel/providers/local/camel-mbox-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:286
#, c-format
msgid "Could not delete folder summary file '%s': %s"
msgstr "无法删除文件夹概要文件“%s”:%s"
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:376
#, c-format
msgid "Cannot create directory '%s': %s."
msgstr "无法创建目录“%s”:%s"
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:390
#, c-format
msgid "Cannot create folder: %s: %s"
msgstr "无法创建文件夹:%s:%s"
-#: ../camel/providers/local/camel-mbox-store.c:394
+#: ../camel/providers/local/camel-mbox-store.c:392
msgid "Folder already exists"
msgstr "文件夹已经存在"
-#: ../camel/providers/local/camel-mbox-store.c:485
+#: ../camel/providers/local/camel-mbox-store.c:483
msgid "The new folder name is illegal."
msgstr "指定的文件夹名称不合法。"
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:496
#, c-format
msgid "Could not rename '%s': '%s': %s"
msgstr "无法重命名“%s”:“%s”:%s"
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:577
#, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "无法将“%s”重命名为 %s:%s"
-#: ../camel/providers/local/camel-mbox-summary.c:532
+#: ../camel/providers/local/camel-mbox-summary.c:535
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "无法打开文件夹:%s:%s"
-#: ../camel/providers/local/camel-mbox-summary.c:582
+#: ../camel/providers/local/camel-mbox-summary.c:585
#, c-format
msgid "Fatal mail parser error near position %ld in folder %s"
msgstr "在文件夹 %2$s 中邻近 %1$ld 的位置出现致命的解析错误"
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#: ../camel/providers/local/camel-mbox-summary.c:662
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "无法检查文件夹:%s:%s"
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-mbox-summary.c:847
+#: ../camel/providers/local/camel-mbox-summary.c:730
+#: ../camel/providers/local/camel-mbox-summary.c:850
#: ../camel/providers/local/camel-spool-summary.c:155
#, c-format
msgid "Could not open file: %s: %s"
msgstr "无法打开文件:%s:%s"
-#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-mbox-summary.c:742
#: ../camel/providers/local/camel-spool-summary.c:168
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "无法打开临时邮件箱:%s"
-#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:956
+#: ../camel/providers/local/camel-mbox-summary.c:755
+#: ../camel/providers/local/camel-mbox-summary.c:961
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "无法关闭来源文件夹 %s:%s"
-#: ../camel/providers/local/camel-mbox-summary.c:761
+#: ../camel/providers/local/camel-mbox-summary.c:764
#, c-format
msgid "Could not close temporary folder: %s"
msgstr "无法关闭临时文件夹:%s"
-#: ../camel/providers/local/camel-mbox-summary.c:776
+#: ../camel/providers/local/camel-mbox-summary.c:779
#, c-format
msgid "Could not rename folder: %s"
msgstr "无法重命名文件夹:%s"
-#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1083
+#: ../camel/providers/local/camel-mbox-summary.c:861
+#: ../camel/providers/local/camel-mbox-summary.c:1090
#, c-format
msgid "Could not store folder: %s"
msgstr "无法存储文件夹:%s"
-#: ../camel/providers/local/camel-mbox-summary.c:897
-#: ../camel/providers/local/camel-mbox-summary.c:905
-#: ../camel/providers/local/camel-mbox-summary.c:1113
+#: ../camel/providers/local/camel-mbox-summary.c:901
+#: ../camel/providers/local/camel-mbox-summary.c:909
#: ../camel/providers/local/camel-mbox-summary.c:1121
+#: ../camel/providers/local/camel-mbox-summary.c:1129
msgid "Summary and folder mismatch, even after a sync"
msgstr "即使同步后,概要和文件夹仍然不匹配"
-#: ../camel/providers/local/camel-mbox-summary.c:1046
+#: ../camel/providers/local/camel-mbox-summary.c:1053
#: ../camel/providers/local/camel-spool-summary.c:334
#, c-format
msgid "Unknown error: %s"
msgstr "未知的错误:%s"
-#: ../camel/providers/local/camel-mbox-summary.c:1189
-#: ../camel/providers/local/camel-mbox-summary.c:1215
+#: ../camel/providers/local/camel-mbox-summary.c:1197
+#: ../camel/providers/local/camel-mbox-summary.c:1223
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "写入临时 mailbox 失败:%s"
-#: ../camel/providers/local/camel-mbox-summary.c:1206
+#: ../camel/providers/local/camel-mbox-summary.c:1214
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "写入临时 mailbox 失败:%s:%s"
@@ -3871,22 +3932,22 @@ msgstr "无法获取文件夹“%s”:不是目录。"
msgid "Cannot open MH directory path: %s: %s"
msgstr "无法打开 MH 目录:%s:%s"
-#: ../camel/providers/local/camel-spool-store.c:134
+#: ../camel/providers/local/camel-spool-store.c:132
#, c-format
msgid "Spool '%s' cannot be opened: %s"
msgstr "无法打开脱机文件“%s”:%s"
-#: ../camel/providers/local/camel-spool-store.c:146
+#: ../camel/providers/local/camel-spool-store.c:144
#, c-format
msgid "Spool '%s' is not a regular file or directory"
msgstr "脱机文件“%s”不是普通文件或目录"
-#: ../camel/providers/local/camel-spool-store.c:165
+#: ../camel/providers/local/camel-spool-store.c:163
#, c-format
msgid "Folder '%s/%s' does not exist."
msgstr "文件夹“%s/%s”不存在。"
-#: ../camel/providers/local/camel-spool-store.c:175
+#: ../camel/providers/local/camel-spool-store.c:173
#, c-format
msgid ""
"Could not open folder '%s':\n"
@@ -3895,12 +3956,12 @@ msgstr ""
"无法打开文件夹“%s”:\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:179
+#: ../camel/providers/local/camel-spool-store.c:177
#, c-format
msgid "Folder '%s' does not exist."
msgstr "文件夹“%s”不存在。"
-#: ../camel/providers/local/camel-spool-store.c:184
+#: ../camel/providers/local/camel-spool-store.c:182
#, c-format
msgid ""
"Could not create folder '%s':\n"
@@ -3909,30 +3970,30 @@ msgstr ""
"无法创建文件夹“%s”:\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:192
+#: ../camel/providers/local/camel-spool-store.c:190
#, c-format
msgid "'%s' is not a mailbox file."
msgstr "“%s”不是邮件箱文件。"
-#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:207
msgid "Store does not support an INBOX"
msgstr "存储并不支持收件箱"
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:219
#, c-format
msgid "Spool mail file %s"
msgstr "脱机邮件文件 %s"
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:219
#, c-format
msgid "Spool folder tree %s"
msgstr "脱机文件夹树 %s"
-#: ../camel/providers/local/camel-spool-store.c:229
+#: ../camel/providers/local/camel-spool-store.c:227
msgid "Spool folders cannot be renamed"
msgstr "脱机文件夹无法改名"
-#: ../camel/providers/local/camel-spool-store.c:237
+#: ../camel/providers/local/camel-spool-store.c:235
msgid "Spool folders cannot be deleted"
msgstr "脱机文件夹无法删除"
@@ -3959,26 +4020,26 @@ msgstr ""
"无法同步脱机文件夹 %s:%s\n"
"文件夹可能已损坏,副本保存在“%s”"
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:194
-#: ../camel/providers/nntp/camel-nntp-folder.c:226
+#: ../camel/providers/nntp/camel-nntp-folder.c:135
+#: ../camel/providers/nntp/camel-nntp-folder.c:192
+#: ../camel/providers/nntp/camel-nntp-folder.c:224
#, c-format
msgid "Internal error: UID in invalid format: %s"
msgstr "内部错误:UID 的格式无效:%s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:367
-#: ../camel/providers/nntp/camel-nntp-folder.c:370
+#: ../camel/providers/nntp/camel-nntp-folder.c:365
+#: ../camel/providers/nntp/camel-nntp-folder.c:368
+#: ../camel/providers/nntp/camel-nntp-folder.c:410
#: ../camel/providers/nntp/camel-nntp-folder.c:412
-#: ../camel/providers/nntp/camel-nntp-folder.c:414
#, c-format
msgid "Posting failed: %s"
msgstr "发表失败:%s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:432
+#: ../camel/providers/nntp/camel-nntp-folder.c:430
msgid "You cannot post NNTP messages while working offline!"
msgstr "您离线时无法投递 NNTP 信件!"
-#: ../camel/providers/nntp/camel-nntp-folder.c:443
+#: ../camel/providers/nntp/camel-nntp-folder.c:441
msgid "You cannot copy messages from a NNTP folder!"
msgstr "您无法从 NNTP 文件夹复制信件!"
@@ -4087,26 +4148,26 @@ msgid "No such folder: %s"
msgstr "没有文件夹:%s"
#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:373
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s:正在扫描新信件"
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:282
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "来自 xover 的意外服务器应答:%s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#: ../camel/providers/nntp/camel-nntp-summary.c:387
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "来自 head 的意外服务器应答:%s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
+#: ../camel/providers/nntp/camel-nntp-summary.c:423
msgid "Use cancel"
msgstr "使用取消"
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:425
#, c-format
msgid "Operation failed: %s"
msgstr "操作失败:%s"
@@ -4128,23 +4189,27 @@ msgstr "销毁旧信件"
msgid "Expunging deleted messages"
msgstr "彻底销毁已删除的信件"
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
+#: ../camel/providers/pop3/camel-pop3-folder.c:539
+#: ../camel/providers/pop3/camel-pop3-folder.c:561
#, c-format
msgid "No message with UID %s"
msgstr "没有 UID 为 %s 的信件"
#. Sigh, most of the crap in this function is so that the cancel button
#. returns the proper exception code. Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
+#: ../camel/providers/pop3/camel-pop3-folder.c:568
#, c-format
msgid "Retrieving POP message %d"
msgstr "正在获取 POP 信件 %d"
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:658
msgid "Unknown reason"
msgstr "未知原因"
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
+msgid "Message storage"
+msgstr "信件存储"
+
#: ../camel/providers/pop3/camel-pop3-provider.c:45
msgid "_Leave messages on server"
msgstr "在服务器上保留信件(_L)"
@@ -4183,56 +4248,62 @@ msgstr ""
"该选项使 Evolution 在连接到 POP 服务器时使用 APOP 协议。即使是声称支持这一功"
"能的服务器,也不一定能使所有用户工作。"
-#: ../camel/providers/pop3/camel-pop3-store.c:207
+#: ../camel/providers/pop3/camel-pop3-store.c:229
#, c-format
msgid "Failed to read a valid greeting from POP server %s"
msgstr "从 POP 服务器 %s 读取欢迎词失败"
-#: ../camel/providers/pop3/camel-pop3-store.c:224
-#: ../camel/providers/pop3/camel-pop3-store.c:238
-#: ../camel/providers/pop3/camel-pop3-store.c:248
-#: ../camel/providers/pop3/camel-pop3-store.c:254
+#: ../camel/providers/pop3/camel-pop3-store.c:246
+#: ../camel/providers/pop3/camel-pop3-store.c:275
+#: ../camel/providers/pop3/camel-pop3-store.c:281
#, 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:225
+#: ../camel/providers/pop3/camel-pop3-store.c:247
msgid "STLS not supported by server"
msgstr "服务器不支持 STLS"
-#: ../camel/providers/pop3/camel-pop3-store.c:255
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:263
+#, 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:282
msgid "TLS is not available in this build"
msgstr "本次编译中未包含 TLS"
-#: ../camel/providers/pop3/camel-pop3-store.c:361
+#: ../camel/providers/pop3/camel-pop3-store.c:388
#, c-format
msgid "Could not connect to POP server %s"
msgstr "无法连接到 POP 服务器 %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:402
-#: ../camel/providers/pop3/camel-pop3-store.c:535
+#: ../camel/providers/pop3/camel-pop3-store.c:429
+#: ../camel/providers/pop3/camel-pop3-store.c:567
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
"mechanism."
msgstr "无法连接到 POP 服务器 %s:不支持请求认证机制。"
-#: ../camel/providers/pop3/camel-pop3-store.c:418
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:448
#, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "使用 SASL“%s”登录 POP 服务器 %s 失败:%s"
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr "使用 SASL“%s”登录 POP 服务器 %s 失败%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:430
+#: ../camel/providers/pop3/camel-pop3-store.c:462
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "无法登录到 POP 服务器 %s:SASL 协议错误"
-#: ../camel/providers/pop3/camel-pop3-store.c:449
+#: ../camel/providers/pop3/camel-pop3-store.c:481
#, c-format
msgid "Failed to authenticate on POP server %s: %s"
msgstr "认证到 POP 服务器 %s 失败:%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:508
+#: ../camel/providers/pop3/camel-pop3-store.c:540
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4241,8 +4312,7 @@ msgstr ""
"无法连接到 POP 服务器 %s:\t接收到非法的 APOP ID。可能是冒名攻击。请联系您的"
"管理员。"
-#: ../camel/providers/pop3/camel-pop3-store.c:549
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:581
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4251,16 +4321,27 @@ msgstr ""
"无法连接到 POP 服务器 %s。\n"
"发送密码错误:%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:556
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:591
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending username%s"
msgstr ""
"无法连接到 POP 服务器 %s。\n"
-"发送用户名错误:%s"
+"发送用户名错误%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:669
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:601
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password%s"
+msgstr ""
+"无法连接到 POP 服务器 %s。\n"
+"发送密码错误:%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:707
#, c-format
msgid "No such folder '%s'."
msgstr "没有文件夹“%s”。"
@@ -4569,85 +4650,85 @@ msgstr "QUIT 命令失败:%s"
msgid "QUIT command failed"
msgstr "QUIT 命令失败"
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:44
msgid "Business"
msgstr "商务"
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:45
msgid "Competition"
msgstr "完成"
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:46
msgid "Favorites"
msgstr "最爱"
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:47
msgid "Gifts"
msgstr "礼物"
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:48
msgid "Goals/Objectives"
msgstr "目标"
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:49
msgid "Holiday"
msgstr "假日"
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:50
msgid "Holiday Cards"
msgstr "假日卡"
#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:52
msgid "Hot Contacts"
msgstr "亲密联系人"
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:53
msgid "Ideas"
msgstr "想法"
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:54
msgid "International"
msgstr "国际"
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:55
msgid "Key Customer"
msgstr "关键客户"
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:56
msgid "Miscellaneous"
msgstr "杂类"
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:57
msgid "Personal"
msgstr "个人"
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:58
msgid "Phone Calls"
msgstr "通电话"
#. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:60
msgid "Status"
msgstr "状态"
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:61
msgid "Strategies"
msgstr "策略"
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:62
msgid "Suppliers"
msgstr "供应商"
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:63
msgid "Time & Expenses"
msgstr "时间和花费"
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:64
msgid "VIP"
msgstr "VIP"
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:65
msgid "Waiting"
msgstr "等候"
@@ -4655,7 +4736,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:1635 ../libedataserver/e-time-utils.c:1900
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%Y-%m-%d %A%p%I:%M:%S"
@@ -4663,7 +4744,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:1640 ../libedataserver/e-time-utils.c:1891
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%Y-%m-%d %A %H:%M:%S"
@@ -4671,7 +4752,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:1645 ../libedataserver/e-time-utils.c:1896
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%Y-%m-%d %A%p%I:%M"
@@ -4679,7 +4760,7 @@ 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:1650 ../libedataserver/e-time-utils.c:1887
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
msgid "%a %m/%d/%Y %H:%M"
msgstr "%Y-%m-%d %A %H:%M"
@@ -4697,8 +4778,8 @@ 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:1663 ../libedataserver/e-time-utils.c:1763
-#: ../libedataserver/e-time-utils.c:1882
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1765
+#: ../libedataserver/e-time-utils.c:1884
msgid "%a %m/%d/%Y"
msgstr "%Y-%m-%d %A"
@@ -4738,19 +4819,19 @@ 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:1697 ../libedataserver/e-time-utils.c:1766
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1768
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:1824 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1946
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:1828 ../libedataserver/e-time-utils.c:1936
+#: ../libedataserver/e-time-utils.c:1830 ../libedataserver/e-time-utils.c:1938
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
@@ -4758,24 +4839,24 @@ msgstr "%H:%M:%S"
#. in 12-hour format.
#. strftime format of a time in 12-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1833 ../libedataserver/e-time-utils.c:1941
+#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
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:1837 ../libedataserver/e-time-utils.c:1933
+#: ../libedataserver/e-time-utils.c:1839 ../libedataserver/e-time-utils.c:1935
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:1840
+#: ../libedataserver/e-time-utils.c:1842
msgid "%H%M"
msgstr "%H%M"
#. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1844
+#: ../libedataserver/e-time-utils.c:1846
msgid "%I %p"
msgstr "%p%I"
@@ -4787,57 +4868,61 @@ msgstr "匿名访问 LDAP 服务器"
msgid "Failed to authenticate.\n"
msgstr "身份验证失败。\n"
-#: ../libedataserverui/e-categories-dialog.c:338
+#: ../libedataserverui/e-categories-dialog.c:145
+msgid "Category Icon"
+msgstr "类别图标"
+
+#: ../libedataserverui/e-categories-dialog.c:151
+msgid "_No Image"
+msgstr "无图像(_N)"
+
+#: ../libedataserverui/e-categories-dialog.c:372
#, c-format
msgid ""
"There is already a category '%s' in the configuration. Please use another "
"name"
msgstr "配置中已经有类别“%s”了。请使用另外一个名称"
-#: ../libedataserverui/e-categories-dialog.c:641
+#: ../libedataserverui/e-categories-dialog.c:680
msgid "Icon"
msgstr "图标"
-#: ../libedataserverui/e-categories-dialog.c:646
+#: ../libedataserverui/e-categories-dialog.c:685
msgid "Category"
msgstr "类别"
#: ../libedataserverui/e-categories-dialog.ui.h:1
-msgid "Category Icon"
-msgstr "类别图标"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:2
msgid "Category Properties"
msgstr "类别属性"
-#: ../libedataserverui/e-categories-dialog.ui.h:3
+#: ../libedataserverui/e-categories-dialog.ui.h:2
msgid "Category _Icon"
msgstr "类别图标(_I)"
-#: ../libedataserverui/e-categories-dialog.ui.h:4
+#: ../libedataserverui/e-categories-dialog.ui.h:3
msgid "Category _Name"
msgstr "类别名称(_N)"
-#: ../libedataserverui/e-categories-dialog.ui.h:5
+#: ../libedataserverui/e-categories-dialog.ui.h:4
msgid "Item(s) _belong to these categories:"
msgstr "项目属于这些类别(_B):"
-#: ../libedataserverui/e-categories-dialog.ui.h:6
+#: ../libedataserverui/e-categories-dialog.ui.h:5
msgid "_Available Categories:"
msgstr "可用类别(_A):"
-#: ../libedataserverui/e-categories-dialog.ui.h:7
+#: ../libedataserverui/e-categories-dialog.ui.h:6
msgid "_Edit"
msgstr "编辑(_E)"
-#: ../libedataserverui/e-categories-dialog.ui.h:8
+#: ../libedataserverui/e-categories-dialog.ui.h:7
msgid "categories"
msgstr "类别"
-#: ../libedataserverui/e-category-completion.c:290
-#, fuzzy, c-format
+#: ../libedataserverui/e-category-completion.c:292
+#, c-format
msgid "Create category \"%s\""
-msgstr "类别列表"
+msgstr "创建类别“%s”"
#: ../libedataserverui/e-cell-renderer-color.c:222
msgid "Color Info"
@@ -4847,19 +4932,19 @@ msgstr "颜色信息"
msgid "The color to render"
msgstr "用于渲染的颜色"
-#: ../libedataserverui/e-name-selector-dialog.c:292
+#: ../libedataserverui/e-name-selector-dialog.c:300
msgid "Select Contacts from Address Book"
msgstr "从地址簿中选择联系人"
-#: ../libedataserverui/e-name-selector-dialog.c:579
+#: ../libedataserverui/e-name-selector-dialog.c:639
msgid "_Add"
msgstr "添加(_A)"
-#: ../libedataserverui/e-name-selector-dialog.c:604
+#: ../libedataserverui/e-name-selector-dialog.c:643
msgid "_Remove"
msgstr "删除(_R)"
-#: ../libedataserverui/e-name-selector-dialog.c:781
+#: ../libedataserverui/e-name-selector-dialog.c:828
#: ../libedataserverui/e-name-selector-dialog.ui.h:6
msgid "Any Category"
msgstr "任何类别"
@@ -4889,7 +4974,6 @@ msgid "Cate_gory:"
msgstr "类别(_G):"
#: ../libedataserverui/e-name-selector-dialog.ui.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
msgid "Contacts"
msgstr "联系人"
@@ -4902,56 +4986,56 @@ msgid "_Search:"
msgstr "搜索(_S):"
#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2455
+#: ../libedataserverui/e-name-selector-entry.c:2511
#, c-format
msgid "E_xpand %s Inline"
msgstr "嵌入式展开 %s(_X)"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2470
+#: ../libedataserverui/e-name-selector-entry.c:2526
#, c-format
msgid "Cop_y %s"
msgstr "复制 %s(_Y)"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2480
+#: ../libedataserverui/e-name-selector-entry.c:2536
#, c-format
msgid "C_ut %s"
msgstr "剪切 %s(_U)"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2497
+#: ../libedataserverui/e-name-selector-entry.c:2553
#, c-format
msgid "_Edit %s"
msgstr "编辑 %s(_E)"
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:479
#, c-format
msgid "_Delete %s"
msgstr "删除 %s(_D)"
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:240
#, c-format
msgid "Keyring key is unusable: no user or host name"
msgstr "密钥环不可用:没有用户或主机名"
-#: ../libedataserverui/e-passwords.c:1093
+#: ../libedataserverui/e-passwords.c:1099
msgid "You have the Caps Lock key on."
msgstr "您打开了 Caps Lock。"
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:1221
msgid "_Remember this passphrase"
msgstr "记住此密码句(_R)"
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1222
msgid "_Remember this passphrase for the remainder of this session"
msgstr "本次会话记住此密码句(_R)"
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:1227
msgid "_Remember this password"
msgstr "记住此密码(_R)"
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1228
msgid "_Remember this password for the remainder of this session"
msgstr "本次会话记住此密码(_R)"
@@ -4960,203 +5044,293 @@ msgstr "本次会话记住此密码(_R)"
msgid "Select destination"
msgstr "选择目的地"
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:172
msgid "_Destination"
msgstr "目的(_D)"
-#: ../servers/exchange/lib/e2k-autoconfig.c:1694
-#: ../servers/exchange/storage/exchange-account.c:954
-#, c-format
-msgid "Enter password for %s"
-msgstr "输入 %s 的密码"
+#: ../servers/groupwise/e-gw-connection.c:227
+msgid "Invalid connection"
+msgstr "无效连接"
-#: ../servers/exchange/lib/e2k-autoconfig.c:1695
-#: ../servers/exchange/storage/exchange-account.c:959
-msgid "Enter password"
-msgstr "输入密码"
+#: ../servers/groupwise/e-gw-connection.c:231
+msgid "Invalid response from server"
+msgstr "服务器的响应无效"
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:844
-msgid "Owner"
-msgstr "所有者"
+#: ../servers/groupwise/e-gw-connection.c:233
+msgid "No response from the server"
+msgstr "服务器的响应无效"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:854
-msgid "Publishing Editor"
-msgstr "发布编辑器"
+#: ../servers/groupwise/e-gw-connection.c:239
+msgid "Bad parameter"
+msgstr "无效参数"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:862
-msgid "Editor"
-msgstr "编辑器"
+#~ msgid "%s: there was no self contact UID stored in gconf"
+#~ msgstr "%s:gconf 中没有存储自身联系人的 UID"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:869
-msgid "Publishing Author"
-msgstr "发布作者"
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "这是信件的数字签名部分"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:875
-msgid "Author"
-msgstr "作者"
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:880
-msgid "Non-editing Author"
-msgstr "非编辑作者"
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 4 authentication."
+#~ msgstr "该选项将用 Kerberos 4 认证连接到服务器。"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:884
-msgid "Reviewer"
-msgstr "复查者"
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法获取 Kerberos 标签:\n"
+#~ "%s"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:886
-msgid "Contributor"
-msgstr "贡献者"
+#~ msgid "Unable to get issuer's certificate"
+#~ msgstr "无法获取发行者的证书"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:888
-msgid "None"
-msgstr "无"
+#~ msgid "Unable to get Certificate Revocation List"
+#~ msgstr "无法获取证书吊销列表签名"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:903
-msgid "Custom"
-msgstr "自定义"
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "无法解密认证签名"
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "Generic error"
-msgstr "常规错误"
+#~ msgid "Unable to decrypt Certificate Revocation List signature"
+#~ msgstr "无法解密证书吊销列表签名"
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "A folder with the same name already exists"
-msgstr "已经存在同名文件夹"
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "无法对发行者的公钥进行解码"
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "The specified folder type is not valid"
-msgstr "指定的文件类型无效"
+#~ msgid "Certificate signature failure"
+#~ msgstr "证书签名失败"
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "I/O error"
-msgstr "I/O 错误"
+#~ msgid "Certificate Revocation List signature failure"
+#~ msgstr "证书吊销列表签名失败"
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "Not enough space to create the folder"
-msgstr "没有足够的空间创建文件夹"
+#~ msgid "Certificate not yet valid"
+#~ msgstr "证书未生效"
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The folder is not empty"
-msgstr "文件夹为空"
+#~ msgid "Certificate has expired"
+#~ msgstr "证书已过期"
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "The specified folder was not found"
-msgstr "指定的文件未找到"
+#, fuzzy
+#~ msgid "Certificate Revocation List (CRL) not yet valid"
+#~ msgstr "证书吊销列表签名失败"
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Function not implemented in this storage"
-msgstr "功能未在此存储中实现"
+#, fuzzy
+#~ msgid "Certificate Revocation List (CRL) has expired"
+#~ msgstr "证书吊销列表签名失败"
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "Operation not supported"
-msgstr "操作不支持"
+#, fuzzy
+#~ msgid "Error in Certificate Revocation List (CRL)"
+#~ msgstr "无法获取证书吊销列表签名"
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified type is not supported in this storage"
-msgstr "此存储不支持指定类型"
+#~ msgid "Out of memory"
+#~ msgstr "内存耗尽"
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "The specified folder cannot be modified or removed"
-msgstr "无法修改或删除指定的文件夹"
+#~ msgid "Zero-depth self-signed certificate"
+#~ msgstr "零深度自签名证书"
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "无法将文件夹变成其子文件夹的子文件夹"
+#~ msgid "Self-signed certificate in chain"
+#~ msgstr "链中的自签名证书"
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "Cannot create a folder with that name"
-msgstr "无法以此名称创建文件夹"
+#~ msgid "Unable to get issuer's certificate locally"
+#~ msgstr "无法在本地获取发行者的证书"
-#: ../servers/exchange/storage/e-storage.c:585
-msgid "This operation cannot be performed in off-line mode"
-msgstr "该信件无法在脱机模式中使用"
+#~ msgid "Unable to verify leaf signature"
+#~ msgstr "无法校验叶子签名"
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:639
-#, c-format
-msgid "%s's Folders"
-msgstr "%s 的文件夹"
+#~ msgid "Certificate chain too long"
+#~ msgstr "证书链过长"
-#: ../servers/exchange/storage/exchange-account.c:1259
-msgid "Personal Folders"
-msgstr "个人文件夹"
+#~ msgid "Certificate Revoked"
+#~ msgstr "证书已撤销"
-#: ../servers/exchange/storage/exchange-account.c:1274
-msgid "Favorite Public Folders"
-msgstr "收藏的公开文件夹"
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "无效的证书颁发机构(CA)"
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1291
-msgid "All Public Folders"
-msgstr "全部公开文件夹"
+#~ msgid "Path length exceeded"
+#~ msgstr "超长的路径长度"
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1305
-msgid "Global Address List"
-msgstr "全局地址列表"
+#~ msgid "Invalid purpose"
+#~ msgstr "无效目的"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "已删项"
+#~ msgid "Certificate untrusted"
+#~ msgstr "不信任的证书"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "草稿"
+#~ msgid "Certificate rejected"
+#~ msgstr "已拒绝的证书"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "日记"
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "主题/发行者不匹配"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "备忘"
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "AKID/SKID 不匹配"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "发件箱"
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "AKID/发行者序列号不匹配"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "已发项"
+#~ msgid "Key usage does not support certificate signing"
+#~ msgstr "密钥不支持证书签名"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "任务"
+#~ msgid "Error in application verification"
+#~ msgstr "应用程序验证错误"
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "无效连接"
+#~ msgid ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
+#~ msgstr ""
+#~ "来自 %s 的错误证书:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "您仍然希望接受吗?"
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "服务器的响应无效"
+#~ msgid ""
+#~ "Experimental IMAP 4(.1) client\n"
+#~ "This is untested and unsupported code, you want to use plain imap "
+#~ "instead.\n"
+#~ "\n"
+#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL !!!\n"
+#~ msgstr ""
+#~ "试验性 IMAP 4(.1) 客户端\n"
+#~ "此功能是未测试的代码,不被支持,您应该换用纯 IMAP。\n"
+#~ "\n"
+#~ " !!! 不要对重要邮件使用此功能 !!!\n"
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "服务器的响应无效"
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "无法连接到 %s 上的 POP 服务器"
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "无效参数"
+#~ msgid "Enter password for %s"
+#~ msgstr "输入 %s 的密码"
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Evolution 地址簿文件后端"
+#~ msgid "Enter password"
+#~ msgstr "输入密码"
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Evolution 日历文件和 Webcal 后端"
+#~ msgid "Owner"
+#~ msgstr "所有者"
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "Evolution 数据服务器接口检查服务"
+#~ msgid "Publishing Editor"
+#~ msgstr "发布编辑器"
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Evolution 数据服务器日志服务"
+#~ msgid "Editor"
+#~ msgstr "编辑器"
+
+#~ msgid "Publishing Author"
+#~ msgstr "发布作者"
+
+#~ msgid "Author"
+#~ msgstr "作者"
+
+#~ msgid "Non-editing Author"
+#~ msgstr "非编辑作者"
+
+#~ msgid "Reviewer"
+#~ msgstr "复查者"
+
+#~ msgid "Contributor"
+#~ msgstr "贡献者"
+
+#~ msgid "None"
+#~ msgstr "无"
+
+#~ msgid "Custom"
+#~ msgstr "自定义"
+
+#~ msgid "Generic error"
+#~ msgstr "常规错误"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "已经存在同名文件夹"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "指定的文件类型无效"
+
+#~ msgid "I/O error"
+#~ msgstr "I/O 错误"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "没有足够的空间创建文件夹"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "文件夹为空"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "指定的文件未找到"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "功能未在此存储中实现"
+
+#~ msgid "Operation not supported"
+#~ msgstr "操作不支持"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "此存储不支持指定类型"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "无法修改或删除指定的文件夹"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "无法将文件夹变成其子文件夹的子文件夹"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "无法以此名称创建文件夹"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "该信件无法在脱机模式中使用"
+
+#~ msgid "%s's Folders"
+#~ msgstr "%s 的文件夹"
+
+#~ msgid "Personal Folders"
+#~ msgstr "个人文件夹"
+
+#~ msgid "Favorite Public Folders"
+#~ msgstr "收藏的公开文件夹"
+
+#~ msgid "All Public Folders"
+#~ msgstr "全部公开文件夹"
+
+#~ msgid "Global Address List"
+#~ msgstr "全局地址列表"
+
+#~ msgid "Deleted Items"
+#~ msgstr "已删项"
+
+#~ msgid "Drafts"
+#~ msgstr "草稿"
+
+#~ msgid "Journal"
+#~ msgstr "日记"
+
+#~ msgid "Notes"
+#~ msgstr "备忘"
+
+#~ msgid "Outbox"
+#~ msgstr "发件箱"
+
+#~ msgid "Sent Items"
+#~ msgstr "已发项"
+
+#~ msgid "Tasks"
+#~ msgstr "任务"
+
+#~ msgid "Evolution Addressbook file backend"
+#~ msgstr "Evolution 地址簿文件后端"
+
+#~ msgid "Evolution Calendar file and webcal backend"
+#~ msgstr "Evolution 日历文件和 Webcal 后端"
+
+#~ msgid "Evolution Data Server interface check service"
+#~ msgstr "Evolution 数据服务器接口检查服务"
+
+#~ msgid "Evolution Data Server logging service"
+#~ msgstr "Evolution 数据服务器日志服务"
#~ msgid "\"%s\" on book before \"%s\""
#~ msgstr "“%2$s”前的“%1$s”"
@@ -5179,9 +5353,6 @@ msgstr "Evolution 数据服务器日志服务"
#~ msgid "%s: canceled"
#~ msgstr "%s:已取消"
-#~ msgid "%s: Invalid source."
-#~ msgstr "%s:无效来源。"
-
#~ msgid "%s: no factories available for URI `%s'"
#~ msgstr "%s:对于 URI“%s”没有可用的工厂"