[evolution-data-server] Update Simplified Chinese translation.
- From: Aron Xu <aronxu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Update Simplified Chinese translation.
- Date: Mon, 6 Sep 2010 13:09:38 +0000 (UTC)
commit 2b37c2ab72d4d7c0525a7d1c139b5b68f601d237
Author: Aron Xu <aronxu gnome org>
Date: Mon Sep 6 21:09:12 2010 +0800
Update Simplified Chinese translation.
po/zh_CN.po | 895 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 495 insertions(+), 400 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e9315d4..7032d02 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,19 +12,21 @@
# Aron Xu <happyaron xu gmail com>, 2009.
# lainme <lainme993 gmail com>, 2010.
# Tao Wang <dancefire gmail com>, 2010.
+# Dean Lee <xslidian gmail com>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: evolution-data-server master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=evolution-data-server&component=Misc.\n"
-"POT-Creation-Date: 2010-07-22 17:13+0000\n"
-"PO-Revision-Date: 2010-07-24 13:26+0800\n"
-"Last-Translator: Tao Wang <dancefire gmail com>\n"
+"POT-Creation-Date: 2010-09-06 08:47+0000\n"
+"PO-Revision-Date: 2010-09-06 21:08+0800\n"
+"Last-Translator: YunQiang Su <wzssyqa gmail com>\n"
"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../addressbook/backends/file/e-book-backend-file.c:570
@@ -37,20 +39,20 @@ 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:4491
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4482
#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
msgid "Searching..."
msgstr "æ£å?¨æ??ç´¢..."
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2698
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4650
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4641
#, c-format
msgid "Downloading contacts (%d)... "
msgstr "æ£å?¨ä¸?è½½è??系人(%d)..."
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2846
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3030
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3077
#, c-format
msgid "Updating contacts cache (%d)... "
msgstr "æ£å?¨æ?´æ?°è??系人ç¼?å?(%d)..."
@@ -67,40 +69,40 @@ msgstr "使ç?¨å·²è¯?å?«ç??å§?å?? (DN)"
msgid "Using Email Address"
msgstr "使ç?¨ç?µå?é?®ä»¶å?°å??"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1031
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
msgid "Reconnecting to LDAP server..."
msgstr "æ£å?¨é??æ?°è¿?æ?¥ LDAP æ??å?¡å?¨..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1156
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
msgid "Invalid DN syntax"
msgstr "æ? æ?? DN è¯æ³?"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1672
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1663
msgid "Adding contact to LDAP server..."
msgstr "æ£å?¨å°?è??系人添å? å?° LDAP æ??å?¡å?¨..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1804
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1795
msgid "Removing contact from LDAP server..."
msgstr "æ£å?¨ä»? LDAP æ??å?¡å?¨å? é?¤è??系人..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2238
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2229
msgid "Modifying contact from LDAP server..."
msgstr "æ£å?¨ä¿®æ?¹ LDAP æ??å?¡å?¨ä¸?ç??è??系人..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4341
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4332
msgid "Receiving LDAP search results..."
msgstr "æ£å?¨æ?¥æ?¶ LDAP ç??æ??ç´¢ç»?æ??..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4513
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4504
msgid "Error performing search"
msgstr "æ?§è¡?æ??ç´¢é??误"
#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
#, c-format
-msgid "Create resource '%s' failed with http status: %d"
-msgstr "å??建èµ?æº?â??%sâ??失败ï¼?HTTP ç?¶æ??为ï¼?%d"
+msgid "Create resource '%s' failed with HTTP status: %d"
+msgstr "å??建èµ?æº?â??%sâ??失败ï¼?HTTP ç?¶æ??ç ?为: %d"
-#: ../addressbook/libebook/e-book.c:3001
+#: ../addressbook/libebook/e-book.c:2995
#, c-format
msgid "%s: there was no source for UID '%s' stored in GConf."
msgstr "%sï¼?GConf ä¸æ²¡æ??å?å?¨ UIDâ??%sâ??ç??æº?ã??"
@@ -291,7 +293,7 @@ msgstr "���记 URL"
#. Contact categories
#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:671
+#: ../libedataserverui/e-categories-dialog.c:667
msgid "Categories"
msgstr "类�"
@@ -557,7 +559,7 @@ msgstr "ç??æ?¥"
#: ../addressbook/libebook/e-contact.c:262
#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:43
+#: ../libedataserver/e-categories.c:44
msgid "Anniversary"
msgstr "�年纪念�"
@@ -640,218 +642,225 @@ msgstr "SIP å?°å??"
msgid "Unnamed List"
msgstr "æ?ªå?½å??ç??å??表"
-#: ../addressbook/libedata-book/e-data-book-factory.c:322
+#: ../addressbook/libedata-book/e-data-book-factory.c:287
#, c-format
msgid "Empty URI"
msgstr "空ç?? URI"
-#: ../addressbook/libedata-book/e-data-book-factory.c:340
-#: ../addressbook/libedata-book/e-data-book-factory.c:377
-#: ../calendar/libedata-cal/e-data-cal-factory.c:333
-#: ../calendar/libedata-cal/e-data-cal-factory.c:345
+#: ../addressbook/libedata-book/e-data-book-factory.c:306
+#: ../addressbook/libedata-book/e-data-book-factory.c:344
+#: ../calendar/libedata-cal/e-data-cal-factory.c:331
+#: ../calendar/libedata-cal/e-data-cal-factory.c:343
#, c-format
msgid "Invalid source"
msgstr "æ? æ??ç??æº?"
-#: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:114
+#: ../addressbook/libedata-book/e-data-book.c:171
+#: ../calendar/libedata-cal/e-data-cal.c:109
msgid "Success"
msgstr "æ??å??"
-#: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:115
+#: ../addressbook/libedata-book/e-data-book.c:172
+#: ../calendar/libedata-cal/e-data-cal.c:110
msgid "Repository offline"
msgstr "��离线"
-#: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libecal/e-cal.c:4027 ../calendar/libedata-cal/e-data-cal.c:116
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libecal/e-cal.c:4066 ../calendar/libedata-cal/e-data-cal.c:111
msgid "Permission denied"
msgstr "没æ??æ??é??"
-#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../addressbook/libedata-book/e-data-book.c:174
msgid "Contact not found"
msgstr "æ?¾ä¸?å?°è??系人"
-#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../addressbook/libedata-book/e-data-book.c:175
msgid "Contact ID already exists"
msgstr "è??系人 ID å·²ç»?å?å?¨"
-#: ../addressbook/libedata-book/e-data-book.c:190
-#: ../calendar/libedata-cal/e-data-cal.c:121
+#: ../addressbook/libedata-book/e-data-book.c:176
+#: ../calendar/libedata-cal/e-data-cal.c:116
msgid "Authentication Failed"
msgstr "认�失败"
-#: ../addressbook/libedata-book/e-data-book.c:191
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#: ../addressbook/libedata-book/e-data-book.c:177
+#: ../calendar/libedata-cal/e-data-cal.c:117
msgid "Authentication Required"
msgstr "é??è¦?认è¯?"
-#: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libedata-cal/e-data-cal.c:123
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:118
msgid "Unsupported field"
msgstr "ä¸?æ?¯æ??ç??å??"
-#: ../addressbook/libedata-book/e-data-book.c:193
-#: ../calendar/libedata-cal/e-data-cal.c:125
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:120
msgid "Unsupported authentication method"
msgstr "ä¸?æ?¯æ??ç??身份éª?è¯?æ?¹å¼?"
-#: ../addressbook/libedata-book/e-data-book.c:194
-#: ../calendar/libedata-cal/e-data-cal.c:126
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:121
msgid "TLS not available"
msgstr "TLS ���"
-#: ../addressbook/libedata-book/e-data-book.c:195
-msgid "Address Book does not exist"
+#: ../addressbook/libedata-book/e-data-book.c:181
+msgid "Address book does not exist"
msgstr "å?°å??ç°¿ä¸?å?å?¨"
-#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../addressbook/libedata-book/e-data-book.c:182
msgid "Book removed"
msgstr "å?°å??ç°¿å·²å? é?¤"
-#: ../addressbook/libedata-book/e-data-book.c:197
-#: ../calendar/libedata-cal/e-data-cal.c:129
+#: ../addressbook/libedata-book/e-data-book.c:183
+#: ../calendar/libedata-cal/e-data-cal.c:124
msgid "Not available in offline mode"
msgstr "å?¨è?±æ?ºæ¨¡å¼?ä¸æ? æ³?使ç?¨"
-#: ../addressbook/libedata-book/e-data-book.c:198
-#: ../calendar/libedata-cal/e-data-cal.c:130
+#: ../addressbook/libedata-book/e-data-book.c:184
+#: ../calendar/libedata-cal/e-data-cal.c:125
msgid "Search size limit exceeded"
msgstr "è¶?è¿?æ??索大å°?é??å?¶"
-#: ../addressbook/libedata-book/e-data-book.c:199
-#: ../calendar/libedata-cal/e-data-cal.c:131
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:126
msgid "Search time limit exceeded"
msgstr "è¶?è¿?æ??ç´¢æ?¶é?´é??å?¶"
-#: ../addressbook/libedata-book/e-data-book.c:200
-#: ../calendar/libedata-cal/e-data-cal.c:132
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:127
msgid "Invalid query"
msgstr "æ? æ??ç??æ?¥è¯¢"
-#: ../addressbook/libedata-book/e-data-book.c:201
-#: ../calendar/libedata-cal/e-data-cal.c:133
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:128
msgid "Query refused"
msgstr "æ?¥è¯¢è¢«æ??ç»?"
-#: ../addressbook/libedata-book/e-data-book.c:202
-#: ../calendar/libedata-cal/e-data-cal.c:134
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:129
msgid "Could not cancel"
msgstr "æ? æ³?å??æ¶?"
#. { E_DATA_BOOK_STATUS_OTHER_ERROR, N_("Other error") },
#. { OtherError, N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:204
-#: ../calendar/libedata-cal/e-data-cal.c:136
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:131
msgid "Invalid server version"
msgstr "æ? æ??ç??æ??å?¡å?¨ç??æ?¬"
-#: ../addressbook/libedata-book/e-data-book.c:205
+#: ../addressbook/libedata-book/e-data-book.c:191
msgid "No space"
msgstr "没æ??空é?´"
-#: ../addressbook/libedata-book/e-data-book.c:206
-#: ../calendar/libecal/e-cal.c:4011 ../calendar/libedata-cal/e-data-cal.c:137
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libecal/e-cal.c:4050 ../calendar/libedata-cal/e-data-cal.c:132
msgid "Invalid argument"
msgstr "æ? æ??å??æ?°"
-#: ../addressbook/libedata-book/e-data-book.c:207
-#: ../calendar/libecal/e-cal.c:4049 ../calendar/libedata-cal/e-data-cal.c:138
+#: ../addressbook/libedata-book/e-data-book.c:193
+#: ../calendar/libecal/e-cal.c:4088 ../calendar/libedata-cal/e-data-cal.c:133
msgid "Not supported"
msgstr "ä¸?æ?¯æ??"
-#: ../addressbook/libedata-book/e-data-book.c:216
-#: ../calendar/libedata-cal/e-data-cal.c:146
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../calendar/libedata-cal/e-data-cal.c:141
msgid "Other error"
msgstr "å?¶ä»?é??误"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:374
+#: ../addressbook/libedata-book/e-data-book.c:322
#, c-format
msgid "Cannot open book: %s"
msgstr "æ? æ³?æ??å¼?å?°å??ç°¿ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:394
+#: ../addressbook/libedata-book/e-data-book.c:344
#, c-format
msgid "Cannot remove book: %s"
msgstr "æ? æ³?å? é?¤å?°å??ç°¿ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:411
-#: ../addressbook/libedata-book/e-data-book.c:428
+#: ../addressbook/libedata-book/e-data-book.c:361
+#: ../addressbook/libedata-book/e-data-book.c:380
#, c-format
msgid "Cannot get contact: %s"
msgstr "æ? æ³?è?·å??è??系人ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:443
+#: ../addressbook/libedata-book/e-data-book.c:395
#, c-format
msgid "Empty query: %s"
msgstr "空ç??æ?¥è¯¢ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:457
+#: ../addressbook/libedata-book/e-data-book.c:411
#, c-format
msgid "Cannot get contact list: %s"
msgstr "æ? æ³?è?·å??è??系人å??表ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:492
+#: ../addressbook/libedata-book/e-data-book.c:448
#, c-format
msgid "Cannot authenticate user: %s"
msgstr "æ? æ³?认è¯?ç?¨æ?·ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:507
-#: ../addressbook/libedata-book/e-data-book.c:524
+#: ../addressbook/libedata-book/e-data-book.c:463
+#: ../addressbook/libedata-book/e-data-book.c:482
#, c-format
msgid "Cannot add contact: %s"
msgstr "æ? æ³?æ·»å? è??系人ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:542
-#: ../addressbook/libedata-book/e-data-book.c:559
+#: ../addressbook/libedata-book/e-data-book.c:500
+#: ../addressbook/libedata-book/e-data-book.c:519
#, c-format
msgid "Cannot modify contact: %s"
msgstr "æ? æ³?ä¿®æ?¹è??系人ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:596
+#: ../addressbook/libedata-book/e-data-book.c:558
#, c-format
msgid "Cannot remove contacts: %s"
msgstr "æ? æ³?移é?¤è??系人ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:626
+#: ../addressbook/libedata-book/e-data-book.c:595
#, c-format
msgid "Cannot get supported fields: %s"
msgstr "æ? æ³?è?·å??æ?¯æ??ç??å?段ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:639
+#: ../addressbook/libedata-book/e-data-book.c:610
#, c-format
msgid "Cannot get required fields: %s"
msgstr "æ? æ³?è?·å??å¿?å¡«å?段ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:652
+#: ../addressbook/libedata-book/e-data-book.c:625
#, c-format
-msgid "Cannot get supported auth methods: %s"
+msgid "Cannot get supported authentication methods: %s"
msgstr "æ? æ³?è?·å??æ?¯æ??ç??认è¯?æ?¹å¼?ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:677
+#: ../addressbook/libedata-book/e-data-book.c:651
+#: ../addressbook/libedata-book/e-data-book.c:662
#, c-format
msgid "Invalid query: %s"
msgstr "æ? æ??ç??æ?¥è¯¢ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:708
+#: ../addressbook/libedata-book/e-data-book.c:698
#, c-format
msgid "Cannot get changes: %s"
msgstr "æ? æ³?è?·å??æ?´æ?¹ï¼?%s"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:737
+#, c-format
+msgid "Cancel operation failed: %s"
+msgstr "å??æ¶?æ??ä½?失败ï¼?%s"
+
#: ../calendar/backends/caldav/e-cal-backend-caldav.c:498
#, c-format
msgid "Unexpected HTTP status code %d returned"
@@ -862,7 +871,7 @@ msgid "Calendar doesn't support Free/Busy"
msgstr "æ?¥å??ä¸?æ?¯æ??空é?²/ç¹?å¿?"
#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
-#: ../libedataserver/e-categories.c:44
+#: ../libedataserver/e-categories.c:45
msgid "Birthday"
msgstr "ç??æ?¥"
@@ -909,13 +918,13 @@ msgid "Invalid server URI"
msgstr "æ? æ??ç??æ??å?¡å?¨ URI"
#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1082
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1343
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1342
#: ../calendar/backends/http/e-cal-backend-http.c:659
#: ../calendar/backends/weather/e-cal-backend-weather.c:487
msgid "Could not create cache file"
msgstr "æ? æ³?å??建ç¼?å?æ??件"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1095
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1094
msgid "Could not create thread for populating cache"
msgstr "æ? æ³?å??建å¢?æ®?ç¼?å?å??建线索"
@@ -1103,24 +1112,25 @@ msgstr "30æ?¥"
msgid "31st"
msgstr "31æ?¥"
-#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:677 ../calendar/libecal/e-cal-util.c:704
msgid "High"
msgstr "é«?"
-#: ../calendar/libecal/e-cal-util.c:690 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:679 ../calendar/libecal/e-cal-util.c:706
msgid "Normal"
msgstr "ä¸"
-#: ../calendar/libecal/e-cal-util.c:692 ../calendar/libecal/e-cal-util.c:719
+#: ../calendar/libecal/e-cal-util.c:681 ../calendar/libecal/e-cal-util.c:708
msgid "Low"
msgstr "ä½?"
#. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:702
msgid "Undefined"
msgstr "���"
-#: ../calendar/libecal/e-cal.c:1142 ../libedataserverui/e-book-auth-util.c:206
+#: ../calendar/libecal/e-cal.c:1227 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:435
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "为 %s è¾?å?¥å¯?ç ? (ç?¨æ?· %s)"
@@ -1129,62 +1139,62 @@ 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:1156
+#: ../calendar/libecal/e-cal.c:1241
#, c-format
msgid "Enter password for %s to enable proxy for user %s"
msgstr "è¾?å?¥ %s ç??å¯?ç ?ï¼?以便为ç?¨æ?· %s å?¯ç?¨ä»£ç??æ??å?¡å?¨"
-#: ../calendar/libecal/e-cal.c:4013
+#: ../calendar/libecal/e-cal.c:4052
msgid "Backend is busy"
msgstr "å??å?°ç¹?å¿?"
-#: ../calendar/libecal/e-cal.c:4015
+#: ../calendar/libecal/e-cal.c:4054
msgid "Repository is offline"
msgstr "��离线"
-#: ../calendar/libecal/e-cal.c:4017
+#: ../calendar/libecal/e-cal.c:4056
msgid "No such calendar"
msgstr "没æ??è¿?æ ·ç??æ?¥å??"
-#: ../calendar/libecal/e-cal.c:4019 ../calendar/libedata-cal/e-data-cal.c:118
+#: ../calendar/libecal/e-cal.c:4058 ../calendar/libedata-cal/e-data-cal.c:113
#: ../servers/groupwise/e-gw-connection.c:235
msgid "Object not found"
msgstr "���对象"
-#: ../calendar/libecal/e-cal.c:4021 ../calendar/libedata-cal/e-data-cal.c:119
+#: ../calendar/libecal/e-cal.c:4060 ../calendar/libedata-cal/e-data-cal.c:114
#: ../servers/groupwise/e-gw-connection.c:229
msgid "Invalid object"
msgstr "æ? æ??对象"
-#: ../calendar/libecal/e-cal.c:4023
+#: ../calendar/libecal/e-cal.c:4062
msgid "URI not loaded"
msgstr "URI �载�"
-#: ../calendar/libecal/e-cal.c:4025
+#: ../calendar/libecal/e-cal.c:4064
msgid "URI already loaded"
msgstr "URI 已�载�"
-#: ../calendar/libecal/e-cal.c:4029 ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4068 ../servers/groupwise/e-gw-connection.c:237
msgid "Unknown User"
msgstr "����"
-#: ../calendar/libecal/e-cal.c:4031 ../calendar/libedata-cal/e-data-cal.c:120
+#: ../calendar/libecal/e-cal.c:4070 ../calendar/libedata-cal/e-data-cal.c:115
msgid "Object ID already exists"
msgstr "对象 ID å·²ç»?å?å?¨"
-#: ../calendar/libecal/e-cal.c:4033
+#: ../calendar/libecal/e-cal.c:4072
msgid "Protocol not supported"
msgstr "ä¸?æ?¯æ??ç??å??è®®"
-#: ../calendar/libecal/e-cal.c:4035
+#: ../calendar/libecal/e-cal.c:4074
msgid "Operation has been canceled"
msgstr "æ??ä½?å·²å??æ¶?"
-#: ../calendar/libecal/e-cal.c:4037
+#: ../calendar/libecal/e-cal.c:4076
msgid "Could not cancel operation"
msgstr "æ? æ³?å??æ¶?æ??ä½?"
-#: ../calendar/libecal/e-cal.c:4039
+#: ../calendar/libecal/e-cal.c:4078
#: ../camel/providers/groupwise/camel-groupwise-folder.c:1434
#: ../camel/providers/groupwise/camel-groupwise-folder.c:1452
#: ../camel/providers/groupwise/camel-groupwise-store.c:618
@@ -1195,25 +1205,25 @@ msgstr "æ? æ³?å??æ¶?æ??ä½?"
msgid "Authentication failed"
msgstr "认�失败"
-#: ../calendar/libecal/e-cal.c:4041
+#: ../calendar/libecal/e-cal.c:4080
#: ../camel/providers/smtp/camel-smtp-transport.c:166
msgid "Authentication required"
msgstr "�须认�"
-#: ../calendar/libecal/e-cal.c:4043
-msgid "A DBUS exception has occurred"
-msgstr "å??ç??äº?ä¸?个 DBUS å¼?常"
+#: ../calendar/libecal/e-cal.c:4082
+msgid "A D-Bus exception has occurred"
+msgstr "å??ç??äº?ä¸?个 D-Bus å¼?常"
-#: ../calendar/libecal/e-cal.c:4045
+#: ../calendar/libecal/e-cal.c:4084
#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
#: ../camel/providers/imap/camel-imap-command.c:457
-#: ../camel/providers/imap/camel-imap-store.c:626
-#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../camel/providers/imap/camel-imap-store.c:627
+#: ../camel/providers/pop3/camel-pop3-store.c:474
#: ../servers/groupwise/e-gw-connection.c:243
msgid "Unknown error"
msgstr "æ?ªç?¥ç??é??误"
-#: ../calendar/libecal/e-cal.c:4047
+#: ../calendar/libecal/e-cal.c:4086
msgid "No error"
msgstr "æ? é??误"
@@ -1310,171 +1320,171 @@ msgid ""
"be a boolean false (#f)"
msgstr "â??%sâ??ç??æ??æ??å??æ?°é?½åº?该为å?符串æ??è??å®?å?¯ä¸?ç??å??æ?°ä¸ºå¸?å°?å?? (#f)"
-#: ../calendar/libedata-cal/e-data-cal.c:117
+#: ../calendar/libedata-cal/e-data-cal.c:112
msgid "Invalid range"
msgstr "æ? æ??è??å?´"
-#: ../calendar/libedata-cal/e-data-cal.c:124
+#: ../calendar/libedata-cal/e-data-cal.c:119
msgid "Unsupported method"
msgstr "ä¸?æ?¯æ??ç??æ?¹å¼?"
-#: ../calendar/libedata-cal/e-data-cal.c:127
+#: ../calendar/libedata-cal/e-data-cal.c:122
msgid "Calendar does not exist"
msgstr "æ?¥å??ä¸?å?å?¨"
-#: ../calendar/libedata-cal/e-data-cal.c:128
-msgid "UnknownUser"
+#: ../calendar/libedata-cal/e-data-cal.c:123
+msgid "Unknown user"
msgstr "����"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:606
+#: ../calendar/libedata-cal/e-data-cal.c:604
#, c-format
msgid "Cannot retrieve calendar address: %s"
msgstr "æ? æ³?è?·å??æ?¥å??å?°å??ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:626
+#: ../calendar/libedata-cal/e-data-cal.c:624
#, c-format
msgid "Cannot retrieve calendar alarm e-mail address: %s"
msgstr "æ? æ³?è?·å??æ?¥å??é?¹é??ç?µå?é?®ä»¶å?°å??ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:646
+#: ../calendar/libedata-cal/e-data-cal.c:644
#, c-format
-msgid "Cannot retrieve calendar's ldap attribute: %s"
-msgstr "æ? æ³?è?·å??æ?¥å?? LDAP å±?æ?§ï¼?%s"
+msgid "Cannot retrieve calendar's LDAP attribute: %s"
+msgstr "æ? æ³?è?·å??æ?¥å??ç?? LDAP å±?æ?§ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:666
+#: ../calendar/libedata-cal/e-data-cal.c:664
#, c-format
msgid "Cannot retrieve calendar scheduling information: %s"
msgstr "æ? æ³?è?·å??æ?¥å??计å??ä»»å?¡ä¿¡æ?¯ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:685
+#: ../calendar/libedata-cal/e-data-cal.c:683
#, c-format
msgid "Cannot open calendar: %s"
msgstr "æ? æ³?æ??å¼?æ?¥å??ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:706
+#: ../calendar/libedata-cal/e-data-cal.c:704
#, c-format
msgid "Cannot refresh calendar: %s"
msgstr "æ? æ³?å?·æ?°æ?¥å??ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:725
+#: ../calendar/libedata-cal/e-data-cal.c:723
#, c-format
msgid "Cannot remove calendar: %s"
msgstr "æ? æ³?移é?¤æ?¥å??ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:746
+#: ../calendar/libedata-cal/e-data-cal.c:744
#, c-format
msgid "Cannot create calendar object: %s"
msgstr "æ? æ³?å??建æ?¥å??对象ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:770
+#: ../calendar/libedata-cal/e-data-cal.c:768
#, c-format
msgid "Cannot modify calendar object: %s"
msgstr "æ? æ³?ä¿®æ?¹æ?¥å??对象ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:796
+#: ../calendar/libedata-cal/e-data-cal.c:794
#, c-format
msgid "Cannot remove calendar object: %s"
msgstr "æ? æ³?移é?¤æ?¥å??对象ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:817
+#: ../calendar/libedata-cal/e-data-cal.c:815
#, c-format
msgid "Cannot receive calendar objects: %s"
msgstr "æ? æ³?æ?¥æ?¶æ?¥å??对象ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:836
+#: ../calendar/libedata-cal/e-data-cal.c:834
#, c-format
msgid "Cannot discard calendar alarm: %s"
msgstr "æ? æ³?å??æ¶?æ?¥å??é?¹é??ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:857
+#: ../calendar/libedata-cal/e-data-cal.c:855
#, c-format
msgid "Cannot send calendar objects: %s"
msgstr "æ? æ³?å??é??æ?¥å??对象ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:894
+#: ../calendar/libedata-cal/e-data-cal.c:880
#, c-format
msgid "Cannot retrieve default calendar object path: %s"
msgstr "æ? æ³?è?·å??é»?认ç??æ?¥å??对象路å¾?ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:914
+#: ../calendar/libedata-cal/e-data-cal.c:900
#, c-format
msgid "Cannot retrieve calendar object path: %s"
msgstr "æ? æ³?è?·å??æ?¥å??对象ç??è·¯å¾?ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:934
+#: ../calendar/libedata-cal/e-data-cal.c:920
#, c-format
msgid "Cannot retrieve calendar object list: %s"
msgstr "æ? æ³?è?·å??æ?¥å??对象ç??å??表ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:974
+#: ../calendar/libedata-cal/e-data-cal.c:948
#, c-format
msgid "Could not retrieve attachment list: %s"
msgstr "æ? æ³?è?·å??é??件å??表ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:998
+#: ../calendar/libedata-cal/e-data-cal.c:974
#, c-format
msgid "Could not complete calendar query: %s"
msgstr "æ? æ³?å®?æ??æ?¥å??æ?¥è¯¢ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1018
+#: ../calendar/libedata-cal/e-data-cal.c:994
#, c-format
msgid "Could not retrieve calendar time zone: %s"
msgstr "æ? æ³?è?·å??æ?¥å??æ?¶å?ºï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1038
+#: ../calendar/libedata-cal/e-data-cal.c:1014
#, c-format
msgid "Could not add calendar time zone: %s"
msgstr "æ? æ³?æ·»å? æ?¥å??æ?¶å?ºï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1057
+#: ../calendar/libedata-cal/e-data-cal.c:1033
#, c-format
msgid "Could not set default calendar time zone: %s"
msgstr "æ? æ³?设置é»?认ç??æ?¥å??æ?¶å?ºï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1080
+#: ../calendar/libedata-cal/e-data-cal.c:1056
#, c-format
msgid "Cannot retrieve calendar changes: %s"
msgstr "æ? æ³?è?·å??æ?¥å??æ?´æ?¹ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1132
+#: ../calendar/libedata-cal/e-data-cal.c:1087
#, c-format
msgid "Cannot retrieve calendar free/busy list: %s"
msgstr "æ? æ³?è?·å??æ?¥å??空é?²ã??ç¹?å¿?å??表ï¼?%s"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:355
+#: ../calendar/libedata-cal/e-data-cal-factory.c:353
#, c-format
msgid "Invalid URI"
msgstr "æ? æ??ç?? URI"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:370
+#: ../calendar/libedata-cal/e-data-cal-factory.c:371
#, c-format
msgid "No backend factory for '%s' of '%s'"
msgstr "对â??%2$sâ??ç??â??%1$sâ??没æ??å??端工å??"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:420
+#: ../calendar/libedata-cal/e-data-cal-factory.c:421
#, c-format
msgid "Could not instantiate backend"
msgstr "æ? æ³?å®?ä¾?å??å??端"
@@ -1528,12 +1538,12 @@ msgstr "æ?¨ä¸?è?½ç?¨æ¤å¯?ç ?导å?ºå¯?é?¥"
#: ../camel/camel-data-cache.c:181
#, c-format
msgid "Unable to create cache path"
-msgstr "æ? æ³?å??建ç¼?å?²è·¯å¾?"
+msgstr "æ? æ³?å??建ç¼?å?è·¯å¾?"
#: ../camel/camel-data-cache.c:494
#, c-format
msgid "Could not remove cache entry: %s: %s"
-msgstr "æ? æ³?å? é?¤ç¼?å?²æ?¡ç?®ï¼?%sï¼?%s"
+msgstr "æ? æ³?å? é?¤ç¼?å?æ?¡ç?®ï¼?%sï¼?%s"
#: ../camel/camel-data-wrapper.c:89
#, c-format
@@ -1585,16 +1595,23 @@ msgstr "å??å¤?è?±æ?ºæ??件夹â??%sâ??"
msgid "Copy folder content locally for offline operation"
msgstr "å°?æ??件夹å??容å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?"
-#: ../camel/camel-disco-store.c:395
+#: ../camel/camel-disco-store.c:398
#: ../camel/providers/groupwise/camel-groupwise-store.c:230
-#: ../camel/providers/imap/camel-imap-store.c:895
-#: ../camel/providers/imap/camel-imap-store.c:1739
-#: ../camel/providers/imap/camel-imap-store.c:2197
-#: ../camel/providers/imap/camel-imap-store.c:3041
-#: ../camel/providers/imapx/camel-imapx-store.c:185
-#: ../camel/providers/imapx/camel-imapx-store.c:709
-#: ../camel/providers/imapx/camel-imapx-store.c:772
-#: ../camel/providers/imapx/camel-imapx-store.c:831
+#: ../camel/providers/imap/camel-imap-store.c:876
+#: ../camel/providers/imap/camel-imap-store.c:1720
+#: ../camel/providers/imap/camel-imap-store.c:2178
+#: ../camel/providers/imap/camel-imap-store.c:3022
+#: ../camel/providers/imapx/camel-imapx-folder.c:165
+#: ../camel/providers/imapx/camel-imapx-folder.c:196
+#: ../camel/providers/imapx/camel-imapx-folder.c:225
+#: ../camel/providers/imapx/camel-imapx-folder.c:282
+#: ../camel/providers/imapx/camel-imapx-folder.c:325
+#: ../camel/providers/imapx/camel-imapx-folder.c:357
+#: ../camel/providers/imapx/camel-imapx-folder.c:388
+#: ../camel/providers/imapx/camel-imapx-store.c:189
+#: ../camel/providers/imapx/camel-imapx-store.c:711
+#: ../camel/providers/imapx/camel-imapx-store.c:774
+#: ../camel/providers/imapx/camel-imapx-store.c:833
#, c-format
msgid "You must be working online to complete this operation"
msgstr "æ?¨å¿?é¡»å?¨çº¿å·¥ä½?以便å®?æ??该æ??ä½?"
@@ -1604,13 +1621,14 @@ msgstr "æ?¨å¿?é¡»å?¨çº¿å·¥ä½?以便å®?æ??该æ??ä½?"
#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
#: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
-#: ../camel/providers/imapx/camel-imapx-server.c:4678
-#: ../camel/providers/imapx/camel-imapx-server.c:4695
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4654
+#: ../camel/providers/imapx/camel-imapx-server.c:4671
#: ../camel/providers/nntp/camel-nntp-summary.c:396
#: ../camel/providers/pop3/camel-pop3-folder.c:269
#: ../camel/providers/pop3/camel-pop3-folder.c:625
#: ../camel/providers/pop3/camel-pop3-folder.c:690
-#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../camel/providers/pop3/camel-pop3-store.c:466
#: ../libedataserverui/e-book-auth-util.c:229
#, c-format
msgid "Cancelled"
@@ -2153,73 +2171,73 @@ msgstr "æ??å?¡å?¨åº?è¾¾å?«æ??ä¸?å®?æ?´ç??认è¯?æ?°æ?®"
msgid "Server response does not match"
msgstr "æ??å?¡å?¨åº?ç?ä¸?å?¹é??"
-#: ../camel/camel-sasl-gssapi.c:82
+#: ../camel/camel-sasl-gssapi.c:80
msgid "GSSAPI"
msgstr "GSSAPI"
-#: ../camel/camel-sasl-gssapi.c:84
+#: ../camel/camel-sasl-gssapi.c:82
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr "该é??项å°?ç?¨ Kerberos 5 认è¯?è¿?æ?¥å?°æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-gssapi.c:121
+#: ../camel/camel-sasl-gssapi.c:119
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
msgstr "æ??æ??ä¾?ç??è¯?书ä¸?æ?¯æ??æ??å®?ç??æ?ºå?¶ï¼?æ??è??æ? æ³?被å®?ç?°æ??è¯?å?«ã??"
-#: ../camel/camel-sasl-gssapi.c:126
+#: ../camel/camel-sasl-gssapi.c:124
msgid "The provided target_name parameter was ill-formed."
msgstr "æ??ä¾?ç?? target_name å??æ?°æ ¼å¼?ä¸?对ã??"
-#: ../camel/camel-sasl-gssapi.c:129
+#: ../camel/camel-sasl-gssapi.c:127
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
msgstr "æ??ä¾?ç?? target_name å??æ?°å??å?«æ? æ??æ??ä¸?æ?¯æ??ç??å??称类å??ã??"
-#: ../camel/camel-sasl-gssapi.c:133
+#: ../camel/camel-sasl-gssapi.c:131
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:138
+#: ../camel/camel-sasl-gssapi.c:136
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
msgstr "input_token å??å?«æ? æ??ç??ç¾å??ï¼?æ??è??æ? æ³?éª?è¯?ç¾å??ã??"
-#: ../camel/camel-sasl-gssapi.c:142
+#: ../camel/camel-sasl-gssapi.c:140
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:147
+#: ../camel/camel-sasl-gssapi.c:145
msgid "The supplied context handle did not refer to a valid context."
msgstr "æ??ä¾?ç??ä¸?ä¸?æ??å?¥æ??æ??å¼?ç?¨ç??ä¸?ä¸?æ??æ? æ??ã??"
-#: ../camel/camel-sasl-gssapi.c:150
+#: ../camel/camel-sasl-gssapi.c:148
msgid "The consistency checks performed on the input_token failed."
msgstr "对 input_token æ?§è¡?å®?æ?´æ?§æ£?æ?¥å¤±è´¥ã??"
-#: ../camel/camel-sasl-gssapi.c:153
+#: ../camel/camel-sasl-gssapi.c:151
msgid "The consistency checks performed on the credential failed."
msgstr "对è¯?书æ?§è¡?å®?æ?´æ?§æ£?æ?¥å¤±è´¥ã??"
-#: ../camel/camel-sasl-gssapi.c:156
+#: ../camel/camel-sasl-gssapi.c:154
msgid "The referenced credentials have expired."
msgstr "å¼?ç?¨ç??è¯?书已è¿?æ??ã??"
-#: ../camel/camel-sasl-gssapi.c:162 ../camel/camel-sasl-gssapi.c:300
-#: ../camel/camel-sasl-gssapi.c:344 ../camel/camel-sasl-gssapi.c:361
-#: ../camel/providers/smtp/camel-smtp-transport.c:1192
+#: ../camel/camel-sasl-gssapi.c:160 ../camel/camel-sasl-gssapi.c:296
+#: ../camel/camel-sasl-gssapi.c:340 ../camel/camel-sasl-gssapi.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:1176
#, c-format
msgid "Bad authentication response from server."
msgstr "æ?¥è?ªæ??å?¡å?¨ç??æ? æ??认è¯?åº?ç?ã??"
-#: ../camel/camel-sasl-gssapi.c:373
+#: ../camel/camel-sasl-gssapi.c:369
#, c-format
msgid "Unsupported security layer."
msgstr "ä¸?æ?¯æ??ç??å®?å?¨å±?ã??"
@@ -2264,14 +2282,14 @@ msgid "POP Source URI"
msgstr "POP � URI"
#: ../camel/camel-sasl-popb4smtp.c:89
-#, c-format
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr "以æ?ªç?¥ç??ä¼ è¾?è¿?è¡? SMTP ä¹?å??ç?? POP æ??æ??"
+#, fuzzy, c-format
+msgid "POP Before SMTP authentication using an unknown transport"
+msgstr "以æ?ªç?¥ç??ä¼ è¾?è¿?è¡? SMTP æ??æ??ä¹?å??ç?? POP"
#: ../camel/camel-sasl-popb4smtp.c:97
-#, c-format
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "以é?? pop æº?è¿?è¡? SMTP ä¹?å??ç?? POP æ??æ??"
+#, fuzzy, c-format
+msgid "POP Before SMTP authentication using a non-POP source"
+msgstr "以é?? POP æº?è¿?è¡? SMTP æ??æ??ä¹?å??ç?? POP"
#: ../camel/camel-search-private.c:112
#, c-format
@@ -2293,7 +2311,7 @@ msgstr "URLâ??%sâ??é??è¦?主æ?ºç»?件"
msgid "URL '%s' needs a path component"
msgstr "URLâ??%sâ??é??è¦?è·¯å¾?ç»?件"
-#: ../camel/camel-session.c:263
+#: ../camel/camel-session.c:261
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -2302,7 +2320,7 @@ msgstr ""
"æ? æ³?å??建ç?®å½? %sï¼?\n"
"%s"
-#: ../camel/camel-session.c:760
+#: ../camel/camel-session.c:758
#, c-format
msgid "Please enter the %s password for %s on host %s."
msgstr "请è¾?å?¥ %2$s %3$s ç?? %1$s å¯?ç ?"
@@ -2519,16 +2537,84 @@ msgid "Cannot rename folder: %s: Invalid operation"
msgstr "æ? æ³?é??å?½å??æ??件夹ï¼?%sï¼?æ? æ??æ??ä½?"
#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:1128 ../camel/camel-vtrash-folder.c:48
+#: ../camel/camel-store.c:1129 ../camel/camel-vtrash-folder.c:48
msgid "Trash"
msgstr "å??æ?¶ç«?"
#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:1131 ../camel/camel-vtrash-folder.c:50
+#: ../camel/camel-store.c:1132 ../camel/camel-vtrash-folder.c:50
msgid "Junk"
msgstr "å??å?¾"
-#: ../camel/camel-tcp-stream-ssl.c:786
+#: ../camel/camel-tcp-stream-raw.c:814
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr "代ç??主æ?ºä¸?æ?¯æ?? SOCKS5"
+
+#: ../camel/camel-tcp-stream-raw.c:820
+#, c-format
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "æ? æ³?æ?¾å?°å??é??ç??éª?è¯?ç±»å??: 代ç ? 0x%x"
+
+#: ../camel/camel-tcp-stream-raw.c:832
+msgid "General SOCKS server failure"
+msgstr "é??ç?¨ SOCKS æ??å?¡å?¨å¤±è´¥"
+
+#: ../camel/camel-tcp-stream-raw.c:833
+msgid "SOCKS server's rules do not allow connection"
+msgstr "SOCKS æ??å?¡å?¨ç??ç?ç?¥ä¸?å??许è¿?æ?¥"
+
+#: ../camel/camel-tcp-stream-raw.c:834
+msgid "Network is unreachable from SOCKS server"
+msgstr "SOCKS æ??å?¡å?¨ç½?ç»?ä¸?å?¯å??"
+
+#: ../camel/camel-tcp-stream-raw.c:835
+msgid "Host is unreachable from SOCKS server"
+msgstr "SOCKS æ??å?¡å?¨ä¸»æ?ºä¸?å?¯å??"
+
+#: ../camel/camel-tcp-stream-raw.c:836
+msgid "Connection refused"
+msgstr "è¿?æ?¥è¢«æ??ç»?"
+
+#: ../camel/camel-tcp-stream-raw.c:837
+msgid "Time-to-live expired"
+msgstr "è¿?é??æ?¶é?´è¿?æ??"
+
+#: ../camel/camel-tcp-stream-raw.c:838
+msgid "Command not supported by SOCKS server"
+msgstr "SOCKS æ??å?¡å?¨ä¸?æ?¯æ??该å?½ä»¤"
+
+#: ../camel/camel-tcp-stream-raw.c:839
+msgid "Address type not supported by SOCKS server"
+msgstr "SOCKS æ??å?¡å?¨ä¸?æ?¯æ??该å?°å??ç±»å??"
+
+#: ../camel/camel-tcp-stream-raw.c:840
+msgid "Unknown error from SOCKS server"
+msgstr "SOCKS æ??å?¡å?¨å??ç??æ?ªç?¥é??误"
+
+#: ../camel/camel-tcp-stream-raw.c:870
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr "ä»? SOCKS æ??å?¡å?¨è?·å??ç??å?°å??ç±»å??æ?ªç?¥"
+
+#: ../camel/camel-tcp-stream-raw.c:887
+#, c-format
+msgid "Incomplete reply from SOCKS server"
+msgstr "SOCKS æ??å?¡å?¨ç??å??åº?ä¸?å®?æ?´"
+
+#: ../camel/camel-tcp-stream-raw.c:902
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "主æ?ºå??太é?¿ (æ??é?¿ 255 å?符)"
+
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:934 ../camel/camel-tcp-stream-raw.c:944
+#, c-format
+msgid "Invalid reply from proxy server"
+msgstr "代ç??æ??å?¡å?¨ç??å??åº?æ? æ??"
+
+#: ../camel/camel-tcp-stream-ssl.c:457
#, c-format
msgid ""
"Issuer: %s\n"
@@ -2541,16 +2627,16 @@ msgstr ""
"æ??纹ï¼? %s\n"
"ç¾å??ï¼? %s"
-#: ../camel/camel-tcp-stream-ssl.c:792
+#: ../camel/camel-tcp-stream-ssl.c:463
msgid "GOOD"
msgstr "好"
-#: ../camel/camel-tcp-stream-ssl.c:792
+#: ../camel/camel-tcp-stream-ssl.c:463
msgid "BAD"
msgstr "å??"
#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:796
+#: ../camel/camel-tcp-stream-ssl.c:467
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -2565,7 +2651,7 @@ msgstr ""
"\n"
"æ?¨å¸?æ??æ?¥å??å??ï¼?"
-#: ../camel/camel-tcp-stream-ssl.c:840
+#: ../camel/camel-tcp-stream-ssl.c:511
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -2574,7 +2660,7 @@ msgstr ""
"�书���%s\n"
"å??è¡?è??ï¼?%s"
-#: ../camel/camel-tcp-stream-ssl.c:892
+#: ../camel/camel-tcp-stream-ssl.c:563
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -2583,7 +2669,7 @@ msgstr ""
"æ? æ??ç??è¯?书å??å??ï¼?%s\n"
"å??è¡?è??ï¼?%s"
-#: ../camel/camel-tcp-stream-ssl.c:910
+#: ../camel/camel-tcp-stream-ssl.c:581
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -2592,7 +2678,7 @@ msgstr ""
"è¯?书è¿?æ??ï¼?%s\n"
"å??è¡?è??ï¼?%s"
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:598
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -2673,7 +2759,7 @@ msgstr "æ? æ³?è?·å??信件 %sï¼?"
#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2644
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2645
#, c-format
msgid "This message is not available in offline mode."
msgstr "该信件æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸ä½¿ç?¨ã??"
@@ -2700,21 +2786,21 @@ msgstr "æ£?æ?¥å·²å? é?¤ç??æ?°å»º %s"
#: ../camel/providers/groupwise/camel-groupwise-folder.c:1637
#: ../camel/providers/groupwise/camel-groupwise-store.c:654
#: ../camel/providers/groupwise/camel-groupwise-store.c:779
-#: ../camel/providers/imap/camel-imap-folder.c:3806
-#: ../camel/providers/imap/camel-imap-folder.c:3884
-#: ../camel/providers/imapx/camel-imapx-server.c:3721
-#: ../camel/providers/imapx/camel-imapx-server.c:3845
+#: ../camel/providers/imap/camel-imap-folder.c:3814
+#: ../camel/providers/imap/camel-imap-folder.c:3892
+#: ../camel/providers/imapx/camel-imapx-server.c:3719
+#: ../camel/providers/imapx/camel-imapx-server.c:3844
#, c-format
msgid "Fetching summary information for new messages in %s"
msgstr "ä»? %s ä¸ç??æ?°ä¿¡ä»¶ä¸è?·å??æ¦?è¦?ä¿¡æ?¯"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2524
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2475
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2525
#, c-format
msgid "Cannot append message to folder '%s': %s"
msgstr "æ? æ³?å°?信件追å? å?°æ??件夹â??%sâ??ï¼?%s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2510
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2511
#, c-format
msgid "Cannot create message: %s"
msgstr "æ? æ³?å??建信件ï¼?%s"
@@ -2805,8 +2891,8 @@ msgid "Host or user not available in url"
msgstr "URL ä¸ç??主æ?ºæ??ç?¨æ?·ä¸?å?¯ç?¨"
#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1207
-#: ../camel/providers/imapx/camel-imapx-server.c:2975
+#: ../camel/providers/imap/camel-imap-store.c:1188
+#: ../camel/providers/imapx/camel-imapx-server.c:2972
#, c-format
msgid "You did not enter a password."
msgstr "æ?¨æ²¡æ??è¾?å?¥å¯?ç ?ã??"
@@ -2816,9 +2902,9 @@ msgid "Some features may not work correctly with your current server version"
msgstr "æ??äº?ç?¹æ?§å?¯è?½æ? æ³?ä¸?æ?¨ç?®å??ç??æ??å?¡å?¨ç??æ?¬å?±å??å·¥ä½?"
#: ../camel/providers/groupwise/camel-groupwise-store.c:550
-#: ../camel/providers/imap/camel-imap-store.c:1776
-#: ../camel/providers/imap/camel-imap-store.c:1971
-#: ../camel/providers/imapx/camel-imapx-store.c:410
+#: ../camel/providers/imap/camel-imap-store.c:1757
+#: ../camel/providers/imap/camel-imap-store.c:1952
+#: ../camel/providers/imapx/camel-imapx-store.c:412
#, c-format
msgid "No such folder %s"
msgstr "没æ??æ??件夹 %s"
@@ -2834,9 +2920,9 @@ msgid "Cannot create a special system folder"
msgstr "æ? æ³?å??建ç?¹æ®?ç³»ç»?æ??件夹"
#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
-#: ../camel/providers/imap/camel-imap-store.c:1854
-#: ../camel/providers/imap/camel-imap-store.c:2276
-#: ../camel/providers/imapx/camel-imapx-store.c:873
+#: ../camel/providers/imap/camel-imap-store.c:1835
+#: ../camel/providers/imap/camel-imap-store.c:2257
+#: ../camel/providers/imapx/camel-imapx-store.c:875
#, c-format
msgid "The parent folder is not allowed to contain subfolders"
msgstr "ç?¶æ??件夹ä¸?å??许å?«æ??å?æ??件夹"
@@ -2955,7 +3041,7 @@ msgid "Could not create directory %s: %s"
msgstr "æ? æ³?å??建ç?®å½? %sï¼?%s"
#: ../camel/providers/imap/camel-imap-folder.c:960
-#: ../camel/providers/imapx/camel-imapx-server.c:3760
+#: ../camel/providers/imapx/camel-imapx-server.c:3759
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "æ?«æ?? %s ä¸æ?´æ?¹äº?ç??信件"
@@ -2965,34 +3051,34 @@ msgid "Unable to retrieve message: "
msgstr "æ? æ³?è?·å??信件ï¼?"
#: ../camel/providers/imap/camel-imap-folder.c:3266
-#: ../camel/providers/imapx/camel-imapx-server.c:4957
+#: ../camel/providers/imapx/camel-imapx-server.c:4937
#, c-format
msgid "Cannot get message with message ID %s: %s"
msgstr "æ? æ³?è?·å??信件 ID %sï¼?%s"
#: ../camel/providers/imap/camel-imap-folder.c:3267
-#: ../camel/providers/imapx/camel-imapx-server.c:4958
+#: ../camel/providers/imapx/camel-imapx-server.c:4938
msgid "No such message available."
msgstr "没æ??该信件ã??"
-#: ../camel/providers/imap/camel-imap-folder.c:3337
-#: ../camel/providers/imap/camel-imap-folder.c:4203
+#: ../camel/providers/imap/camel-imap-folder.c:3341
+#: ../camel/providers/imap/camel-imap-folder.c:4211
#: ../camel/providers/nntp/camel-nntp-folder.c:326
#, c-format
msgid "This message is not currently available"
msgstr "该信件ç?®å??ä¸?å?¯ç?¨"
-#: ../camel/providers/imap/camel-imap-folder.c:4013
+#: ../camel/providers/imap/camel-imap-folder.c:4021
#, c-format
msgid "Incomplete server response: no information provided for message %d"
msgstr "ä¸?å®?æ?´ç??æ??å?¡å?¨å??åº?ï¼?没æ??为第%då°?ä¿¡æ??ä¾?ä¿¡æ?¯"
-#: ../camel/providers/imap/camel-imap-folder.c:4023
+#: ../camel/providers/imap/camel-imap-folder.c:4031
#, c-format
msgid "Incomplete server response: no UID provided for message %d"
msgstr "ä¸?å®?æ?´ç??æ??å?¡å?¨å??åº?ï¼?没æ??为第%då°?ä¿¡æ??ä¾? UID"
-#: ../camel/providers/imap/camel-imap-folder.c:4243
+#: ../camel/providers/imap/camel-imap-folder.c:4251
#, c-format
msgid "Could not find message body in FETCH response."
msgstr "æ? æ³?å?¨ FETCH åº?ç?ä¸æ?¾å?°ä¿¡ä½?ã??"
@@ -3091,18 +3177,18 @@ msgid "This option will connect to the IMAP server using a plaintext password."
msgstr "该é??项å°?使ç?¨çº¯æ??æ?¬å¯?ç ?è¿?æ?¥å?° IMAP æ??å?¡å?¨ã??"
#: ../camel/providers/imap/camel-imap-store.c:310
-#: ../camel/providers/imapx/camel-imapx-store.c:220
+#: ../camel/providers/imapx/camel-imapx-store.c:224
#, c-format
msgid "IMAP server %s"
msgstr "IMAP æ??å?¡å?¨ %s"
#: ../camel/providers/imap/camel-imap-store.c:312
-#: ../camel/providers/imapx/camel-imapx-store.c:222
+#: ../camel/providers/imapx/camel-imapx-store.c:226
#, c-format
msgid "IMAP service for %s on %s"
msgstr "%2$s 为 %1$s æ??ä¾?ç?? IMAP æ??å?¡"
-#: ../camel/providers/imap/camel-imap-store.c:446
+#: ../camel/providers/imap/camel-imap-store.c:447
#: ../camel/providers/nntp/camel-nntp-store.c:234
#: ../camel/providers/pop3/camel-pop3-store.c:132
#: ../camel/providers/smtp/camel-smtp-transport.c:215
@@ -3110,62 +3196,62 @@ msgstr "%2$s 为 %1$s æ??ä¾?ç?? IMAP æ??å?¡"
msgid "Could not connect to %s: %s"
msgstr "æ? æ³?è¿?æ?¥å?° %sï¼?%s"
-#: ../camel/providers/imap/camel-imap-store.c:447
+#: ../camel/providers/imap/camel-imap-store.c:448
#: ../camel/providers/nntp/camel-nntp-store.c:235
#: ../camel/providers/pop3/camel-pop3-store.c:133
#: ../camel/providers/smtp/camel-smtp-transport.c:216
msgid "SSL unavailable"
msgstr "SSL ���"
-#: ../camel/providers/imap/camel-imap-store.c:465
+#: ../camel/providers/imap/camel-imap-store.c:466
#: ../camel/providers/nntp/camel-nntp-store.c:252
#, c-format
msgid "Could not connect to %s: "
msgstr "æ? æ³?è¿?æ?¥å?° %sï¼?"
-#: ../camel/providers/imap/camel-imap-store.c:571
-#: ../camel/providers/imap/camel-imap-store.c:591
-#: ../camel/providers/imap/camel-imap-store.c:598
-#: ../camel/providers/imap/camel-imap-store.c:625
-#: ../camel/providers/imapx/camel-imapx-server.c:2828
-#: ../camel/providers/imapx/camel-imapx-server.c:2864
+#: ../camel/providers/imap/camel-imap-store.c:572
+#: ../camel/providers/imap/camel-imap-store.c:592
+#: ../camel/providers/imap/camel-imap-store.c:599
+#: ../camel/providers/imap/camel-imap-store.c:626
+#: ../camel/providers/imapx/camel-imapx-server.c:2825
+#: ../camel/providers/imapx/camel-imapx-server.c:2861
#, 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:572
-#: ../camel/providers/imapx/camel-imapx-server.c:2829
+#: ../camel/providers/imap/camel-imap-store.c:573
+#: ../camel/providers/imapx/camel-imapx-server.c:2826
#: ../camel/providers/smtp/camel-smtp-transport.c:295
msgid "STARTTLS not supported"
msgstr "ä¸?æ?¯æ?? STARTTLS"
-#: ../camel/providers/imap/camel-imap-store.c:592
-#: ../camel/providers/imapx/camel-imapx-server.c:2865
+#: ../camel/providers/imap/camel-imap-store.c:593
+#: ../camel/providers/imapx/camel-imapx-server.c:2862
msgid "SSL negotiations failed"
msgstr "SSL å??å??失败"
-#: ../camel/providers/imap/camel-imap-store.c:599
+#: ../camel/providers/imap/camel-imap-store.c:600
#: ../camel/providers/smtp/camel-smtp-transport.c:339
msgid "SSL is not available in this build"
msgstr "æ?¬æ¬¡ç¼?è¯?ä¸æ?ªå??å?« SSL"
-#: ../camel/providers/imap/camel-imap-store.c:747
-#: ../camel/providers/imapx/camel-imapx-server.c:2648
+#: ../camel/providers/imap/camel-imap-store.c:748
+#: ../camel/providers/imapx/camel-imapx-server.c:2662
#, c-format
msgid "Connection cancelled"
msgstr "è¿?æ?¥å·²å??æ¶?"
-#: ../camel/providers/imap/camel-imap-store.c:752
-#: ../camel/providers/imapx/camel-imapx-server.c:2653
+#: ../camel/providers/imap/camel-imap-store.c:753
+#: ../camel/providers/imapx/camel-imapx-server.c:2667
#, 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:945
-#: ../camel/providers/imap/camel-imap-store.c:2369
-#: ../camel/providers/imapx/camel-imapx-store.c:457
-#: ../camel/providers/imapx/camel-imapx-store.c:1054
+#: ../camel/providers/imap/camel-imap-store.c:926
+#: ../camel/providers/imap/camel-imap-store.c:2350
+#: ../camel/providers/imapx/camel-imapx-store.c:459
+#: ../camel/providers/imapx/camel-imapx-store.c:1056
#: ../camel/providers/local/camel-maildir-folder.c:90
#: ../camel/providers/local/camel-maildir-store.c:225
#: ../camel/providers/local/camel-maildir-store.c:315
@@ -3175,21 +3261,21 @@ msgstr "æ? æ³?使ç?¨å?½ä»¤â??%sâ??è¿?æ?¥ï¼?%s"
msgid "Inbox"
msgstr "�件箱"
-#: ../camel/providers/imap/camel-imap-store.c:1148
-#: ../camel/providers/imapx/camel-imapx-server.c:2931
+#: ../camel/providers/imap/camel-imap-store.c:1129
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP æ??å?¡å?¨ %s ä¸?æ?¯æ??è¦?æ±?ç??éª?è¯?ç±»å?? %s"
-#: ../camel/providers/imap/camel-imap-store.c:1160
-#: ../camel/providers/imapx/camel-imapx-server.c:2943
-#: ../camel/providers/smtp/camel-smtp-transport.c:483
+#: ../camel/providers/imap/camel-imap-store.c:1141
+#: ../camel/providers/imapx/camel-imapx-server.c:2940
+#: ../camel/providers/smtp/camel-smtp-transport.c:462
#, c-format
msgid "No support for authentication type %s"
msgstr "ä¸?æ?¯æ??éª?è¯?ç±»å?? %s"
-#: ../camel/providers/imap/camel-imap-store.c:1239
-#: ../camel/providers/imapx/camel-imapx-server.c:3013
+#: ../camel/providers/imap/camel-imap-store.c:1220
+#: ../camel/providers/imapx/camel-imapx-server.c:3010
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3200,15 +3286,15 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/imap/camel-imap-store.c:1790
-#: ../camel/providers/imap/camel-imap-store.c:2212
-#: ../camel/providers/imapx/camel-imapx-store.c:852
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2193
+#: ../camel/providers/imapx/camel-imapx-store.c:854
#, 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:1906
+#: ../camel/providers/imap/camel-imap-store.c:1887
#: ../camel/providers/local/camel-maildir-store.c:189
#: ../camel/providers/local/camel-mbox-store.c:193
#: ../camel/providers/local/camel-mh-store.c:255
@@ -3216,18 +3302,18 @@ msgstr "æ??件夹å??â??%sâ??æ? æ??ï¼?å??å? æ?¯å?¶ä¸å?«æ??å?符â??%câ??"
msgid "Cannot create folder '%s': folder exists."
msgstr "æ? æ³?å??建æ??件夹â??%sâ??ï¼?æ??件夹已å?å?¨ã??"
-#: ../camel/providers/imap/camel-imap-store.c:2225
-#: ../camel/providers/imapx/camel-imapx-store.c:863
+#: ../camel/providers/imap/camel-imap-store.c:2206
+#: ../camel/providers/imapx/camel-imapx-store.c:865
#, c-format
msgid "Unknown parent folder: %s"
msgstr "æ?ªç?¥ç??ç?¶æ??件夹ï¼?%s"
-#: ../camel/providers/imap/camel-imap-store.c:3081
+#: ../camel/providers/imap/camel-imap-store.c:3062
#, c-format
msgid "Server unexpectedly disconnected"
msgstr "æ??å?¡å?¨æ??å¤?æ?å¼? "
-#: ../camel/providers/imap/camel-imap-store.c:3084
+#: ../camel/providers/imap/camel-imap-store.c:3065
msgid "Server unexpectedly disconnected: "
msgstr "æ??å?¡å?¨æ??å¤?æ?å¼?ï¼?"
@@ -3269,31 +3355,31 @@ msgstr "IMAP+"
msgid "Error writing to cache stream: "
msgstr "å??å?¥ç¼?å?æµ?é??误ï¼?"
-#: ../camel/providers/imapx/camel-imapx-server.c:2008
+#: ../camel/providers/imapx/camel-imapx-server.c:2019
#, c-format
msgid "Not authenticated"
msgstr "没æ??éª?è¯?"
-#: ../camel/providers/imapx/camel-imapx-server.c:2756
+#: ../camel/providers/imapx/camel-imapx-server.c:2753
#, c-format
msgid "Could not connect to %s (port %s): "
msgstr "æ? æ³?è¿?æ?¥å?° %s(端å?£ %s)ï¼?"
-#: ../camel/providers/imapx/camel-imapx-server.c:3185
+#: ../camel/providers/imapx/camel-imapx-server.c:3182
msgid "Closing tmp stream failed: "
msgstr "å?³é?临æ?¶æµ?失败ï¼?"
-#: ../camel/providers/imapx/camel-imapx-server.c:5081
+#: ../camel/providers/imapx/camel-imapx-server.c:5061
#, c-format
msgid "Cannot create spool file: %s"
-msgstr "æ? æ³?å??建æ??å?°æ??件ï¼?%s"
+msgstr "æ? æ³?å??建è?±æ?ºæ??件ï¼?%s"
-#: ../camel/providers/imapx/camel-imapx-server.c:5096
+#: ../camel/providers/imapx/camel-imapx-server.c:5076
msgid "Cannot create spool file: "
-msgstr "æ? æ³?å??建æ??å?°æ??件ï¼?"
+msgstr "æ? æ³?å??建è?±æ?ºæ??件ï¼?"
-#: ../camel/providers/imapx/camel-imapx-store.c:426
-#: ../camel/providers/nntp/camel-nntp-store.c:1529
+#: ../camel/providers/imapx/camel-imapx-store.c:428
+#: ../camel/providers/nntp/camel-nntp-store.c:1510
#, c-format
msgid "No such folder: %s"
msgstr "没æ??æ??件夹ï¼?%s"
@@ -3328,7 +3414,7 @@ msgstr "%s (%s)"
msgid "Index message body data"
msgstr "索�信���"
-#: ../camel/providers/local/camel-local-folder.c:683
+#: ../camel/providers/local/camel-local-folder.c:686
#, c-format
msgid ""
"Cannot get message %s from folder %s\n"
@@ -3380,7 +3466,7 @@ msgstr "以 Elm/Pine/Mutt æ ¼å¼?å?å?¨ç?¶æ??头(_S)"
#: ../camel/providers/local/camel-local-provider.c:111
msgid "Standard Unix mbox spool file"
-msgstr "æ ?å?? Unix mbox spool æ??件"
+msgstr "æ ?å?? Unix mbox è?±æ?ºæ??件"
#: ../camel/providers/local/camel-local-provider.c:112
#: ../camel/providers/local/camel-local-provider.c:123
@@ -3393,7 +3479,7 @@ msgstr ""
#: ../camel/providers/local/camel-local-provider.c:122
msgid "Standard Unix mbox spool directory"
-msgstr "æ ?å?? Unix mbox spool ç?®å½?"
+msgstr "æ ?å?? Unix mbox è?±æ?ºç?®å½?"
#: ../camel/providers/local/camel-local-store.c:149
#: ../camel/providers/local/camel-local-store.c:284
@@ -3532,8 +3618,8 @@ msgstr "���信件"
#: ../camel/providers/local/camel-maildir-summary.c:732
#: ../camel/providers/local/camel-mbox-summary.c:465
-#: ../camel/providers/local/camel-mbox-summary.c:669
-#: ../camel/providers/local/camel-mbox-summary.c:799
+#: ../camel/providers/local/camel-mbox-summary.c:679
+#: ../camel/providers/local/camel-mbox-summary.c:809
#: ../camel/providers/local/camel-spool-summary.c:130
msgid "Storing folder"
msgstr "å?å?¨æ??件夹"
@@ -3630,71 +3716,78 @@ msgstr "æ? æ³?å°?â??%sâ??é??å?½å??为 %sï¼?%s"
msgid "Could not open folder: %s: %s"
msgstr "æ? æ³?æ??å¼?æ??件夹ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:524
-msgid "Fatal mail parser error near position %"
-msgstr "å?¨ % é??è¿?å??ç??è?´å?½ç??é?®ä»¶è§£æ??é??误"
+#: ../camel/providers/local/camel-mbox-summary.c:533
+#, c-format
+msgid "Fatal mail parser error near position %s in folder %s"
+msgstr "é?®ä»¶è§£æ??å??ç??è?´å?½é??误ï¼?ä½?äº? %s (æ??件夹 %s)"
-#: ../camel/providers/local/camel-mbox-summary.c:605
+#: ../camel/providers/local/camel-mbox-summary.c:615
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "æ? æ³?æ£?æ?¥æ??件夹ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:676
-#: ../camel/providers/local/camel-mbox-summary.c:806
+#: ../camel/providers/local/camel-mbox-summary.c:686
+#: ../camel/providers/local/camel-mbox-summary.c:816
#: ../camel/providers/local/camel-spool-summary.c:137
#, c-format
msgid "Could not open file: %s: %s"
msgstr "æ? æ³?æ??å¼?æ??件ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:690
+#: ../camel/providers/local/camel-mbox-summary.c:700
#: ../camel/providers/local/camel-spool-summary.c:152
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "æ? æ³?æ??å¼?临æ?¶é?®ä»¶ç®±ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:705
-#: ../camel/providers/local/camel-mbox-summary.c:923
+#: ../camel/providers/local/camel-mbox-summary.c:715
+#: ../camel/providers/local/camel-mbox-summary.c:932
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "æ? æ³?å?³é?æ?¥æº?æ??件夹 %sï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:716
+#: ../camel/providers/local/camel-mbox-summary.c:726
#, c-format
msgid "Could not close temporary folder: %s"
msgstr "æ? æ³?å?³é?临æ?¶æ??件夹ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:733
+#: ../camel/providers/local/camel-mbox-summary.c:743
#, c-format
msgid "Could not rename folder: %s"
msgstr "æ? æ³?é??å?½å??æ??件夹ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:819
-#: ../camel/providers/local/camel-mbox-summary.c:1061
+#: ../camel/providers/local/camel-mbox-summary.c:829
+#: ../camel/providers/local/camel-mbox-summary.c:1070
#, c-format
msgid "Could not store folder: %s"
msgstr "æ? æ³?å?å?¨æ??件夹ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:860
#: ../camel/providers/local/camel-mbox-summary.c:869
-#: ../camel/providers/local/camel-mbox-summary.c:1094
-#: ../camel/providers/local/camel-mbox-summary.c:1103
+#: ../camel/providers/local/camel-mbox-summary.c:1102
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr "MBOX æ??件æ??å??ï¼?请修å¤?ã??(åº?该æ?? From è¡?ï¼?ä½?æ?ªæ?¾å?°ã??)"
+
+#: ../camel/providers/local/camel-mbox-summary.c:878
+#: ../camel/providers/local/camel-mbox-summary.c:1111
#, c-format
msgid "Summary and folder mismatch, even after a sync"
msgstr "å?³ä½¿å??æ¥å??ï¼?æ¦?è¦?å??æ??件夹ä»?ç?¶ä¸?å?¹é??"
-#: ../camel/providers/local/camel-mbox-summary.c:1020
+#: ../camel/providers/local/camel-mbox-summary.c:1029
#: ../camel/providers/local/camel-spool-summary.c:337
#, c-format
msgid "Unknown error: %s"
msgstr "æ?ªç?¥ç??é??误ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:1173
-#: ../camel/providers/local/camel-mbox-summary.c:1203
+#: ../camel/providers/local/camel-mbox-summary.c:1181
+#: ../camel/providers/local/camel-mbox-summary.c:1211
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "å??å?¥ä¸´æ?¶ mailbox 失败ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:1192
+#: ../camel/providers/local/camel-mbox-summary.c:1200
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "å??å?¥ä¸´æ?¶ mailbox 失败ï¼?%sï¼?%s"
@@ -3791,24 +3884,24 @@ msgstr "è?±æ?ºæ??件夹æ? æ³?å? é?¤"
#: ../camel/providers/local/camel-spool-summary.c:178
#: ../camel/providers/local/camel-spool-summary.c:190
#, c-format
-msgid "Could not sync temporary folder %s: %s"
-msgstr "æ? æ³?å??æ¥ä¸´æ?¶æ??件夹 %sï¼?%s"
+msgid "Could not synchronize temporary folder %s: %s"
+msgstr "æ? æ³?å??æ¥ä¸´æ?¶æ??件夹 %s: %s"
#: ../camel/providers/local/camel-spool-summary.c:208
#, c-format
-msgid "Could not sync spool folder %s: %s"
-msgstr "æ? æ³?å??æ¥è?±æ?ºæ??件夹 %sï¼?%s"
+msgid "Could not synchronize spool folder %s: %s"
+msgstr "æ? æ³?å??æ¥è?±æ?ºæ??件夹 %s: %s"
#: ../camel/providers/local/camel-spool-summary.c:240
#: ../camel/providers/local/camel-spool-summary.c:259
#: ../camel/providers/local/camel-spool-summary.c:272
#, c-format
msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
"Folder may be corrupt, copy saved in '%s'"
msgstr ""
-"æ? æ³?å??æ¥è?±æ?ºæ??件夹 %sï¼?%s\n"
-"æ??件夹å?¯è?½å·²æ??å??ï¼?å?¯æ?¬ä¿?å?å?¨â??%sâ??"
+"æ? æ³?å??æ¥è?±æ?ºæ??件夹 %s: %s\n"
+"æ??件夹å?¯è?½å·²æ??å??ï¼?å?¯æ?¬å·²å?æ?¾å?¨ '%s'"
#: ../camel/providers/nntp/camel-nntp-folder.c:197
#: ../camel/providers/nntp/camel-nntp-folder.c:271
@@ -3881,12 +3974,12 @@ msgstr "æ? æ³?é??读æ?¥è?ª %s ç??欢è¿?ä¿¡æ?¯ï¼?"
msgid "NNTP server %s returned error code %d: %s"
msgstr "NNTP æ??å?¡å?¨ %s è¿?å??é??误ç ? %dï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:453
+#: ../camel/providers/nntp/camel-nntp-store.c:434
#, c-format
msgid "USENET News via %s"
msgstr "USENET æ?°é?» %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:946
+#: ../camel/providers/nntp/camel-nntp-store.c:927
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -3897,7 +3990,7 @@ msgstr ""
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1043
+#: ../camel/providers/nntp/camel-nntp-store.c:1024
#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
@@ -3908,7 +4001,7 @@ msgstr ""
"\n"
"没æ??è¿?æ ·ç??æ?°é?»ç»?ã??é??ä¸é¡¹ç?®å?¯è?½æ?¯ç?¶æ??件夹ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1083
+#: ../camel/providers/nntp/camel-nntp-store.c:1064
#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
@@ -3919,36 +4012,36 @@ msgstr ""
"\n"
"æ?°é?»ç»?ä¸?å?å?¨ï¼?"
-#: ../camel/providers/nntp/camel-nntp-store.c:1113
+#: ../camel/providers/nntp/camel-nntp-store.c:1094
#, c-format
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸å??建æ??件夹ï¼?åº?该订é??ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1125
+#: ../camel/providers/nntp/camel-nntp-store.c:1106
#, c-format
msgid "You cannot rename a folder in a News store."
msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸é??å?½å??æ??件夹ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1138
+#: ../camel/providers/nntp/camel-nntp-store.c:1119
#, c-format
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸å? é?¤æ??件夹ï¼?åº?该é??订ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1276
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
#, c-format
msgid "Authentication requested but no username provided"
msgstr "请æ±?äº?身份éª?è¯?ï¼?ä½?æ?ªæ??ä¾?ç?¨æ?·å??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1288
+#: ../camel/providers/nntp/camel-nntp-store.c:1269
#, c-format
msgid "Cannot authenticate to server: %s"
msgstr "æ? æ³?认è¯?å?°æ??å?¡å?¨ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1414
+#: ../camel/providers/nntp/camel-nntp-store.c:1395
msgid "NNTP Command failed: "
msgstr "NNTP �令失败�"
-#: ../camel/providers/nntp/camel-nntp-store.c:1472
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
#, c-format
msgid "Not connected."
msgstr "æ?ªè¿?æ?¥ã??"
@@ -4085,8 +4178,8 @@ msgstr "TLS å??å??失败"
msgid "TLS is not available in this build"
msgstr "æ?¬æ¬¡ç¼?è¯?ä¸æ?ªå??å?« TLS"
-#: ../camel/providers/pop3/camel-pop3-store.c:321
-#: ../camel/providers/pop3/camel-pop3-store.c:473
+#: ../camel/providers/pop3/camel-pop3-store.c:300
+#: ../camel/providers/pop3/camel-pop3-store.c:452
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -4094,22 +4187,22 @@ msgid ""
msgstr "æ? æ³?è¿?æ?¥å?° POP æ??å?¡å?¨ %sï¼?ä¸?æ?¯æ??请æ±?认è¯?æ?ºå?¶ã??"
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:344
+#: ../camel/providers/pop3/camel-pop3-store.c:323
#, c-format
msgid "SASL '%s' Login failed for POP server %s%s"
msgstr "使ç?¨ SASLâ??%sâ??ç?»å½? POP æ??å?¡å?¨ %s 失败%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:361
+#: ../camel/providers/pop3/camel-pop3-store.c:340
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "æ? æ³?ç?»å½?å?° POP æ??å?¡å?¨ %sï¼?SASL å??è®®é??误"
-#: ../camel/providers/pop3/camel-pop3-store.c:378
+#: ../camel/providers/pop3/camel-pop3-store.c:357
#, c-format
msgid "Failed to authenticate on POP server %s: "
msgstr "认è¯?å?° POP æ??å?¡å?¨ %s 失败ï¼?"
-#: ../camel/providers/pop3/camel-pop3-store.c:442
+#: ../camel/providers/pop3/camel-pop3-store.c:421
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4118,7 +4211,7 @@ msgstr ""
"æ? æ³?è¿?æ?¥å?° POP æ??å?¡å?¨ %sï¼?\tæ?¥æ?¶å?°é??æ³?ç?? APOP IDã??å?¯è?½æ?¯å??å??æ?»å?»ã??请è??ç³»æ?¨ç??"
"管ç??å??ã??"
-#: ../camel/providers/pop3/camel-pop3-store.c:492
+#: ../camel/providers/pop3/camel-pop3-store.c:471
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4128,7 +4221,7 @@ msgstr ""
"å??é??å¯?ç ?é??误ï¼?%s"
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:505
+#: ../camel/providers/pop3/camel-pop3-store.c:484
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4138,7 +4231,7 @@ msgstr ""
"å??é??ç?¨æ?·å??é??误%s"
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:518
+#: ../camel/providers/pop3/camel-pop3-store.c:497
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4147,27 +4240,27 @@ msgstr ""
"æ? æ³?è¿?æ?¥å?° POP æ??å?¡å?¨ %sã??\n"
"å??é??å¯?ç ?é??误%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:674
+#: ../camel/providers/pop3/camel-pop3-store.c:653
#, c-format
msgid "Could not connect to POP server %s"
msgstr "æ? æ³?è¿?æ?¥å?° POP æ??å?¡å?¨ %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:687
+#: ../camel/providers/pop3/camel-pop3-store.c:666
#, c-format
msgid "POP3 server %s"
msgstr "POP3 æ??å?¡å?¨ %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:691
+#: ../camel/providers/pop3/camel-pop3-store.c:670
#, c-format
msgid "POP3 server for %s on %s"
msgstr "%2$s 为 %1$s æ??ä¾?ç?? POP æ??å?¡"
-#: ../camel/providers/pop3/camel-pop3-store.c:706
+#: ../camel/providers/pop3/camel-pop3-store.c:685
#, c-format
msgid "No such folder '%s'."
msgstr "没æ??æ??件夹â??%sâ??ã??"
-#: ../camel/providers/pop3/camel-pop3-store.c:730
+#: ../camel/providers/pop3/camel-pop3-store.c:709
#, c-format
msgid "POP3 stores have no folder hierarchy"
msgstr "POP3 ç??å?å?¨æ²¡æ??æ??件夹ç»?æ??"
@@ -4346,12 +4439,12 @@ msgstr "以å®?å?¨æ¨¡å¼?è¿?æ?¥ SMTP æ??å?¡å?¨ %s 失败ï¼?%s"
msgid "STARTTLS command failed: "
msgstr "STARTTLS �令失败�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:471
+#: ../camel/providers/smtp/camel-smtp-transport.c:450
#, c-format
msgid "SMTP server %s does not support requested authentication type %s."
msgstr "SMTP æ??å?¡å?¨ %s ä¸?æ?¯æ??请æ±?ç??认è¯?ç±»å?? %sã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:547
+#: ../camel/providers/smtp/camel-smtp-transport.c:526
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -4362,182 +4455,182 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/smtp/camel-smtp-transport.c:685
+#: ../camel/providers/smtp/camel-smtp-transport.c:669
#, c-format
msgid "SMTP server %s"
msgstr "SMTP æ??å?¡å?¨ %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:687
+#: ../camel/providers/smtp/camel-smtp-transport.c:671
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "é??è¿? %s å??é?? SMTP é?®ä»¶"
-#: ../camel/providers/smtp/camel-smtp-transport.c:707
+#: ../camel/providers/smtp/camel-smtp-transport.c:691
#, c-format
msgid "Cannot send message: service not connected."
msgstr "æ? æ³?å??é??信件ï¼?æ??å?¡æ?ªè¿?æ?¥ã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:714
+#: ../camel/providers/smtp/camel-smtp-transport.c:698
#, c-format
msgid "Cannot send message: sender address not valid."
msgstr "æ? æ³?å??é??信件ï¼?å??件人å?°å??ä¸?å??æ³?ã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:718
+#: ../camel/providers/smtp/camel-smtp-transport.c:702
msgid "Sending message"
msgstr "å??é??信件"
-#: ../camel/providers/smtp/camel-smtp-transport.c:734
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
#, c-format
msgid "Cannot send message: no recipients defined."
msgstr "æ? æ³?å??é??信件ï¼?没æ??å®?ä¹?æ?¶ä»¶äººã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
#, c-format
msgid "Cannot send message: one or more invalid recipients"
msgstr "æ? æ³?å??é??信件ï¼?ä¸?个æ??å¤?个é??æ³?æ?¶ä»¶äºº"
-#: ../camel/providers/smtp/camel-smtp-transport.c:982
+#: ../camel/providers/smtp/camel-smtp-transport.c:966
msgid "SMTP Greeting"
msgstr "SMTP 欢�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1006
-#: ../camel/providers/smtp/camel-smtp-transport.c:1021
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
+#: ../camel/providers/smtp/camel-smtp-transport.c:990
+#: ../camel/providers/smtp/camel-smtp-transport.c:1005
+#: ../camel/providers/smtp/camel-smtp-transport.c:1012
msgid "HELO command failed: "
msgstr "HELO �令失败�%s\\"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../camel/providers/smtp/camel-smtp-transport.c:1079
msgid "SMTP Authentication"
msgstr "SMTP 认�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1102
+#: ../camel/providers/smtp/camel-smtp-transport.c:1086
#, c-format
msgid "Error creating SASL authentication object."
msgstr "å??建 SASL 认è¯?对象é??误ã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1118
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
-#: ../camel/providers/smtp/camel-smtp-transport.c:1136
+#: ../camel/providers/smtp/camel-smtp-transport.c:1102
+#: ../camel/providers/smtp/camel-smtp-transport.c:1112
+#: ../camel/providers/smtp/camel-smtp-transport.c:1120
msgid "AUTH command failed: "
msgstr "AUTH �令失败�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1233
-#: ../camel/providers/smtp/camel-smtp-transport.c:1245
-#: ../camel/providers/smtp/camel-smtp-transport.c:1252
+#: ../camel/providers/smtp/camel-smtp-transport.c:1219
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#: ../camel/providers/smtp/camel-smtp-transport.c:1238
msgid "MAIL FROM command failed: "
msgstr "MAIL FROM �令失败�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1275
+#: ../camel/providers/smtp/camel-smtp-transport.c:1261
msgid "RCPT TO command failed: "
msgstr "RSET �令失败�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1289
-#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#: ../camel/providers/smtp/camel-smtp-transport.c:1275
+#: ../camel/providers/smtp/camel-smtp-transport.c:1283
#, c-format
msgid "RCPT TO <%s> failed: "
msgstr "RCPT TO <%s> 失败�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1335
-#: ../camel/providers/smtp/camel-smtp-transport.c:1344
-#: ../camel/providers/smtp/camel-smtp-transport.c:1354
-#: ../camel/providers/smtp/camel-smtp-transport.c:1411
-#: ../camel/providers/smtp/camel-smtp-transport.c:1427
-#: ../camel/providers/smtp/camel-smtp-transport.c:1438
-#: ../camel/providers/smtp/camel-smtp-transport.c:1445
+#: ../camel/providers/smtp/camel-smtp-transport.c:1321
+#: ../camel/providers/smtp/camel-smtp-transport.c:1330
+#: ../camel/providers/smtp/camel-smtp-transport.c:1340
+#: ../camel/providers/smtp/camel-smtp-transport.c:1397
+#: ../camel/providers/smtp/camel-smtp-transport.c:1413
+#: ../camel/providers/smtp/camel-smtp-transport.c:1424
+#: ../camel/providers/smtp/camel-smtp-transport.c:1431
msgid "DATA command failed: "
msgstr "DATP �令失败�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1467
-#: ../camel/providers/smtp/camel-smtp-transport.c:1479
-#: ../camel/providers/smtp/camel-smtp-transport.c:1486
+#: ../camel/providers/smtp/camel-smtp-transport.c:1453
+#: ../camel/providers/smtp/camel-smtp-transport.c:1465
+#: ../camel/providers/smtp/camel-smtp-transport.c:1472
msgid "RSET command failed: "
msgstr "RSET �令失败�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1508
-#: ../camel/providers/smtp/camel-smtp-transport.c:1521
-#: ../camel/providers/smtp/camel-smtp-transport.c:1527
+#: ../camel/providers/smtp/camel-smtp-transport.c:1494
+#: ../camel/providers/smtp/camel-smtp-transport.c:1507
+#: ../camel/providers/smtp/camel-smtp-transport.c:1513
msgid "QUIT command failed: "
msgstr "QUIT �令失败�"
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:46
msgid "Business"
msgstr "å??å?¡"
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:47
msgid "Competition"
msgstr "å®?æ??"
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:48
msgid "Favorites"
msgstr "æ??ç?±"
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:49
msgid "Gifts"
msgstr "礼�"
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:50
msgid "Goals/Objectives"
msgstr "ç?®æ ?"
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:51
msgid "Holiday"
msgstr "å??æ?¥"
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:52
msgid "Holiday Cards"
msgstr "å??æ?¥å?¡"
#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:54
msgid "Hot Contacts"
msgstr "亲å¯?è??系人"
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:55
msgid "Ideas"
msgstr "��"
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:56
msgid "International"
msgstr "å?½é??"
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:57
msgid "Key Customer"
msgstr "��客�"
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:58
msgid "Miscellaneous"
msgstr "æ??ç±»"
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:59
msgid "Personal"
msgstr "个人"
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:60
msgid "Phone Calls"
msgstr "é??ç?µè¯?"
#. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:62
msgid "Status"
msgstr "ç?¶æ??"
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:63
msgid "Strategies"
msgstr "ç?ç?¥"
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:64
msgid "Suppliers"
msgstr "ä¾?åº?å??"
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:65
msgid "Time & Expenses"
msgstr "æ?¶é?´å??è?±è´¹"
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:66
msgid "VIP"
msgstr "VIP"
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:67
msgid "Waiting"
msgstr "ç?å??"
@@ -4670,10 +4763,12 @@ msgid "%I %p"
msgstr "%p%I"
#: ../libedataserverui/e-book-auth-util.c:93
+#: ../libedataserverui/e-book-auth-util.c:668
msgid "Accessing LDAP Server anonymously"
msgstr "å?¿å??访é?® LDAP æ??å?¡å?¨"
#: ../libedataserverui/e-book-auth-util.c:199
+#: ../libedataserverui/e-book-auth-util.c:430
msgid "Failed to authenticate.\n"
msgstr "身份éª?è¯?失败ã??\n"
@@ -4685,18 +4780,18 @@ msgstr "ç±»å?«å?¾æ ?"
msgid "_No Image"
msgstr "没æ??å?¾å??(_N)"
-#: ../libedataserverui/e-categories-dialog.c:372
+#: ../libedataserverui/e-categories-dialog.c:368
#, c-format
msgid ""
"There is already a category '%s' in the configuration. Please use another "
"name"
msgstr "é??ç½®ä¸å·²ç»?æ??ç±»å?«â??%sâ??äº?ã??请使ç?¨å?¦å¤?ä¸?个å??称"
-#: ../libedataserverui/e-categories-dialog.c:680
+#: ../libedataserverui/e-categories-dialog.c:676
msgid "Icon"
msgstr "å?¾æ ?"
-#: ../libedataserverui/e-categories-dialog.c:685
+#: ../libedataserverui/e-categories-dialog.c:681
msgid "Category"
msgstr "类�"
@@ -4745,7 +4840,7 @@ msgstr "æ·»å? (_A)"
msgid "_Remove"
msgstr "å? é?¤(_R)"
-#: ../libedataserverui/e-name-selector-dialog.c:858
+#: ../libedataserverui/e-name-selector-dialog.c:890
#: ../libedataserverui/e-name-selector-dialog.ui.h:6
msgid "Any Category"
msgstr "任�类�"
@@ -4787,30 +4882,30 @@ 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:2559
+#: ../libedataserverui/e-name-selector-entry.c:2636
#, c-format
msgid "E_xpand %s Inline"
msgstr "����� %s(_X)"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2574
+#: ../libedataserverui/e-name-selector-entry.c:2651
#, c-format
msgid "Cop_y %s"
msgstr "�� %s(_Y)"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2584
+#: ../libedataserverui/e-name-selector-entry.c:2661
#, c-format
msgid "C_ut %s"
msgstr "å?ªå?? %s(_U)"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2601
+#: ../libedataserverui/e-name-selector-entry.c:2678
#, c-format
msgid "_Edit %s"
msgstr "ç¼?è¾? %s(_E)"
-#: ../libedataserverui/e-name-selector-list.c:517
+#: ../libedataserverui/e-name-selector-list.c:516
#, c-format
msgid "_Delete %s"
msgstr "å? é?¤ %s(_D)"
@@ -4820,23 +4915,23 @@ msgstr "å? é?¤ %s(_D)"
msgid "Keyring key is unusable: no user or host name"
msgstr "å¯?é?¥ç?¯ä¸?å?¯ç?¨ï¼?没æ??ç?¨æ?·æ??主æ?ºå??"
-#: ../libedataserverui/e-passwords.c:1116
+#: ../libedataserverui/e-passwords.c:1120
msgid "You have the Caps Lock key on."
msgstr "æ?¨æ??å¼?äº? Caps Lockã??"
-#: ../libedataserverui/e-passwords.c:1238
+#: ../libedataserverui/e-passwords.c:1241
msgid "_Remember this passphrase"
msgstr "è®°ä½?æ¤å¯?ç ?å?¥(_R)"
-#: ../libedataserverui/e-passwords.c:1239
+#: ../libedataserverui/e-passwords.c:1242
msgid "_Remember this passphrase for the remainder of this session"
msgstr "æ?¬æ¬¡ä¼?è¯?è®°ä½?æ¤å¯?ç ?å?¥(_R)"
-#: ../libedataserverui/e-passwords.c:1244
+#: ../libedataserverui/e-passwords.c:1247
msgid "_Remember this password"
msgstr "è®°ä½?æ¤å¯?ç ?(_R)"
-#: ../libedataserverui/e-passwords.c:1245
+#: ../libedataserverui/e-passwords.c:1248
msgid "_Remember this password for the remainder of this session"
msgstr "æ?¬æ¬¡ä¼?è¯?è®°ä½?æ¤å¯?ç ?(_R)"
@@ -4865,6 +4960,9 @@ msgstr "æ??å?¡å?¨ç??å??åº?æ? æ??"
msgid "Bad parameter"
msgstr "æ? æ??å??æ?°"
+#~ msgid "UnknownUser"
+#~ msgstr "����"
+
#~ msgid "%s: there was no self contact UID stored in gconf"
#~ msgstr "%sï¼?gconf ä¸æ²¡æ??å?å?¨è?ªèº«è??系人ç?? UID"
@@ -5157,9 +5255,6 @@ msgstr "æ? æ??å??æ?°"
#~ "password."
#~ msgstr "该é??项å°?使ç?¨çº¯æ??æ?¬å¯?ç ?è¿?æ?¥å?° IMAPv4rev1 æ??å?¡å?¨ã??"
-#~ msgid "Connection canceled"
-#~ msgstr "è¿?æ?¥å·²å??æ¶?"
-
#~ msgid ""
#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
#~ "support STARTTLS"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
