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