[evolution-data-server] Update Simplified Chinese translation.
- From: Aron Xu <aronxu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Update Simplified Chinese translation.
- Date: Sat, 24 Jul 2010 05:27:41 +0000 (UTC)
commit c462d3cc34b2d2535d610e2ed37dd5030faa5b63
Author: Aron Xu <aronxu gnome org>
Date: Sat Jul 24 13:27:22 2010 +0800
Update Simplified Chinese translation.
po/zh_CN.po | 4683 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 2481 insertions(+), 2202 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ac607f8..e9315d4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,908 +10,1117 @@
# Partly comes from Sun_l10n group, 2003.
# Yang Zhang <zyangmath gmail com>, 2008.
# Aron Xu <happyaron xu gmail com>, 2009.
+# lainme <lainme993 gmail com>, 2010.
+# Tao Wang <dancefire 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-07-22 17:13+0000\n"
+"PO-Revision-Date: 2010-07-24 13:26+0800\n"
+"Last-Translator: Tao Wang <dancefire 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"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../addressbook/backends/file/e-book-backend-file.c:570
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
msgid "Loading..."
msgstr "æ£å?¨è½½å?¥..."
-#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../addressbook/backends/file/e-book-backend-file.c:573
#: ../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/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4491
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
msgid "Searching..."
msgstr "æ£å?¨æ??ç´¢..."
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2698
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4650
#, 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:2846
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
#, c-format
msgid "Updating contacts cache (%d)... "
msgstr "æ£å?¨æ?´æ?°è??系人ç¼?å?(%d)..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:788
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+msgid "Not connected"
+msgstr "æ?ªè¿?æ?¥ã??"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
msgid "Using Distinguished Name (DN)"
msgstr "使ç?¨å·²è¯?å?«ç??å§?å?? (DN)"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
msgid "Using Email Address"
msgstr "使ç?¨ç?µå?é?®ä»¶å?°å??"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1031
msgid "Reconnecting to LDAP server..."
msgstr "æ£å?¨é??æ?°è¿?æ?¥ LDAP æ??å?¡å?¨..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1156
+msgid "Invalid DN syntax"
+msgstr "æ? æ?? DN è¯æ³?"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1672
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:1804
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:2238
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:4341
msgid "Receiving LDAP search results..."
msgstr "æ£å?¨æ?¥æ?¶ LDAP ç??æ??ç´¢ç»?æ??..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4513
msgid "Error performing search"
msgstr "æ?§è¡?æ??ç´¢é??误"
-#: ../addressbook/libebook/e-book.c:1837
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
#, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%sï¼?gconf ä¸æ²¡æ??å?å?¨è?ªèº«è??系人ç?? UID"
+msgid "Create resource '%s' failed with http status: %d"
+msgstr "å??建èµ?æº?â??%sâ??失败ï¼?HTTP ç?¶æ??为ï¼?%d"
-#: ../addressbook/libebook/e-book.c:1967
+#: ../addressbook/libebook/e-book.c:3001
#, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%sï¼?gconf ä¸æ²¡æ??å?å?¨ uidâ??%sâ??ç??æº?ã??"
+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
-msgid "Jabber Home Id 1"
-msgstr "Jabber å®¶åº Id 1"
-
-#: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
-msgstr "Jabber å®¶åº Id 2"
-
#: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
-msgstr "Jabber å®¶åº Id 3"
+msgid "Jabber Home ID 1"
+msgstr "Jabber å®¶åº ID 1"
#: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
-msgstr "Jabber 工� Id 1"
+msgid "Jabber Home ID 2"
+msgstr "Jabber å®¶åº ID 2"
#: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
-msgstr "Jabber 工� Id 2"
+msgid "Jabber Home ID 3"
+msgstr "Jabber å®¶åº ID 3"
#: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
-msgstr "Jabber 工� Id 3"
+msgid "Jabber Work ID 1"
+msgstr "Jabber 工� ID 1"
#: ../addressbook/libebook/e-contact.c:207
+msgid "Jabber Work ID 2"
+msgstr "Jabber 工� ID 2"
+
+#: ../addressbook/libebook/e-contact.c:208
+msgid "Jabber Work ID 3"
+msgstr "Jabber 工� ID 3"
+
+#: ../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
-msgid "ICQ Home Id 1"
-msgstr "ICQ å®¶åº Id 1"
-
-#: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
-msgstr "ICQ å®¶åº Id 2"
-
#: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
-msgstr "ICQ å®¶åº Id 3"
+msgid "ICQ Home ID 1"
+msgstr "ICQ å®¶åº ID 1"
#: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
-msgstr "ICQ 工� Id 1"
+msgid "ICQ Home ID 2"
+msgstr "ICQ å®¶åº ID 2"
#: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
-msgstr "ICQ 工� Id 2"
+msgid "ICQ Home ID 3"
+msgstr "ICQ å®¶åº ID 3"
#: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
-msgstr "ICQ 工� Id 3"
+msgid "ICQ Work ID 1"
+msgstr "ICQ 工� ID 1"
+
+#: ../addressbook/libebook/e-contact.c:225
+msgid "ICQ Work ID 2"
+msgstr "ICQ 工� ID 2"
+
+#: ../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
-msgid "GroupWise Id List"
-msgstr "GroupWise Id å??表"
+#: ../addressbook/libebook/e-contact.c:250
+msgid "GroupWise ID List"
+msgstr "GroupWise ID å??表"
-#: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
-msgstr "Jabber Id å??表"
+#: ../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
-msgid "ICQ Id List"
-msgstr "ICQ Id å??表"
-
#: ../addressbook/libebook/e-contact.c:254
+msgid "ICQ ID List"
+msgstr "ICQ ID å??表"
+
+#: ../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:717
+#: ../libedataserver/e-categories.c:43
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
-msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu å®¶åº Id 1"
-
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu å®¶åº Id 2"
-
#: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu å®¶åº Id 3"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "Gadu-Gadu å®¶åº ID 1"
#: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu 工� Id 1"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "Gadu-Gadu å®¶åº ID 2"
#: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu 工� Id 2"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "Gadu-Gadu å®¶åº ID 3"
#: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu 工� Id 3"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "Gadu-Gadu 工� ID 1"
#: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "Gadu-Gadu 工� ID 2"
+
+#: ../addressbook/libebook/e-contact.c:272
+msgid "Gadu-Gadu Work ID 3"
+msgstr "Gadu-Gadu 工� ID 3"
+
+#: ../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:1517
+#: ../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:322
+#, c-format
+msgid "Empty URI"
+msgstr "空ç?? URI"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:340
+#: ../addressbook/libedata-book/e-data-book-factory.c:377
+#: ../calendar/libedata-cal/e-data-cal-factory.c:333
+#: ../calendar/libedata-cal/e-data-cal-factory.c:345
+#, c-format
+msgid "Invalid source"
+msgstr "æ? æ??ç??æº?"
+
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:114
+msgid "Success"
+msgstr "æ??å??"
+
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:115
+msgid "Repository offline"
+msgstr "��离线"
+
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libecal/e-cal.c:4027 ../calendar/libedata-cal/e-data-cal.c:116
+msgid "Permission denied"
+msgstr "没æ??æ??é??"
+
+#: ../addressbook/libedata-book/e-data-book.c:188
+msgid "Contact not found"
+msgstr "æ?¾ä¸?å?°è??系人"
+
+#: ../addressbook/libedata-book/e-data-book.c:189
+msgid "Contact ID already exists"
+msgstr "è??系人 ID å·²ç»?å?å?¨"
+
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Authentication Failed"
+msgstr "认�失败"
+
+#: ../addressbook/libedata-book/e-data-book.c:191
+#: ../calendar/libedata-cal/e-data-cal.c:122
+msgid "Authentication Required"
+msgstr "é??è¦?认è¯?"
+
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:123
+msgid "Unsupported field"
+msgstr "ä¸?æ?¯æ??ç??å??"
+
+#: ../addressbook/libedata-book/e-data-book.c:193
+#: ../calendar/libedata-cal/e-data-cal.c:125
+msgid "Unsupported authentication method"
+msgstr "ä¸?æ?¯æ??ç??身份éª?è¯?æ?¹å¼?"
+
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "TLS not available"
+msgstr "TLS ���"
+
+#: ../addressbook/libedata-book/e-data-book.c:195
+msgid "Address Book does not exist"
+msgstr "å?°å??ç°¿ä¸?å?å?¨"
+
+#: ../addressbook/libedata-book/e-data-book.c:196
+msgid "Book removed"
+msgstr "å?°å??ç°¿å·²å? é?¤"
+
+#: ../addressbook/libedata-book/e-data-book.c:197
+#: ../calendar/libedata-cal/e-data-cal.c:129
+msgid "Not available in offline mode"
+msgstr "å?¨è?±æ?ºæ¨¡å¼?ä¸æ? æ³?使ç?¨"
+
+#: ../addressbook/libedata-book/e-data-book.c:198
+#: ../calendar/libedata-cal/e-data-cal.c:130
+msgid "Search size limit exceeded"
+msgstr "è¶?è¿?æ??索大å°?é??å?¶"
+
+#: ../addressbook/libedata-book/e-data-book.c:199
+#: ../calendar/libedata-cal/e-data-cal.c:131
+msgid "Search time limit exceeded"
+msgstr "è¶?è¿?æ??ç´¢æ?¶é?´é??å?¶"
+
+#: ../addressbook/libedata-book/e-data-book.c:200
+#: ../calendar/libedata-cal/e-data-cal.c:132
+msgid "Invalid query"
+msgstr "æ? æ??ç??æ?¥è¯¢"
+
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../calendar/libedata-cal/e-data-cal.c:133
+msgid "Query refused"
+msgstr "æ?¥è¯¢è¢«æ??ç»?"
+
+#: ../addressbook/libedata-book/e-data-book.c:202
+#: ../calendar/libedata-cal/e-data-cal.c:134
+msgid "Could not cancel"
+msgstr "æ? æ³?å??æ¶?"
+
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR, N_("Other error") },
+#. { OtherError, N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:136
+msgid "Invalid server version"
+msgstr "æ? æ??ç??æ??å?¡å?¨ç??æ?¬"
+
+#: ../addressbook/libedata-book/e-data-book.c:205
+msgid "No space"
+msgstr "没æ??空é?´"
+
+#: ../addressbook/libedata-book/e-data-book.c:206
+#: ../calendar/libecal/e-cal.c:4011 ../calendar/libedata-cal/e-data-cal.c:137
+msgid "Invalid argument"
+msgstr "æ? æ??å??æ?°"
+
+#: ../addressbook/libedata-book/e-data-book.c:207
+#: ../calendar/libecal/e-cal.c:4049 ../calendar/libedata-cal/e-data-cal.c:138
+msgid "Not supported"
+msgstr "ä¸?æ?¯æ??"
+
+#: ../addressbook/libedata-book/e-data-book.c:216
+#: ../calendar/libedata-cal/e-data-cal.c:146
+msgid "Other error"
+msgstr "å?¶ä»?é??误"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:374
+#, c-format
+msgid "Cannot open book: %s"
+msgstr "æ? æ³?æ??å¼?å?°å??ç°¿ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:394
+#, c-format
+msgid "Cannot remove book: %s"
+msgstr "æ? æ³?å? é?¤å?°å??ç°¿ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:411
+#: ../addressbook/libedata-book/e-data-book.c:428
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "æ? æ³?è?·å??è??系人ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:443
+#, c-format
+msgid "Empty query: %s"
+msgstr "空ç??æ?¥è¯¢ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:457
+#, c-format
+msgid "Cannot get contact list: %s"
+msgstr "æ? æ³?è?·å??è??系人å??表ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:492
+#, c-format
+msgid "Cannot authenticate user: %s"
+msgstr "æ? æ³?认è¯?ç?¨æ?·ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:507
+#: ../addressbook/libedata-book/e-data-book.c:524
+#, c-format
+msgid "Cannot add contact: %s"
+msgstr "æ? æ³?æ·»å? è??系人ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:542
+#: ../addressbook/libedata-book/e-data-book.c:559
+#, c-format
+msgid "Cannot modify contact: %s"
+msgstr "æ? æ³?ä¿®æ?¹è??系人ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:596
+#, c-format
+msgid "Cannot remove contacts: %s"
+msgstr "æ? æ³?移é?¤è??系人ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:626
+#, c-format
+msgid "Cannot get supported fields: %s"
+msgstr "æ? æ³?è?·å??æ?¯æ??ç??å?段ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:639
+#, c-format
+msgid "Cannot get required fields: %s"
+msgstr "æ? æ³?è?·å??å¿?å¡«å?段ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:652
+#, c-format
+msgid "Cannot get supported auth methods: %s"
+msgstr "æ? æ³?è?·å??æ?¯æ??ç??认è¯?æ?¹å¼?ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:677
+#, c-format
+msgid "Invalid query: %s"
+msgstr "æ? æ??ç??æ?¥è¯¢ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:708
+#, c-format
+msgid "Cannot get changes: %s"
+msgstr "æ? æ³?è?·å??æ?´æ?¹ï¼?%s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:498
+#, c-format
+msgid "Unexpected HTTP status code %d returned"
+msgstr "è¿?å??äº?æ??å¤?ç?? HTTP ç?¶æ??代ç ? %d"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4094
+msgid "Calendar doesn't support Free/Busy"
+msgstr "æ?¥å??ä¸?æ?¯æ??空é?²/ç¹?å¿?"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
+#: ../libedataserver/e-categories.c:44
msgid "Birthday"
msgstr "ç??æ?¥"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:748
#, c-format
msgid "Birthday: %s"
msgstr "ç??æ?¥ï¼?%s"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:772
#, c-format
msgid "Anniversary: %s"
msgstr "�年�%s"
-#: ../calendar/backends/file/e-cal-backend-file.c:234
+#: ../calendar/backends/file/e-cal-backend-file.c:239
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:246
+#: ../calendar/backends/file/e-cal-backend-file.c:252
msgid "Cannot save calendar data"
msgstr "æ? æ³?ä¿?å?æ?¥å??æ?°æ?®"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
-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
-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
-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:1121
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2224
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:1126
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2229
msgid "Reply Requested: When convenient"
msgstr "请æ±?å??å¤?ï¼?æ?¹ä¾¿æ?¶"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:295
#, 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:989
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
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
-msgid "Authentication failed"
-msgstr "认�失败"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1082
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1343
+#: ../calendar/backends/http/e-cal-backend-http.c:659
+#: ../calendar/backends/weather/e-cal-backend-weather.c:487
+msgid "Could not create cache file"
+msgstr "æ? æ³?å??建ç¼?å?æ??件"
-#: ../calendar/backends/http/e-cal-backend-http.c:330
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1095
+msgid "Could not create thread for populating cache"
+msgstr "æ? æ³?å??建å¢?æ®?ç¼?å?å??建线索"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:327
msgid "Redirected to Invalid URI"
msgstr "å·²é??å®?å??å?°æ? æ?? URI"
-#: ../calendar/backends/http/e-cal-backend-http.c:353
+#: ../calendar/backends/http/e-cal-backend-http.c:350
msgid "Bad file format."
msgstr "æ? æ??ç??æ??ä»¶æ ¼å¼?ã??"
-#: ../calendar/backends/http/e-cal-backend-http.c:360
+#: ../calendar/backends/http/e-cal-backend-http.c:357
msgid "Not a calendar."
msgstr "ä¸?æ?¯æ?¥å??ã??"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:150
+#: ../calendar/backends/weather/e-cal-backend-weather.c:154
msgid "Could not retrieve weather data"
msgstr "æ? æ³?è?·å??天æ°?æ?°æ?®"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
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:254
msgid "Weather: Cloudy Night"
msgstr "天æ°?ï¼?å¤?äº?å¤?æ??"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+msgid "Weather: Cloudy"
+msgstr "天����"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
msgid "Weather: Overcast"
msgstr "天���天"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
msgid "Weather: Showers"
msgstr "天����"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
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:259
msgid "Weather: Clear Night"
msgstr "天æ°?ï¼?æ?´æ??å¤?æ??"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:260
+msgid "Weather: Sunny"
+msgstr "天���"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:261
msgid "Weather: Thunderstorms"
msgstr "天�����"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:400
+#: ../calendar/backends/weather/e-cal-backend-weather.c:407
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:1142 ../libedataserverui/e-book-auth-util.c:206
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "为 %s è¾?å?¥å¯?ç ? (ç?¨æ?· %s)"
@@ -920,186 +1129,165 @@ 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:1156
#, c-format
msgid "Enter password for %s to enable proxy for user %s"
msgstr "è¾?å?¥ %s ç??å¯?ç ?ï¼?以便为ç?¨æ?· %s å?¯ç?¨ä»£ç??æ??å?¡å?¨"
-#: ../calendar/libecal/e-cal.c:5089
-msgid "Invalid argument"
-msgstr "æ? æ??å??æ?°"
-
-#: ../calendar/libecal/e-cal.c:5091
+#: ../calendar/libecal/e-cal.c:4013
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:4015
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:4017
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:4019 ../calendar/libedata-cal/e-data-cal.c:118
+#: ../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:4021 ../calendar/libedata-cal/e-data-cal.c:119
+#: ../servers/groupwise/e-gw-connection.c:229
msgid "Invalid object"
msgstr "æ? æ??对象"
-#: ../calendar/libecal/e-cal.c:5101
+#: ../calendar/libecal/e-cal.c:4023
msgid "URI not loaded"
-msgstr "URI ���"
+msgstr "URI �载�"
-#: ../calendar/libecal/e-cal.c:5103
+#: ../calendar/libecal/e-cal.c:4025
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
-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:4029 ../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:4031 ../calendar/libedata-cal/e-data-cal.c:120
msgid "Object ID already exists"
msgstr "对象 ID å·²ç»?å?å?¨"
-#: ../calendar/libecal/e-cal.c:5111
+#: ../calendar/libecal/e-cal.c:4033
msgid "Protocol not supported"
msgstr "ä¸?æ?¯æ??ç??å??è®®"
-#: ../calendar/libecal/e-cal.c:5113
+#: ../calendar/libecal/e-cal.c:4035
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:4037
msgid "Could not cancel operation"
msgstr "æ? æ³?å??æ¶?æ??ä½?"
-#: ../calendar/libecal/e-cal.c:5119
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../calendar/libecal/e-cal.c:4039
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1434
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1452
+#: ../camel/providers/groupwise/camel-groupwise-store.c:618
+#: ../camel/providers/groupwise/camel-groupwise-store.c:793
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
+#, c-format
+msgid "Authentication failed"
+msgstr "认�失败"
+
+#: ../calendar/libecal/e-cal.c:4041
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
msgid "Authentication required"
msgstr "�须认�"
-#: ../calendar/libecal/e-cal.c:5121
-msgid "A CORBA exception has occurred"
-msgstr "å??ç??äº? CORBA å¼?常"
-
-#: ../calendar/libecal/e-cal.c:5123
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../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/imap4/camel-imap4-engine.c:1547
-#: ../camel/providers/imap4/camel-imap4-engine.c:1585
-#: ../camel/providers/imap4/camel-imap4-engine.c:1629
-#: ../camel/providers/imap4/camel-imap4-engine.c:1684
-#: ../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
+#: ../calendar/libecal/e-cal.c:4043
+msgid "A DBUS exception has occurred"
+msgstr "å??ç??äº?ä¸?个 DBUS å¼?常"
+
+#: ../calendar/libecal/e-cal.c:4045
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
+#: ../camel/providers/imap/camel-imap-command.c:457
+#: ../camel/providers/imap/camel-imap-store.c:626
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../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:4047
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,116 +1298,254 @@ 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-data-cal.c:117
msgid "Invalid range"
msgstr "æ? æ??è??å?´"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "ä¸?æ?¯æ??ç??å??"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:124
msgid "Unsupported method"
msgstr "ä¸?æ?¯æ??ç??æ?¹å¼?"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "ä¸?æ?¯æ??ç??身份éª?è¯?æ?¹å¼?"
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Calendar does not exist"
+msgstr "æ?¥å??ä¸?å?å?¨"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "TLS ���"
+#: ../calendar/libedata-cal/e-data-cal.c:128
+msgid "UnknownUser"
+msgstr "����"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "离线模����"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:606
+#, c-format
+msgid "Cannot retrieve calendar address: %s"
+msgstr "æ? æ³?è?·å??æ?¥å??å?°å??ï¼?%s"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "è¶?è¿?æ??索大å°?é??å?¶"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:626
+#, c-format
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "æ? æ³?è?·å??æ?¥å??é?¹é??ç?µå?é?®ä»¶å?°å??ï¼?%s"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "è¶?è¿?æ??ç´¢æ?¶é?´é??å?¶"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:646
+#, c-format
+msgid "Cannot retrieve calendar's ldap attribute: %s"
+msgstr "æ? æ³?è?·å??æ?¥å?? LDAP å±?æ?§ï¼?%s"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "æ? æ??ç??æ?¥è¯¢"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:666
+#, c-format
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "æ? æ³?è?·å??æ?¥å??计å??ä»»å?¡ä¿¡æ?¯ï¼?%s"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "æ?¥è¯¢è¢«æ??ç»?"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:685
+#, c-format
+msgid "Cannot open calendar: %s"
+msgstr "æ? æ³?æ??å¼?æ?¥å??ï¼?%s"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "æ? æ??ç??æ??å?¡å?¨ç??æ?¬"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:706
+#, c-format
+msgid "Cannot refresh calendar: %s"
+msgstr "æ? æ³?å?·æ?°æ?¥å??ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:725
+#, c-format
+msgid "Cannot remove calendar: %s"
+msgstr "æ? æ³?移é?¤æ?¥å??ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:746
+#, c-format
+msgid "Cannot create calendar object: %s"
+msgstr "æ? æ³?å??建æ?¥å??对象ï¼?%s"
-#: ../camel/camel-cipher-context.c:102
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:770
+#, c-format
+msgid "Cannot modify calendar object: %s"
+msgstr "æ? æ³?ä¿®æ?¹æ?¥å??对象ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:796
+#, c-format
+msgid "Cannot remove calendar object: %s"
+msgstr "æ? æ³?移é?¤æ?¥å??对象ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:817
+#, c-format
+msgid "Cannot receive calendar objects: %s"
+msgstr "æ? æ³?æ?¥æ?¶æ?¥å??对象ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:836
+#, c-format
+msgid "Cannot discard calendar alarm: %s"
+msgstr "æ? æ³?å??æ¶?æ?¥å??é?¹é??ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:857
+#, c-format
+msgid "Cannot send calendar objects: %s"
+msgstr "æ? æ³?å??é??æ?¥å??对象ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:894
+#, c-format
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "æ? æ³?è?·å??é»?认ç??æ?¥å??对象路å¾?ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:914
+#, c-format
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "æ? æ³?è?·å??æ?¥å??对象ç??è·¯å¾?ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:934
+#, c-format
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "æ? æ³?è?·å??æ?¥å??对象ç??å??表ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:974
+#, c-format
+msgid "Could not retrieve attachment list: %s"
+msgstr "æ? æ³?è?·å??é??件å??表ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:998
+#, c-format
+msgid "Could not complete calendar query: %s"
+msgstr "æ? æ³?å®?æ??æ?¥å??æ?¥è¯¢ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1018
+#, c-format
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "æ? æ³?è?·å??æ?¥å??æ?¶å?ºï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1038
+#, c-format
+msgid "Could not add calendar time zone: %s"
+msgstr "æ? æ³?æ·»å? æ?¥å??æ?¶å?ºï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1057
+#, c-format
+msgid "Could not set default calendar time zone: %s"
+msgstr "æ? æ³?设置é»?认ç??æ?¥å??æ?¶å?ºï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1080
+#, c-format
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "æ? æ³?è?·å??æ?¥å??æ?´æ?¹ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1132
+#, c-format
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "æ? æ³?è?·å??æ?¥å??空é?²ã??ç¹?å¿?å??表ï¼?%s"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:355
+#, c-format
+msgid "Invalid URI"
+msgstr "æ? æ??ç?? URI"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:370
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "对â??%2$sâ??ç??â??%1$sâ??没æ??å??端工å??"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:420
+#, c-format
+msgid "Could not instantiate backend"
+msgstr "æ? æ³?å®?ä¾?å??å??端"
+
+#: ../camel/camel-cipher-context.c:75
+#, c-format
msgid "Signing is not supported by this cipher"
msgstr "该å¯?ç ?ä¸?æ?¯æ??ç¾å??"
-#: ../camel/camel-cipher-context.c:128
+#: ../camel/camel-cipher-context.c:110
msgid "Signing message"
msgstr "ç¾å??信件"
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:131
+#, c-format
msgid "Verifying is not supported by this cipher"
msgstr "该å¯?ç ?ä¸?æ?¯æ??éª?è¯?"
-#: ../camel/camel-cipher-context.c:171
+#: ../camel/camel-cipher-context.c:164
msgid "Verifying message"
msgstr "æ ¡éª?信件"
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:188
+#, c-format
msgid "Encryption is not supported by this cipher"
msgstr "该å¯?ç ?ä¸?æ?¯æ??å? å¯?"
-#: ../camel/camel-cipher-context.c:215
+#: ../camel/camel-cipher-context.c:223
msgid "Encrypting message"
msgstr "å? å¯?信件"
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:246
+#, c-format
msgid "Decryption is not supported by this cipher"
msgstr "该å¯?ç ?ä¸?æ?¯æ??解å¯?"
-#: ../camel/camel-cipher-context.c:254
+#: ../camel/camel-cipher-context.c:276
msgid "Decrypting message"
msgstr "解�信件"
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:297
+#, c-format
msgid "You may not import keys with this cipher"
msgstr "æ?¨ä¸?è?½ç?¨æ¤å¯?ç ?导å?¥å¯?é?¥"
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:341
+#, c-format
msgid "You may not export keys with this cipher"
msgstr "æ?¨ä¸?è?½ç?¨æ¤å¯?ç ?导å?ºå¯?é?¥"
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-data-cache.c:181
+#, c-format
msgid "Unable to create cache path"
msgstr "æ? æ³?å??建ç¼?å?²è·¯å¾?"
-#: ../camel/camel-data-cache.c:402
+#: ../camel/camel-data-cache.c:494
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "æ? æ³?å? é?¤ç¼?å?²æ?¡ç?®ï¼?%sï¼?%s"
-#: ../camel/camel-db.c:412
+#: ../camel/camel-data-wrapper.c:89
+#, c-format
+msgid "No stream available"
+msgstr "没æ??å?¯ç?¨ç??æµ?"
+
+#: ../camel/camel-db.c:464
+#, c-format
msgid "Insufficient memory"
msgstr "å??å?ä¸?足"
-#: ../camel/camel-disco-diary.c:197
+#: ../camel/camel-disco-diary.c:195
#, c-format
msgid ""
"Could not write log entry: %s\n"
@@ -1230,8 +1556,8 @@ msgstr ""
"å½?æ?¨é??æ?°è¿?æ?¥å?°ç½?ç»?æ?¶æ?¬æ??å?¡å?¨\n"
"ä¸?è¿?ä¸?æ¥ç??æ??ä½?ä¸?ä¼?é??å??ã??"
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/camel-disco-diary.c:258
+#: ../camel/providers/imap/camel-imap-journal.c:298
#, c-format
msgid ""
"Could not open '%s':\n"
@@ -1242,120 +1568,141 @@ msgstr ""
"%s\n"
"对该æ??件夹ç??ä¿®æ?¹ä¸?ä¼?被é??æ?°å??æ¥ã??"
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:299
msgid "Resynchronizing with server"
msgstr "é??æ?°ä¸?æ??å?¡å?¨å??æ¥"
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
-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:68 ../camel/camel-offline-folder.c:66
msgid "Downloading new messages for offline mode"
msgstr "ä¸?è½½æ?°ä¿¡ä»¶ä»¥è¿?è¡?è?±æ?ºæ??ä½?"
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:379
#, c-format
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/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
+msgid "Copy folder content locally for offline operation"
+msgstr "å°?æ??件夹å??容å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?"
+
+#: ../camel/camel-disco-store.c:395
+#: ../camel/providers/groupwise/camel-groupwise-store.c:230
+#: ../camel/providers/imap/camel-imap-store.c:895
+#: ../camel/providers/imap/camel-imap-store.c:1739
+#: ../camel/providers/imap/camel-imap-store.c:2197
+#: ../camel/providers/imap/camel-imap-store.c:3041
+#: ../camel/providers/imapx/camel-imapx-store.c:185
+#: ../camel/providers/imapx/camel-imapx-store.c:709
+#: ../camel/providers/imapx/camel-imapx-store.c:772
+#: ../camel/providers/imapx/camel-imapx-store.c:831
+#, c-format
msgid "You must be working online to complete this operation"
msgstr "æ?¨å¿?é¡»å?¨çº¿å·¥ä½?以便å®?æ??该æ??ä½?"
-#: ../camel/camel-exception.c:260
-msgid "No description available"
-msgstr "没æ??å?¯ç?¨ç??æ??è¿°"
+#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
+#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
+#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
+#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
+#: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
+#: ../camel/providers/imapx/camel-imapx-server.c:4678
+#: ../camel/providers/imapx/camel-imapx-server.c:4695
+#: ../camel/providers/nntp/camel-nntp-summary.c:396
+#: ../camel/providers/pop3/camel-pop3-folder.c:269
+#: ../camel/providers/pop3/camel-pop3-folder.c:625
+#: ../camel/providers/pop3/camel-pop3-folder.c:690
+#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "å·²å??æ¶?"
+
+#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
+#: ../camel/camel-file-utils.c:791
+#, c-format
+msgid "Canceled"
+msgstr "å·²å??æ¶?"
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
#, c-format
msgid "Failed to create child process '%s': %s"
msgstr "å??建å?è¿?ç¨?â??%sâ??失败ï¼?%s"
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:853
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "æ?¶å?° %s å??æ?¥ç??æ? æ??信件æµ?ï¼?%s"
-#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
+#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
msgid "Syncing folders"
msgstr "å??æ¥æ??件夹"
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "解æ??è¿?滤è§?å??å?ºé??ï¼?%sï¼?%s"
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "æ?§è¡?è¿?滤è§?å??é??误ï¼?%sï¼?%s"
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1240
+#, c-format
msgid "Unable to open spool folder"
msgstr "æ? æ³?æ??å¼?è?±æ?ºæ??件夹"
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1251
+#, c-format
msgid "Unable to process spool folder"
msgstr "æ? æ³?å¤?ç??è?±æ?ºæ??件夹"
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1269
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "è?·å??第%då°?ä¿¡(%d%%)"
-#: ../camel/camel-filter-driver.c:1245
-msgid "Cannot open message"
-msgstr "æ? æ³?æ??å¼?信件"
-
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
#, c-format
msgid "Failed on message %d"
msgstr "�第%d�信失败"
-#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
msgid "Syncing folder"
msgstr "å??æ¥æ??件夹"
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
msgid "Complete"
msgstr "å®?æ??"
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1377
#, c-format
msgid "Getting message %d of %d"
msgstr "è?·å??第%då°?ä¿¡ï¼?å?±%då°?"
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1395
#, c-format
msgid "Failed at message %d of %d"
msgstr "�第%d�信失败��%d�"
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:135
msgid "Failed to retrieve message"
msgstr "è?·å??信件失败"
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:401
msgid "Invalid arguments to (system-flag)"
msgstr "(system-flag)å??æ?°æ? æ??"
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:416
msgid "Invalid arguments to (user-tag)"
msgstr "(user-tag)å??æ?°æ? æ??"
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
#, c-format
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:345 ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -1364,8 +1711,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:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -1374,72 +1721,71 @@ msgstr ""
"æ?§è¡?æ??索表达å¼?é??误ï¼?%sï¼?\n"
"%s"
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
#, c-format
msgid "(%s) requires a single bool result"
msgstr "(%s) é??è¦?ä¸?个å¸?å°?ç»?æ??"
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:938
#, 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:944 ../camel/camel-folder-search.c:951
#, c-format
msgid "(%s) requires a match type string"
msgstr "(%s) é??è¦?ä¸?个å?¹é??ç±»å??å?符串"
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:978
#, c-format
msgid "(%s) expects an array result"
msgstr "(%s) é??è¦?ä¸?个æ?°ç»?ç»?æ??"
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:987
#, c-format
msgid "(%s) requires the folder set"
msgstr "(%s) é??è¦?æ??件夹é??"
-#: ../camel/camel-folder.c:683
+#: ../camel/camel-folder.c:125
#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?é??å? 信件ï¼?为 %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "å?¨â??%sâ??ä¸å¦ä¹ æ?°ç??å??å?¾é?®ä»¶"
-#: ../camel/camel-folder.c:1388
+#: ../camel/camel-folder.c:147
#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?æ??表达å¼?æ??ç´¢ï¼?æ??ç´¢ %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "å?¨â??%sâ??ä¸å¦ä¹ æ?°ç??æ??害é?®ä»¶"
-#: ../camel/camel-folder.c:1429
-#, fuzzy, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?æ??表达å¼?æ??ç´¢ï¼?æ??ç´¢ %s"
-
-#: ../camel/camel-folder.c:1468
+#: ../camel/camel-folder.c:171
#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?æ?? UID æ??ç´¢ï¼?æ??ç´¢ %s"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "å?¨â??%sâ??ä¸è¿?滤æ?°ä¿¡ä»¶"
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:688
+#: ../camel/providers/local/camel-maildir-folder.c:366
msgid "Moving messages"
msgstr "移�信件"
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:690
msgid "Copying messages"
msgstr "��信件"
-#: ../camel/camel-folder.c:1922
-msgid "Learning junk"
-msgstr "å¦ä¹ å??å?¾é?®ä»¶"
-
-#: ../camel/camel-folder.c:1939
-msgid "Learning non-junk"
-msgstr "å¦ä¹ é??å??å?¾é?®ä»¶"
+#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
+#: ../camel/camel-gpg-context.c:1330
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "�� gpg 失败�%s"
-#: ../camel/camel-folder.c:1958
-msgid "Filtering new message(s)"
-msgstr "�滤�信件"
+#: ../camel/camel-gpg-context.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:114
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Unknown"
+msgstr "��"
-#: ../camel/camel-gpg-context.c:752
+#: ../camel/camel-gpg-context.c:770
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -1450,15 +1796,17 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:767
+#: ../camel/camel-gpg-context.c:787
+#, c-format
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:812 ../camel/camel-gpg-context.c:827
+#, c-format
msgid "Failed to parse gpg passphrase request."
msgstr "解æ?? gpg å¯?ç ?å?¥è¯·æ±?失败ã??"
-#: ../camel/camel-gpg-context.c:825
+#: ../camel/camel-gpg-context.c:848
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
@@ -1467,7 +1815,7 @@ msgstr ""
"æ?¨é??è¦?ä¸?个 PIN ç?¨æ?¥è§£é??æ?¨ç??æ?ºè?½å?¡ï¼?\n"
"â??%sâ??"
-#: ../camel/camel-gpg-context.c:829
+#: ../camel/camel-gpg-context.c:852
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -1476,140 +1824,112 @@ msgstr ""
"æ?¨é??è¦?ä¸?个å¯?ç ?å?¥ç?¨æ?¥è§£é??以ä¸?ç?¨æ?·ï¼?\n"
"â??%sâ??"
-#: ../camel/camel-gpg-context.c:834
+#: ../camel/camel-gpg-context.c:858
#, 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/providers/nntp/camel-nntp-store.c:1313
-msgid "Canceled."
-msgstr "å·²å??æ¶?ã??"
-
-#: ../camel/camel-gpg-context.c:873
+#: ../camel/camel-gpg-context.c:905
+#, c-format
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr "解é??å¯?é?¥å¤±è´¥ï¼?ç»?å?ºäº? 3 个é??误ç??å¯?ç ?å?¥ã??"
-#: ../camel/camel-gpg-context.c:881
+#: ../camel/camel-gpg-context.c:917
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "æ?¥è?ª GnuPG ç??æ??å¤?åº?ç?ï¼?%s"
-#: ../camel/camel-gpg-context.c:944
+#: ../camel/camel-gpg-context.c:1048
+#, c-format
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
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "�� gpg 失败�%s"
+#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+msgid "Could not generate signing data: "
+msgstr "æ? æ³?ç??æ??ç¾å??æ?°æ?®ï¼?"
-#: ../camel/camel-gpg-context.c:1299 ../camel/camel-smime-context.c:602
-#, 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:1481 ../camel/camel-gpg-context.c:1740
+#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
+#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
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:1622 ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
+#: ../camel/camel-smime-context.c:966
+#, c-format
msgid "Cannot verify message signature: Incorrect message format"
msgstr "æ? æ³?æ ¡éª?信件ç¾å??ï¼?ä¿¡ä»¶æ ¼å¼?ä¸?对"
-#: ../camel/camel-gpg-context.c:1517
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "æ? æ³?æ ¡éª?信件ç¾å??ï¼?æ? æ³?å??建临æ?¶æ??件ï¼?%s"
+#: ../camel/camel-gpg-context.c:1695
+msgid "Cannot verify message signature: "
+msgstr "æ? æ³?æ ¡éª?信件ç¾å??ï¼?"
-#: ../camel/camel-gpg-context.c:1626
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "æ? æ³?ç??æ??å? å¯?æ?°æ?®ï¼?%s"
+#: ../camel/camel-gpg-context.c:1814
+msgid "Could not generate encrypting data: "
+msgstr "æ? æ³?ç??æ??å? å¯?æ?°æ?®ï¼?"
-#: ../camel/camel-gpg-context.c:1676
+#: ../camel/camel-gpg-context.c:1866
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:1922 ../camel/camel-gpg-context.c:1931
+#: ../camel/camel-gpg-context.c:1954
+#, c-format
msgid "Cannot decrypt message: Incorrect message format"
msgstr "æ? æ³?解å¯?信件ï¼?ä¿¡ä»¶æ ¼å¼?ä¸?对"
-#: ../camel/camel-gpg-context.c:1746
+#: ../camel/camel-gpg-context.c:1942
+#, c-format
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:2023 ../camel/camel-smime-context.c:1241
msgid "Encrypted content"
msgstr "å? å¯?å??容"
-#: ../camel/camel-gpg-context.c:1830
-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/providers/imap4/camel-imap4-utils.c:614
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
-msgid "Unknown"
-msgstr "��"
-
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
#, c-format
msgid "Cannot build locking helper pipe: %s"
msgstr "æ? æ³?å??建é??å®?å?©æ??管é??ï¼?%s"
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
#, c-format
msgid "Cannot fork locking helper: %s"
msgstr "æ? æ³?å??建é??å®?å?©æ??è¿?ç¨?ï¼?%s"
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
#, c-format
msgid "Could not lock '%s': protocol error with lock-helper"
msgstr "æ? æ³?é??å®?â??%sâ??ï¼?lock-helper å??è®®é??误"
-#: ../camel/camel-lock-client.c:216
+#: ../camel/camel-lock-client.c:227
#, c-format
msgid "Could not lock '%s'"
msgstr "æ? æ³?é??å®?â??%sâ??"
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
#, c-format
msgid "Could not create lock file for %s: %s"
msgstr "æ? æ³?为 %s å??建é??å®?æ??件ï¼?%s"
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:145
#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Timed out trying to get lock file on %s. Try again later."
msgstr "对 %s è?·å??é??æ??件ç??å°?è¯?è¶?æ?¶ã??请ç¨?å??å??è¯?ã??"
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
#, c-format
msgid "Failed to get lock using fcntl(2): %s"
msgstr "ç?¨ fcntl(2) è?·å??é??失败ï¼?%s"
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
#, c-format
msgid "Failed to get lock using flock(2): %s"
msgstr "ç?¨ flock(2) è?·å??é??失败ï¼?%s"
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
#, c-format
msgid "Could not check mail file %s: %s"
msgstr "æ? æ³?æ£?æ?¥é?®ä»¶æ??件 %sï¼?%s"
@@ -1619,143 +1939,144 @@ msgstr "æ? æ³?æ£?æ?¥é?®ä»¶æ??件 %sï¼?%s"
msgid "Could not open mail file %s: %s"
msgstr "æ? æ³?æ??å¼?é?®ä»¶æ??件 %sï¼?%s"
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
#, c-format
msgid "Could not open temporary mail file %s: %s"
msgstr "æ? æ³?æ??å¼?临æ?¶é?®ä»¶æ??件 %sï¼?%s"
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
#, c-format
msgid "Failed to store mail in temp file %s: %s"
msgstr "å°?é?®ä»¶å?å?¨å?°ä¸´æ?¶æ??件 %s 失败ï¼?%s"
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
#, c-format
msgid "Could not create pipe: %s"
msgstr "æ? æ³?å??建管é??ï¼?%s"
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
#, c-format
msgid "Could not fork: %s"
msgstr "æ? æ³?å??建è¿?ç¨?ï¼?%s"
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
#, c-format
msgid "Movemail program failed: %s"
msgstr "移��件��失败�%s"
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
msgid "(Unknown error)"
msgstr "(æ?ªç?¥ç??é??误)"
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
#, c-format
msgid "Error reading mail file: %s"
msgstr "é??读é?®ä»¶æ??件é??误ï¼?%s"
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
#, c-format
msgid "Error writing mail temp file: %s"
msgstr "å??å?¥é?®ä»¶ä¸´æ?¶æ??件é??误ï¼?%s"
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
#, c-format
msgid "Error copying mail temp file: %s"
msgstr "å¤?å?¶é?®ä»¶ä¸´æ?¶æ??件é??误ï¼?%s"
-#: ../camel/camel-multipart-signed.c:592
-msgid "parse error"
-msgstr "解æ??é??误"
+#: ../camel/camel-multipart-signed.c:285
+#, c-format
+msgid "No content available"
+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
-msgid "Canceled"
-msgstr "å·²å??æ¶?"
+#: ../camel/camel-multipart-signed.c:293
+#, c-format
+msgid "No signature available"
+msgstr "没æ??å?¯ç?¨ç??ç¾å??"
-#: ../camel/camel-net-utils.c:522
-msgid "cannot create thread"
-msgstr "æ? æ³?å??建线索"
+#: ../camel/camel-multipart-signed.c:612
+#, c-format
+msgid "parse error"
+msgstr "解æ??é??误"
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:693
#, c-format
msgid "Resolving: %s"
msgstr "解æ??ï¼?%s"
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:715
msgid "Host lookup failed"
msgstr "主æ?ºæ?¥é??失败"
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:719
#, c-format
msgid "Host lookup failed: %s: %s"
msgstr "主æ?ºæ?¥é??失败ï¼?%sï¼?%s"
-#: ../camel/camel-net-utils.c:810
+#: ../camel/camel-net-utils.c:842
msgid "Resolving address"
msgstr "解æ??å?°å??"
-#: ../camel/camel-net-utils.c:830
+#: ../camel/camel-net-utils.c:862
msgid "Name lookup failed"
msgstr "å??称æ?¥é??失败"
-#: ../camel/camel-net-utils.c:833
+#: ../camel/camel-net-utils.c:867
#, c-format
msgid "Name lookup failed: %s"
msgstr "å??称æ?¥é??失败ï¼?%s"
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:169
#, c-format
msgid "Syncing messages in folder '%s' to disk"
msgstr "æ£å?¨å°?æ??件夹â??%sâ??ä¸ç??信件å??æ¥å?°ç£?ç??"
-#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
#, c-format
msgid "Cannot write offline journal for folder '%s': %s"
msgstr "æ? æ³?å??å?¥æ??件夹â??%sâ??ç??离线æ?¥è®°ï¼?%s"
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
msgid "Virtual folder email provider"
msgstr "è??æ??æ??件夹ç?µå?é?®ä»¶æ??ä¾?è??"
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
msgid "For reading mail as a query of another set of folders"
msgstr "å?³äº?å°?读å?¥é?®ä»¶ä½?为对å?¦ä¸?ç»?æ??件夹ç??æ?¥è¯¢"
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:188
#, c-format
msgid "Could not load %s: Module loading not supported on this system."
-msgstr "æ? æ³?è£?å?¥ %sï¼?æ?¬ç³»ç»?ä¸?æ?¯æ??模å??è£?å?¥ã??"
+msgstr "æ? æ³?è½½å?¥ %sï¼?æ?¬ç³»ç»?ä¸?æ?¯æ??模å??è½½å?¥ã??"
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:197
#, c-format
msgid "Could not load %s: %s"
-msgstr "æ? æ³?è£?å?¥ %sï¼?%s"
+msgstr "æ? æ³?è½½å?¥ %sï¼?%s"
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:206
#, 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:388 ../camel/camel-session.c:207
#, c-format
msgid "No provider available for protocol '%s'"
msgstr "å??è®®â??%sâ??没æ??å?¯ç?¨ç??æ??ä¾?è??"
-#: ../camel/camel-sasl-anonymous.c:36
+#: ../camel/camel-sasl-anonymous.c:35
msgid "Anonymous"
msgstr "å?¿å??"
-#: ../camel/camel-sasl-anonymous.c:38
+#: ../camel/camel-sasl-anonymous.c:37
msgid "This option will connect to the server using an anonymous login."
msgstr "该é??项å°?è¿?æ?¥å?°å?¿å??ç?»å½?ç??æ??å?¡å?¨ä¸?ã??"
-#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:69
+#, c-format
msgid "Authentication failed."
msgstr "认è¯?失败ã??"
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:80
#, c-format
msgid ""
"Invalid email address trace information:\n"
@@ -1764,7 +2085,7 @@ msgstr ""
"æ? æ??ç??ç?µå?é?®ä»¶è·?踪信æ?¯ï¼?\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:94
#, c-format
msgid ""
"Invalid opaque trace information:\n"
@@ -1773,7 +2094,7 @@ msgstr ""
"æ? æ??ç??诲涩è·?踪信æ?¯ï¼?\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:108
#, c-format
msgid ""
"Invalid trace information:\n"
@@ -1782,204 +2103,197 @@ msgstr ""
"æ? æ??ç??è·?踪信æ?¯ï¼?\n"
"%s"
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:45
msgid "CRAM-MD5"
msgstr "CRAM-MD5"
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:47
msgid ""
"This option will connect to the server using a secure CRAM-MD5 password, if "
"the server supports it."
msgstr "å¦?æ??æ??å?¡å?¨æ?¯æ??ç??è¯?ï¼?该é??项å°?ç?¨å®?å?¨ CRAM-MD5 å¯?ç ?è¿?æ?¥å?°æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:56
msgid "DIGEST-MD5"
msgstr "DIGEST-MD5"
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:58
msgid ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
msgstr "å¦?æ??æ??å?¡å?¨æ?¯æ??ç??è¯?ï¼?该é??项å°?ç?¨å®?å?¨ DIGEST-MD5 å¯?ç ?è¿?æ?¥å?°æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-digest-md5.c:844
+#: ../camel/camel-sasl-digest-md5.c:818
+#, c-format
msgid "Server challenge too long (>2048 octets)"
msgstr "æ??å?¡å?¨è´¨è¯¢è¿?é?¿ (>2048 å?è??)"
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:829
+#, c-format
msgid "Server challenge invalid\n"
msgstr "æ??å?¡å?¨è´¨è¯¢æ? æ??\n"
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:837
+#, c-format
msgid "Server challenge contained invalid \"Quality of Protection\" token"
msgstr "æ??å?¡å?¨è´¨è¯¢å?«æ??æ? æ??ç??â??å??è´¨ä¿?æ?¤â??æ ?å¿?"
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:869
+#, c-format
msgid "Server response did not contain authorization data"
msgstr "æ??å?¡å?¨åº?ç?ä¸?å?«æ??认è¯?æ?°æ?®"
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:890
+#, c-format
msgid "Server response contained incomplete authorization data"
msgstr "æ??å?¡å?¨åº?è¾¾å?«æ??ä¸?å®?æ?´ç??认è¯?æ?°æ?®"
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:903
+#, c-format
msgid "Server response does not match"
msgstr "æ??å?¡å?¨åº?ç?ä¸?å?¹é??"
-#: ../camel/camel-sasl-gssapi.c:63
+#: ../camel/camel-sasl-gssapi.c:82
msgid "GSSAPI"
msgstr "GSSAPI"
-#: ../camel/camel-sasl-gssapi.c:65
+#: ../camel/camel-sasl-gssapi.c:84
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:121
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:126
msgid "The provided target_name parameter was ill-formed."
msgstr "æ??ä¾?ç?? target_name å??æ?°æ ¼å¼?ä¸?对ã??"
-#: ../camel/camel-sasl-gssapi.c:167
+#: ../camel/camel-sasl-gssapi.c:129
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:133
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:138
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:142
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:147
msgid "The supplied context handle did not refer to a valid context."
msgstr "æ??ä¾?ç??ä¸?ä¸?æ??å?¥æ??æ??å¼?ç?¨ç??ä¸?ä¸?æ??æ? æ??ã??"
-#: ../camel/camel-sasl-gssapi.c:188
+#: ../camel/camel-sasl-gssapi.c:150
msgid "The consistency checks performed on the input_token failed."
msgstr "对 input_token æ?§è¡?å®?æ?´æ?§æ£?æ?¥å¤±è´¥ã??"
-#: ../camel/camel-sasl-gssapi.c:191
+#: ../camel/camel-sasl-gssapi.c:153
msgid "The consistency checks performed on the credential failed."
msgstr "对è¯?书æ?§è¡?å®?æ?´æ?§æ£?æ?¥å¤±è´¥ã??"
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:156
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:162 ../camel/camel-sasl-gssapi.c:300
+#: ../camel/camel-sasl-gssapi.c:344 ../camel/camel-sasl-gssapi.c:361
+#: ../camel/providers/smtp/camel-smtp-transport.c:1192
+#, c-format
msgid "Bad authentication response from server."
msgstr "æ?¥è?ªæ??å?¡å?¨ç??æ? æ??认è¯?åº?ç?ã??"
-#: ../camel/camel-sasl-gssapi.c:309
+#: ../camel/camel-sasl-gssapi.c:373
+#, c-format
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
+#: ../camel/camel-sasl-login.c:39
msgid "Login"
msgstr "Login"
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
msgid "This option will connect to the server using a simple password."
msgstr "该é??项å°?以æ?®é??å¯?ç ?è¿?æ?¥å?°æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:94
+#, c-format
msgid "Unknown authentication state."
msgstr "æ?ªç?¥ç??认è¯?ç?¶æ??ã??"
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:41
msgid "NTLM / SPA"
msgstr "NTLM / SPA"
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:43
msgid ""
"This option will connect to a Windows-based server using NTLM / Secure "
"Password Authentication."
msgstr "该é??项å°?使ç?¨ NTLM / Secure å?£ä»¤è®¤è¯?è¿?æ?¥å?°å?ºäº? Windows ç??æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:43
msgid "PLAIN"
msgstr "PLAIN"
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:46
msgid "POP before SMTP"
msgstr "å?¨ SMTP ä¹?å?? POP"
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:48
msgid "This option will authorise a POP connection before attempting SMTP"
msgstr "该é??项å°?å?¨å°?è¯? SMTP ä¹?å??å??许 POP è¿?æ?¥"
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:82
msgid "POP Source URI"
msgstr "POP � URI"
-#: ../camel/camel-sasl-popb4smtp.c:109
+#: ../camel/camel-sasl-popb4smtp.c:89
+#, c-format
msgid "POP Before SMTP auth using an unknown transport"
msgstr "以æ?ªç?¥ç??ä¼ è¾?è¿?è¡? SMTP ä¹?å??ç?? POP æ??æ??"
-#: ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:97
+#, c-format
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:112
#, c-format
msgid "Regular expression compilation failed: %s: %s"
msgstr "常�表达���失败�%s�%s"
-#: ../camel/camel-service.c:265
+#: ../camel/camel-service.c:88
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URLâ??%sâ??é??è¦?ç?¨æ?·å??ç»?件"
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:92
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URLâ??%sâ??é??è¦?主æ?ºç»?件"
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:96
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URLâ??%sâ??é??è¦?è·¯å¾?ç»?件"
-#: ../camel/camel-session.c:307
+#: ../camel/camel-session.c:263
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -1988,373 +2302,233 @@ msgstr ""
"æ? æ³?å??建ç?®å½? %sï¼?\n"
"%s"
-#: ../camel/camel-session.c:479
+#: ../camel/camel-session.c:760
#, 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
-msgid "Camel session doesn't support forwarding of a message."
-msgstr ""
-
-#: ../camel/camel-smime-context.c:444 ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "æ? æ³?æ?¾å?°â??%sâ??ç??è¯?书"
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:376
msgid "Cannot create CMS message"
msgstr "æ? æ³?å??建 CMS 信件"
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:381
msgid "Cannot create CMS signed data"
msgstr "æ? æ³?å??建 CMS ç¾å??æ?°æ?®"
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:387
msgid "Cannot attach CMS signed data"
msgstr "æ? æ³?é??å? CMS ç¾å??æ?°æ?®"
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:394
msgid "Cannot attach CMS data"
msgstr "æ? æ³?é??å? CMS æ?°æ?®"
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:400
msgid "Cannot create CMS Signer information"
msgstr "æ? æ³?å??建 CMS ç¾å??è??ä¿¡æ?¯"
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:406
msgid "Cannot find certificate chain"
msgstr "����书�"
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:412
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:436 ../camel/camel-smime-context.c:451
#, c-format
msgid "Encryption certificate for '%s' does not exist"
msgstr "â??%sâ??ç??å? å¯?è¯?书ä¸?å?å?¨"
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:458
msgid "Cannot add SMIMEEncKeyPrefs attribute"
msgstr "æ? æ³?æ·»å? SMIMEEncKeyPrefs å±?æ?§"
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:463
msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
msgstr "æ? æ³?æ·»å? MS SMIMEEncKeyPrefs å±?æ?§"
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:468
msgid "Cannot add encryption certificate"
msgstr "æ? æ³?æ·»å? å? å¯?è¯?书"
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:474
msgid "Cannot add CMS Signer information"
msgstr "æ? æ³?æ·»å? CMS ç¾å??è??ä¿¡æ?¯"
-#: ../camel/camel-smime-context.c:613 ../camel/camel-smime-context.c:1065
-msgid "Cannot create encoder context"
-msgstr "æ? æ³?å??建ç¼?ç ?å?¨ä¸?ä¸?æ??"
-
-#: ../camel/camel-smime-context.c:619
-msgid "Failed to add data to CMS encoder"
-msgstr "å°?æ?°æ?®æ·»å? å?° CMS ç¼?ç ?å?¨å¤±è´¥"
-
-#: ../camel/camel-smime-context.c:624 ../camel/camel-smime-context.c:1082
-msgid "Failed to encode data"
-msgstr "ç¼?ç ?æ?°æ?®å¤±è´¥"
-
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:506
msgid "Unverified"
msgstr "æ?ªæ ¡éª?"
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:508
msgid "Good signature"
msgstr "å®?好ç¾å??"
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:510
msgid "Bad signature"
msgstr "æ? æ??ç¾å??"
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:512
msgid "Content tampered with or altered in transit"
msgstr "å??容å?¨ä¼ é??è¿?ç¨?ä¸è¢«ç¯¡æ?¹"
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:514
msgid "Signing certificate not found"
msgstr "ç¾å??è¯?书æ?¾ä¸?å?°"
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:516
msgid "Signing certificate not trusted"
msgstr "ç¾å??è¯?书ä¸?å?¯ä¿¡"
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:518
msgid "Signature algorithm unknown"
msgstr "ç¾å??ç®?æ³?æ?ªç?¥"
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:520
msgid "Signature algorithm unsupported"
msgstr "ç¾å??ç®?æ³?ä¸?æ?¯æ??"
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:522
msgid "Malformed signature"
msgstr "ç¾å??æ ¼å¼?ä¸?对"
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:524
msgid "Processing error"
msgstr "å¤?ç??é??误"
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:566
msgid "No signed data in signature"
msgstr "ç¾å??ä¸æ²¡æ??ç¾å??æ?°æ?®"
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:571
msgid "Digests missing from enveloped data"
msgstr "ä¿¡å°?æ?°æ?®ç¼ºå°?æ??è¦?"
-#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
msgid "Cannot calculate digests"
msgstr "æ? æ³?计ç®?æ??è¦?"
-#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
msgid "Cannot set message digests"
msgstr "æ? æ³?设置信件æ??è¦?"
-#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
msgid "Certificate import failed"
msgstr "�书导�失败"
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:631
#, c-format
msgid "Certificate is the only message, cannot verify certificates"
msgstr "å?ªæ??è¯?书ç??信件ï¼?æ? æ³?æ ¡éª?è¯?书"
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:634
#, c-format
msgid "Certificate is the only message, certificates imported and verified"
msgstr "å?ªæ??è¯?书ç??信件ï¼?è¯?书已导å?¥å¹¶æ ¡éª?"
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:638
msgid "Cannot find signature digests"
msgstr "æ?¾ä¸?å?°ç¾å??æ??è¦?"
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:654
#, 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:832 ../camel/camel-smime-context.c:1114
+msgid "Cannot create encoder context"
+msgstr "æ? æ³?å??建ç¼?ç ?å?¨ä¸?ä¸?æ??"
+
+#: ../camel/camel-smime-context.c:838
+msgid "Failed to add data to CMS encoder"
+msgstr "å°?æ?°æ?®æ·»å? å?° CMS ç¼?ç ?å?¨å¤±è´¥"
+
+#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
+msgid "Failed to encode data"
+msgstr "ç¼?ç ?æ?°æ?®å¤±è´¥"
+
+#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
msgid "Decoder failed"
msgstr "解ç ?å?¨å¤±è´¥"
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1049
msgid "Cannot find common bulk encryption algorithm"
msgstr "æ?¾ä¸?å?°å?¬å?±æ?¹é??å? å¯?ç®?æ³?"
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1057
msgid "Cannot allocate slot for encryption bulk key"
msgstr "æ? æ³?为å? å¯?æ?¹é??å¯?é?¥å??é??å¯?é?¥æ§½"
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1068
msgid "Cannot create CMS Message"
msgstr "æ? æ³?å??建 CMS 信件"
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1074
msgid "Cannot create CMS Enveloped data"
msgstr "æ? æ³?å??建 CMS ä¿¡å°?æ?°æ?®"
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1080
msgid "Cannot attach CMS Enveloped data"
msgstr "æ? æ³?é??å? CMS ä¿¡å°?æ?°æ?®"
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1086
msgid "Cannot attach CMS data object"
msgstr "æ? æ³?é??å? CMS æ?°æ?®å¯¹è±¡"
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1095
msgid "Cannot create CMS Recipient information"
msgstr "æ? æ³?å??建 CMS æ?¶ä»¶äººä¿¡æ?¯"
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1100
msgid "Cannot add CMS Recipient information"
msgstr "æ? æ³?æ·»å? CMS æ?¶ä»¶äººä¿¡æ?¯"
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1125
msgid "Failed to add data to encoder"
msgstr "å°?æ?°æ?®æ·»å? å?°ç¼?ç ?å?¨å¤±è´¥"
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1227
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME 解å¯?ï¼?没æ??æ?¾å?°å? å¯?å??容"
-#: ../camel/camel-smime-context.c:1200
-msgid "import keys: unimplemented"
-msgstr "导��������"
-
-#: ../camel/camel-smime-context.c:1208
-msgid "export keys: unimplemented"
-msgstr "导��������"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "æ? æ³?è?·å??æ??件夹ï¼?对该å?å?¨ç??æ? æ??æ??ä½?"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:444
#, c-format
msgid "Cannot create folder '%s': folder exists"
msgstr "æ? æ³?å??建æ??件夹ï¼?%sï¼?æ??件夹已å?å?¨"
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "æ? æ³?å??建æ??件夹ï¼?对该å?å?¨ç??æ? æ??æ??ä½?"
-
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:543
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "æ? æ³?å??建æ??件夹ï¼?%sï¼?æ??件夹已å?å?¨"
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
+#: ../camel/providers/local/camel-maildir-store.c:224
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "æ? æ³?å? é?¤æ??件夹ï¼?%sï¼?æ? æ??æ??ä½?"
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:314
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "æ? æ³?é??å?½å??æ??件夹ï¼?%sï¼?æ? æ??æ??ä½?"
#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-store.c:1128 ../camel/camel-vtrash-folder.c:48
msgid "Trash"
msgstr "å??æ?¶ç«?"
#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:1131 ../camel/camel-vtrash-folder.c:50
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:786
#, c-format
msgid ""
"Issuer: %s\n"
@@ -2367,35 +2541,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:792
msgid "GOOD"
msgstr "好"
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:792
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:796
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -2410,7 +2565,7 @@ msgstr ""
"\n"
"æ?¨å¸?æ??æ?¥å??å??ï¼?"
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:840
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -2419,7 +2574,7 @@ msgstr ""
"�书���%s\n"
"å??è¡?è??ï¼?%s"
-#: ../camel/camel-tcp-stream-ssl.c:979
+#: ../camel/camel-tcp-stream-ssl.c:892
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -2428,7 +2583,7 @@ msgstr ""
"æ? æ??ç??è¯?书å??å??ï¼?%s\n"
"å??è¡?è??ï¼?%s"
-#: ../camel/camel-tcp-stream-ssl.c:997
+#: ../camel/camel-tcp-stream-ssl.c:910
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -2437,7 +2592,7 @@ msgstr ""
"è¯?书è¿?æ??ï¼?%s\n"
"å??è¡?è??ï¼?%s"
-#: ../camel/camel-tcp-stream-ssl.c:1014
+#: ../camel/camel-tcp-stream-ssl.c:927
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -2446,49 +2601,50 @@ msgstr ""
"è¯?书æ?¤é??å??表已è¿?æ??ï¼?%s\n"
"å??è¡?è??ï¼?%s"
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:314
#, c-format
msgid "Could not parse URL '%s'"
msgstr "æ? æ³?解æ?? URLâ??%sâ??"
-#: ../camel/camel-vee-folder.c:580
+#: ../camel/camel-vee-folder.c:1044
#, c-format
-msgid "Error storing '%s': %s"
-msgstr "å?å?¨â??%sâ??é??误ï¼?%s"
+msgid "Error storing '%s': "
+msgstr "å?å?¨â??%sâ??å?ºé??ï¼?"
-#: ../camel/camel-vee-folder.c:657
+#: ../camel/camel-vee-folder.c:1117
#, 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:1133 ../camel/camel-vee-folder.c:1148
+#, c-format
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "æ? æ³?å°?信件移å?¨æ??å¤?å?¶å?°è??æ??æ??件夹ä¸"
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:417
msgid "Unmatched"
msgstr "æ? å?¹é??"
-#: ../camel/camel-vee-store.c:400
-#, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "æ? æ³?å? é?¤æ??件夹ï¼?%sï¼?没æ??该æ??件夹"
-
-#: ../camel/camel-vee-store.c:422
+#: ../camel/camel-vee-store.c:223
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "æ? æ³?é??å?½å??æ??件夹ï¼?%sï¼?没æ??该æ??件夹"
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vee-store.c:289
+#, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "æ? æ³?å? é?¤æ??件夹ï¼?%sï¼?没æ??该æ??件夹"
+
+#: ../camel/camel-vtrash-folder.c:49
msgid "Cannot copy messages to the Trash folder"
msgstr "æ? æ³?å°?信件å¤?å?¶å?°å??æ?¶ç«?æ??件夹"
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
msgid "Cannot copy messages to the Junk folder"
msgstr "æ? æ³?å°?信件å¤?å?¶å?°å??å?¾é?®ä»¶æ??件夹"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -2497,234 +2653,227 @@ 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/local/camel-mbox-folder.c:363
-#: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:226
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
+#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:268
+#: ../camel/providers/local/camel-maildir-folder.c:380
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/local/camel-mh-folder.c:215
msgid "No such message"
msgstr "没æ??该信件"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
-#: ../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/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
-msgid "User canceled"
-msgstr "ç?¨æ?·å·²å??æ¶?"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:819
-#: ../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/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/groupwise/camel-groupwise-folder.c:158
+#: ../camel/providers/nntp/camel-nntp-folder.c:244
+#: ../camel/providers/nntp/camel-nntp-folder.c:337
+#: ../camel/providers/pop3/camel-pop3-folder.c:714
#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "æ? æ³?è?·å??信件 %sï¼?%s"
+msgid "Cannot get message %s: "
+msgstr "æ? æ³?è?·å??信件 %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/imap4/camel-imap4-folder.c:837
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
+#, c-format
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:203
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2109
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2163
+#, c-format
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:1038
+#: ../camel/providers/imap/camel-imap-folder.c:376
#, 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:1112
+#, c-format
msgid "Checking for deleted messages %s"
-msgstr "���信件"
+msgstr "æ£?æ?¥å·²å? é?¤ç??æ?°å»º %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
-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:1637
+#: ../camel/providers/groupwise/camel-groupwise-store.c:654
+#: ../camel/providers/groupwise/camel-groupwise-store.c:779
+#: ../camel/providers/imap/camel-imap-folder.c:3806
+#: ../camel/providers/imap/camel-imap-folder.c:3884
+#: ../camel/providers/imapx/camel-imapx-server.c:3721
+#: ../camel/providers/imapx/camel-imapx-server.c:3845
#, 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:2474
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2524
#, 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:2510
#, c-format
msgid "Cannot create message: %s"
msgstr "æ? æ³?å??建信件ï¼?%s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
#, c-format
msgid "Cannot get folder container %s"
msgstr "æ? æ³?è?·å¾?æ??件夹容å?¨ %s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#, c-format
msgid "Cannot append message in offline mode: cache unavailable"
msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?追å? 信件ï¼?ç¼?å?ä¸?å?¯ç?¨"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?追å? 信件ï¼?%s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+msgid "Cannot append message in offline mode: "
+msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?追å? 信件ï¼?"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
msgid "Checking for new mail"
msgstr "����件"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
-#: ../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/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:47
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/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
msgid "Options"
msgstr "é??项"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
msgid "_Apply filters to new messages in Inbox on this server"
msgstr "åº?ç?¨è¿?滤è§?å??å?°æ¤æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡ä»¶(_A)"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
msgid "Check new messages for J_unk contents"
msgstr "æ£?æ?¥æ?°ä¿¡ä»¶ç??å??å?¾å??容(_U)"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:79
msgid "Only check for Junk messages in the IN_BOX folder"
msgstr "ä»?å?¨æ?¶ä»¶ç®±ä¸æ£?æ?¥å??å?¾é?®ä»¶(_B)"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
msgid "Automatically synchroni_ze account locally"
msgstr "è?ªå?¨å°?è¿?ç¨?é?®ä»¶å??æ¥å?°æ?¬å?°(_Z)"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
msgid "SOAP Settings"
msgstr "SOAP 设置"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
-#, fuzzy
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
msgid "Post Office Agent SOAP _Port:"
-msgstr "é?®å±?代ç?? SOAP 端å?£ï¼?"
+msgstr "é?®å±?代ç?? SOAP 端å?£(_P)ï¼?"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
msgid "Novell GroupWise"
msgstr "Novell GroupWise"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
msgid "For accessing Novell GroupWise servers"
msgstr "访é?® Novell GroupWise æ??å?¡å?¨"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
-#: ../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/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:105
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:70
msgid "Password"
msgstr "å¯?ç ?"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
msgid ""
"This option will connect to the GroupWise server using a plaintext password."
msgstr "该é??项å°?使ç?¨çº¯æ??æ?¬å¯?ç ?è¿?æ?¥å?° GroupWise æ??å?¡å?¨ã??"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
+#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#, c-format
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:207
+#: ../camel/providers/imap/camel-imap-store.c:1207
+#: ../camel/providers/imapx/camel-imapx-server.c:2975
+#, c-format
msgid "You did not enter a password."
msgstr "æ?¨æ²¡æ??è¾?å?¥å¯?ç ?ã??"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
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:550
+#: ../camel/providers/imap/camel-imap-store.c:1776
+#: ../camel/providers/imap/camel-imap-store.c:1971
+#: ../camel/providers/imapx/camel-imapx-store.c:410
#, c-format
msgid "No such folder %s"
msgstr "没æ??æ??件夹 %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#, c-format
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:1196
+#, c-format
+msgid "Cannot create a special system folder"
+msgstr "æ? æ³?å??建ç?¹æ®?ç³»ç»?æ??件夹"
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
+#: ../camel/providers/imap/camel-imap-store.c:1854
+#: ../camel/providers/imap/camel-imap-store.c:2276
+#: ../camel/providers/imapx/camel-imapx-store.c:873
+#, c-format
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:1289
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
+#, 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-transport.c:120
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
#, c-format
msgid "GroupWise server %s"
msgstr "GroupWise æ??å?¡å?¨ %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
#, c-format
msgid "GroupWise service for %s on %s"
msgstr "%2$s 为 %1$s æ??ä¾?ç?? GroupWise æ??å?¡"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
#, c-format
msgid "GroupWise mail delivery via %s"
msgstr "é??è¿? %s å??é?? GroupWise é?®ä»¶"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
msgid "Sending Message"
msgstr "å??é??信件"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
+#, c-format
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "æ? æ³?è?·å??æ??件夹ï¼?对该å?å?¨ç??æ? æ??æ??ä½?"
+
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#, c-format
msgid ""
"You have exceeded this account's storage limit. Your messages are queued in "
"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
@@ -2733,93 +2882,36 @@ msgstr ""
"æ?¨å·²ç»?è¾¾å?°äº?è´¦æ?·ç??å?å?¨é??å?¶ã??æ?¨ç??é?®ä»¶æ£å?¨å??件箱ä¸æ??é??ã??请å??å? é?¤/å?æ¡£æ??äº?é?®ä»¶ä¹?"
"å??å??å??é??/æ?¥æ?¶ã??\n"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
#, c-format
msgid "Could not send message: %s"
msgstr "æ? æ³?å??é??信件ï¼?%s"
-#: ../camel/providers/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-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
-msgid "Connection to Server"
-msgstr "è¿?æ?¥æ??å?¡å?¨"
-
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:54
-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
-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/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-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
-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
-msgid "O_verride server-supplied folder namespace"
-msgstr "è¦?ç??æ??å?¡å?¨æ??ä¾?ç??æ??件夹å?½å??空é?´(_V)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "å?½å??空é?´"
-
-#: ../camel/providers/hula/camel-hula-provider.c:76
-msgid "Hula"
-msgstr "Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "For accessing Hula servers"
-msgstr "访é?® Hula æ??å?¡å?¨"
-
-#: ../camel/providers/hula/camel-hula-provider.c:95
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "该é??项å°?使ç?¨çº¯æ??æ?¬å¯?ç ?è¿?æ?¥å?° Hula æ??å?¡å?¨ã??"
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../camel/providers/imap/camel-imap-command.c:190
+#: ../camel/providers/imap/camel-imap-command.c:288
+#, c-format
msgid "No output stream"
msgstr "没æ??è¾?å?ºæµ?"
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:296
+#, c-format
msgid "No input stream"
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-command.c:245
+#, c-format
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-command.c:353
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "æ??å?¡å?¨æ??å¤?å?°ä¸æ¢äº?è¿?æ?¥ï¼?%s"
#. for imap ALERT codes, account user host
#. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:352
+#: ../camel/providers/imap/camel-imap-command.c:373
#, c-format
msgid ""
"Alert from IMAP server %s %s:\n"
@@ -2828,244 +2920,276 @@ msgstr ""
"æ?¥è?ª IMAP æ??å?¡å?¨ %s %s ç??æ??é??ï¼?\n"
"%s"
-#: ../camel/providers/imap/camel-imap-command.c:421
+#: ../camel/providers/imap/camel-imap-command.c:444
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "æ?¥è?ª IMAP æ??å?¡å?¨ç??æ??å¤?åº?ç?ï¼?%s"
-#: ../camel/providers/imap/camel-imap-command.c:431
+#: ../camel/providers/imap/camel-imap-command.c:456
#, c-format
msgid "IMAP command failed: %s"
msgstr "IMAP �令失败�%s"
-#: ../camel/providers/imap/camel-imap-command.c:506
+#: ../camel/providers/imap/camel-imap-command.c:532
+#, c-format
msgid "Server response ended too soon."
msgstr "æ??å?¡å?¨åº?ç?ç»?æ??太快ã??"
-#: ../camel/providers/imap/camel-imap-command.c:712
+#: ../camel/providers/imap/camel-imap-command.c:740
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "IMAP æ??å?¡å?¨åº?ç?ä¸?å?«æ?? %s ä¿¡æ?¯"
-#: ../camel/providers/imap/camel-imap-command.c:748
+#: ../camel/providers/imap/camel-imap-command.c:778
#, c-format
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:281
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:353
#, 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:960
+#: ../camel/providers/imapx/camel-imapx-server.c:3760
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "æ?«æ?? %s ä¸æ?´æ?¹äº?ç??信件"
-#: ../camel/providers/imap/camel-imap-folder.c:1987
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "APPEND å?½ä»¤å??è¿?å??äº?æ?ªç?¥ç??å??åº?ç?¶æ??â??%sâ??"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2002
-msgid "No response on continuation after APPEND command"
-msgstr "APPEND å?½ä»¤å??ç»æ? å??åº?"
+#: ../camel/providers/imap/camel-imap-folder.c:3231
+msgid "Unable to retrieve message: "
+msgstr "æ? æ³?è?·å??信件ï¼?"
-#: ../camel/providers/imap/camel-imap-folder.c:2047
-msgid "Unknown error occurred during APPEND command!"
-msgstr "å?¨ APPEND å?½ä»¤æ?¶å??ç??äº?é??误ï¼?"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2878
-#, 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:3266
+#: ../camel/providers/imapx/camel-imapx-server.c:4957
#, 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:3267
+#: ../camel/providers/imapx/camel-imapx-server.c:4958
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:3337
+#: ../camel/providers/imap/camel-imap-folder.c:4203
+#: ../camel/providers/nntp/camel-nntp-folder.c:326
+#, c-format
msgid "This message is not currently available"
msgstr "该信件ç?®å??ä¸?å?¯ç?¨"
-#: ../camel/providers/imap/camel-imap-folder.c:3624
+#: ../camel/providers/imap/camel-imap-folder.c:4013
#, 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:4023
#, 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:4243
+#, c-format
msgid "Could not find message body in FETCH response."
msgstr "æ? æ³?å?¨ FETCH åº?ç?ä¸æ?¾å?°ä¿¡ä½?ã??"
-#: ../camel/providers/imap/camel-imap-message-cache.c:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "æ? æ³?æ??å¼?ç¼?å?²å?¨ç?®å½?ï¼?%s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+msgid "Could not open cache directory: "
+msgstr "æ? æ³?æ??å¼?ç¼?å?ç?®å½?ï¼?"
-#: ../camel/providers/imap/camel-imap-message-cache.c:330
-#: ../camel/providers/imap/camel-imap-message-cache.c:387
-#: ../camel/providers/imap/camel-imap-message-cache.c:418
-#: ../camel/providers/imap/camel-imap-message-cache.c:450
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
#, c-format
msgid "Failed to cache message %s: %s"
msgstr "ç¼?å?信件 %s 失败ï¼?%s"
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
+#: ../camel/providers/imap/camel-imap-message-cache.c:388
#, c-format
-msgid "Failed to cache %s: %s"
-msgstr "ç¼?å? %s 失败ï¼?%s"
+msgid "Failed to cache message %s: "
+msgstr "ç¼?å?信件 %s 失败ï¼?"
-#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imap/camel-imap-message-cache.c:525
+#, c-format
+msgid "Failed to cache %s: "
+msgstr "ç¼?å? %s 失败ï¼?"
+
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:41
+msgid "Checking for New Mail"
+msgstr "����件"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
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
-msgid "Namespace:"
-msgstr "å?½å??空é?´ï¼?"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
+msgid "Connection to Server"
+msgstr "è¿?æ?¥æ??å?¡å?¨"
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:55
+msgid "_Use custom command to connect to server"
+msgstr "使ç?¨è?ªå®?ä¹?å?½ä»¤è¿?æ?¥å?°æ??å?¡å?¨(_U)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:52
+msgid "Co_mmand:"
+msgstr "�令(_M)�"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "æ??件夹"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
+msgid "_Show only subscribed folders"
+msgstr "å?ªæ?¾ç¤ºè®¢é??äº?ç??æ??件夹(_S)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
+msgid "O_verride server-supplied folder namespace"
+msgstr "è¦?ç??æ??å?¡å?¨æ??ä¾?ç??æ??件夹å?½å??空é?´(_V)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+msgid "Names_pace:"
+msgstr "å?½å??空é?´(_P)ï¼?"
+
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
msgid "_Apply filters to new messages in INBOX on this server"
msgstr "åº?ç?¨è¿?滤è§?å??å?°æ?¬æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡ä»¶(_A)"
-#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:77
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/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:81
msgid "Automatically synchroni_ze remote mail locally"
msgstr "è?ªå?¨å°?è¿?ç¨?é?®ä»¶å??æ¥å?°æ?¬å?°(_Z)"
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
msgid "IMAP"
msgstr "IMAP"
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:91
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/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:107
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/imap4/camel-imap4-store.c:210
+#: ../camel/providers/imap/camel-imap-store.c:310
+#: ../camel/providers/imapx/camel-imapx-store.c:220
#, c-format
msgid "IMAP server %s"
msgstr "IMAP æ??å?¡å?¨ %s"
-#: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:212
+#: ../camel/providers/imap/camel-imap-store.c:312
+#: ../camel/providers/imapx/camel-imapx-store.c:222
#, 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/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/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:274
+#: ../camel/providers/imap/camel-imap-store.c:446
+#: ../camel/providers/nntp/camel-nntp-store.c:234
+#: ../camel/providers/pop3/camel-pop3-store.c:132
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
#, c-format
msgid "Could not connect to %s: %s"
msgstr "æ? æ³?è¿?æ?¥å?° %sï¼?%s"
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../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/smtp/camel-smtp-transport.c:260
+#: ../camel/providers/imap/camel-imap-store.c:447
+#: ../camel/providers/nntp/camel-nntp-store.c:235
+#: ../camel/providers/pop3/camel-pop3-store.c:133
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
msgid "SSL unavailable"
msgstr "SSL ���"
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
-msgid "Connection cancelled"
-msgstr "è¿?æ?¥å·²å??æ¶?"
+#: ../camel/providers/imap/camel-imap-store.c:465
+#: ../camel/providers/nntp/camel-nntp-store.c:252
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "æ? æ³?è¿?æ?¥å?° %sï¼?"
-#: ../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/imap4/camel-imap4-store.c:310
-#: ../camel/providers/imap4/camel-imap4-store.c:325
-#: ../camel/providers/imap4/camel-imap4-store.c:334
+#: ../camel/providers/imap/camel-imap-store.c:571
+#: ../camel/providers/imap/camel-imap-store.c:591
+#: ../camel/providers/imap/camel-imap-store.c:598
+#: ../camel/providers/imap/camel-imap-store.c:625
+#: ../camel/providers/imapx/camel-imapx-server.c:2828
+#: ../camel/providers/imapx/camel-imapx-server.c:2864
#, 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/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:572
+#: ../camel/providers/imapx/camel-imapx-server.c:2829
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
msgid "STARTTLS not supported"
msgstr "ä¸?æ?¯æ?? STARTTLS"
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:592
+#: ../camel/providers/imapx/camel-imapx-server.c:2865
msgid "SSL negotiations failed"
msgstr "SSL å??å??失败"
-#: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:335
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/imap/camel-imap-store.c:599
+#: ../camel/providers/smtp/camel-smtp-transport.c:339
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:747
+#: ../camel/providers/imapx/camel-imapx-server.c:2648
+#, c-format
+msgid "Connection cancelled"
+msgstr "è¿?æ?¥å·²å??æ¶?"
+
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:2653
#, 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/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/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/imap/camel-imap-store.c:945
+#: ../camel/providers/imap/camel-imap-store.c:2369
+#: ../camel/providers/imapx/camel-imapx-store.c:457
+#: ../camel/providers/imapx/camel-imapx-store.c:1054
+#: ../camel/providers/local/camel-maildir-folder.c:90
+#: ../camel/providers/local/camel-maildir-store.c:225
+#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/providers/local/camel-maildir-store.c:562
+#: ../camel/providers/local/camel-maildir-store.c:575
+#: ../camel/providers/local/camel-spool-store.c:508
msgid "Inbox"
msgstr "�件箱"
-#: ../camel/providers/imap/camel-imap-store.c:1305
+#: ../camel/providers/imap/camel-imap-store.c:1148
+#: ../camel/providers/imapx/camel-imapx-server.c:2931
#, 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/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:1160
+#: ../camel/providers/imapx/camel-imapx-server.c:2943
+#: ../camel/providers/smtp/camel-smtp-transport.c:483
#, 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:1239
+#: ../camel/providers/imapx/camel-imapx-server.c:3013
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3076,413 +3200,160 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:954
+#: ../camel/providers/imap/camel-imap-store.c:1790
+#: ../camel/providers/imap/camel-imap-store.c:2212
+#: ../camel/providers/imapx/camel-imapx-store.c:852
#, 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/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
+#: ../camel/providers/imap/camel-imap-store.c:1906
+#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-mbox-store.c:193
+#: ../camel/providers/local/camel-mh-store.c:255
#, 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:2225
+#: ../camel/providers/imapx/camel-imapx-store.c:863
#, c-format
msgid "Unknown parent folder: %s"
msgstr "æ?ªç?¥ç??ç?¶æ??件夹ï¼?%s"
-#: ../camel/providers/imap/camel-imap-store.c:3053
-#, fuzzy
-msgid "Server unexpectedly disconnected"
-msgstr "æ??å?¡å?¨æ??å¤?å?°ä¸æ¢äº?è¿?æ?¥ï¼?%s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:572
-#: ../camel/providers/imap4/camel-imap4-command.c:579
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "å?? IMAP æ??å?¡å?¨ %s å??é??å?½ä»¤å¤±è´¥ï¼?%s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "æ?¥è?ª IMAP4 æ??å?¡å?¨ %s ç??æ??å¤?å??åº?ï¼?%s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "æ?¥è?ª IMAP æ??å?¡å?¨ %s ç??æ??å¤?åº?ç?ã??"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "æ? æ³?é??æ?©æ??件夹â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "æ? æ³?é??æ?©æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1414
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "å?? IMAP æ??å?¡å?¨ %s å??é??å?½ä»¤å¤±è´¥ï¼?%s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1416
-msgid "service unavailable"
-msgstr "æ??å?¡ä¸?å?¯ç?¨"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1546
-#: ../camel/providers/imap4/camel-imap4-engine.c:1584
-#: ../camel/providers/imap4/camel-imap4-engine.c:1628
-#: ../camel/providers/imap4/camel-imap4-engine.c:1683
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "IMAP4 æ??å?¡å?¨ %s æ??å¤?æ?å¼?è¿?æ?¥ï¼?%s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:87
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr "å?¯ç?¨æ??äº?è¿?滤å?¨å??è??æ??æ??件夹è§?å??æ??é??ç??æ?©å±?é?®ä»¶å??表æ£?æµ?"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:88
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "å°?è?¥å¹²ç§?æ?ªé??读ç??ç¼?å?信件设置为è¿?æ??"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Expire cached messages older than X seconds"
-msgstr "å?¨è?¥å¹²ç§?å??å°?信件设置为è¿?æ??"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "æ? æ³?访é?®æ??件夹â??%sâ??ï¼?%s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "æ? æ³?å°?æ ?å¿?ä¸?æ??件夹â??%sâ??å??æ¥ï¼?æ?ªç?¥"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
+#: ../camel/providers/imap/camel-imap-store.c:3081
#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "æ? æ³?å°?æ ?å¿?ä¸?æ??件夹â??%sâ??å??æ¥ï¼?æ? æ??ç??å?½ä»¤"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "æ? æ³?é??æ¯?æ??件夹â??%sâ??ï¼?æ?ªç?¥"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "æ? æ³?é??æ¯?æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "æ? æ³?ä»?æ??件夹â??%2$sâ??è?·å??信件 %1$sï¼?没æ??è¿?æ ·ç??信件"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "æ? æ³?ä»?æ??件夹â??%2$sâ??è?·å??信件 %1$sï¼?å?½ä»¤æ? æ??"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:940
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "æ? æ³?å°?信件追å? å?°æ??件夹â??%sâ??ï¼?æ??件夹为å?ªè¯»"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "æ? æ³?å°?信件追å? å?°æ??件夹â??%sâ??ï¼?æ?ªç?¥é??误"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "æ? æ³?å°?信件追å? å?°æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1182
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "æ? æ³?å°?信件ä»?æ??件夹â??%sâ??移å?¨å?°æ??件夹â??%sâ??ï¼?æ?ªç?¥é??误"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1186
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "æ? æ³?å°?信件ä»?æ??件夹â??%sâ??å¤?å?¶å?°æ??件夹â??%sâ??ï¼?æ?ªç?¥é??误"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "æ? æ³?å°?信件ä»?æ??件夹â??%sâ??移å?¨å?°æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1198
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "æ? æ³?å°?信件ä»?æ??件夹â??%sâ??å¤?å?¶å?°æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "æ£?æ?¥æ?°ä¿¡ä»¶ç??å??å?¾å??容(_J)"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "ä»?å?¨æ?¶ä»¶ç®±ä¸æ£?æ?¥å??å?¾é?®ä»¶(_G)"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
-msgid "IMAP4rev1"
-msgstr "IMAPrev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "IMAPv4rev1 æ??å?¡å?¨ä¸?é?®ä»¶ç??读å??ã??"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-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/smtp/camel-smtp-transport.c:271
-msgid "Connection canceled"
-msgstr "è¿?æ?¥å·²å??æ¶?"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:296
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "以å®?å?¨æ¨¡å¼?è¿?æ?¥å?° IMAP æ??å?¡å?¨ %s 失败ï¼?æ??å?¡å?¨ä¸?æ?¯æ?? STARTTLS"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-msgid "TLS negotiations failed"
-msgstr "TLS å??å??失败"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:411
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "æ? æ³?使ç?¨ %2$s 身份éª?è¯?ç®?æ³?对 IMAP æ??å?¡å?¨ %1$s è¿?è¡?身份éª?è¯?"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:534
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "æ? æ³?使ç?¨ %2$s 认è¯?å?° IMAP æ??å?¡å?¨ %1$s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:697
-#: ../camel/providers/imap4/camel-imap4-store.c:964
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?å??建 IMAP æ??件夹ã??"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "æ? æ³?è?·å?? IMAP æ??å?¡å?¨ %2$s ä¸?ç??æ??件夹 %1$sï¼?æ?ªç?¥é??误"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "æ? æ³?å?¨ IMAP æ??å?¡å?¨ %2$s ä¸?为â??%1$sâ??è?·å¾? LIST ä¿¡æ?¯ï¼?%3$s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "æ? æ??å?½ä»¤"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:897
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "æ? æ³?å??建æ??件夹â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "æ? æ³?å??建æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "æ? æ³?å? é?¤æ??件夹â??%sâ??ï¼?ç?¹æ®?æ??件夹"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?å? é?¤ IMAP æ??件夹ã??"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "æ? æ³?å? é?¤æ??件夹â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
+msgid "Server unexpectedly disconnected"
+msgstr "æ??å?¡å?¨æ??å¤?æ?å¼? "
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "æ? æ³?å? é?¤æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+#: ../camel/providers/imap/camel-imap-store.c:3084
+msgid "Server unexpectedly disconnected: "
+msgstr "æ??å?¡å?¨æ??å¤?æ?å¼?ï¼?"
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
+#: ../camel/providers/imapx/camel-imapx-folder.c:75
#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "æ? æ³?å°?æ??件夹â??%sâ??é??å?½å??为â??%sâ??ï¼?ç?¹æ®?æ??件夹"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?é??å?½å?? IMAP æ??件夹ã??"
+msgid "Could not create folder summary for %s"
+msgstr "æ? æ³?为 %s å??建æ??件夹æ¦?è¦?"
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
+#: ../camel/providers/imapx/camel-imapx-folder.c:83
#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "æ? æ³?å°?æ??件夹â??%sâ??é??å?½å??为â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
+msgid "Could not create cache for %s: "
+msgstr "æ? æ³?为 %s å??建ç¼?å?ï¼?"
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "æ? æ³?å°?æ??件夹â??%sâ??é??å?½å??为â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+#: ../camel/providers/imapx/camel-imapx-provider.c:43
+msgid "Use _Quick Resync if the server supports it"
+msgstr "å¦?æ??æ??å?¡å?¨æ?¯æ??å??使ç?¨å¿«é??é??æ?°å??æ¥(_Q)"
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1572
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "æ? æ³?å?¨ IMAP æ??å?¡å?¨ %3$s ä¸?为模å¼?â??%2$sâ??è?·å?? %1$s ä¿¡æ?¯ï¼?%4$s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:45
+msgid "Use I_dle if the server supports it"
+msgstr "å¦?æ??æ??å?¡å?¨æ?¯æ??ç??è¯?使ç?¨ I_DLE"
-#: ../camel/providers/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?订é?? IMAP æ??件夹ã??"
+#: ../camel/providers/imapx/camel-imapx-provider.c:57
+msgid "Command:"
+msgstr "�令�"
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "æ? æ³?订é??æ??件夹â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
+msgid "Numbe_r of cached connections to use"
+msgstr "使ç?¨ç??ç¼?å?è¿?æ?¥ç??æ?°ç?®(_R)"
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "æ? æ³?订é??æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+#: ../camel/providers/imapx/camel-imapx-provider.c:70
+msgid "Namespace:"
+msgstr "å?½å??空é?´ï¼?"
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?é??订 IMAP æ??件夹ã??"
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
+msgid "IMAP+"
+msgstr "IMAP+"
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "æ? æ³?é??订æ??件夹â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
+#: ../camel/providers/imapx/camel-imapx-server.c:1365
+msgid "Error writing to cache stream: "
+msgstr "å??å?¥ç¼?å?æµ?é??误ï¼?"
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
+#: ../camel/providers/imapx/camel-imapx-server.c:2008
#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "æ? æ³?é??订æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+msgid "Not authenticated"
+msgstr "没æ??éª?è¯?"
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "æ?«æ??æ?´æ?¹äº?ç??信件"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
+#: ../camel/providers/imapx/camel-imapx-server.c:2756
#, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP æ??å?¡å?¨ %s ç??ç?¶æ??ä¸?ä¸?è?´ã??"
+msgid "Could not connect to %s (port %s): "
+msgstr "æ? æ³?è¿?æ?¥å?° %s(端å?£ %s)ï¼?"
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "è?·å??æ?°æ?°ä¿¡ä»¶ç??ä¿¡å°?"
+#: ../camel/providers/imapx/camel-imapx-server.c:3185
+msgid "Closing tmp stream failed: "
+msgstr "å?³é?临æ?¶æµ?失败ï¼?"
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
+#: ../camel/providers/imapx/camel-imapx-server.c:5081
#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "æ?¥è?ª IMAP4 æ??å?¡å?¨ %s ç??æ??å¤?å??åº?ï¼?"
+msgid "Cannot create spool file: %s"
+msgstr "æ? æ³?å??建æ??å?°æ??件ï¼?%s"
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "æ? æ?°æ?®"
+#: ../camel/providers/imapx/camel-imapx-server.c:5096
+msgid "Cannot create spool file: "
+msgstr "æ? æ³?å??建æ??å?°æ??件ï¼?"
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
+#: ../camel/providers/imapx/camel-imapx-store.c:426
+#: ../camel/providers/nntp/camel-nntp-store.c:1529
#, c-format
-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/imapp/camel-imapp-provider.c:49
-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"
+msgid "No such folder: %s"
+msgstr "没æ??æ??件夹ï¼?%s"
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-stream.c:71
#, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "æ? æ³?è¿?æ?¥å?° %s(端å?£ %s)ï¼?%s"
+msgid "Source stream returned no data"
+msgstr "æº?æµ?没è¿?å??æ?°æ?®"
-#: ../camel/providers/imapp/camel-imapp-store.c:348
+#: ../camel/providers/imapx/camel-imapx-stream.c:80
#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "æ? æ³?è¿?æ?¥å?° %s ä¸?ç?? POP æ??å?¡å?¨"
+msgid "Source stream unavailable"
+msgstr "�����"
-#: ../camel/providers/local/camel-local-folder.c:178
-msgid "Index message body data"
-msgstr "索�信���"
-
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
+#: ../camel/providers/local/camel-local-folder.c:199
#, c-format
msgid "~%s (%s)"
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
+#: ../camel/providers/local/camel-local-folder.c:209
+#: ../camel/providers/local/camel-local-folder.c:218
+#, c-format
msgid "mailbox: %s (%s)"
msgstr "�件箱�%s (%s)"
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
+#: ../camel/providers/local/camel-local-folder.c:227
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:272
+msgid "Index message body data"
+msgstr "索�信���"
+
+#: ../camel/providers/local/camel-local-folder.c:683
+#, c-format
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"æ? æ³?ä»?æ??件夹 %2$s è?·å??信件 %1$s\n"
+"%3$s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
msgid "_Use the '.folders' folder summary file (exmh)"
msgstr "使ç?¨â??.foldersâ??æ??件夹æ¦?è§?æ??件(exmh)(_U)"
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
msgid "MH-format mail directories"
msgstr "MH-æ ¼å¼?ç??é?®ä»¶ç?®å½?"
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
msgid "For storing local mail in MH-like mail directories."
msgstr "å?¨ç±»ä¼¼äº? MH ç??é?®ä»¶ç?®å½?ä¸å?å?¨æ?¬å?°é?®ä»¶ã??"
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
msgid "Local delivery"
msgstr "æ?¬å?°å??é??"
-#: ../camel/providers/local/camel-local-provider.c:74
+#: ../camel/providers/local/camel-local-provider.c:70
msgid ""
"For retrieving (moving) local mail from standard mbox-formatted spools into "
"folders managed by Evolution."
@@ -3490,29 +3361,29 @@ msgstr ""
"对äº?å°?æ?¬å?°é?®ä»¶ä»?æ ?å?? mbox æ ¼å¼?è?±æ?ºæ??件夹è?·å??(移å?¨)å?°ç?± Evolution 管ç??ç??æ??件"
"夹ã??"
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
msgid "_Apply filters to new messages in INBOX"
msgstr "对 INBOX ä¸ç??æ?°ä¿¡ä»¶åº?ç?¨è¿?滤è§?å??(_A)"
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
msgid "Maildir-format mail directories"
msgstr "Maildir æ ¼å¼?ç??é?®ä»¶ç?®å½?"
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
msgid "For storing local mail in maildir directories."
msgstr "å?¨ maildir é?®ä»¶ç?®å½?ä¸å?å?¨æ?¬å?°é?®ä»¶ã??"
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
msgid "_Store status headers in Elm/Pine/Mutt format"
msgstr "以 Elm/Pine/Mutt æ ¼å¼?å?å?¨ç?¶æ??头(_S)"
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
msgid "Standard Unix mbox spool file"
msgstr "æ ?å?? Unix mbox spool æ??件"
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
msgid ""
"For reading and storing local mail in external standard mbox spool files.\n"
"May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3520,145 +3391,133 @@ msgstr ""
"对äº?读å??å??å?å?¨å¤?é?¨æ ?å?? mbox è?±æ?ºæ??件ä¸ç??æ?¬å?°é?®ä»¶ã??\n"
"ä¹?å?¯ç?¨äº?读å?? Elmã??Pine æ?? Mutt é£?æ ¼ç??æ??件夹æ ?ã??"
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
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:149
+#: ../camel/providers/local/camel-local-store.c:284
+#: ../camel/providers/local/camel-mbox-store.c:371
+#: ../camel/providers/local/camel-spool-store.c:109
#, 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:158
#, 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:169
+#: ../camel/providers/local/camel-local-store.c:179
+#: ../camel/providers/local/camel-local-store.c:297
#, 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:193
+#, c-format
msgid "Local stores do not have an inbox"
msgstr "æ?¬å?°å?å?¨æ²¡æ??æ?¶ä»¶ç®±"
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:250
#, c-format
msgid "Local mail file %s"
msgstr "æ?¬å?°é?®ä»¶æ??件 %s"
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:358
#, 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:431
#, 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:461
+#: ../camel/providers/local/camel-mbox-store.c:304
#, 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:489
+#: ../camel/providers/local/camel-mbox-store.c:333
#, c-format
msgid "Could not delete folder meta file '%s': %s"
msgstr "æ? æ³?å? é?¤æ??件夹å??æ??件â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:537
+#, c-format
msgid "Unable to add message to summary: unknown reason"
msgstr "æ? æ³?å°?信件添å? å?°æ¦?è¦?ä¸ï¼?æ?ªç?¥ç??å??å? "
-#: ../camel/providers/local/camel-maildir-folder.c:228
-msgid "Maildir append message canceled"
-msgstr "é?®ä»¶ç?®å½?é??å? æ¶?æ?¯å·²å??æ¶?"
-
-#: ../camel/providers/local/camel-maildir-folder.c:231
+#: ../camel/providers/local/camel-maildir-folder.c:195
#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "æ? æ³?å°?信件é??å? å?°é?®ä»¶ç?®å½?æ??件夹ï¼?%sï¼?%s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "æ? æ³?å°?信件é??å? å?°é?®ä»¶ç?®å½?æ??件夹ï¼?%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-mbox-folder.c:362
-#: ../camel/providers/local/camel-mbox-folder.c:413
-#: ../camel/providers/local/camel-mbox-folder.c:434
-#: ../camel/providers/local/camel-mbox-folder.c:465
-#: ../camel/providers/local/camel-mbox-folder.c:473
-#: ../camel/providers/local/camel-mh-folder.c:225
-#: ../camel/providers/local/camel-mh-folder.c:236
-#: ../camel/providers/local/camel-mh-folder.c:244
+#: ../camel/providers/local/camel-maildir-folder.c:283
+#: ../camel/providers/local/camel-maildir-folder.c:291
+#: ../camel/providers/local/camel-mbox-folder.c:440
+#: ../camel/providers/local/camel-mh-folder.c:227
+#: ../camel/providers/local/camel-mh-folder.c:235
#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-" %s"
-msgstr ""
-"æ? æ³?ä»?æ??件夹 %2$s è?·å??信件ï¼?%1$s\n"
-" %3$s"
+msgid "Cannot get message %s from folder %s: "
+msgstr "æ? æ³?ä»?æ??件夹 %2$s è?·å??信件 %1$sï¼?"
-#: ../camel/providers/local/camel-maildir-folder.c:313
-msgid "Invalid message contents"
-msgstr "æ? æ??ç??信件å??容"
+#: ../camel/providers/local/camel-maildir-folder.c:399
+#, c-format
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "æ? æ³?å°?信件转移å?°ç?®æ ?æ??件夹ï¼?%s"
-#: ../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-maildir-store.c:136
+#: ../camel/providers/local/camel-maildir-store.c:167
+#: ../camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/local/camel-mbox-store.c:175
#, 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-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:151
+#: ../camel/providers/local/camel-mbox-store.c:127
+#: ../camel/providers/local/camel-mh-store.c:215
#, 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-maildir-store.c:157
+#: ../camel/providers/local/camel-mbox-store.c:137
#: ../camel/providers/local/camel-mh-store.c:224
#, c-format
msgid "Cannot get folder '%s': folder does not exist."
msgstr "æ? æ³?è?·å¾?æ??件夹â??%sâ??ï¼?æ??件夹ä¸?å?å?¨ã??"
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:184
#, c-format
msgid "Cannot get folder '%s': not a maildir directory."
msgstr "æ? æ³?è?·å??æ??件夹â??%sâ??ï¼?ä¸?æ?¯ maildir ç?®å½?ã??"
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-maildir-store.c:282
+#: ../camel/providers/local/camel-mh-store.c:287
#, c-format
msgid "Could not delete folder '%s': %s"
msgstr "æ? æ³?å? é?¤æ??件夹â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:244
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-maildir-store.c:482
+#: ../camel/providers/local/camel-spool-store.c:364
+#: ../camel/providers/local/camel-spool-store.c:380
#, 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:435
+#: ../camel/providers/local/camel-maildir-summary.c:558
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "æ? æ³?æ??å¼?é?®ä»¶ç?®å½?è·¯å¾?ï¼?%sï¼?%s"
@@ -3667,60 +3526,52 @@ msgstr "æ? æ³?æ??å¼?é?®ä»¶ç?®å½?è·¯å¾?ï¼?%sï¼?%s"
msgid "Checking folder consistency"
msgstr "æ£?æ?¥æ??件夹ä¸?è?´æ?§"
-#: ../camel/providers/local/camel-maildir-summary.c:658
+#: ../camel/providers/local/camel-maildir-summary.c:641
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-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:732
+#: ../camel/providers/local/camel-mbox-summary.c:465
+#: ../camel/providers/local/camel-mbox-summary.c:669
+#: ../camel/providers/local/camel-mbox-summary.c:799
+#: ../camel/providers/local/camel-spool-summary.c:130
msgid "Storing folder"
msgstr "å?å?¨æ??件夹"
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:124
+#: ../camel/providers/local/camel-spool-folder.c:125
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr "æ? æ³?å?¨ %s å??建æ??件夹é??ï¼?%s"
-#: ../camel/providers/local/camel-mbox-folder.c:231
+#: ../camel/providers/local/camel-mbox-folder.c:194
#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "æ? æ³?æ??å¼?é?®ä»¶ç®±ï¼?%sï¼?%s\n"
-
-#: ../camel/providers/local/camel-mbox-folder.c:297
-msgid "Mail append canceled"
-msgstr "é?®ä»¶è¿½å? å·²å??æ¶?"
+msgid "Cannot open mailbox: %s: "
+msgstr "æ? æ³?æ??å¼?é?®ä»¶ç®±ï¼?%sï¼?"
-#: ../camel/providers/local/camel-mbox-folder.c:300
+#: ../camel/providers/local/camel-mbox-folder.c:260
#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "æ? æ³?å°?信件é??å? å?°é?®ä»¶ç®±æ??件ï¼?%sï¼?%s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "æ? æ³?å°?信件é??å? å?°é?®ä»¶ç®±æ??件ï¼?%sï¼?"
-#: ../camel/providers/local/camel-mbox-folder.c:466
+#: ../camel/providers/local/camel-mbox-folder.c:433
msgid "The folder appears to be irrecoverably corrupted."
msgstr "æ??件夹好å??å·²ç»?被ä¸?å?¯æ?¢å¤?å?°ç ´å??äº?ã??"
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:245
-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:149
+#: ../camel/providers/local/camel-mbox-store.c:379
+#, c-format
msgid "Cannot create a folder by this name."
msgstr "æ? æ³?以æ¤å??称å??建æ??件夹ã??"
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:186
#, 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:218
+#: ../camel/providers/local/camel-mbox-store.c:231
+#: ../camel/providers/local/camel-mbox-store.c:260
#, c-format
msgid ""
"Could not delete folder '%s':\n"
@@ -3729,164 +3580,161 @@ msgstr ""
"æ? æ³?å? é?¤æ??件夹â??%sâ??ï¼?\n"
"%s"
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:241
#, 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:250
#, 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:290
#, 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:395
#, 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:411
#, 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:413
msgid "Folder already exists"
msgstr "æ??件夹已ç»?å?å?¨"
-#: ../camel/providers/local/camel-mbox-store.c:485
+#: ../camel/providers/local/camel-mbox-store.c:507
+#, c-format
msgid "The new folder name is illegal."
msgstr "æ??å®?ç??æ??件夹å??称ä¸?å??æ³?ã??"
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:522
#, 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:605
#, 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:473
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "æ? æ³?æ??å¼?æ??件夹ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:582
-#, 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:524
+msgid "Fatal mail parser error near position %"
+msgstr "å?¨ % é??è¿?å??ç??è?´å?½ç??é?®ä»¶è§£æ??é??误"
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#: ../camel/providers/local/camel-mbox-summary.c:605
#, 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-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:676
+#: ../camel/providers/local/camel-mbox-summary.c:806
+#: ../camel/providers/local/camel-spool-summary.c:137
#, c-format
msgid "Could not open file: %s: %s"
msgstr "æ? æ³?æ??å¼?æ??件ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:739
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:690
+#: ../camel/providers/local/camel-spool-summary.c:152
#, 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:705
+#: ../camel/providers/local/camel-mbox-summary.c:923
#, 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:716
#, 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:733
#, 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:819
+#: ../camel/providers/local/camel-mbox-summary.c:1061
#, 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:1121
+#: ../camel/providers/local/camel-mbox-summary.c:860
+#: ../camel/providers/local/camel-mbox-summary.c:869
+#: ../camel/providers/local/camel-mbox-summary.c:1094
+#: ../camel/providers/local/camel-mbox-summary.c:1103
+#, c-format
msgid "Summary and folder mismatch, even after a sync"
msgstr "å?³ä½¿å??æ¥å??ï¼?æ¦?è¦?å??æ??件夹ä»?ç?¶ä¸?å?¹é??"
-#: ../camel/providers/local/camel-mbox-summary.c:1046
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1020
+#: ../camel/providers/local/camel-spool-summary.c:337
#, 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:1173
+#: ../camel/providers/local/camel-mbox-summary.c:1203
#, 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:1192
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "å??å?¥ä¸´æ?¶ mailbox 失败ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-mh-folder.c:180
-msgid "MH append message canceled"
-msgstr "MH 追å? 信件已å??æ¶?"
-
-#: ../camel/providers/local/camel-mh-folder.c:183
+#: ../camel/providers/local/camel-mh-folder.c:165
#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "æ? æ³?å°?信件é??å? å?° mh æ??件夹ï¼?%sï¼?%s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "æ? æ³?å°?信件é??å? å?° mh æ??件夹ï¼?%sï¼?"
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:234
#, c-format
msgid "Could not create folder '%s': %s"
msgstr "æ? æ³?å??建æ??件夹â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:248
#, c-format
msgid "Cannot get folder '%s': not a directory."
msgstr "æ? æ³?è?·å??æ??件夹â??%sâ??ï¼?ä¸?æ?¯ç?®å½?ã??"
-#: ../camel/providers/local/camel-mh-summary.c:240
+#: ../camel/providers/local/camel-mh-summary.c:228
#, c-format
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:118
#, 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:132
#, 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:158
#, 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:170
#, c-format
msgid ""
"Could not open folder '%s':\n"
@@ -3895,12 +3743,12 @@ msgstr ""
"æ? æ³?æ??å¼?æ??件夹â??%sâ??ï¼?\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:179
+#: ../camel/providers/local/camel-spool-store.c:176
#, 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:183
#, c-format
msgid ""
"Could not create folder '%s':\n"
@@ -3909,48 +3757,51 @@ msgstr ""
"æ? æ³?å??建æ??件夹â??%sâ??ï¼?\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:192
+#: ../camel/providers/local/camel-spool-store.c:193
#, 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:213
+#, c-format
msgid "Store does not support an INBOX"
msgstr "å?å?¨å¹¶ä¸?æ?¯æ??æ?¶ä»¶ç®±"
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:226
#, c-format
msgid "Spool mail file %s"
msgstr "è?±æ?ºé?®ä»¶æ??件 %s"
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:226
#, c-format
msgid "Spool folder tree %s"
msgstr "è?±æ?ºæ??件夹æ ? %s"
-#: ../camel/providers/local/camel-spool-store.c:229
+#: ../camel/providers/local/camel-spool-store.c:238
+#, c-format
msgid "Spool folders cannot be renamed"
msgstr "è?±æ?ºæ??件夹æ? æ³?æ?¹å??"
-#: ../camel/providers/local/camel-spool-store.c:237
+#: ../camel/providers/local/camel-spool-store.c:251
+#, c-format
msgid "Spool folders cannot be deleted"
msgstr "è?±æ?ºæ??件夹æ? æ³?å? é?¤"
-#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:166
+#: ../camel/providers/local/camel-spool-summary.c:178
#: ../camel/providers/local/camel-spool-summary.c:190
-#: ../camel/providers/local/camel-spool-summary.c:200
#, c-format
msgid "Could not sync temporary folder %s: %s"
msgstr "æ? æ³?å??æ¥ä¸´æ?¶æ??件夹 %sï¼?%s"
-#: ../camel/providers/local/camel-spool-summary.c:216
+#: ../camel/providers/local/camel-spool-summary.c:208
#, c-format
msgid "Could not sync spool folder %s: %s"
msgstr "æ? æ³?å??æ¥è?±æ?ºæ??件夹 %sï¼?%s"
-#: ../camel/providers/local/camel-spool-summary.c:246
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:240
+#: ../camel/providers/local/camel-spool-summary.c:259
+#: ../camel/providers/local/camel-spool-summary.c:272
#, c-format
msgid ""
"Could not sync spool folder %s: %s\n"
@@ -3959,68 +3810,83 @@ 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:197
+#: ../camel/providers/nntp/camel-nntp-folder.c:271
+#: ../camel/providers/nntp/camel-nntp-folder.c:312
#, 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:412
-#: ../camel/providers/nntp/camel-nntp-folder.c:414
+#: ../camel/providers/nntp/camel-nntp-folder.c:234
+#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/pop3/camel-pop3-folder.c:402
+#: ../camel/providers/pop3/camel-pop3-folder.c:630
+#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "æ? æ³?è?·å??信件 %sï¼?%s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:465
+#: ../camel/providers/nntp/camel-nntp-folder.c:471
+#: ../camel/providers/nntp/camel-nntp-folder.c:518
#, c-format
msgid "Posting failed: %s"
msgstr "å??表失败ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:432
+#: ../camel/providers/nntp/camel-nntp-folder.c:513
+msgid "Posting failed: "
+msgstr "å??表失败ï¼?"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#, c-format
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:560
+#, c-format
msgid "You cannot copy messages from a NNTP folder!"
msgstr "æ?¨æ? æ³?ä»? NNTP æ??件夹å¤?å?¶ä¿¡ä»¶ï¼?"
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
msgid ""
"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
msgstr "以ç?æ ¼å¼?æ?¾ç¤ºæ??件夹(å¦? c.o.linux è??ä¸?æ?¯ comp.os.linux)(_S)"
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
msgid "In the subscription _dialog, show relative folder names"
msgstr "å?¨è®¢é??对è¯?æ¡?ä¸æ?¾ç¤ºç?¸å¯¹æ??件夹å??称(_D)"
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
msgid "USENET news"
msgstr "USENET æ?°é?»"
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
msgid "This is a provider for reading from and posting to USENET newsgroups."
msgstr "è¿?æ?¯ä¸?个读å?? USENET æ?°é?»ç»?å??å?? USENET æ?°é?»ç»?å??å¸?é?®ä»¶ç??æ??ä¾?è??ã??"
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
msgid ""
"This option will authenticate with the NNTP server using a plaintext "
"password."
msgstr "该é??项å°?以æ??æ??å¯?ç ?å??è¿?è¡? NNTP æ??å?¡å?¨è¿?è¡?认è¯?ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:265
#, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "æ? æ³?é??读æ?¥è?ª %s ç??欢è¿?ä¿¡æ?¯ï¼?%s"
+msgid "Could not read greeting from %s: "
+msgstr "æ? æ³?é??读æ?¥è?ª %s ç??欢è¿?ä¿¡æ?¯ï¼?"
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:278
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "NNTP æ??å?¡å?¨ %s è¿?å??é??误ç ? %dï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+#: ../camel/providers/nntp/camel-nntp-store.c:453
#, c-format
msgid "USENET News via %s"
msgstr "USENET æ?°é?» %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:946
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -4031,7 +3897,8 @@ msgstr ""
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1043
+#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
"\n"
@@ -4041,7 +3908,8 @@ msgstr ""
"\n"
"没æ??è¿?æ ·ç??æ?°é?»ç»?ã??é??ä¸é¡¹ç?®å?¯è?½æ?¯ç?¶æ??件夹ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1083
+#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
"\n"
@@ -4051,122 +3919,121 @@ msgstr ""
"\n"
"æ?°é?»ç»?ä¸?å?å?¨ï¼?"
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:1113
+#, c-format
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸å??建æ??件夹ï¼?åº?该订é??ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:978
+#: ../camel/providers/nntp/camel-nntp-store.c:1125
+#, c-format
msgid "You cannot rename a folder in a News store."
msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸é??å?½å??æ??件夹ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:986
+#: ../camel/providers/nntp/camel-nntp-store.c:1138
+#, c-format
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸å? é?¤æ??件夹ï¼?åº?该é??订ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1180
+#: ../camel/providers/nntp/camel-nntp-store.c:1276
+#, c-format
msgid "Authentication requested but no username provided"
msgstr "请æ±?äº?身份éª?è¯?ï¼?ä½?æ?ªæ??ä¾?ç?¨æ?·å??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1288
#, c-format
msgid "Cannot authenticate to server: %s"
msgstr "æ? æ³?认è¯?å?°æ??å?¡å?¨ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP �令失败�%s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1414
+msgid "NNTP Command failed: "
+msgstr "NNTP �令失败�"
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
+#: ../camel/providers/nntp/camel-nntp-store.c:1472
+#, c-format
msgid "Not connected."
msgstr "æ?ªè¿?æ?¥ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
-#, c-format
-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:238
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
#, c-format
msgid "%s: Scanning new messages"
msgstr "%sï¼?æ£å?¨æ?«æ??æ?°ä¿¡ä»¶"
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
#, 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:356
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "æ?¥è?ª head ç??æ??å¤?æ??å?¡å?¨åº?ç?ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr "使ç?¨å??æ¶?"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
#, c-format
msgid "Operation failed: %s"
msgstr "æ??ä½?失败ï¼?%s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:251
msgid "Retrieving POP summary"
msgstr "æ£å?¨è?·å?? POP æ¦?è¦?"
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:274
#, c-format
msgid "Cannot get POP summary: %s"
msgstr "æ? æ³?è?·å?? POP æ¦?è¦?ï¼?%s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:324
msgid "Expunging old messages"
msgstr "é??æ¯?æ?§ä¿¡ä»¶"
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:332
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:566
+#: ../camel/providers/pop3/camel-pop3-folder.c:596
#, 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:603
#, 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:707
msgid "Unknown reason"
msgstr "æ?ªç?¥å??å? "
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Message storage"
+msgstr "信件å?å?¨"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
msgid "_Leave messages on server"
msgstr "å?¨æ??å?¡å?¨ä¸?ä¿?ç??信件(_L)"
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
#, c-format
msgid "_Delete after %s day(s)"
msgstr "%s 天ä¹?å??å? é?¤(_D)"
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
msgid "Disable _support for all POP3 extensions"
msgstr "ç¦?ç?¨æ??æ?? POP3 æ?©å±?ç??æ?¯æ??(_S)"
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
msgid "POP"
msgstr "POP"
-#: ../camel/providers/pop3/camel-pop3-provider.c:59
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
msgid "For connecting to and downloading mail from POP servers."
msgstr "å?³äº?è¿?æ?¥å?° POP æ??å?¡å?¨å??ä»? POP æ??å?¡å?¨ä¸?è½½é?®ä»¶ã??"
-#: ../camel/providers/pop3/camel-pop3-provider.c:76
+#: ../camel/providers/pop3/camel-pop3-provider.c:72
msgid ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
@@ -4174,7 +4041,7 @@ msgstr ""
"该é??项使 Evolution å?¨è¿?æ?¥å?° POP æ??å?¡å?¨æ?¶ä½¿ç?¨æ??æ??å¯?ç ?ã??è¿?æ?¯è®¸å¤? POP æ??å?¡å?¨å?¯ä¸?"
"æ?¯æ??ç??é??项ã??"
-#: ../camel/providers/pop3/camel-pop3-provider.c:86
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
msgid ""
"This option will connect to the POP server using an encrypted password via "
"the APOP protocol. This may not work for all users even on servers that "
@@ -4183,56 +4050,66 @@ msgstr ""
"该é??项使 Evolution å?¨è¿?æ?¥å?° POP æ??å?¡å?¨æ?¶ä½¿ç?¨ APOP å??è®®ã??å?³ä½¿æ?¯å£°ç§°æ?¯æ??è¿?ä¸?å??"
"è?½ç??æ??å?¡å?¨ï¼?ä¹?ä¸?ä¸?å®?è?½ä½¿æ??æ??ç?¨æ?·å·¥ä½?ã??"
-#: ../camel/providers/pop3/camel-pop3-store.c:207
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:98
+msgid ": "
+msgstr "ï¼?"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:168
#, c-format
msgid "Failed to read a valid greeting from POP server %s"
msgstr "ä»? POP æ??å?¡å?¨ %s 读å??欢è¿?è¯?失败"
+#: ../camel/providers/pop3/camel-pop3-store.c:186
+#: ../camel/providers/pop3/camel-pop3-store.c:217
#: ../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
#, 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:187
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:205
+#, 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:218
+msgid "TLS negotiations failed"
+msgstr "TLS å??å??失败"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:225
msgid "TLS is not available in this build"
msgstr "æ?¬æ¬¡ç¼?è¯?ä¸æ?ªå??å?« TLS"
-#: ../camel/providers/pop3/camel-pop3-store.c:361
-#, 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:321
+#: ../camel/providers/pop3/camel-pop3-store.c:473
#, 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:344
#, 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:361
#, 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:378
#, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "认è¯?å?° POP æ??å?¡å?¨ %s 失败ï¼?%s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "认è¯?å?° POP æ??å?¡å?¨ %s 失败ï¼?"
-#: ../camel/providers/pop3/camel-pop3-store.c:508
+#: ../camel/providers/pop3/camel-pop3-store.c:442
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4241,8 +4118,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:492
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4251,197 +4127,231 @@ 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:505
#, 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:518
+#, 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:674
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "æ? æ³?è¿?æ?¥å?° POP æ??å?¡å?¨ %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:687
+#, c-format
+msgid "POP3 server %s"
+msgstr "POP3 æ??å?¡å?¨ %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:691
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "%2$s 为 %1$s æ??ä¾?ç?? POP æ??å?¡"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:706
#, c-format
msgid "No such folder '%s'."
msgstr "没æ??æ??件夹â??%sâ??ã??"
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:730
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "POP3 ç??å?å?¨æ²¡æ??æ??件夹ç»?æ??"
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
msgid "Sendmail"
msgstr "Sendmail"
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
msgid ""
"For delivering mail by passing it to the \"sendmail\" program on the local "
"system."
msgstr "å°?é?®ä»¶ä¼ é??å?°æ?¬å?°ç³»ç»?ç??â??sendmailâ??æ?¥å??é??é?®ä»¶ã??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#, c-format
msgid "Could not parse recipient list"
msgstr "æ? æ³?解æ??æ?¶ä»¶äººå??表"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
#, c-format
msgid "Could not create pipe to sendmail: %s: mail not sent"
msgstr "æ? æ³?å??建å?° sendmail ç??管é??ï¼?%sï¼?é?®ä»¶æ?ªå??é??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
#, c-format
msgid "Could not fork sendmail: %s: mail not sent"
msgstr "æ? æ³?å??建 sendmail è¿?ç¨?ï¼?%sï¼?é?®ä»¶æ?ªå??é??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+msgid "Could not send message: "
+msgstr "æ? æ³?å??é??信件ï¼?"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr "sendmail 以信å?· %s é??å?ºï¼?é?®ä»¶æ?ªå??é??ã??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr "æ? æ³?æ?§è¡? %sï¼?é?®ä»¶æ?ªå??é??ã??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr "sendmail 以ç?¶æ??ç ? %d é??å?ºï¼?é?®ä»¶æ?ªå??é??ã??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
msgid "sendmail"
msgstr "sendmail"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
msgid "Mail delivery via the sendmail program"
msgstr "é??è¿? sendmail ç¨?åº?å??é??é?®ä»¶"
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
msgid "SMTP"
msgstr "SMTP"
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
msgid "For delivering mail by connecting to a remote mailhub using SMTP."
msgstr "è¦?æ??é??é?®ä»¶ï¼?åº?该使ç?¨ SMTP è¿?æ?¥å?°è¿?ç¨?ç??é?®ä»¶äº¤æ?¢æ??å?¡å?¨ã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:116
msgid "Syntax error, command unrecognized"
msgstr "è¯æ³?é??误ï¼?æ? æ³?è¯?å?«ç??å?½ä»¤"
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:118
msgid "Syntax error in parameters or arguments"
msgstr "å??æ?°è¯æ³?é??误"
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:120
msgid "Command not implemented"
msgstr "�令����"
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:122
msgid "Command parameter not implemented"
msgstr "å?½ä»¤å??æ?°å°?æ?ªå®?ç?°"
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:124
msgid "System status, or system help reply"
msgstr "ç³»ç»?ç?¶æ??ï¼?æ??ç³»ç»?æ±?å?©å°±ç»ª"
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:126
msgid "Help message"
msgstr "帮�信件"
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:128
msgid "Service ready"
msgstr "æ??å?¡å°±ç»ª"
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:130
msgid "Service closing transmission channel"
msgstr "æ??å?¡æ£å?¨å?³é?ä¼ è¾?é??é??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:132
msgid "Service not available, closing transmission channel"
msgstr "æ??å?¡ä¸?å?¯ç?¨ï¼?æ£å?¨å?³é?ä¼ è¾?é??é??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:134
msgid "Requested mail action okay, completed"
msgstr "é?®ä»¶å?¨ä½?请æ±?确认ï¼?å·²å®?æ??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:136
msgid "User not local; will forward to <forward-path>"
msgstr "ç?¨æ?·ä¸?å?¨æ?¬å?°ï¼?å°?转å??å?° <转å??è·¯å¾?>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:138
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "é?®ä»¶å?¨ä½?请æ±?æ?ªå??ç??ï¼?é?®ä»¶ç®±æ? æ??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:140
msgid "Requested action not taken: mailbox unavailable"
msgstr "å?¨ä½?请æ±?æ?ªå??ç??ï¼?é?®ä»¶ç®±æ? æ??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:142
msgid "Requested action aborted: error in processing"
msgstr "å?¨ä½?请æ±?å·²æ?¾å¼?ï¼?å¤?ç??ä¸å?ºé??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:144
msgid "User not local; please try <forward-path>"
msgstr "ç?¨æ?·ä¸?å?¨æ?¬å?°ï¼?请å°?è¯? <转å??è·¯å¾?>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:146
msgid "Requested action not taken: insufficient system storage"
msgstr "å?¨ä½?请æ±?æ?ªå??ç??ï¼?ç³»ç»?å?å?¨ç©ºé?´ä¸?足"
-#: ../camel/providers/smtp/camel-smtp-transport.c:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:148
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "é?®ä»¶å?¨ä½?请æ±?å·²æ?¾å¼?ï¼?è¶?å®?é¢?å¾·å?å?¨å??é??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
msgid "Requested action not taken: mailbox name not allowed"
msgstr "å?¨ä½?请æ±?æ?ªå??ç??ï¼?ä¸?å??许ç??é?®ä»¶ç®±å??称"
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "å¼?å§?è¾?å?¥é?®ä»¶ï¼?以 <CRLF>.<CRLF> ç»?æ??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
msgid "Transaction failed"
msgstr "��失败"
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
msgid "A password transition is needed"
msgstr "å¿?é¡»ä¼ è¾?å¯?ç ?"
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:160
msgid "Authentication mechanism is too weak"
msgstr "认���太弱"
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
msgid "Encryption required for requested authentication mechanism"
msgstr "请æ±?ç??认è¯?æ?ºå?¶å¿?é¡»å? å¯?"
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:164
msgid "Temporary authentication failure"
msgstr "临�认�失败"
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
-msgid "Welcome response error"
-msgstr "欢è¿?åº?ç?é??误"
+#: ../camel/providers/smtp/camel-smtp-transport.c:252
+#: ../camel/providers/smtp/camel-smtp-transport.c:258
+msgid "Welcome response error: "
+msgstr "欢è¿?åº?ç?é??误ï¼?"
+#: ../camel/providers/smtp/camel-smtp-transport.c:294
#: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:364
-#: ../camel/providers/smtp/camel-smtp-transport.c:370
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
#, c-format
msgid "Failed to connect to SMTP server %s in secure mode: %s"
msgstr "以å®?å?¨æ¨¡å¼?è¿?æ?¥ SMTP æ??å?¡å?¨ %s 失败ï¼?%s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:340
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS �令失败�%s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
-msgid "STARTTLS command failed"
-msgstr "STARTTLS �令失败"
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:314
+#: ../camel/providers/smtp/camel-smtp-transport.c:320
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS �令失败�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
+#: ../camel/providers/smtp/camel-smtp-transport.c:471
#, c-format
msgid "SMTP server %s does not support requested authentication type %s."
msgstr "SMTP æ??å?¡å?¨ %s ä¸?æ?¯æ??请æ±?ç??认è¯?ç±»å?? %sã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:567
+#: ../camel/providers/smtp/camel-smtp-transport.c:547
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -4452,202 +4362,182 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
+#: ../camel/providers/smtp/camel-smtp-transport.c:685
#, c-format
msgid "SMTP server %s"
msgstr "SMTP æ??å?¡å?¨ %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
+#: ../camel/providers/smtp/camel-smtp-transport.c:687
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "é??è¿? %s å??é?? SMTP é?®ä»¶"
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:707
+#, c-format
msgid "Cannot send message: service not connected."
msgstr "æ? æ³?å??é??信件ï¼?æ??å?¡æ?ªè¿?æ?¥ã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:714
+#, c-format
msgid "Cannot send message: sender address not valid."
msgstr "æ? æ³?å??é??信件ï¼?å??件人å?°å??ä¸?å??æ³?ã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
msgid "Sending message"
msgstr "å??é??信件"
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:734
+#, c-format
msgid "Cannot send message: no recipients defined."
msgstr "æ? æ³?å??é??信件ï¼?没æ??å®?ä¹?æ?¶ä»¶äººã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#, c-format
msgid "Cannot send message: one or more invalid recipients"
msgstr "æ? æ³?å??é??信件ï¼?ä¸?个æ??å¤?个é??æ³?æ?¶ä»¶äºº"
-#: ../camel/providers/smtp/camel-smtp-transport.c:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:982
msgid "SMTP Greeting"
msgstr "SMTP 欢�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "HELO �令失败�%s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
-msgid "HELO command failed"
-msgstr "HELO �令失败"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1006
+#: ../camel/providers/smtp/camel-smtp-transport.c:1021
+#: ../camel/providers/smtp/camel-smtp-transport.c:1028
+msgid "HELO command failed: "
+msgstr "HELO �令失败�%s\\"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1095
msgid "SMTP Authentication"
msgstr "SMTP 认�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../camel/providers/smtp/camel-smtp-transport.c:1102
+#, c-format
msgid "Error creating SASL authentication object."
msgstr "å??建 SASL 认è¯?对象é??误ã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "AUTH �令失败�%s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
-msgid "AUTH command failed"
-msgstr "AUTH �令失败"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
-msgid "Bad authentication response from server.\n"
-msgstr "æ?¥è?ªæ??å?¡å?¨ç??é??误认è¯?åº?ç?ã??\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM å?½ä»¤å¤±è´¥ï¼?%sï¼?é?®ä»¶æ?ªå??é??"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
-msgid "MAIL FROM command failed"
-msgstr "MAIL FROM �令失败"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1118
+#: ../camel/providers/smtp/camel-smtp-transport.c:1128
+#: ../camel/providers/smtp/camel-smtp-transport.c:1136
+msgid "AUTH command failed: "
+msgstr "AUTH �令失败�"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1233
+#: ../camel/providers/smtp/camel-smtp-transport.c:1245
+#: ../camel/providers/smtp/camel-smtp-transport.c:1252
+msgid "MAIL FROM command failed: "
+msgstr "MAIL FROM �令失败�"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1275
+msgid "RCPT TO command failed: "
+msgstr "RSET �令失败�"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1289
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#, c-format
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> 失败�"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1335
+#: ../camel/providers/smtp/camel-smtp-transport.c:1344
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#: ../camel/providers/smtp/camel-smtp-transport.c:1411
+#: ../camel/providers/smtp/camel-smtp-transport.c:1427
+#: ../camel/providers/smtp/camel-smtp-transport.c:1438
+#: ../camel/providers/smtp/camel-smtp-transport.c:1445
+msgid "DATA command failed: "
+msgstr "DATP �令失败�"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1467
+#: ../camel/providers/smtp/camel-smtp-transport.c:1479
+#: ../camel/providers/smtp/camel-smtp-transport.c:1486
+msgid "RSET command failed: "
+msgstr "RSET �令失败�"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1508
+#: ../camel/providers/smtp/camel-smtp-transport.c:1521
+#: ../camel/providers/smtp/camel-smtp-transport.c:1527
+msgid "QUIT command failed: "
+msgstr "QUIT �令失败�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCPT TO å?½ä»¤å¤±è´¥ï¼?%sï¼?é?®ä»¶æ?ªå??é??"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> 失败"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "DATA å?½ä»¤å¤±è´¥ï¼?%sï¼?é?®ä»¶æ?ªå??é??"
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1347
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
-msgid "DATA command failed"
-msgstr "DATP �令失败"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "RSET �令失败�%s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
-msgid "RSET command failed"
-msgstr "RSET �令失败"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "QUIT �令失败�%s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
-msgid "QUIT command failed"
-msgstr "QUIT �令失败"
-
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:45
msgid "Business"
msgstr "å??å?¡"
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:46
msgid "Competition"
msgstr "å®?æ??"
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:47
msgid "Favorites"
msgstr "æ??ç?±"
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:48
msgid "Gifts"
msgstr "礼�"
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:49
msgid "Goals/Objectives"
msgstr "ç?®æ ?"
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:50
msgid "Holiday"
msgstr "å??æ?¥"
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:51
msgid "Holiday Cards"
msgstr "å??æ?¥å?¡"
#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:53
msgid "Hot Contacts"
msgstr "亲å¯?è??系人"
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:54
msgid "Ideas"
msgstr "��"
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:55
msgid "International"
msgstr "å?½é??"
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:56
msgid "Key Customer"
msgstr "��客�"
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:57
msgid "Miscellaneous"
msgstr "æ??ç±»"
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:58
msgid "Personal"
msgstr "个人"
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:59
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:61
msgid "Status"
msgstr "ç?¶æ??"
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:62
msgid "Strategies"
msgstr "ç?ç?¥"
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:63
msgid "Suppliers"
msgstr "ä¾?åº?å??"
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:64
msgid "Time & Expenses"
msgstr "æ?¶é?´å??è?±è´¹"
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:65
msgid "VIP"
msgstr "VIP"
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:66
msgid "Waiting"
msgstr "ç?å??"
@@ -4655,7 +4545,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 +4553,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 +4561,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 +4569,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 +4587,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 +4628,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,108 +4648,104 @@ 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"
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
msgid "Accessing LDAP Server anonymously"
msgstr "å?¿å??访é?® LDAP æ??å?¡å?¨"
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
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
-msgid "Item(s) belong to these _categories:"
-msgstr "项�����类�(_C)�"
+#: ../libedataserverui/e-categories-dialog.ui.h:4
+msgid "Currently _used categories:"
+msgstr "å½?å??使ç?¨ç??å??ç±»(_U)ï¼?"
-#: ../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"
-msgstr "��信�"
-
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "ç?¨äº?渲æ??ç??é¢?è?²"
-
-#: ../libedataserverui/e-name-selector-dialog.c:292
+#: ../libedataserverui/e-name-selector-dialog.c:319
msgid "Select Contacts from Address Book"
msgstr "ä»?å?°å??ç°¿ä¸é??æ?©è??系人"
-#: ../libedataserverui/e-name-selector-dialog.c:579
+#: ../libedataserverui/e-name-selector-dialog.c:658
msgid "_Add"
msgstr "æ·»å? (_A)"
-#: ../libedataserverui/e-name-selector-dialog.c:604
+#: ../libedataserverui/e-name-selector-dialog.c:662
msgid "_Remove"
msgstr "å? é?¤(_R)"
-#: ../libedataserverui/e-name-selector-dialog.c:781
+#: ../libedataserverui/e-name-selector-dialog.c:858
#: ../libedataserverui/e-name-selector-dialog.ui.h:6
msgid "Any Category"
msgstr "任�类�"
@@ -4889,7 +4775,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 +4787,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:2559
#, 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:2574
#, 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:2584
#, 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:2601
#, c-format
msgid "_Edit %s"
msgstr "ç¼?è¾? %s(_E)"
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:517
#, c-format
msgid "_Delete %s"
msgstr "å? é?¤ %s(_D)"
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:257
#, c-format
msgid "Keyring key is unusable: no user or host name"
msgstr "å¯?é?¥ç?¯ä¸?å?¯ç?¨ï¼?没æ??ç?¨æ?·æ??主æ?ºå??"
-#: ../libedataserverui/e-passwords.c:1093
+#: ../libedataserverui/e-passwords.c:1116
msgid "You have the Caps Lock key on."
msgstr "æ?¨æ??å¼?äº? Caps Lockã??"
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:1238
msgid "_Remember this passphrase"
msgstr "è®°ä½?æ¤å¯?ç ?å?¥(_R)"
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1239
msgid "_Remember this passphrase for the remainder of this session"
msgstr "æ?¬æ¬¡ä¼?è¯?è®°ä½?æ¤å¯?ç ?å?¥(_R)"
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:1244
msgid "_Remember this password"
msgstr "è®°ä½?æ¤å¯?ç ?(_R)"
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1245
msgid "_Remember this password for the remainder of this session"
msgstr "æ?¬æ¬¡ä¼?è¯?è®°ä½?æ¤å¯?ç ?(_R)"
@@ -4960,203 +4845,603 @@ 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 "Could not create thread for getting deltas"
+#~ msgstr "æ? æ³?为è?·å¾?å·®å¼?å??建线索"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:875
-msgid "Author"
-msgstr "ä½?è??"
+#~ msgid "Offline mode unavailable"
+#~ msgstr "离线模����"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:880
-msgid "Non-editing Author"
-msgstr "é??ç¼?è¾?ä½?è??"
+#~ msgid "Cannot open message"
+#~ msgstr "æ? æ³?æ??å¼?信件"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:884
-msgid "Reviewer"
-msgstr "å¤?æ?¥è??"
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?é??å? 信件ï¼?为 %s"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:886
-msgid "Contributor"
-msgstr "è´¡ç?®è??"
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?æ??表达å¼?æ??ç´¢ï¼?æ??ç´¢ %s"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:888
-msgid "None"
-msgstr "æ? "
+#, fuzzy
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?æ??表达å¼?æ??ç´¢ï¼?æ??ç´¢ %s"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:903
-msgid "Custom"
-msgstr "���"
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?æ?? UID æ??ç´¢ï¼?æ??ç´¢ %s"
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "Generic error"
-msgstr "常è§?é??误"
+#~ msgid "Learning junk"
+#~ msgstr "å¦ä¹ å??å?¾é?®ä»¶"
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "A folder with the same name already exists"
-msgstr "å·²ç»?å?å?¨å??å??æ??件夹"
+#~ msgid "Learning non-junk"
+#~ msgstr "å¦ä¹ é??å??å?¾é?®ä»¶"
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "The specified folder type is not valid"
-msgstr "æ??å®?ç??æ??件类å??æ? æ??"
+#~ msgid "Canceled."
+#~ msgstr "å·²å??æ¶?ã??"
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "I/O error"
-msgstr "I/O é??误"
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "è¿?æ?¯ä¿¡ä»¶ç??æ?°å?ç¾å??é?¨å??"
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "Not enough space to create the folder"
-msgstr "没æ??足å¤?ç??空é?´å??建æ??件夹"
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr "æ? æ³?æ ¡éª?信件ç¾å??ï¼?æ? æ³?å??建临æ?¶æ??件ï¼?%s"
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The folder is not empty"
-msgstr "æ??件夹为空"
+#~ msgid "Unable to parse message content"
+#~ msgstr "æ? æ³?å??æ??信件å??容"
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "The specified folder was not found"
-msgstr "æ??å®?ç??æ??件æ?ªæ?¾å?°"
+#~ msgid "cannot create thread"
+#~ msgstr "æ? æ³?å??建线索"
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Function not implemented in this storage"
-msgstr "å??è?½æ?ªå?¨æ¤å?å?¨ä¸å®?ç?°"
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "Operation not supported"
-msgstr "æ??ä½?ä¸?æ?¯æ??"
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 4 authentication."
+#~ msgstr "该é??项å°?ç?¨ Kerberos 4 认è¯?è¿?æ?¥å?°æ??å?¡å?¨ã??"
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified type is not supported in this storage"
-msgstr "æ¤å?å?¨ä¸?æ?¯æ??æ??å®?ç±»å??"
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "æ? æ³?è?·å?? Kerberos æ ?ç¾ï¼?\n"
+#~ "%s"
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "The specified folder cannot be modified or removed"
-msgstr "æ? æ³?ä¿®æ?¹æ??å? é?¤æ??å®?ç??æ??件夹"
+#~ msgid "import keys: unimplemented"
+#~ msgstr "导��������"
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "æ? æ³?å°?æ??件夹å??æ??å?¶å?æ??件夹ç??å?æ??件夹"
+#~ msgid "export keys: unimplemented"
+#~ msgstr "导��������"
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "Cannot create a folder with that name"
-msgstr "æ? æ³?以æ¤å??称å??建æ??件夹"
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr "æ? æ³?å??建æ??件夹ï¼?对该å?å?¨ç??æ? æ??æ??ä½?"
-#: ../servers/exchange/storage/e-storage.c:585
-msgid "This operation cannot be performed in off-line mode"
-msgstr "该信件æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸ä½¿ç?¨"
+#~ msgid "Unable to get issuer's certificate"
+#~ 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 "Unable to get Certificate Revocation List"
+#~ msgstr "æ? æ³?è?·å??è¯?书å??é??å??表ç¾å??"
-#: ../servers/exchange/storage/exchange-account.c:1259
-msgid "Personal Folders"
-msgstr "个人æ??件夹"
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "æ? æ³?解å¯?认è¯?ç¾å??"
-#: ../servers/exchange/storage/exchange-account.c:1274
-msgid "Favorite Public Folders"
-msgstr "æ?¶è??ç??å?¬å¼?æ??件夹"
+#~ msgid "Unable to decrypt Certificate Revocation List signature"
+#~ msgstr "æ? æ³?解å¯?è¯?书å??é??å??表ç¾å??"
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1291
-msgid "All Public Folders"
-msgstr "å?¨é?¨å?¬å¼?æ??件夹"
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "æ? æ³?对å??è¡?è??ç??å?¬é?¥è¿?è¡?解ç ?"
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1305
-msgid "Global Address List"
-msgstr "å?¨å±?å?°å??å??表"
+#~ msgid "Certificate signature failure"
+#~ msgstr "è¯?书ç¾å??失败"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "å·²å? 项"
+#~ msgid "Certificate Revocation List signature failure"
+#~ msgstr "è¯?书å??é??å??表ç¾å??失败"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "è??稿"
+#~ msgid "Certificate not yet valid"
+#~ msgstr "è¯?书æ?ªç??æ??"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "�记"
+#~ msgid "Certificate has expired"
+#~ msgstr "è¯?书已è¿?æ??"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "��"
+#, fuzzy
+#~ msgid "Certificate Revocation List (CRL) not yet valid"
+#~ msgstr "è¯?书å??é??å??表ç¾å??失败"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "å??件箱"
+#, fuzzy
+#~ msgid "Certificate Revocation List (CRL) has expired"
+#~ msgstr "è¯?书å??é??å??表ç¾å??失败"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "å·²å??项"
+#, fuzzy
+#~ msgid "Error in Certificate Revocation List (CRL)"
+#~ msgstr "æ? æ³?è?·å??è¯?书å??é??å??表ç¾å??"
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "任�"
+#~ msgid "Out of memory"
+#~ msgstr "å??å?è??å°½"
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "æ? æ??è¿?æ?¥"
+#~ msgid "Zero-depth self-signed certificate"
+#~ msgstr "é?¶æ·±åº¦è?ªç¾å??è¯?书"
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "æ??å?¡å?¨ç??å??åº?æ? æ??"
+#~ msgid "Self-signed certificate in chain"
+#~ msgstr "é?¾ä¸ç??è?ªç¾å??è¯?书"
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "æ??å?¡å?¨ç??å??åº?æ? æ??"
+#~ msgid "Unable to get issuer's certificate locally"
+#~ msgstr "æ? æ³?å?¨æ?¬å?°è?·å??å??è¡?è??ç??è¯?书"
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "æ? æ??å??æ?°"
+#~ msgid "Unable to verify leaf signature"
+#~ msgstr "æ? æ³?æ ¡éª?å?¶å?ç¾å??"
+
+#~ msgid "Certificate chain too long"
+#~ msgstr "�书���"
+
+#~ msgid "Certificate Revoked"
+#~ msgstr "è¯?书已æ?¤é??"
+
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "æ? æ??ç??è¯?书é¢?å??æ?ºæ??(CA)"
+
+#~ msgid "Path length exceeded"
+#~ msgstr "è¶?é?¿ç??è·¯å¾?é?¿åº¦"
+
+#~ msgid "Invalid purpose"
+#~ msgstr "æ? æ??ç?®ç??"
+
+#~ msgid "Certificate untrusted"
+#~ msgstr "ä¸?ä¿¡ä»»ç??è¯?书"
+
+#~ msgid "Certificate rejected"
+#~ msgstr "å·²æ??ç»?ç??è¯?书"
+
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "主é¢?/å??è¡?è??ä¸?å?¹é??"
+
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "AKID/SKID ä¸?å?¹é??"
+
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "AKID/å??è¡?è??åº?å??å?·ä¸?å?¹é??"
+
+#~ msgid "Key usage does not support certificate signing"
+#~ msgstr "å¯?é?¥ä¸?æ?¯æ??è¯?书ç¾å??"
+
+#~ msgid "Error in application verification"
+#~ 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"
+#~ "æ?¨ä»?ç?¶å¸?æ??æ?¥å??å??ï¼?"
+
+#~ msgid "User canceled"
+#~ msgstr "ç?¨æ?·å·²å??æ¶?"
+
+#~ msgid "Trash Folder Full. Please Empty."
+#~ msgstr "å??æ?¶ç«?æ??件夹已满ã??请æ¸?空ã??"
+
+#~ msgid "Hula"
+#~ msgstr "Hula"
+
+#~ msgid "For accessing Hula servers"
+#~ msgstr "访é?® Hula æ??å?¡å?¨"
+
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr "该é??项å°?使ç?¨çº¯æ??æ?¬å¯?ç ?è¿?æ?¥å?° Hula æ??å?¡å?¨ã??"
+
+#~ msgid "Unexpected response status '%s' after APPEND command"
+#~ msgstr "APPEND å?½ä»¤å??è¿?å??äº?æ?ªç?¥ç??å??åº?ç?¶æ??â??%sâ??"
+
+#~ msgid "No response on continuation after APPEND command"
+#~ msgstr "APPEND å?½ä»¤å??ç»æ? å??åº?"
+
+#~ msgid "Unknown error occurred during APPEND command!"
+#~ msgstr "å?¨ APPEND å?½ä»¤æ?¶å??ç??äº?é??误ï¼?"
+
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "å?? IMAP æ??å?¡å?¨ %s å??é??å?½ä»¤å¤±è´¥ï¼?%s"
+
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "æ?¥è?ª IMAP4 æ??å?¡å?¨ %s ç??æ??å¤?å??åº?ï¼?%s"
+
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "æ?¥è?ª IMAP æ??å?¡å?¨ %s ç??æ??å¤?åº?ç?ã??"
+
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr "æ? æ³?é??æ?©æ??件夹â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
+
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "æ? æ³?é??æ?©æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "å?? IMAP æ??å?¡å?¨ %s å??é??å?½ä»¤å¤±è´¥ï¼?%s"
+
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "IMAP4 æ??å?¡å?¨ %s æ??å¤?æ?å¼?è¿?æ?¥ï¼?%s"
+
+#~ msgid ""
+#~ "Enable extended Mailing-List detection required for some filter and "
+#~ "vFolder rules"
+#~ msgstr "å?¯ç?¨æ??äº?è¿?滤å?¨å??è??æ??æ??件夹è§?å??æ??é??ç??æ?©å±?é?®ä»¶å??表æ£?æµ?"
+
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr "å°?è?¥å¹²ç§?æ?ªé??读ç??ç¼?å?信件设置为è¿?æ??"
+
+#~ msgid "Expire cached messages older than X seconds"
+#~ msgstr "å?¨è?¥å¹²ç§?å??å°?信件设置为è¿?æ??"
+
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "æ? æ³?访é?®æ??件夹â??%sâ??ï¼?%s"
+
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr "æ? æ³?å°?æ ?å¿?ä¸?æ??件夹â??%sâ??å??æ¥ï¼?æ?ªç?¥"
+
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr "æ? æ³?å°?æ ?å¿?ä¸?æ??件夹â??%sâ??å??æ¥ï¼?æ? æ??ç??å?½ä»¤"
+
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "æ? æ³?é??æ¯?æ??件夹â??%sâ??ï¼?æ?ªç?¥"
+
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "æ? æ³?é??æ¯?æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr "æ? æ³?ä»?æ??件夹â??%2$sâ??è?·å??信件 %1$sï¼?没æ??è¿?æ ·ç??信件"
+
+#~ msgid "Cannot get message %s from folder '%s': Bad command"
+#~ msgstr "æ? æ³?ä»?æ??件夹â??%2$sâ??è?·å??信件 %1$sï¼?å?½ä»¤æ? æ??"
+
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr "æ? æ³?å°?信件追å? å?°æ??件夹â??%sâ??ï¼?æ??件夹为å?ªè¯»"
+
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr "æ? æ³?å°?信件追å? å?°æ??件夹â??%sâ??ï¼?æ?ªç?¥é??误"
+
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr "æ? æ³?å°?信件追å? å?°æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr "æ? æ³?å°?信件ä»?æ??件夹â??%sâ??移å?¨å?°æ??件夹â??%sâ??ï¼?æ?ªç?¥é??误"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr "æ? æ³?å°?信件ä»?æ??件夹â??%sâ??å¤?å?¶å?°æ??件夹â??%sâ??ï¼?æ?ªç?¥é??误"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr "æ? æ³?å°?信件ä»?æ??件夹â??%sâ??移å?¨å?°æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr "æ? æ³?å°?信件ä»?æ??件夹â??%sâ??å¤?å?¶å?°æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+
+#~ msgid "Check new messages for _Junk contents"
+#~ msgstr "æ£?æ?¥æ?°ä¿¡ä»¶ç??å??å?¾å??容(_J)"
+
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "ä»?å?¨æ?¶ä»¶ç®±ä¸æ£?æ?¥å??å?¾é?®ä»¶(_G)"
+
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAPrev1"
+
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "IMAPv4rev1 æ??å?¡å?¨ä¸?é?®ä»¶ç??读å??ã??"
+
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr "该é??项å°?使ç?¨çº¯æ??æ?¬å¯?ç ?è¿?æ?¥å?° IMAPv4rev1 æ??å?¡å?¨ã??"
+
+#~ msgid "Connection canceled"
+#~ msgstr "è¿?æ?¥å·²å??æ¶?"
+
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr "以å®?å?¨æ¨¡å¼?è¿?æ?¥å?° IMAP æ??å?¡å?¨ %s 失败ï¼?æ??å?¡å?¨ä¸?æ?¯æ?? STARTTLS"
+
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr "æ? æ³?使ç?¨ %2$s 身份éª?è¯?ç®?æ³?对 IMAP æ??å?¡å?¨ %1$s è¿?è¡?身份éª?è¯?"
+
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "æ? æ³?使ç?¨ %2$s 认è¯?å?° IMAP æ??å?¡å?¨ %1$s"
+
+#~ msgid "Cannot create IMAP folders in offline mode."
+#~ msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?å??建 IMAP æ??件夹ã??"
+
+#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+#~ msgstr "æ? æ³?è?·å?? IMAP æ??å?¡å?¨ %2$s ä¸?ç??æ??件夹 %1$sï¼?æ?ªç?¥é??误"
+
+#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+#~ msgstr "æ? æ³?å?¨ IMAP æ??å?¡å?¨ %2$s ä¸?为â??%1$sâ??è?·å¾? LIST ä¿¡æ?¯ï¼?%3$s"
+
+#~ msgid "Bad command"
+#~ msgstr "æ? æ??å?½ä»¤"
+
+#~ msgid "Cannot create folder '%s': Invalid mailbox name"
+#~ msgstr "æ? æ³?å??建æ??件夹â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
+
+#~ msgid "Cannot create folder '%s': Bad command"
+#~ msgstr "æ? æ³?å??建æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+
+#~ msgid "Cannot delete IMAP folders in offline mode."
+#~ msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?å? é?¤ IMAP æ??件夹ã??"
+
+#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
+#~ msgstr "æ? æ³?å? é?¤æ??件夹â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
+
+#~ msgid "Cannot delete folder '%s': Bad command"
+#~ msgstr "æ? æ³?å? é?¤æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
+#~ msgstr "æ? æ³?å°?æ??件夹â??%sâ??é??å?½å??为â??%sâ??ï¼?ç?¹æ®?æ??件夹"
+
+#~ msgid "Cannot rename IMAP folders in offline mode."
+#~ msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?é??å?½å?? IMAP æ??件夹ã??"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#~ msgstr "æ? æ³?å°?æ??件夹â??%sâ??é??å?½å??为â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Evolution å?°å??ç°¿æ??件å??端"
+#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
+#~ msgstr "æ? æ³?å°?æ??件夹â??%sâ??é??å?½å??为â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Evolution æ?¥å??æ??件å?? Webcal å??端"
+#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+#~ msgstr "æ? æ³?å?¨ IMAP æ??å?¡å?¨ %3$s ä¸?为模å¼?â??%2$sâ??è?·å?? %1$s ä¿¡æ?¯ï¼?%4$s"
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "Evolution æ?°æ?®æ??å?¡å?¨æ?¥å?£æ£?æ?¥æ??å?¡"
+#~ msgid "Cannot subscribe to IMAP folders in offline mode."
+#~ msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?订é?? IMAP æ??件夹ã??"
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Evolution æ?°æ?®æ??å?¡å?¨æ?¥å¿?æ??å?¡"
+#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+#~ msgstr "æ? æ³?订é??æ??件夹â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
+
+#~ msgid "Cannot subscribe to folder '%s': Bad command"
+#~ msgstr "æ? æ³?订é??æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+
+#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
+#~ msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?é??订 IMAP æ??件夹ã??"
+
+#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+#~ msgstr "æ? æ³?é??订æ??件夹â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
+
+#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
+#~ msgstr "æ? æ³?é??订æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+
+#~ msgid "Scanning for changed messages"
+#~ msgstr "æ?«æ??æ?´æ?¹äº?ç??信件"
+
+#~ msgid "IMAP server %s is in an inconsistent state."
+#~ msgstr "IMAP æ??å?¡å?¨ %s ç??ç?¶æ??ä¸?ä¸?è?´ã??"
+
+#~ msgid "Fetching envelopes of new messages"
+#~ msgstr "è?·å??æ?°æ?°ä¿¡ä»¶ç??ä¿¡å°?"
+
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "æ?¥è?ª IMAP4 æ??å?¡å?¨ %s ç??æ??å¤?å??åº?ï¼?"
+
+#~ msgid "No data"
+#~ msgstr "æ? æ?°æ?®"
+
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "IMAP4 æ??å?¡å?¨ %s æ??å¤?æ?å¼?è¿?æ?¥ï¼?%s"
+
+#~ 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"
+
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "æ? æ³?è¿?æ?¥å?° %s ä¸?ç?? POP æ??å?¡å?¨"
+
+#~ msgid "Maildir append message canceled"
+#~ msgstr "é?®ä»¶ç?®å½?é??å? æ¶?æ?¯å·²å??æ¶?"
+
+#~ msgid "Invalid message contents"
+#~ msgstr "æ? æ??ç??信件å??容"
+
+#~ msgid "Mail append canceled"
+#~ msgstr "é?®ä»¶è¿½å? å·²å??æ¶?"
+
+#~ msgid "Message construction failed."
+#~ msgstr "信件æ??建失败ã??"
+
+#~ msgid "MH append message canceled"
+#~ msgstr "MH 追å? 信件已å??æ¶?"
+
+#~ msgid "Use cancel"
+#~ msgstr "使ç?¨å??æ¶?"
+
+#~ msgid "STARTTLS command failed"
+#~ msgstr "STARTTLS �令失败"
+
+#~ msgid "HELO command failed"
+#~ msgstr "HELO �令失败"
+
+#~ msgid "AUTH command failed"
+#~ msgstr "AUTH �令失败"
+
+#~ msgid "Bad authentication response from server.\n"
+#~ msgstr "æ?¥è?ªæ??å?¡å?¨ç??é??误认è¯?åº?ç?ã??\n"
+
+#~ msgid "MAIL FROM command failed: %s: mail not sent"
+#~ msgstr "MAIL FROM å?½ä»¤å¤±è´¥ï¼?%sï¼?é?®ä»¶æ?ªå??é??"
+
+#~ msgid "RCPT TO command failed: %s: mail not sent"
+#~ msgstr "RCPT TO å?½ä»¤å¤±è´¥ï¼?%sï¼?é?®ä»¶æ?ªå??é??"
+
+#~ msgid "DATA command failed: %s: mail not sent"
+#~ msgstr "DATA å?½ä»¤å¤±è´¥ï¼?%sï¼?é?®ä»¶æ?ªå??é??"
+
+#~ msgid "RSET command failed"
+#~ msgstr "RSET �令失败"
+
+#~ msgid "QUIT command failed"
+#~ msgstr "QUIT �令失败"
+
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "项�����类�(_C)�"
+
+#~ msgid "Color Info"
+#~ msgstr "��信�"
+
+#~ msgid "The color to render"
+#~ msgstr "ç?¨äº?渲æ??ç??é¢?è?²"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "è¾?å?¥ %s ç??å¯?ç ?"
+
+#~ msgid "Enter password"
+#~ msgstr "è¾?å?¥å¯?ç ?"
+
+#~ msgid "Owner"
+#~ msgstr "æ??æ??è??"
+
+#~ msgid "Publishing Editor"
+#~ msgstr "å??å¸?ç¼?è¾?å?¨"
+
+#~ 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 "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â??"
@@ -5170,18 +5455,12 @@ msgstr "Evolution æ?°æ?®æ??å?¡å?¨æ?¥å¿?æ??å?¡"
#~ msgid "%s: there is no current operation"
#~ msgstr "%sï¼?没æ??å½?å??æ??ä½?"
-#~ msgid "%s: could not cancel"
-#~ msgstr "%sï¼?æ? æ³?å??æ¶?"
-
#~ msgid "\"%s\" on book after \"%s\""
#~ msgstr "â??%2$sâ??å??ç??â??%1$sâ??"
#~ msgid "%s: canceled"
#~ msgstr "%sï¼?å·²å??æ¶?"
-#~ msgid "%s: Invalid source."
-#~ msgstr "%sï¼?æ? æ??æ?¥æº?ã??"
-
#~ msgid "%s: no factories available for URI `%s'"
#~ msgstr "%sï¼?对äº? URIâ??%sâ??没æ??å?¯ç?¨ç??å·¥å??"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
