[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, 25 Oct 2010 08:00:25 +0000 (UTC)
commit 85db8c301fd7d2b474497cd99cde780cd3c53b53
Author: Aron Xu <aronxu gnome org>
Date: Mon Oct 25 08:00:02 2010 +0000
Update Simplified Chinese translation.
po/zh_CN.po | 2204 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 1108 insertions(+), 1096 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7032d02..8a414bd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -19,8 +19,8 @@ msgstr ""
"Project-Id-Version: evolution-data-server master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=evolution-data-server&component=Misc.\n"
-"POT-Creation-Date: 2010-09-06 08:47+0000\n"
-"PO-Revision-Date: 2010-09-06 21:08+0800\n"
+"POT-Creation-Date: 2010-10-21 09:39+0000\n"
+"PO-Revision-Date: 2010-10-25 15:56+0800\n"
"Last-Translator: YunQiang Su <wzssyqa gmail com>\n"
"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
"MIME-Version: 1.0\n"
@@ -39,13 +39,13 @@ 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:4482
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4505
#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
msgid "Searching..."
msgstr "æ£å?¨æ??ç´¢..."
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4641
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4664
#, c-format
msgid "Downloading contacts (%d)... "
msgstr "æ£å?¨ä¸?è½½è??系人(%d)..."
@@ -61,48 +61,61 @@ msgstr "æ£å?¨æ?´æ?°è??系人ç¼?å?(%d)..."
msgid "Not connected"
msgstr "æ?ªè¿?æ?¥ã??"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:763
msgid "Using Distinguished Name (DN)"
msgstr "使ç?¨å·²è¯?å?«ç??å§?å?? (DN)"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:766
msgid "Using Email Address"
msgstr "使ç?¨ç?µå?é?®ä»¶å?°å??"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1032
msgid "Reconnecting to LDAP server..."
msgstr "æ£å?¨é??æ?°è¿?æ?¥ LDAP æ??å?¡å?¨..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1157
msgid "Invalid DN syntax"
msgstr "æ? æ?? DN è¯æ³?"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1663
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1674
msgid "Adding contact to LDAP server..."
msgstr "æ£å?¨å°?è??系人添å? å?° LDAP æ??å?¡å?¨..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1795
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1806
msgid "Removing contact from LDAP server..."
msgstr "æ£å?¨ä»? LDAP æ??å?¡å?¨å? é?¤è??系人..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2229
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2242
msgid "Modifying contact from LDAP server..."
msgstr "æ£å?¨ä¿®æ?¹ LDAP æ??å?¡å?¨ä¸?ç??è??系人..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4332
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4355
msgid "Receiving LDAP search results..."
msgstr "æ£å?¨æ?¥æ?¶ LDAP ç??æ??ç´¢ç»?æ??..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4504
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4527
msgid "Error performing search"
msgstr "æ?§è¡?æ??ç´¢é??误"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:538
+#: ../calendar/backends/http/e-cal-backend-http.c:378
+#: ../calendar/libecal/e-cal.c:4089
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
+#: ../camel/providers/imap/camel-imap-command.c:481
+#: ../camel/providers/imap/camel-imap-store.c:425
+#: ../camel/providers/pop3/camel-pop3-store.c:490
+#: ../servers/groupwise/e-gw-connection.c:243
+msgid "Unknown error"
+msgstr "æ?ªç?¥ç??é??误"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
#, c-format
-msgid "Create resource '%s' failed with HTTP status: %d"
-msgstr "å??建èµ?æº?â??%sâ??失败ï¼?HTTP ç?¶æ??ç ?为: %d"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "å??建èµ?æº?â??%sâ??失败ï¼?HTTP ç?¶æ??ç ?为: %d(%s)"
-#: ../addressbook/libebook/e-book.c:2995
+#: ../addressbook/libebook/e-book.c:3000
#, c-format
msgid "%s: there was no source for UID '%s' stored in GConf."
msgstr "%sï¼?GConf ä¸æ²¡æ??å?å?¨ UIDâ??%sâ??ç??æº?ã??"
@@ -293,7 +306,7 @@ msgstr "���记 URL"
#. Contact categories
#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:667
+#: ../libedataserverui/e-categories-dialog.c:690
msgid "Categories"
msgstr "类�"
@@ -559,7 +572,7 @@ msgstr "ç??æ?¥"
#: ../addressbook/libebook/e-contact.c:262
#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:44
+#: ../libedataserver/e-categories.c:47
msgid "Anniversary"
msgstr "�年纪念�"
@@ -642,15 +655,15 @@ msgstr "SIP å?°å??"
msgid "Unnamed List"
msgstr "æ?ªå?½å??ç??å??表"
-#: ../addressbook/libedata-book/e-data-book-factory.c:287
+#: ../addressbook/libedata-book/e-data-book-factory.c:298
#, c-format
msgid "Empty URI"
msgstr "空ç?? URI"
-#: ../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
+#: ../addressbook/libedata-book/e-data-book-factory.c:317
+#: ../addressbook/libedata-book/e-data-book-factory.c:355
+#: ../calendar/libedata-cal/e-data-cal-factory.c:346
+#: ../calendar/libedata-cal/e-data-cal-factory.c:358
#, c-format
msgid "Invalid source"
msgstr "æ? æ??ç??æº?"
@@ -666,7 +679,7 @@ msgid "Repository offline"
msgstr "��离线"
#: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libecal/e-cal.c:4066 ../calendar/libedata-cal/e-data-cal.c:111
+#: ../calendar/libecal/e-cal.c:4071 ../calendar/libedata-cal/e-data-cal.c:111
msgid "Permission denied"
msgstr "没æ??æ??é??"
@@ -753,12 +766,12 @@ msgid "No space"
msgstr "没æ??空é?´"
#: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libecal/e-cal.c:4050 ../calendar/libedata-cal/e-data-cal.c:132
+#: ../calendar/libecal/e-cal.c:4055 ../calendar/libedata-cal/e-data-cal.c:132
msgid "Invalid argument"
msgstr "æ? æ??å??æ?°"
#: ../addressbook/libedata-book/e-data-book.c:193
-#: ../calendar/libecal/e-cal.c:4088 ../calendar/libedata-cal/e-data-cal.c:133
+#: ../calendar/libecal/e-cal.c:4093 ../calendar/libedata-cal/e-data-cal.c:133
msgid "Not supported"
msgstr "ä¸?æ?¯æ??"
@@ -856,22 +869,22 @@ 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
+#: ../addressbook/libedata-book/e-data-book.c:738
#, c-format
msgid "Cancel operation failed: %s"
msgstr "å??æ¶?æ??ä½?失败ï¼?%s"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:498
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:535
#, c-format
-msgid "Unexpected HTTP status code %d returned"
-msgstr "è¿?å??äº?æ??å¤?ç?? HTTP ç?¶æ??代ç ? %d"
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr "è¿?å??äº?æ??å¤?ç?? HTTP ç?¶æ??代ç ? %d(%s)"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4094
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4150
msgid "Calendar doesn't support Free/Busy"
msgstr "æ?¥å??ä¸?æ?¯æ??空é?²/ç¹?å¿?"
#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:48
msgid "Birthday"
msgstr "ç??æ?¥"
@@ -885,102 +898,102 @@ msgstr "ç??æ?¥ï¼?%s"
msgid "Anniversary: %s"
msgstr "�年�%s"
-#: ../calendar/backends/file/e-cal-backend-file.c:239
+#: ../calendar/backends/file/e-cal-backend-file.c:251
msgid "Cannot save calendar data: Malformed URI."
msgstr "æ? æ³?ä¿?å?æ?¥å??æ?°æ?®ï¼?URI æ ¼å¼?é??误ã??"
-#: ../calendar/backends/file/e-cal-backend-file.c:246
-#: ../calendar/backends/file/e-cal-backend-file.c:252
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
msgid "Cannot save calendar data"
msgstr "æ? æ³?ä¿?å?æ?¥å??æ?°æ?®"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1121
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2224
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2107
msgid "Reply Requested: by "
msgstr "请æ±?å??å¤?ï¼?ç?±"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1126
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2229
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2112
msgid "Reply Requested: When convenient"
msgstr "请æ±?å??å¤?ï¼?æ?¹ä¾¿æ?¶"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:295
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:330
#, c-format
msgid "Loading %s items"
msgstr "载� %s 项"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:926
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:959
msgid "Calendar"
msgstr "æ?¥å??"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:989
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1022
msgid "Invalid server URI"
msgstr "æ? æ??ç??æ??å?¡å?¨ URI"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1082
-#: ../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
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1123
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1383
+#: ../calendar/backends/http/e-cal-backend-http.c:721
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
msgid "Could not create cache file"
msgstr "æ? æ³?å??建ç¼?å?æ??件"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1094
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1135
msgid "Could not create thread for populating cache"
msgstr "æ? æ³?å??建å¢?æ®?ç¼?å?å??建线索"
-#: ../calendar/backends/http/e-cal-backend-http.c:327
+#: ../calendar/backends/http/e-cal-backend-http.c:366
msgid "Redirected to Invalid URI"
msgstr "å·²é??å®?å??å?°æ? æ?? URI"
-#: ../calendar/backends/http/e-cal-backend-http.c:350
+#: ../calendar/backends/http/e-cal-backend-http.c:399
msgid "Bad file format."
msgstr "æ? æ??ç??æ??ä»¶æ ¼å¼?ã??"
-#: ../calendar/backends/http/e-cal-backend-http.c:357
+#: ../calendar/backends/http/e-cal-backend-http.c:406
msgid "Not a calendar."
msgstr "ä¸?æ?¯æ?¥å??ã??"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:154
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
msgid "Could not retrieve weather data"
msgstr "æ? æ³?è?·å??天æ°?æ?°æ?®"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
msgid "Weather: Fog"
msgstr "天���"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
msgid "Weather: Cloudy Night"
msgstr "天æ°?ï¼?å¤?äº?å¤?æ??"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
msgid "Weather: Cloudy"
msgstr "天����"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
msgid "Weather: Overcast"
msgstr "天���天"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
msgid "Weather: Showers"
msgstr "天����"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
msgid "Weather: Snow"
msgstr "天���"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
msgid "Weather: Clear Night"
msgstr "天æ°?ï¼?æ?´æ??å¤?æ??"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:260
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
msgid "Weather: Sunny"
msgstr "天���"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:261
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
msgid "Weather: Thunderstorms"
msgstr "天�����"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:407
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
msgid "Forecast"
msgstr "天���"
@@ -988,148 +1001,148 @@ msgstr "天���"
msgid "Untitled appointment"
msgstr "æ? æ ?é¢?约ä¼?"
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3979
msgid "1st"
msgstr "1æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3980
msgid "2nd"
msgstr "2æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3981
msgid "3rd"
msgstr "3æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3982
msgid "4th"
msgstr "4æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3983
msgid "5th"
msgstr "5æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3984
msgid "6th"
msgstr "6æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3985
msgid "7th"
msgstr "7æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3986
msgid "8th"
msgstr "8æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3987
msgid "9th"
msgstr "9æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3988
msgid "10th"
msgstr "10æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3989
msgid "11th"
msgstr "11æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3990
msgid "12th"
msgstr "12æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3991
msgid "13th"
msgstr "13æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3992
msgid "14th"
msgstr "14æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:3993
msgid "15th"
msgstr "15æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:3994
msgid "16th"
msgstr "16æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:3995
msgid "17th"
msgstr "17æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:3996
msgid "18th"
msgstr "18å?«æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:3997
msgid "19th"
msgstr "19æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:3998
msgid "20th"
msgstr "20æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:3999
msgid "21st"
msgstr "21æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4000
msgid "22nd"
msgstr "22æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4001
msgid "23rd"
msgstr "23æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4002
msgid "24th"
msgstr "24æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4003
msgid "25th"
msgstr "25æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3976
+#: ../calendar/libecal/e-cal-recur.c:4004
msgid "26th"
msgstr "26æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3977
+#: ../calendar/libecal/e-cal-recur.c:4005
msgid "27th"
msgstr "27æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3978
+#: ../calendar/libecal/e-cal-recur.c:4006
msgid "28th"
msgstr "28æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:4007
msgid "29th"
msgstr "29æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:4008
msgid "30th"
msgstr "30æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:4009
msgid "31st"
msgstr "31æ?¥"
-#: ../calendar/libecal/e-cal-util.c:677 ../calendar/libecal/e-cal-util.c:704
+#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
msgid "High"
msgstr "é«?"
-#: ../calendar/libecal/e-cal-util.c:679 ../calendar/libecal/e-cal-util.c:706
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
msgid "Normal"
msgstr "ä¸"
-#: ../calendar/libecal/e-cal-util.c:681 ../calendar/libecal/e-cal-util.c:708
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
msgid "Low"
msgstr "ä½?"
#. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:702
+#: ../calendar/libecal/e-cal-util.c:703
msgid "Undefined"
msgstr "���"
-#: ../calendar/libecal/e-cal.c:1227 ../libedataserverui/e-book-auth-util.c:206
+#: ../calendar/libecal/e-cal.c:1233 ../libedataserverui/e-book-auth-util.c:206
#: ../libedataserverui/e-book-auth-util.c:435
#, c-format
msgid "Enter password for %s (user %s)"
@@ -1139,91 +1152,82 @@ 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:1241
+#: ../calendar/libecal/e-cal.c:1247
#, c-format
msgid "Enter password for %s to enable proxy for user %s"
msgstr "è¾?å?¥ %s ç??å¯?ç ?ï¼?以便为ç?¨æ?· %s å?¯ç?¨ä»£ç??æ??å?¡å?¨"
-#: ../calendar/libecal/e-cal.c:4052
+#: ../calendar/libecal/e-cal.c:4057
msgid "Backend is busy"
msgstr "å??å?°ç¹?å¿?"
-#: ../calendar/libecal/e-cal.c:4054
+#: ../calendar/libecal/e-cal.c:4059
msgid "Repository is offline"
msgstr "��离线"
-#: ../calendar/libecal/e-cal.c:4056
+#: ../calendar/libecal/e-cal.c:4061
msgid "No such calendar"
msgstr "没æ??è¿?æ ·ç??æ?¥å??"
-#: ../calendar/libecal/e-cal.c:4058 ../calendar/libedata-cal/e-data-cal.c:113
+#: ../calendar/libecal/e-cal.c:4063 ../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:4060 ../calendar/libedata-cal/e-data-cal.c:114
+#: ../calendar/libecal/e-cal.c:4065 ../calendar/libedata-cal/e-data-cal.c:114
#: ../servers/groupwise/e-gw-connection.c:229
msgid "Invalid object"
msgstr "æ? æ??对象"
-#: ../calendar/libecal/e-cal.c:4062
+#: ../calendar/libecal/e-cal.c:4067
msgid "URI not loaded"
msgstr "URI �载�"
-#: ../calendar/libecal/e-cal.c:4064
+#: ../calendar/libecal/e-cal.c:4069
msgid "URI already loaded"
msgstr "URI 已�载�"
-#: ../calendar/libecal/e-cal.c:4068 ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4073 ../servers/groupwise/e-gw-connection.c:237
msgid "Unknown User"
msgstr "����"
-#: ../calendar/libecal/e-cal.c:4070 ../calendar/libedata-cal/e-data-cal.c:115
+#: ../calendar/libecal/e-cal.c:4075 ../calendar/libedata-cal/e-data-cal.c:115
msgid "Object ID already exists"
msgstr "对象 ID å·²ç»?å?å?¨"
-#: ../calendar/libecal/e-cal.c:4072
+#: ../calendar/libecal/e-cal.c:4077
msgid "Protocol not supported"
msgstr "ä¸?æ?¯æ??ç??å??è®®"
-#: ../calendar/libecal/e-cal.c:4074
+#: ../calendar/libecal/e-cal.c:4079
msgid "Operation has been canceled"
msgstr "æ??ä½?å·²å??æ¶?"
-#: ../calendar/libecal/e-cal.c:4076
+#: ../calendar/libecal/e-cal.c:4081
msgid "Could not cancel operation"
msgstr "æ? æ³?å??æ¶?æ??ä½?"
-#: ../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
-#: ../camel/providers/groupwise/camel-groupwise-store.c:793
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
+#: ../calendar/libecal/e-cal.c:4083
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1311
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1329
+#: ../camel/providers/groupwise/camel-groupwise-store.c:635
+#: ../camel/providers/groupwise/camel-groupwise-store.c:817
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
#, c-format
msgid "Authentication failed"
msgstr "认�失败"
-#: ../calendar/libecal/e-cal.c:4080
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../calendar/libecal/e-cal.c:4085
+#: ../camel/providers/smtp/camel-smtp-transport.c:768
msgid "Authentication required"
msgstr "�须认�"
-#: ../calendar/libecal/e-cal.c:4082
+#: ../calendar/libecal/e-cal.c:4087
msgid "A D-Bus exception has occurred"
msgstr "å??ç??äº?ä¸?个 D-Bus å¼?常"
-#: ../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: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:4086
+#: ../calendar/libecal/e-cal.c:4091
msgid "No error"
msgstr "æ? é??误"
@@ -1337,204 +1341,200 @@ msgid "Unknown user"
msgstr "����"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:604
+#: ../calendar/libedata-cal/e-data-cal.c:608
#, 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:624
+#: ../calendar/libedata-cal/e-data-cal.c:628
#, 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:644
+#: ../calendar/libedata-cal/e-data-cal.c:648
#, c-format
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:664
+#: ../calendar/libedata-cal/e-data-cal.c:668
#, 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:683
+#: ../calendar/libedata-cal/e-data-cal.c:687
#, 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:704
+#: ../calendar/libedata-cal/e-data-cal.c:708
#, 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:723
+#: ../calendar/libedata-cal/e-data-cal.c:727
#, 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:744
+#: ../calendar/libedata-cal/e-data-cal.c:748
#, 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:768
+#: ../calendar/libedata-cal/e-data-cal.c:772
#, 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:794
+#: ../calendar/libedata-cal/e-data-cal.c:798
#, 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:815
+#: ../calendar/libedata-cal/e-data-cal.c:819
#, 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:834
+#: ../calendar/libedata-cal/e-data-cal.c:838
#, 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:855
+#: ../calendar/libedata-cal/e-data-cal.c:859
#, 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:880
+#: ../calendar/libedata-cal/e-data-cal.c:884
#, 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:900
+#: ../calendar/libedata-cal/e-data-cal.c:904
#, 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:920
+#: ../calendar/libedata-cal/e-data-cal.c:924
#, 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:948
+#: ../calendar/libedata-cal/e-data-cal.c:952
#, 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:974
+#: ../calendar/libedata-cal/e-data-cal.c:978
#, 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:994
+#: ../calendar/libedata-cal/e-data-cal.c:998
#, 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:1014
+#: ../calendar/libedata-cal/e-data-cal.c:1018
#, 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:1033
+#: ../calendar/libedata-cal/e-data-cal.c:1037
#, 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:1056
+#: ../calendar/libedata-cal/e-data-cal.c:1060
#, 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:1087
+#: ../calendar/libedata-cal/e-data-cal.c:1091
#, c-format
msgid "Cannot retrieve calendar free/busy list: %s"
msgstr "æ? æ³?è?·å??æ?¥å??空é?²ã??ç¹?å¿?å??表ï¼?%s"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:353
+#: ../calendar/libedata-cal/e-data-cal-factory.c:368
#, c-format
msgid "Invalid URI"
msgstr "æ? æ??ç?? URI"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:371
+#: ../calendar/libedata-cal/e-data-cal-factory.c:386
#, c-format
msgid "No backend factory for '%s' of '%s'"
msgstr "对â??%2$sâ??ç??â??%1$sâ??没æ??å??端工å??"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:421
+#: ../calendar/libedata-cal/e-data-cal-factory.c:436
#, c-format
msgid "Could not instantiate backend"
msgstr "æ? æ³?å®?ä¾?å??å??端"
-#: ../camel/camel-cipher-context.c:75
+#: ../camel/camel-cipher-context.c:204
#, c-format
msgid "Signing is not supported by this cipher"
msgstr "该å¯?ç ?ä¸?æ?¯æ??ç¾å??"
-#: ../camel/camel-cipher-context.c:110
-msgid "Signing message"
-msgstr "ç¾å??信件"
-
-#: ../camel/camel-cipher-context.c:131
+#: ../camel/camel-cipher-context.c:217
#, c-format
msgid "Verifying is not supported by this cipher"
msgstr "该å¯?ç ?ä¸?æ?¯æ??éª?è¯?"
-#: ../camel/camel-cipher-context.c:164
-msgid "Verifying message"
-msgstr "æ ¡éª?信件"
-
-#: ../camel/camel-cipher-context.c:188
+#: ../camel/camel-cipher-context.c:233
#, c-format
msgid "Encryption is not supported by this cipher"
msgstr "该å¯?ç ?ä¸?æ?¯æ??å? å¯?"
-#: ../camel/camel-cipher-context.c:223
-msgid "Encrypting message"
-msgstr "å? å¯?信件"
-
-#: ../camel/camel-cipher-context.c:246
+#: ../camel/camel-cipher-context.c:247
#, c-format
msgid "Decryption is not supported by this cipher"
msgstr "该å¯?ç ?ä¸?æ?¯æ??解å¯?"
-#: ../camel/camel-cipher-context.c:276
-msgid "Decrypting message"
-msgstr "解�信件"
-
-#: ../camel/camel-cipher-context.c:297
+#: ../camel/camel-cipher-context.c:260
#, c-format
msgid "You may not import keys with this cipher"
msgstr "æ?¨ä¸?è?½ç?¨æ¤å¯?ç ?导å?¥å¯?é?¥"
-#: ../camel/camel-cipher-context.c:341
+#: ../camel/camel-cipher-context.c:274
#, c-format
msgid "You may not export keys with this cipher"
msgstr "æ?¨ä¸?è?½ç?¨æ¤å¯?ç ?导å?ºå¯?é?¥"
+#: ../camel/camel-cipher-context.c:815
+msgid "Signing message"
+msgstr "ç¾å??æ¶?æ?¯"
+
+#: ../camel/camel-cipher-context.c:1056
+msgid "Encrypting message"
+msgstr "å? å¯?æ¶?æ?¯"
+
+#: ../camel/camel-cipher-context.c:1183
+msgid "Decrypting message"
+msgstr "解���"
+
#: ../camel/camel-data-cache.c:181
#, c-format
msgid "Unable to create cache path"
@@ -1545,7 +1545,7 @@ msgstr "æ? æ³?å??建ç¼?å?è·¯å¾?"
msgid "Could not remove cache entry: %s: %s"
msgstr "æ? æ³?å? é?¤ç¼?å?æ?¡ç?®ï¼?%sï¼?%s"
-#: ../camel/camel-data-wrapper.c:89
+#: ../camel/camel-data-wrapper.c:147
#, c-format
msgid "No stream available"
msgstr "没æ??å?¯ç?¨ç??æµ?"
@@ -1566,8 +1566,8 @@ msgstr ""
"å½?æ?¨é??æ?°è¿?æ?¥å?°ç½?ç»?æ?¶æ?¬æ??å?¡å?¨\n"
"ä¸?è¿?ä¸?æ¥ç??æ??ä½?ä¸?ä¼?é??å??ã??"
-#: ../camel/camel-disco-diary.c:258
-#: ../camel/providers/imap/camel-imap-journal.c:298
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:300
#, c-format
msgid ""
"Could not open '%s':\n"
@@ -1578,133 +1578,114 @@ msgstr ""
"%s\n"
"对该æ??件夹ç??ä¿®æ?¹ä¸?ä¼?被é??æ?°å??æ¥ã??"
-#: ../camel/camel-disco-diary.c:299
+#: ../camel/camel-disco-diary.c:304
msgid "Resynchronizing with server"
msgstr "é??æ?°ä¸?æ??å?¡å?¨å??æ¥"
-#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
+#: ../camel/camel-disco-folder.c:67 ../camel/camel-offline-folder.c:83
msgid "Downloading new messages for offline mode"
-msgstr "ä¸?è½½æ?°ä¿¡ä»¶ä»¥è¿?è¡?è?±æ?ºæ??ä½?"
+msgstr "ä¸?è½½æ?°æ¶?æ?¯ä»¥è¿?è¡?è?±æ?ºæ??ä½?"
-#: ../camel/camel-disco-folder.c:379
+#: ../camel/camel-disco-folder.c:389
#, c-format
msgid "Preparing folder '%s' for offline"
msgstr "å??å¤?è?±æ?ºæ??件夹â??%sâ??"
-#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
+#: ../camel/camel-disco-folder.c:455 ../camel/camel-offline-folder.c:316
msgid "Copy folder content locally for offline operation"
msgstr "å°?æ??件夹å??容å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?"
-#: ../camel/camel-disco-store.c:398
-#: ../camel/providers/groupwise/camel-groupwise-store.c:230
-#: ../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
+#: ../camel/camel-disco-store.c:420
+#: ../camel/providers/groupwise/camel-groupwise-store.c:232
+#: ../camel/providers/imap/camel-imap-store.c:1250
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2244
+#: ../camel/providers/imap/camel-imap-store.c:3094
+#: ../camel/providers/imapx/camel-imapx-folder.c:298
+#: ../camel/providers/imapx/camel-imapx-folder.c:331
+#: ../camel/providers/imapx/camel-imapx-folder.c:385
+#: ../camel/providers/imapx/camel-imapx-folder.c:431
+#: ../camel/providers/imapx/camel-imapx-folder.c:465
+#: ../camel/providers/imapx/camel-imapx-folder.c:505
+#: ../camel/providers/imapx/camel-imapx-folder.c:541
+#: ../camel/providers/imapx/camel-imapx-store.c:277
+#: ../camel/providers/imapx/camel-imapx-store.c:1299
+#: ../camel/providers/imapx/camel-imapx-store.c:1387
+#: ../camel/providers/imapx/camel-imapx-store.c:1422
#, c-format
msgid "You must be working online to complete this operation"
msgstr "æ?¨å¿?é¡»å?¨çº¿å·¥ä½?以便å®?æ??该æ??ä½?"
-#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
-#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
-#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
-#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
-#: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
-#: ../camel/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:466
-#: ../libedataserverui/e-book-auth-util.c:229
-#, c-format
-msgid "Cancelled"
-msgstr "å·²å??æ¶?"
-
-#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
-#: ../camel/camel-file-utils.c:791
+#: ../camel/camel-file-utils.c:719
#, c-format
msgid "Canceled"
msgstr "å·²å??æ¶?"
-#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:839 ../camel/camel-filter-search.c:582
#, c-format
msgid "Failed to create child process '%s': %s"
msgstr "å??建å?è¿?ç¨?â??%sâ??失败ï¼?%s"
-#: ../camel/camel-filter-driver.c:853
+#: ../camel/camel-filter-driver.c:886
#, c-format
msgid "Invalid message stream received from %s: %s"
-msgstr "æ?¶å?° %s å??æ?¥ç??æ? æ??信件æµ?ï¼?%s"
+msgstr "æ?¶å?° %s å??æ?¥ç??æ? æ??æ¶?æ?¯æµ?ï¼?%s"
-#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
+#: ../camel/camel-filter-driver.c:1073 ../camel/camel-filter-driver.c:1082
msgid "Syncing folders"
msgstr "å??æ¥æ??件夹"
-#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
+#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1620
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "解æ??è¿?滤è§?å??å?ºé??ï¼?%sï¼?%s"
-#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
+#: ../camel/camel-filter-driver.c:1181 ../camel/camel-filter-driver.c:1631
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "æ?§è¡?è¿?滤è§?å??é??误ï¼?%sï¼?%s"
-#: ../camel/camel-filter-driver.c:1240
+#: ../camel/camel-filter-driver.c:1278
#, c-format
msgid "Unable to open spool folder"
msgstr "æ? æ³?æ??å¼?è?±æ?ºæ??件夹"
-#: ../camel/camel-filter-driver.c:1251
+#: ../camel/camel-filter-driver.c:1289
#, c-format
msgid "Unable to process spool folder"
msgstr "æ? æ³?å¤?ç??è?±æ?ºæ??件夹"
-#: ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1307
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "è?·å??第%då°?ä¿¡(%d%%)"
-#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
+#: ../camel/camel-filter-driver.c:1314 ../camel/camel-filter-driver.c:1336
#, c-format
msgid "Failed on message %d"
msgstr "�第%d�信失败"
-#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
+#: ../camel/camel-filter-driver.c:1351 ../camel/camel-filter-driver.c:1456
msgid "Syncing folder"
msgstr "å??æ¥æ??件夹"
-#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
+#: ../camel/camel-filter-driver.c:1356 ../camel/camel-filter-driver.c:1462
msgid "Complete"
msgstr "å®?æ??"
-#: ../camel/camel-filter-driver.c:1377
+#: ../camel/camel-filter-driver.c:1420
#, c-format
msgid "Getting message %d of %d"
msgstr "è?·å??第%då°?ä¿¡ï¼?å?±%då°?"
-#: ../camel/camel-filter-driver.c:1395
+#: ../camel/camel-filter-driver.c:1438
#, c-format
msgid "Failed at message %d of %d"
msgstr "�第%d�信失败��%d�"
#: ../camel/camel-filter-search.c:135
msgid "Failed to retrieve message"
-msgstr "è?·å??信件失败"
+msgstr "è?·å??æ¶?æ?¯å¤±è´¥"
#: ../camel/camel-filter-search.c:401
msgid "Invalid arguments to (system-flag)"
@@ -1764,46 +1745,51 @@ msgstr "(%s) é??è¦?ä¸?个æ?°ç»?ç»?æ??"
msgid "(%s) requires the folder set"
msgstr "(%s) é??è¦?æ??件夹é??"
-#: ../camel/camel-folder.c:125
+#: ../camel/camel-folder.c:220
#, c-format
msgid "Learning new spam message in '%s'"
msgid_plural "Learning new spam messages in '%s'"
msgstr[0] "å?¨â??%sâ??ä¸å¦ä¹ æ?°ç??å??å?¾é?®ä»¶"
-#: ../camel/camel-folder.c:147
+#: ../camel/camel-folder.c:244
#, c-format
msgid "Learning new ham message in '%s'"
msgid_plural "Learning new ham messages in '%s'"
msgstr[0] "å?¨â??%sâ??ä¸å¦ä¹ æ?°ç??æ??害é?®ä»¶"
-#: ../camel/camel-folder.c:171
+#: ../camel/camel-folder.c:270
#, c-format
msgid "Filtering new message in '%s'"
msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "å?¨â??%sâ??ä¸è¿?滤æ?°ä¿¡ä»¶"
+msgstr[0] "å?¨â??%sâ??ä¸è¿?滤æ?°æ¶?æ?¯"
-#: ../camel/camel-folder.c:688
-#: ../camel/providers/local/camel-maildir-folder.c:366
+#: ../camel/camel-folder.c:875
+#: ../camel/providers/local/camel-maildir-folder.c:297
msgid "Moving messages"
-msgstr "移�信件"
+msgstr "移���"
-#: ../camel/camel-folder.c:690
+#: ../camel/camel-folder.c:878
msgid "Copying messages"
-msgstr "��信件"
+msgstr "����"
-#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
-#: ../camel/camel-gpg-context.c:1330
+#: ../camel/camel-folder.c:3237
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "æ£å?¨è?·å?? POP æ¶?æ?¯â??%sâ??"
+
+#: ../camel/camel-gpg-context.c:646 ../camel/camel-gpg-context.c:651
+#: ../camel/camel-gpg-context.c:1276
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "�� gpg 失败�%s"
-#: ../camel/camel-gpg-context.c:706
-#: ../camel/providers/smtp/camel-smtp-transport.c:114
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/camel-gpg-context.c:651
+#: ../camel/providers/smtp/camel-smtp-transport.c:716
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
msgid "Unknown"
msgstr "��"
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:715
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -1814,17 +1800,17 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:787
+#: ../camel/camel-gpg-context.c:732
#, c-format
msgid "Failed to parse gpg userid hint."
msgstr "解æ?? gpg userid æ??示失败ã??"
-#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:757 ../camel/camel-gpg-context.c:772
#, c-format
msgid "Failed to parse gpg passphrase request."
msgstr "解æ?? gpg å¯?ç ?å?¥è¯·æ±?失败ã??"
-#: ../camel/camel-gpg-context.c:848
+#: ../camel/camel-gpg-context.c:793
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
@@ -1833,7 +1819,7 @@ msgstr ""
"æ?¨é??è¦?ä¸?个 PIN ç?¨æ?¥è§£é??æ?¨ç??æ?ºè?½å?¡ï¼?\n"
"â??%sâ??"
-#: ../camel/camel-gpg-context.c:852
+#: ../camel/camel-gpg-context.c:797
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -1842,68 +1828,83 @@ msgstr ""
"æ?¨é??è¦?ä¸?个å¯?ç ?å?¥ç?¨æ?¥è§£é??以ä¸?ç?¨æ?·ï¼?\n"
"â??%sâ??"
-#: ../camel/camel-gpg-context.c:858
+#: ../camel/camel-gpg-context.c:803
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr "GnuPG 对â??%sâ??ç??æ??å¤?å??åº?"
-#: ../camel/camel-gpg-context.c:905
+#: ../camel/camel-gpg-context.c:832 ../camel/camel-net-utils.c:515
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4854
+#: ../camel/providers/imapx/camel-imapx-server.c:4871
+#: ../camel/providers/imapx/camel-imapx-store.c:199
+#: ../camel/providers/nntp/camel-nntp-summary.c:413
+#: ../camel/providers/pop3/camel-pop3-folder.c:364
+#: ../camel/providers/pop3/camel-pop3-folder.c:429
+#: ../camel/providers/pop3/camel-pop3-folder.c:501
+#: ../camel/providers/pop3/camel-pop3-store.c:482
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "å·²å??æ¶?"
+
+#: ../camel/camel-gpg-context.c:850
#, c-format
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr "解é??å¯?é?¥å¤±è´¥ï¼?ç»?å?ºäº? 3 个é??误ç??å¯?ç ?å?¥ã??"
-#: ../camel/camel-gpg-context.c:917
+#: ../camel/camel-gpg-context.c:862
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "æ?¥è?ª GnuPG ç??æ??å¤?åº?ç?ï¼?%s"
-#: ../camel/camel-gpg-context.c:1048
+#: ../camel/camel-gpg-context.c:993
#, c-format
msgid "Failed to encrypt: No valid recipients specified."
msgstr "å? å¯?失败ï¼?没æ??æ??å®?æ??æ??ç??æ?¶ä»¶äººã??"
-#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+#: ../camel/camel-gpg-context.c:1539 ../camel/camel-smime-context.c:823
msgid "Could not generate signing data: "
msgstr "æ? æ³?ç??æ??ç¾å??æ?°æ?®ï¼?"
-#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
-#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
-#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
+#: ../camel/camel-gpg-context.c:1586 ../camel/camel-gpg-context.c:1786
+#: ../camel/camel-gpg-context.c:1896 ../camel/camel-gpg-context.c:2042
+#: ../camel/camel-gpg-context.c:2141 ../camel/camel-gpg-context.c:2189
msgid "Failed to execute gpg."
msgstr "æ?§è¡? gpg 失败ã??"
-#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
-#: ../camel/camel-smime-context.c:966
+#: ../camel/camel-gpg-context.c:1666 ../camel/camel-gpg-context.c:1674
+#: ../camel/camel-gpg-context.c:1682 ../camel/camel-gpg-context.c:1701
+#: ../camel/camel-smime-context.c:947 ../camel/camel-smime-context.c:961
+#: ../camel/camel-smime-context.c:970
#, c-format
msgid "Cannot verify message signature: Incorrect message format"
-msgstr "æ? æ³?æ ¡éª?信件ç¾å??ï¼?ä¿¡ä»¶æ ¼å¼?ä¸?对"
+msgstr "æ? æ³?æ ¡éª?æ¶?æ?¯ç¾å??ï¼?æ¶?æ?¯æ ¼å¼?ä¸?对"
-#: ../camel/camel-gpg-context.c:1695
+#: ../camel/camel-gpg-context.c:1741
msgid "Cannot verify message signature: "
-msgstr "æ? æ³?æ ¡éª?信件ç¾å??ï¼?"
+msgstr "æ? æ³?æ ¡éª?æ¶?æ?¯ç¾å??ï¼?"
-#: ../camel/camel-gpg-context.c:1814
+#: ../camel/camel-gpg-context.c:1862
msgid "Could not generate encrypting data: "
msgstr "æ? æ³?ç??æ??å? å¯?æ?°æ?®ï¼?"
-#: ../camel/camel-gpg-context.c:1866
+#: ../camel/camel-gpg-context.c:1915
msgid "This is a digitally encrypted message part"
-msgstr "è¿?æ?¯ä¿¡ä»¶ç??æ?°å?å? å¯?é?¨å??"
+msgstr "è¿?æ?¯æ¶?æ?¯ç??æ?°å?å? å¯?é?¨å??"
-#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
-#: ../camel/camel-gpg-context.c:1954
+#: ../camel/camel-gpg-context.c:1973 ../camel/camel-gpg-context.c:1982
+#: ../camel/camel-gpg-context.c:2005
#, c-format
msgid "Cannot decrypt message: Incorrect message format"
-msgstr "æ? æ³?解å¯?信件ï¼?ä¿¡ä»¶æ ¼å¼?ä¸?对"
+msgstr "æ? æ³?解å¯?æ¶?æ?¯ï¼?æ¶?æ?¯æ ¼å¼?ä¸?对"
-#: ../camel/camel-gpg-context.c:1942
+#: ../camel/camel-gpg-context.c:1993
#, c-format
msgid "Failed to decrypt MIME part: protocol error"
msgstr "解å¯? MIME é?¨å??失败ï¼?å??è®®é??误"
-#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
+#: ../camel/camel-gpg-context.c:2082 ../camel/camel-smime-context.c:1254
msgid "Encrypted content"
msgstr "å? å¯?å??容"
@@ -2001,54 +2002,54 @@ msgstr "å??å?¥é?®ä»¶ä¸´æ?¶æ??件é??误ï¼?%s"
msgid "Error copying mail temp file: %s"
msgstr "å¤?å?¶é?®ä»¶ä¸´æ?¶æ??件é??误ï¼?%s"
-#: ../camel/camel-multipart-signed.c:285
+#: ../camel/camel-multipart-signed.c:286
#, c-format
msgid "No content available"
msgstr "没æ??å?¯ç?¨ç??å??容"
-#: ../camel/camel-multipart-signed.c:293
+#: ../camel/camel-multipart-signed.c:294
#, c-format
msgid "No signature available"
msgstr "没æ??å?¯ç?¨ç??ç¾å??"
-#: ../camel/camel-multipart-signed.c:612
+#: ../camel/camel-multipart-signed.c:620
#, c-format
msgid "parse error"
msgstr "解æ??é??误"
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:695
#, c-format
msgid "Resolving: %s"
msgstr "解æ??ï¼?%s"
-#: ../camel/camel-net-utils.c:715
+#: ../camel/camel-net-utils.c:718
msgid "Host lookup failed"
msgstr "主æ?ºæ?¥é??失败"
-#: ../camel/camel-net-utils.c:719
+#: ../camel/camel-net-utils.c:724
#, c-format
msgid "Host lookup failed: %s: %s"
msgstr "主æ?ºæ?¥é??失败ï¼?%sï¼?%s"
-#: ../camel/camel-net-utils.c:842
+#: ../camel/camel-net-utils.c:845
msgid "Resolving address"
msgstr "解æ??å?°å??"
-#: ../camel/camel-net-utils.c:862
+#: ../camel/camel-net-utils.c:866
msgid "Name lookup failed"
msgstr "å??称æ?¥é??失败"
-#: ../camel/camel-net-utils.c:867
+#: ../camel/camel-net-utils.c:872
#, c-format
msgid "Name lookup failed: %s"
msgstr "å??称æ?¥é??失败ï¼?%s"
-#: ../camel/camel-offline-folder.c:169
+#: ../camel/camel-offline-folder.c:193
#, c-format
msgid "Syncing messages in folder '%s' to disk"
-msgstr "æ£å?¨å°?æ??件夹â??%sâ??ä¸ç??信件å??æ¥å?°ç£?ç??"
+msgstr "æ£å?¨å°?æ??件夹â??%sâ??ä¸ç??æ¶?æ?¯å??æ¥å?°ç£?ç??"
-#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
#, c-format
msgid "Cannot write offline journal for folder '%s': %s"
msgstr "æ? æ³?å??å?¥æ??件夹â??%sâ??ç??离线æ?¥è®°ï¼?%s"
@@ -2076,7 +2077,7 @@ msgstr "æ? æ³?è½½å?¥ %sï¼?%s"
msgid "Could not load %s: No initialization code in module."
msgstr "æ? æ³?è½½å?¥ %sï¼?模å??ä¸æ²¡æ??å??å§?å??代ç ?ã??"
-#: ../camel/camel-provider.c:388 ../camel/camel-session.c:207
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:206
#, c-format
msgid "No provider available for protocol '%s'"
msgstr "å??è®®â??%sâ??没æ??å?¯ç?¨ç??æ??ä¾?è??"
@@ -2089,12 +2090,12 @@ msgstr "å?¿å??"
msgid "This option will connect to the server using an anonymous login."
msgstr "该é??项å°?è¿?æ?¥å?°å?¿å??ç?»å½?ç??æ??å?¡å?¨ä¸?ã??"
-#: ../camel/camel-sasl-anonymous.c:69
+#: ../camel/camel-sasl-anonymous.c:70
#, c-format
msgid "Authentication failed."
msgstr "认è¯?失败ã??"
-#: ../camel/camel-sasl-anonymous.c:80
+#: ../camel/camel-sasl-anonymous.c:81
#, c-format
msgid ""
"Invalid email address trace information:\n"
@@ -2103,7 +2104,7 @@ msgstr ""
"æ? æ??ç??ç?µå?é?®ä»¶è·?踪信æ?¯ï¼?\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:94
+#: ../camel/camel-sasl-anonymous.c:95
#, c-format
msgid ""
"Invalid opaque trace information:\n"
@@ -2112,7 +2113,7 @@ msgstr ""
"æ? æ??ç??诲涩è·?踪信æ?¯ï¼?\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:108
+#: ../camel/camel-sasl-anonymous.c:109
#, c-format
msgid ""
"Invalid trace information:\n"
@@ -2131,113 +2132,113 @@ msgid ""
"the server supports it."
msgstr "å¦?æ??æ??å?¡å?¨æ?¯æ??ç??è¯?ï¼?该é??项å°?ç?¨å®?å?¨ CRAM-MD5 å¯?ç ?è¿?æ?¥å?°æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-digest-md5.c:56
+#: ../camel/camel-sasl-digest-md5.c:58
msgid "DIGEST-MD5"
msgstr "DIGEST-MD5"
-#: ../camel/camel-sasl-digest-md5.c:58
+#: ../camel/camel-sasl-digest-md5.c:60
msgid ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
msgstr "å¦?æ??æ??å?¡å?¨æ?¯æ??ç??è¯?ï¼?该é??项å°?ç?¨å®?å?¨ DIGEST-MD5 å¯?ç ?è¿?æ?¥å?°æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-digest-md5.c:818
+#: ../camel/camel-sasl-digest-md5.c:821
#, c-format
msgid "Server challenge too long (>2048 octets)"
msgstr "æ??å?¡å?¨è´¨è¯¢è¿?é?¿ (>2048 å?è??)"
-#: ../camel/camel-sasl-digest-md5.c:829
+#: ../camel/camel-sasl-digest-md5.c:832
#, c-format
msgid "Server challenge invalid\n"
msgstr "æ??å?¡å?¨è´¨è¯¢æ? æ??\n"
-#: ../camel/camel-sasl-digest-md5.c:837
+#: ../camel/camel-sasl-digest-md5.c:840
#, c-format
msgid "Server challenge contained invalid \"Quality of Protection\" token"
msgstr "æ??å?¡å?¨è´¨è¯¢å?«æ??æ? æ??ç??â??å??è´¨ä¿?æ?¤â??æ ?å¿?"
-#: ../camel/camel-sasl-digest-md5.c:869
+#: ../camel/camel-sasl-digest-md5.c:875
#, c-format
msgid "Server response did not contain authorization data"
msgstr "æ??å?¡å?¨åº?ç?ä¸?å?«æ??认è¯?æ?°æ?®"
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:896
#, c-format
msgid "Server response contained incomplete authorization data"
msgstr "æ??å?¡å?¨åº?è¾¾å?«æ??ä¸?å®?æ?´ç??认è¯?æ?°æ?®"
-#: ../camel/camel-sasl-digest-md5.c:903
+#: ../camel/camel-sasl-digest-md5.c:909
#, c-format
msgid "Server response does not match"
msgstr "æ??å?¡å?¨åº?ç?ä¸?å?¹é??"
-#: ../camel/camel-sasl-gssapi.c:80
+#: ../camel/camel-sasl-gssapi.c:87
msgid "GSSAPI"
msgstr "GSSAPI"
-#: ../camel/camel-sasl-gssapi.c:82
+#: ../camel/camel-sasl-gssapi.c:89
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr "该é??项å°?ç?¨ Kerberos 5 认è¯?è¿?æ?¥å?°æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-gssapi.c:119
+#: ../camel/camel-sasl-gssapi.c:130
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
msgstr "æ??æ??ä¾?ç??è¯?书ä¸?æ?¯æ??æ??å®?ç??æ?ºå?¶ï¼?æ??è??æ? æ³?被å®?ç?°æ??è¯?å?«ã??"
-#: ../camel/camel-sasl-gssapi.c:124
+#: ../camel/camel-sasl-gssapi.c:135
msgid "The provided target_name parameter was ill-formed."
msgstr "æ??ä¾?ç?? target_name å??æ?°æ ¼å¼?ä¸?对ã??"
-#: ../camel/camel-sasl-gssapi.c:127
+#: ../camel/camel-sasl-gssapi.c:138
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
msgstr "æ??ä¾?ç?? target_name å??æ?°å??å?«æ? æ??æ??ä¸?æ?¯æ??ç??å??称类å??ã??"
-#: ../camel/camel-sasl-gssapi.c:131
+#: ../camel/camel-sasl-gssapi.c:142
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:136
+#: ../camel/camel-sasl-gssapi.c:147
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
msgstr "input_token å??å?«æ? æ??ç??ç¾å??ï¼?æ??è??æ? æ³?éª?è¯?ç¾å??ã??"
-#: ../camel/camel-sasl-gssapi.c:140
+#: ../camel/camel-sasl-gssapi.c:151
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:145
+#: ../camel/camel-sasl-gssapi.c:156
msgid "The supplied context handle did not refer to a valid context."
msgstr "æ??ä¾?ç??ä¸?ä¸?æ??å?¥æ??æ??å¼?ç?¨ç??ä¸?ä¸?æ??æ? æ??ã??"
-#: ../camel/camel-sasl-gssapi.c:148
+#: ../camel/camel-sasl-gssapi.c:159
msgid "The consistency checks performed on the input_token failed."
msgstr "对 input_token æ?§è¡?å®?æ?´æ?§æ£?æ?¥å¤±è´¥ã??"
-#: ../camel/camel-sasl-gssapi.c:151
+#: ../camel/camel-sasl-gssapi.c:162
msgid "The consistency checks performed on the credential failed."
msgstr "对è¯?书æ?§è¡?å®?æ?´æ?§æ£?æ?¥å¤±è´¥ã??"
-#: ../camel/camel-sasl-gssapi.c:154
+#: ../camel/camel-sasl-gssapi.c:165
msgid "The referenced credentials have expired."
msgstr "å¼?ç?¨ç??è¯?书已è¿?æ??ã??"
-#: ../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
+#: ../camel/camel-sasl-gssapi.c:171 ../camel/camel-sasl-gssapi.c:311
+#: ../camel/camel-sasl-gssapi.c:355 ../camel/camel-sasl-gssapi.c:372
+#: ../camel/providers/smtp/camel-smtp-transport.c:1249
#, c-format
msgid "Bad authentication response from server."
msgstr "æ?¥è?ªæ??å?¡å?¨ç??æ? æ??认è¯?åº?ç?ã??"
-#: ../camel/camel-sasl-gssapi.c:369
+#: ../camel/camel-sasl-gssapi.c:384
#, c-format
msgid "Unsupported security layer."
msgstr "ä¸?æ?¯æ??ç??å®?å?¨å±?ã??"
@@ -2250,7 +2251,7 @@ msgstr "Login"
msgid "This option will connect to the server using a simple password."
msgstr "该é??项å°?以æ?®é??å¯?ç ?è¿?æ?¥å?°æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-login.c:94
+#: ../camel/camel-sasl-login.c:95
#, c-format
msgid "Unknown authentication state."
msgstr "æ?ªç?¥ç??认è¯?ç?¶æ??ã??"
@@ -2277,16 +2278,16 @@ msgstr "å?¨ SMTP ä¹?å?? POP"
msgid "This option will authorise a POP connection before attempting SMTP"
msgstr "该é??项å°?å?¨å°?è¯? SMTP ä¹?å??å??许 POP è¿?æ?¥"
-#: ../camel/camel-sasl-popb4smtp.c:82
+#: ../camel/camel-sasl-popb4smtp.c:83
msgid "POP Source URI"
msgstr "POP � URI"
-#: ../camel/camel-sasl-popb4smtp.c:89
+#: ../camel/camel-sasl-popb4smtp.c:90
#, fuzzy, c-format
msgid "POP Before SMTP authentication using an unknown transport"
msgstr "以æ?ªç?¥ç??ä¼ è¾?è¿?è¡? SMTP æ??æ??ä¹?å??ç?? POP"
-#: ../camel/camel-sasl-popb4smtp.c:97
+#: ../camel/camel-sasl-popb4smtp.c:98
#, fuzzy, c-format
msgid "POP Before SMTP authentication using a non-POP source"
msgstr "以é?? POP æº?è¿?è¡? SMTP æ??æ??ä¹?å??ç?? POP"
@@ -2296,22 +2297,22 @@ msgstr "以é?? POP æº?è¿?è¡? SMTP æ??æ??ä¹?å??ç?? POP"
msgid "Regular expression compilation failed: %s: %s"
msgstr "常�表达���失败�%s�%s"
-#: ../camel/camel-service.c:88
+#: ../camel/camel-service.c:89
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URLâ??%sâ??é??è¦?ç?¨æ?·å??ç»?件"
-#: ../camel/camel-service.c:92
+#: ../camel/camel-service.c:93
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URLâ??%sâ??é??è¦?主æ?ºç»?件"
-#: ../camel/camel-service.c:96
+#: ../camel/camel-service.c:97
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URLâ??%sâ??é??è¦?è·¯å¾?ç»?件"
-#: ../camel/camel-session.c:261
+#: ../camel/camel-session.c:260
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -2320,19 +2321,19 @@ msgstr ""
"æ? æ³?å??建ç?®å½? %sï¼?\n"
"%s"
-#: ../camel/camel-session.c:758
+#: ../camel/camel-session.c:757
#, c-format
msgid "Please enter the %s password for %s on host %s."
msgstr "请è¾?å?¥ %2$s %3$s ç?? %1$s å¯?ç ?"
-#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1047
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "æ? æ³?æ?¾å?°â??%sâ??ç??è¯?书"
#: ../camel/camel-smime-context.c:376
msgid "Cannot create CMS message"
-msgstr "æ? æ³?å??建 CMS 信件"
+msgstr "æ? æ³?å??建 CMS æ¶?æ?¯"
#: ../camel/camel-smime-context.c:381
msgid "Cannot create CMS signed data"
@@ -2419,197 +2420,207 @@ msgstr "ç¾å??æ ¼å¼?ä¸?对"
msgid "Processing error"
msgstr "å¤?ç??é??误"
-#: ../camel/camel-smime-context.c:566
+#: ../camel/camel-smime-context.c:567
msgid "No signed data in signature"
msgstr "ç¾å??ä¸æ²¡æ??ç¾å??æ?°æ?®"
-#: ../camel/camel-smime-context.c:571
+#: ../camel/camel-smime-context.c:572
msgid "Digests missing from enveloped data"
msgstr "ä¿¡å°?æ?°æ?®ç¼ºå°?æ??è¦?"
-#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
+#: ../camel/camel-smime-context.c:585 ../camel/camel-smime-context.c:596
msgid "Cannot calculate digests"
msgstr "æ? æ³?计ç®?æ??è¦?"
-#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
+#: ../camel/camel-smime-context.c:603 ../camel/camel-smime-context.c:607
msgid "Cannot set message digests"
-msgstr "æ? æ³?设置信件æ??è¦?"
+msgstr "æ? æ³?设置æ¶?æ?¯æ??è¦?"
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
+#: ../camel/camel-smime-context.c:617 ../camel/camel-smime-context.c:622
msgid "Certificate import failed"
msgstr "�书导�失败"
-#: ../camel/camel-smime-context.c:631
+#: ../camel/camel-smime-context.c:632
#, c-format
msgid "Certificate is the only message, cannot verify certificates"
-msgstr "å?ªæ??è¯?书ç??信件ï¼?æ? æ³?æ ¡éª?è¯?书"
+msgstr "å?ªæ??è¯?书ç??æ¶?æ?¯ï¼?æ? æ³?æ ¡éª?è¯?书"
-#: ../camel/camel-smime-context.c:634
+#: ../camel/camel-smime-context.c:635
#, c-format
msgid "Certificate is the only message, certificates imported and verified"
-msgstr "å?ªæ??è¯?书ç??信件ï¼?è¯?书已导å?¥å¹¶æ ¡éª?"
+msgstr "å?ªæ??è¯?书ç??æ¶?æ?¯ï¼?è¯?书已导å?¥å¹¶æ ¡éª?"
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:639
msgid "Cannot find signature digests"
msgstr "æ?¾ä¸?å?°ç¾å??æ??è¦?"
-#: ../camel/camel-smime-context.c:654
+#: ../camel/camel-smime-context.c:655
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "ç¾å??è??ï¼?%s <%s>ï¼?%s\n"
-#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
+#: ../camel/camel-smime-context.c:834 ../camel/camel-smime-context.c:1120
msgid "Cannot create encoder context"
msgstr "æ? æ³?å??建ç¼?ç ?å?¨ä¸?ä¸?æ??"
-#: ../camel/camel-smime-context.c:838
+#: ../camel/camel-smime-context.c:840
msgid "Failed to add data to CMS encoder"
msgstr "å°?æ?°æ?®æ·»å? å?° CMS ç¼?ç ?å?¨å¤±è´¥"
-#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
+#: ../camel/camel-smime-context.c:845 ../camel/camel-smime-context.c:1137
msgid "Failed to encode data"
msgstr "ç¼?ç ?æ?°æ?®å¤±è´¥"
-#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
+#: ../camel/camel-smime-context.c:986 ../camel/camel-smime-context.c:1232
msgid "Decoder failed"
msgstr "解ç ?å?¨å¤±è´¥"
-#: ../camel/camel-smime-context.c:1049
+#: ../camel/camel-smime-context.c:1055
msgid "Cannot find common bulk encryption algorithm"
msgstr "æ?¾ä¸?å?°å?¬å?±æ?¹é??å? å¯?ç®?æ³?"
-#: ../camel/camel-smime-context.c:1057
+#: ../camel/camel-smime-context.c:1063
msgid "Cannot allocate slot for encryption bulk key"
msgstr "æ? æ³?为å? å¯?æ?¹é??å¯?é?¥å??é??å¯?é?¥æ§½"
-#: ../camel/camel-smime-context.c:1068
+#: ../camel/camel-smime-context.c:1074
msgid "Cannot create CMS Message"
-msgstr "æ? æ³?å??建 CMS 信件"
+msgstr "æ? æ³?å??建 CMS æ¶?æ?¯"
-#: ../camel/camel-smime-context.c:1074
+#: ../camel/camel-smime-context.c:1080
msgid "Cannot create CMS Enveloped data"
msgstr "æ? æ³?å??建 CMS ä¿¡å°?æ?°æ?®"
-#: ../camel/camel-smime-context.c:1080
+#: ../camel/camel-smime-context.c:1086
msgid "Cannot attach CMS Enveloped data"
msgstr "æ? æ³?é??å? CMS ä¿¡å°?æ?°æ?®"
-#: ../camel/camel-smime-context.c:1086
+#: ../camel/camel-smime-context.c:1092
msgid "Cannot attach CMS data object"
msgstr "æ? æ³?é??å? CMS æ?°æ?®å¯¹è±¡"
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1101
msgid "Cannot create CMS Recipient information"
msgstr "æ? æ³?å??建 CMS æ?¶ä»¶äººä¿¡æ?¯"
-#: ../camel/camel-smime-context.c:1100
+#: ../camel/camel-smime-context.c:1106
msgid "Cannot add CMS Recipient information"
msgstr "æ? æ³?æ·»å? CMS æ?¶ä»¶äººä¿¡æ?¯"
-#: ../camel/camel-smime-context.c:1125
+#: ../camel/camel-smime-context.c:1131
msgid "Failed to add data to encoder"
msgstr "å°?æ?°æ?®æ·»å? å?°ç¼?ç ?å?¨å¤±è´¥"
-#: ../camel/camel-smime-context.c:1227
+#: ../camel/camel-smime-context.c:1239
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME 解å¯?ï¼?没æ??æ?¾å?°å? å¯?å??容"
-#: ../camel/camel-store.c:444
+#: ../camel/camel-store.c:2141
#, c-format
msgid "Cannot create folder '%s': folder exists"
msgstr "æ? æ³?å??建æ??件夹ï¼?%sï¼?æ??件夹已å?å?¨"
-#: ../camel/camel-store.c:543
+#. the name of the Trash folder, used for deleted messages
+#: ../camel/camel-store.c:2332 ../camel/camel-vtrash-folder.c:48
+msgid "Trash"
+msgstr "å??æ?¶ç«?"
+
+#. the name of the Junk folder, used for spam messages
+#: ../camel/camel-store.c:2335 ../camel/camel-vtrash-folder.c:50
+msgid "Junk"
+msgstr "å??å?¾"
+
+#: ../camel/camel-store.c:2768
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "æ? æ³?å??建æ??件夹ï¼?%sï¼?æ??件夹已å?å?¨"
-#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
-#: ../camel/providers/local/camel-maildir-store.c:224
+#: ../camel/camel-store.c:2895 ../camel/camel-vee-store.c:367
+#: ../camel/providers/local/camel-maildir-store.c:481
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "æ? æ³?å? é?¤æ??件夹ï¼?%sï¼?æ? æ??æ??ä½?"
-#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
-#: ../camel/providers/local/camel-maildir-store.c:314
+#: ../camel/camel-store.c:3036 ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:572
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "æ? æ³?é??å?½å??æ??件夹ï¼?%sï¼?æ? æ??æ??ä½?"
-#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:1129 ../camel/camel-vtrash-folder.c:48
-msgid "Trash"
-msgstr "å??æ?¶ç«?"
+#: ../camel/camel-tcp-stream-raw.c:747 ../camel/camel-tcp-stream-raw.c:758
+#, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr "代ç??主æ?ºä¸?æ?¯æ?? SOCKS4"
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:1132 ../camel/camel-vtrash-folder.c:50
-msgid "Junk"
-msgstr "å??å?¾"
+#: ../camel/camel-tcp-stream-raw.c:769
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr "代ç??主æ?ºæ??ç»?äº?å·²æ?¹ç??请æ±?ï¼?代ç ? %d"
-#: ../camel/camel-tcp-stream-raw.c:814
+#: ../camel/camel-tcp-stream-raw.c:865 ../camel/camel-tcp-stream-raw.c:871
#, c-format
msgid "The proxy host does not support SOCKS5"
msgstr "代ç??主æ?ºä¸?æ?¯æ?? SOCKS5"
-#: ../camel/camel-tcp-stream-raw.c:820
+#: ../camel/camel-tcp-stream-raw.c:877
#, c-format
msgid "Could not find a suitable authentication type: code 0x%x"
msgstr "æ? æ³?æ?¾å?°å??é??ç??éª?è¯?ç±»å??: 代ç ? 0x%x"
-#: ../camel/camel-tcp-stream-raw.c:832
+#: ../camel/camel-tcp-stream-raw.c:889
msgid "General SOCKS server failure"
msgstr "é??ç?¨ SOCKS æ??å?¡å?¨å¤±è´¥"
-#: ../camel/camel-tcp-stream-raw.c:833
+#: ../camel/camel-tcp-stream-raw.c:890
msgid "SOCKS server's rules do not allow connection"
msgstr "SOCKS æ??å?¡å?¨ç??ç?ç?¥ä¸?å??许è¿?æ?¥"
-#: ../camel/camel-tcp-stream-raw.c:834
+#: ../camel/camel-tcp-stream-raw.c:891
msgid "Network is unreachable from SOCKS server"
msgstr "SOCKS æ??å?¡å?¨ç½?ç»?ä¸?å?¯å??"
-#: ../camel/camel-tcp-stream-raw.c:835
+#: ../camel/camel-tcp-stream-raw.c:892
msgid "Host is unreachable from SOCKS server"
msgstr "SOCKS æ??å?¡å?¨ä¸»æ?ºä¸?å?¯å??"
-#: ../camel/camel-tcp-stream-raw.c:836
+#: ../camel/camel-tcp-stream-raw.c:893
msgid "Connection refused"
msgstr "è¿?æ?¥è¢«æ??ç»?"
-#: ../camel/camel-tcp-stream-raw.c:837
+#: ../camel/camel-tcp-stream-raw.c:894
msgid "Time-to-live expired"
msgstr "è¿?é??æ?¶é?´è¿?æ??"
-#: ../camel/camel-tcp-stream-raw.c:838
+#: ../camel/camel-tcp-stream-raw.c:895
msgid "Command not supported by SOCKS server"
msgstr "SOCKS æ??å?¡å?¨ä¸?æ?¯æ??该å?½ä»¤"
-#: ../camel/camel-tcp-stream-raw.c:839
+#: ../camel/camel-tcp-stream-raw.c:896
msgid "Address type not supported by SOCKS server"
msgstr "SOCKS æ??å?¡å?¨ä¸?æ?¯æ??该å?°å??ç±»å??"
-#: ../camel/camel-tcp-stream-raw.c:840
+#: ../camel/camel-tcp-stream-raw.c:897
msgid "Unknown error from SOCKS server"
msgstr "SOCKS æ??å?¡å?¨å??ç??æ?ªç?¥é??误"
-#: ../camel/camel-tcp-stream-raw.c:870
+#: ../camel/camel-tcp-stream-raw.c:930
#, c-format
msgid "Got unknown address type from SOCKS server"
msgstr "ä»? SOCKS æ??å?¡å?¨è?·å??ç??å?°å??ç±»å??æ?ªç?¥"
-#: ../camel/camel-tcp-stream-raw.c:887
+#: ../camel/camel-tcp-stream-raw.c:948
#, c-format
msgid "Incomplete reply from SOCKS server"
msgstr "SOCKS æ??å?¡å?¨ç??å??åº?ä¸?å®?æ?´"
-#: ../camel/camel-tcp-stream-raw.c:902
+#: ../camel/camel-tcp-stream-raw.c:968
#, 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
+#: ../camel/camel-tcp-stream-raw.c:1000 ../camel/camel-tcp-stream-raw.c:1010
#, c-format
msgid "Invalid reply from proxy server"
msgstr "代ç??æ??å?¡å?¨ç??å??åº?æ? æ??"
@@ -2692,132 +2703,132 @@ msgstr ""
msgid "Could not parse URL '%s'"
msgstr "æ? æ³?解æ?? URLâ??%sâ??"
-#: ../camel/camel-vee-folder.c:1044
+#: ../camel/camel-vee-folder.c:1220 ../camel/camel-vee-folder.c:1382
#, c-format
-msgid "Error storing '%s': "
-msgstr "å?å?¨â??%sâ??å?ºé??ï¼?"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "æ? æ³?å°?æ¶?æ?¯ç§»å?¨æ??å¤?å?¶å?°è??æ??æ??件夹ä¸"
-#: ../camel/camel-vee-folder.c:1117
+#: ../camel/camel-vee-folder.c:1256
#, c-format
msgid "No such message %s in %s"
-msgstr "å?¨ %2$s ä¸æ²¡æ??信件 %1$s"
+msgstr "å?¨ %2$s ä¸æ²¡æ??æ¶?æ?¯ %1$s"
-#: ../camel/camel-vee-folder.c:1133 ../camel/camel-vee-folder.c:1148
+#: ../camel/camel-vee-folder.c:1324
#, c-format
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "æ? æ³?å°?信件移å?¨æ??å¤?å?¶å?°è??æ??æ??件夹ä¸"
+msgid "Error storing '%s': "
+msgstr "å?å?¨â??%sâ??å?ºé??ï¼?"
#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
-#: ../camel/camel-vee-store.c:417
+#: ../camel/camel-vee-store.c:322
msgid "Unmatched"
msgstr "æ? å?¹é??"
-#: ../camel/camel-vee-store.c:223
-#, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "æ? æ³?é??å?½å??æ??件夹ï¼?%sï¼?没æ??该æ??件夹"
-
-#: ../camel/camel-vee-store.c:289
+#: ../camel/camel-vee-store.c:393
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "æ? æ³?å? é?¤æ??件夹ï¼?%sï¼?没æ??该æ??件夹"
+#: ../camel/camel-vee-store.c:427
+#, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "æ? æ³?é??å?½å??æ??件夹ï¼?%sï¼?没æ??该æ??件夹"
+
#: ../camel/camel-vtrash-folder.c:49
msgid "Cannot copy messages to the Trash folder"
-msgstr "æ? æ³?å°?信件å¤?å?¶å?°å??æ?¶ç«?æ??件夹"
+msgstr "æ? æ³?å°?æ¶?æ?¯å¤?å?¶å?°å??æ?¶ç«?æ??件夹"
#: ../camel/camel-vtrash-folder.c:51
msgid "Cannot copy messages to the Junk folder"
-msgstr "æ? æ³?å°?信件å¤?å?¶å?°å??å?¾é?®ä»¶æ??件夹"
+msgstr "æ? æ³?å°?æ¶?æ?¯å¤?å?¶å?°å??å?¾é?®ä»¶æ??件夹"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:959
+#: ../camel/providers/imap/camel-imap-folder.c:390
#, c-format
-msgid ""
-"Cannot get message: %s\n"
-" %s"
-msgstr ""
-"æ? æ³?è?·å??信件ï¼?%s\n"
-" %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
-#: ../camel/providers/local/camel-maildir-folder.c:233
-#: ../camel/providers/local/camel-maildir-folder.c:268
-#: ../camel/providers/local/camel-maildir-folder.c:380
-#: ../camel/providers/local/camel-mbox-folder.c:329
-#: ../camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/local/camel-mh-folder.c:215
-msgid "No such message"
-msgstr "没æ??该信件"
+msgid "Could not load summary for %s"
+msgstr "æ? æ³?为 %s è½½å?¥æ¦?è¦?"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:158
-#: ../camel/providers/nntp/camel-nntp-folder.c:244
-#: ../camel/providers/nntp/camel-nntp-folder.c:337
-#: ../camel/providers/pop3/camel-pop3-folder.c:714
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1035
#, c-format
-msgid "Cannot get message %s: "
-msgstr "æ? æ³?è?·å??信件 %sï¼?"
+msgid "Checking for deleted messages %s"
+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:2645
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1520
+#: ../camel/providers/groupwise/camel-groupwise-store.c:672
+#: ../camel/providers/groupwise/camel-groupwise-store.c:803
+#: ../camel/providers/imap/camel-imap-folder.c:3919
+#: ../camel/providers/imap/camel-imap-folder.c:4001
+#: ../camel/providers/imapx/camel-imapx-server.c:3857
+#: ../camel/providers/imapx/camel-imapx-server.c:3984
#, c-format
-msgid "This message is not available in offline mode."
-msgstr "该信件æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸ä½¿ç?¨ã??"
+msgid "Fetching summary information for new messages in %s"
+msgstr "ä»? %s ä¸ç??æ?°æ¶?æ?¯ä¸è?·å??æ¦?è¦?ä¿¡æ?¯"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:203
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2109
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2163
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1992
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2046
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2710
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2720
#, c-format
msgid "Could not get message"
-msgstr "æ? æ³?è?·å¾?信件"
+msgstr "æ? æ³?è?·å¾?æ¶?æ?¯"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1038
-#: ../camel/providers/imap/camel-imap-folder.c:376
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2430
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2480
#, c-format
-msgid "Could not load summary for %s"
-msgstr "æ? æ³?为 %s è½½å?¥æ¦?è¦?"
+msgid "Cannot append message to folder '%s': %s"
+msgstr "æ? æ³?å°?æ¶?æ?¯è¿½å? å?°æ??件夹â??%sâ??ï¼?%s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1112
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2466
#, c-format
-msgid "Checking for deleted messages %s"
-msgstr "æ£?æ?¥å·²å? é?¤ç??æ?°å»º %s"
+msgid "Cannot create message: %s"
+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: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
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2646
#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "ä»? %s ä¸ç??æ?°ä¿¡ä»¶ä¸è?·å??æ¦?è¦?ä¿¡æ?¯"
+msgid ""
+"Cannot get message: %s\n"
+" %s"
+msgstr ""
+"æ? æ³?è?·å??æ¶?æ?¯ï¼?%s\n"
+" %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2646
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:235
+#: ../camel/providers/local/camel-maildir-folder.c:311
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "没æ??该æ¶?æ?¯"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2475
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2525
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2665
+#: ../camel/providers/nntp/camel-nntp-folder.c:251
+#: ../camel/providers/nntp/camel-nntp-folder.c:418
+#: ../camel/providers/pop3/camel-pop3-folder.c:455
#, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "æ? æ³?å°?信件追å? å?°æ??件夹â??%sâ??ï¼?%s"
+msgid "Cannot get message %s: "
+msgstr "æ? æ³?è?·å??æ¶?æ?¯ %sï¼?"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2511
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2683
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2693
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2897
#, c-format
-msgid "Cannot create message: %s"
-msgstr "æ? æ³?å??建信件ï¼?%s"
+msgid "This message is not available in offline mode."
+msgstr "该æ¶?æ?¯æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸ä½¿ç?¨ã??"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
#, c-format
msgid "Cannot get folder container %s"
msgstr "æ? æ³?è?·å¾?æ??件夹容å?¨ %s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
#, c-format
msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?追å? 信件ï¼?ç¼?å?ä¸?å?¯ç?¨"
+msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?追å? æ¶?æ?¯ï¼?ç¼?å?ä¸?å?¯ç?¨"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
msgid "Cannot append message in offline mode: "
-msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?追å? 信件ï¼?"
+msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?追å? æ¶?æ?¯ï¼?"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
msgid "Checking for new mail"
@@ -2825,13 +2836,13 @@ msgstr "����件"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
#: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
msgid "C_heck for new messages in all folders"
-msgstr "å?¨æ??æ??æ??件夹ä¸æ£?æ?¥æ?°ä¿¡ä»¶(_H)"
+msgstr "å?¨æ??æ??æ??件夹ä¸æ£?æ?¥æ?°æ¶?æ?¯(_H)"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:73
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
#: ../camel/providers/local/camel-local-provider.c:42
#: ../camel/providers/local/camel-local-provider.c:82
#: ../camel/providers/local/camel-local-provider.c:102
@@ -2840,15 +2851,15 @@ msgstr "é??项"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "åº?ç?¨è¿?滤è§?å??å?°æ¤æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡ä»¶(_A)"
+msgstr "åº?ç?¨è¿?滤è§?å??å?°æ¤æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°æ¶?æ?¯(_A)"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
msgid "Check new messages for J_unk contents"
-msgstr "æ£?æ?¥æ?°ä¿¡ä»¶ç??å??å?¾å??容(_U)"
+msgstr "æ£?æ?¥æ?°æ¶?æ?¯ç??å??å?¾å??容(_U)"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
msgid "Only check for Junk messages in the IN_BOX folder"
msgstr "ä»?å?¨æ?¶ä»¶ç®±ä¸æ£?æ?¥å??å?¾é?®ä»¶(_B)"
@@ -2874,7 +2885,7 @@ msgstr "访é?® Novell GroupWise æ??å?¡å?¨"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
#: ../camel/providers/imap/camel-imap-provider.c:97
-#: ../camel/providers/imapx/camel-imapx-provider.c:105
+#: ../camel/providers/imapx/camel-imapx-provider.c:104
#: ../camel/providers/nntp/camel-nntp-provider.c:72
#: ../camel/providers/pop3/camel-pop3-provider.c:70
msgid "Password"
@@ -2890,75 +2901,75 @@ msgstr "该é??项å°?使ç?¨çº¯æ??æ?¬å¯?ç ?è¿?æ?¥å?° GroupWise æ??å?¡å?¨ã??"
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:1188
-#: ../camel/providers/imapx/camel-imapx-server.c:2972
+#: ../camel/providers/groupwise/camel-groupwise-store.c:209
+#: ../camel/providers/imap/camel-imap-store.c:801
+#: ../camel/providers/imapx/camel-imapx-server.c:3080
#, c-format
msgid "You did not enter a password."
msgstr "æ?¨æ²¡æ??è¾?å?¥å¯?ç ?ã??"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:328
+#: ../camel/providers/groupwise/camel-groupwise-store.c:332
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:1757
-#: ../camel/providers/imap/camel-imap-store.c:1952
-#: ../camel/providers/imapx/camel-imapx-store.c:412
+#: ../camel/providers/groupwise/camel-groupwise-store.c:563
+#: ../camel/providers/imap/camel-imap-store.c:1808
+#: ../camel/providers/imap/camel-imap-store.c:2005
+#: ../camel/providers/imapx/camel-imapx-store.c:342
#, c-format
msgid "No such folder %s"
msgstr "没æ??æ??件夹 %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1224
#, c-format
msgid "Cannot create GroupWise folders in offline mode."
msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?å??建 GroupWise æ??件夹ã??"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1196
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1233
#, c-format
msgid "Cannot create a special system folder"
msgstr "æ? æ³?å??建ç?¹æ®?ç³»ç»?æ??件夹"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
-#: ../camel/providers/imap/camel-imap-store.c:1835
-#: ../camel/providers/imap/camel-imap-store.c:2257
-#: ../camel/providers/imapx/camel-imapx-store.c:875
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1243
+#: ../camel/providers/imap/camel-imap-store.c:1886
+#: ../camel/providers/imap/camel-imap-store.c:2323
+#: ../camel/providers/imapx/camel-imapx-store.c:1341
#, c-format
msgid "The parent folder is not allowed to contain subfolders"
msgstr "ç?¶æ??件夹ä¸?å??许å?«æ??å?æ??件夹"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1328
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1353
#, c-format
msgid "Cannot rename GroupWise folder '%s' to '%s'"
msgstr "æ? æ³?å°? GroupWise æ??件夹â??%sâ??é??å?½å??为â??%sâ??"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1387
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
#, c-format
msgid "GroupWise server %s"
msgstr "GroupWise æ??å?¡å?¨ %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1389
#, c-format
msgid "GroupWise service for %s on %s"
msgstr "%2$s 为 %1$s æ??ä¾?ç?? GroupWise æ??å?¡"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
#, c-format
msgid "GroupWise mail delivery via %s"
msgstr "é??è¿? %s å??é?? GroupWise é?®ä»¶"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
msgid "Sending Message"
-msgstr "å??é??信件"
+msgstr "å??é??æ¶?æ?¯"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
#, c-format
msgid "Cannot get folder: Invalid operation on this store"
msgstr "æ? æ³?è?·å??æ??件夹ï¼?对该å?å?¨ç??æ? æ??æ??ä½?"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
#, c-format
msgid ""
"You have exceeded this account's storage limit. Your messages are queued in "
@@ -2968,36 +2979,36 @@ msgstr ""
"æ?¨å·²ç»?è¾¾å?°äº?è´¦æ?·ç??å?å?¨é??å?¶ã??æ?¨ç??é?®ä»¶æ£å?¨å??件箱ä¸æ??é??ã??请å??å? é?¤/å?æ¡£æ??äº?é?®ä»¶ä¹?"
"å??å??å??é??/æ?¥æ?¶ã??\n"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
#, c-format
msgid "Could not send message: %s"
-msgstr "æ? æ³?å??é??信件ï¼?%s"
+msgstr "æ? æ³?å??é??æ¶?æ?¯ï¼?%s"
-#: ../camel/providers/imap/camel-imap-command.c:190
-#: ../camel/providers/imap/camel-imap-command.c:288
+#: ../camel/providers/imap/camel-imap-command.c:197
+#: ../camel/providers/imap/camel-imap-command.c:301
#, c-format
msgid "No output stream"
msgstr "没æ??è¾?å?ºæµ?"
-#: ../camel/providers/imap/camel-imap-command.c:198
-#: ../camel/providers/imap/camel-imap-command.c:296
+#: ../camel/providers/imap/camel-imap-command.c:205
+#: ../camel/providers/imap/camel-imap-command.c:309
#, c-format
msgid "No input stream"
msgstr "没æ??è¾?å?¥æµ?"
-#: ../camel/providers/imap/camel-imap-command.c:245
+#: ../camel/providers/imap/camel-imap-command.c:255
#, c-format
msgid "Operation cancelled"
msgstr "æ??ä½?å·²å??æ¶?"
-#: ../camel/providers/imap/camel-imap-command.c:353
+#: ../camel/providers/imap/camel-imap-command.c:373
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "æ??å?¡å?¨æ??å¤?å?°ä¸æ¢äº?è¿?æ?¥ï¼?%s"
#. for imap ALERT codes, account user host
#. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:373
+#: ../camel/providers/imap/camel-imap-command.c:394
#, c-format
msgid ""
"Alert from IMAP server %s %s:\n"
@@ -3006,79 +3017,79 @@ msgstr ""
"æ?¥è?ª IMAP æ??å?¡å?¨ %s %s ç??æ??é??ï¼?\n"
"%s"
-#: ../camel/providers/imap/camel-imap-command.c:444
+#: ../camel/providers/imap/camel-imap-command.c:468
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "æ?¥è?ª IMAP æ??å?¡å?¨ç??æ??å¤?åº?ç?ï¼?%s"
-#: ../camel/providers/imap/camel-imap-command.c:456
+#: ../camel/providers/imap/camel-imap-command.c:480
#, c-format
msgid "IMAP command failed: %s"
msgstr "IMAP �令失败�%s"
-#: ../camel/providers/imap/camel-imap-command.c:532
+#: ../camel/providers/imap/camel-imap-command.c:560
#, c-format
msgid "Server response ended too soon."
msgstr "æ??å?¡å?¨åº?ç?ç»?æ??太快ã??"
-#: ../camel/providers/imap/camel-imap-command.c:740
+#: ../camel/providers/imap/camel-imap-command.c:771
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "IMAP æ??å?¡å?¨åº?ç?ä¸?å?«æ?? %s ä¿¡æ?¯"
-#: ../camel/providers/imap/camel-imap-command.c:778
+#: ../camel/providers/imap/camel-imap-command.c:809
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr "æ?¥è?ª IMAP æ??å?¡å?¨æ??å¤?ç?? OK åº?ç?ï¼?%s"
-#: ../camel/providers/imap/camel-imap-folder.c:281
+#: ../camel/providers/imap/camel-imap-folder.c:291
msgid "Always check for new mail in this folder"
msgstr "æ?»æ?¯æ£?æ?¥æ¤æ??件夹ä¸ç??æ?°é?®ä»¶(_B)"
-#: ../camel/providers/imap/camel-imap-folder.c:353
+#: ../camel/providers/imap/camel-imap-folder.c:367
#, c-format
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:3759
+#: ../camel/providers/imap/camel-imap-folder.c:990
+#: ../camel/providers/imapx/camel-imapx-server.c:3899
#, c-format
msgid "Scanning for changed messages in %s"
-msgstr "æ?«æ?? %s ä¸æ?´æ?¹äº?ç??信件"
+msgstr "æ?«æ?? %s ä¸æ?´æ?¹äº?ç??æ¶?æ?¯"
-#: ../camel/providers/imap/camel-imap-folder.c:3231
+#: ../camel/providers/imap/camel-imap-folder.c:3326
msgid "Unable to retrieve message: "
-msgstr "æ? æ³?è?·å??信件ï¼?"
+msgstr "æ? æ³?è?·å??æ¶?æ?¯ï¼?"
-#: ../camel/providers/imap/camel-imap-folder.c:3266
-#: ../camel/providers/imapx/camel-imapx-server.c:4937
+#: ../camel/providers/imap/camel-imap-folder.c:3361
+#: ../camel/providers/imapx/camel-imapx-server.c:5152
#, c-format
msgid "Cannot get message with message ID %s: %s"
-msgstr "æ? æ³?è?·å??信件 ID %sï¼?%s"
+msgstr "æ? æ³?è?·å??æ¶?æ?¯ ID %sï¼?%s"
-#: ../camel/providers/imap/camel-imap-folder.c:3267
-#: ../camel/providers/imapx/camel-imapx-server.c:4938
+#: ../camel/providers/imap/camel-imap-folder.c:3362
+#: ../camel/providers/imapx/camel-imapx-server.c:5153
msgid "No such message available."
-msgstr "没æ??该信件ã??"
+msgstr "没æ??该æ¶?æ?¯ã??"
-#: ../camel/providers/imap/camel-imap-folder.c:3341
-#: ../camel/providers/imap/camel-imap-folder.c:4211
-#: ../camel/providers/nntp/camel-nntp-folder.c:326
+#: ../camel/providers/imap/camel-imap-folder.c:3437
+#: ../camel/providers/imap/camel-imap-folder.c:4332
+#: ../camel/providers/nntp/camel-nntp-folder.c:407
#, c-format
msgid "This message is not currently available"
-msgstr "该信件ç?®å??ä¸?å?¯ç?¨"
+msgstr "该æ¶?æ?¯ç?®å??ä¸?å?¯ç?¨"
-#: ../camel/providers/imap/camel-imap-folder.c:4021
+#: ../camel/providers/imap/camel-imap-folder.c:4133
#, c-format
msgid "Incomplete server response: no information provided for message %d"
-msgstr "ä¸?å®?æ?´ç??æ??å?¡å?¨å??åº?ï¼?没æ??为第%då°?ä¿¡æ??ä¾?ä¿¡æ?¯"
+msgstr "ä¸?å®?æ?´ç??æ??å?¡å?¨å??åº?ï¼?没æ??为第 %d å°?ä¿¡æ??ä¾?ä¿¡æ?¯"
-#: ../camel/providers/imap/camel-imap-folder.c:4031
+#: ../camel/providers/imap/camel-imap-folder.c:4143
#, c-format
msgid "Incomplete server response: no UID provided for message %d"
-msgstr "ä¸?å®?æ?´ç??æ??å?¡å?¨å??åº?ï¼?没æ??为第%då°?ä¿¡æ??ä¾? UID"
+msgstr "ä¸?å®?æ?´ç??æ??å?¡å?¨å??åº?ï¼?没æ??为第 %d å°?ä¿¡æ??ä¾? UID"
-#: ../camel/providers/imap/camel-imap-folder.c:4251
+#: ../camel/providers/imap/camel-imap-folder.c:4372
#, c-format
msgid "Could not find message body in FETCH response."
msgstr "æ? æ³?å?¨ FETCH åº?ç?ä¸æ?¾å?°ä¿¡ä½?ã??"
@@ -3091,35 +3102,35 @@ msgstr "æ? æ³?æ??å¼?ç¼?å?ç?®å½?ï¼?"
#: ../camel/providers/imap/camel-imap-message-cache.c:326
#, c-format
msgid "Failed to cache message %s: %s"
-msgstr "ç¼?å?信件 %s 失败ï¼?%s"
+msgstr "ç¼?å?æ¶?æ?¯ %s 失败ï¼?%s"
-#: ../camel/providers/imap/camel-imap-message-cache.c:388
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
#, c-format
msgid "Failed to cache message %s: "
-msgstr "ç¼?å?信件 %s 失败ï¼?"
+msgstr "ç¼?å?æ¶?æ?¯ %s 失败ï¼?"
-#: ../camel/providers/imap/camel-imap-message-cache.c:525
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
#, c-format
msgid "Failed to cache %s: "
msgstr "ç¼?å? %s 失败ï¼?"
#: ../camel/providers/imap/camel-imap-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:41
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
msgid "Checking for New Mail"
msgstr "����件"
#: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
msgid "Ch_eck for new messages in subscribed folders"
-msgstr "å?¨è®¢é??ç??æ??件夹ä¸æ£?æ?¥æ?°ä¿¡ä»¶(_E)"
+msgstr "å?¨è®¢é??ç??æ??件夹ä¸æ£?æ?¥æ?°æ¶?æ?¯(_E)"
#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
msgid "Connection to Server"
msgstr "è¿?æ?¥æ??å?¡å?¨"
#: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:55
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
msgid "_Use custom command to connect to server"
msgstr "使ç?¨è?ªå®?ä¹?å?½ä»¤è¿?æ?¥å?°æ??å?¡å?¨(_U)"
@@ -3128,18 +3139,18 @@ msgid "Co_mmand:"
msgstr "�令(_M)�"
#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
#: ../camel/providers/nntp/camel-nntp-provider.c:42
msgid "Folders"
msgstr "æ??件夹"
#: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:65
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
msgid "_Show only subscribed folders"
msgstr "å?ªæ?¾ç¤ºè®¢é??äº?ç??æ??件夹(_S)"
#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
msgid "O_verride server-supplied folder namespace"
msgstr "è¦?ç??æ??å?¡å?¨æ??ä¾?ç??æ??件夹å?½å??空é?´(_V)"
@@ -3148,17 +3159,17 @@ msgid "Names_pace:"
msgstr "å?½å??空é?´(_P)ï¼?"
#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:75
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "åº?ç?¨è¿?滤è§?å??å?°æ?¬æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡ä»¶(_A)"
+msgstr "åº?ç?¨è¿?滤è§?å??å?°æ?¬æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°æ¶?æ?¯(_A)"
#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imapx/camel-imapx-provider.c:77
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
msgid "Check new messages for Jun_k contents"
-msgstr "æ£?æ?¥æ?°ä¿¡ä»¶ç??å??å?¾å??容(_K)"
+msgstr "æ£?æ?¥æ?°æ¶?æ?¯ç??å??å?¾å??容(_K)"
#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
msgid "Automatically synchroni_ze remote mail locally"
msgstr "è?ªå?¨å°?è¿?ç¨?é?®ä»¶å??æ¥å?°æ?¬å?°(_Z)"
@@ -3167,115 +3178,89 @@ msgid "IMAP"
msgstr "IMAP"
#: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:91
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
msgid "For reading and storing mail on IMAP servers."
msgstr "IMAP æ??å?¡å?¨ä¸?ç??é?®ä»¶ç??读å??ã??"
#: ../camel/providers/imap/camel-imap-provider.c:99
-#: ../camel/providers/imapx/camel-imapx-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
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: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:226
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%2$s 为 %1$s æ??ä¾?ç?? IMAP æ??å?¡"
-
-#: ../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
+#: ../camel/providers/imap/camel-imap-store.c:243
+#: ../camel/providers/nntp/camel-nntp-store.c:313
+#: ../camel/providers/pop3/camel-pop3-store.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
#, c-format
msgid "Could not connect to %s: %s"
msgstr "æ? æ³?è¿?æ?¥å?° %sï¼?%s"
-#: ../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
+#: ../camel/providers/imap/camel-imap-store.c:244
+#: ../camel/providers/nntp/camel-nntp-store.c:314
+#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
msgid "SSL unavailable"
msgstr "SSL ���"
-#: ../camel/providers/imap/camel-imap-store.c:466
-#: ../camel/providers/nntp/camel-nntp-store.c:252
+#: ../camel/providers/imap/camel-imap-store.c:264
+#: ../camel/providers/nntp/camel-nntp-store.c:333
#, c-format
msgid "Could not connect to %s: "
msgstr "æ? æ³?è¿?æ?¥å?° %sï¼?"
-#: ../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
+#: ../camel/providers/imap/camel-imap-store.c:370
+#: ../camel/providers/imap/camel-imap-store.c:390
+#: ../camel/providers/imap/camel-imap-store.c:397
+#: ../camel/providers/imap/camel-imap-store.c:424
+#: ../camel/providers/imapx/camel-imapx-server.c:2926
+#: ../camel/providers/imapx/camel-imapx-server.c:2964
#, 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:573
-#: ../camel/providers/imapx/camel-imapx-server.c:2826
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#: ../camel/providers/imap/camel-imap-store.c:371
+#: ../camel/providers/imapx/camel-imapx-server.c:2927
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
msgid "STARTTLS not supported"
msgstr "ä¸?æ?¯æ?? STARTTLS"
-#: ../camel/providers/imap/camel-imap-store.c:593
-#: ../camel/providers/imapx/camel-imapx-server.c:2862
+#: ../camel/providers/imap/camel-imap-store.c:391
+#: ../camel/providers/imapx/camel-imapx-server.c:2965
msgid "SSL negotiations failed"
msgstr "SSL å??å??失败"
-#: ../camel/providers/imap/camel-imap-store.c:600
-#: ../camel/providers/smtp/camel-smtp-transport.c:339
+#: ../camel/providers/imap/camel-imap-store.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
msgid "SSL is not available in this build"
msgstr "æ?¬æ¬¡ç¼?è¯?ä¸æ?ªå??å?« SSL"
-#: ../camel/providers/imap/camel-imap-store.c:748
-#: ../camel/providers/imapx/camel-imapx-server.c:2662
+#: ../camel/providers/imap/camel-imap-store.c:549
+#: ../camel/providers/imapx/camel-imapx-server.c:2756
#, c-format
msgid "Connection cancelled"
msgstr "è¿?æ?¥å·²å??æ¶?"
-#: ../camel/providers/imap/camel-imap-store.c:753
-#: ../camel/providers/imapx/camel-imapx-server.c:2667
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imapx/camel-imapx-server.c:2761
#, 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: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
-#: ../camel/providers/local/camel-maildir-store.c:562
-#: ../camel/providers/local/camel-maildir-store.c:575
-#: ../camel/providers/local/camel-spool-store.c:508
-msgid "Inbox"
-msgstr "�件箱"
-
-#: ../camel/providers/imap/camel-imap-store.c:1129
-#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imapx/camel-imapx-server.c:3036
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP æ??å?¡å?¨ %s ä¸?æ?¯æ??è¦?æ±?ç??éª?è¯?ç±»å?? %s"
-#: ../camel/providers/imap/camel-imap-store.c:1141
-#: ../camel/providers/imapx/camel-imapx-server.c:2940
-#: ../camel/providers/smtp/camel-smtp-transport.c:462
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:3048
+#: ../camel/providers/smtp/camel-smtp-transport.c:420
#, c-format
msgid "No support for authentication type %s"
msgstr "ä¸?æ?¯æ??éª?è¯?ç±»å?? %s"
-#: ../camel/providers/imap/camel-imap-store.c:1220
-#: ../camel/providers/imapx/camel-imapx-server.c:3010
+#: ../camel/providers/imap/camel-imap-store.c:836
+#: ../camel/providers/imapx/camel-imapx-server.c:3123
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3286,141 +3271,167 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/imap/camel-imap-store.c:1771
-#: ../camel/providers/imap/camel-imap-store.c:2193
-#: ../camel/providers/imapx/camel-imapx-store.c:854
+#: ../camel/providers/imap/camel-imap-store.c:997
+#: ../camel/providers/imapx/camel-imapx-store.c:183
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP æ??å?¡å?¨ %s"
+
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:185
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%2$s 为 %1$s æ??ä¾?ç?? IMAP æ??å?¡"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:1367
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imapx/camel-imapx-store.c:372
+#: ../camel/providers/imapx/camel-imapx-store.c:794
+#: ../camel/providers/local/camel-maildir-folder.c:413
+#: ../camel/providers/local/camel-maildir-store.c:422
+#: ../camel/providers/local/camel-maildir-store.c:435
+#: ../camel/providers/local/camel-maildir-store.c:482
+#: ../camel/providers/local/camel-maildir-store.c:573
+#: ../camel/providers/local/camel-spool-store.c:289
+msgid "Inbox"
+msgstr "�件箱"
+
+#: ../camel/providers/imap/camel-imap-store.c:1822
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imapx/camel-imapx-store.c:1320
#, 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: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
+#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/local/camel-maildir-store.c:390
+#: ../camel/providers/local/camel-mbox-store.c:413
+#: ../camel/providers/local/camel-mh-store.c:504
#, c-format
msgid "Cannot create folder '%s': folder exists."
msgstr "æ? æ³?å??建æ??件夹â??%sâ??ï¼?æ??件夹已å?å?¨ã??"
-#: ../camel/providers/imap/camel-imap-store.c:2206
-#: ../camel/providers/imapx/camel-imapx-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imapx/camel-imapx-store.c:1331
#, c-format
msgid "Unknown parent folder: %s"
msgstr "æ?ªç?¥ç??ç?¶æ??件夹ï¼?%s"
-#: ../camel/providers/imap/camel-imap-store.c:3062
+#: ../camel/providers/imap/camel-imap-store.c:3137
#, c-format
msgid "Server unexpectedly disconnected"
msgstr "æ??å?¡å?¨æ??å¤?æ?å¼? "
-#: ../camel/providers/imap/camel-imap-store.c:3065
+#: ../camel/providers/imap/camel-imap-store.c:3140
msgid "Server unexpectedly disconnected: "
msgstr "æ??å?¡å?¨æ??å¤?æ?å¼?ï¼?"
-#: ../camel/providers/imapx/camel-imapx-folder.c:75
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
#, c-format
msgid "Could not create folder summary for %s"
msgstr "æ? æ³?为 %s å??建æ??件夹æ¦?è¦?"
-#: ../camel/providers/imapx/camel-imapx-folder.c:83
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
#, c-format
msgid "Could not create cache for %s: "
msgstr "æ? æ³?为 %s å??建ç¼?å?ï¼?"
-#: ../camel/providers/imapx/camel-imapx-provider.c:43
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
msgid "Use _Quick Resync if the server supports it"
msgstr "å¦?æ??æ??å?¡å?¨æ?¯æ??å??使ç?¨å¿«é??é??æ?°å??æ¥(_Q)"
-#: ../camel/providers/imapx/camel-imapx-provider.c:45
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
msgid "Use I_dle if the server supports it"
msgstr "å¦?æ??æ??å?¡å?¨æ?¯æ??ç??è¯?使ç?¨ I_DLE"
-#: ../camel/providers/imapx/camel-imapx-provider.c:57
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
msgid "Command:"
msgstr "�令�"
-#: ../camel/providers/imapx/camel-imapx-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
msgid "Numbe_r of cached connections to use"
msgstr "使ç?¨ç??ç¼?å?è¿?æ?¥ç??æ?°ç?®(_R)"
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
msgid "Namespace:"
msgstr "å?½å??空é?´ï¼?"
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
msgid "IMAP+"
msgstr "IMAP+"
-#: ../camel/providers/imapx/camel-imapx-server.c:1365
+#: ../camel/providers/imapx/camel-imapx-server.c:1410
msgid "Error writing to cache stream: "
msgstr "å??å?¥ç¼?å?æµ?é??误ï¼?"
-#: ../camel/providers/imapx/camel-imapx-server.c:2019
+#: ../camel/providers/imapx/camel-imapx-server.c:2092
#, c-format
msgid "Not authenticated"
msgstr "没æ??éª?è¯?"
-#: ../camel/providers/imapx/camel-imapx-server.c:2753
+#: ../camel/providers/imapx/camel-imapx-server.c:2851
#, c-format
msgid "Could not connect to %s (port %s): "
msgstr "æ? æ³?è¿?æ?¥å?° %s(端å?£ %s)ï¼?"
-#: ../camel/providers/imapx/camel-imapx-server.c:3182
+#: ../camel/providers/imapx/camel-imapx-server.c:3303
msgid "Closing tmp stream failed: "
msgstr "å?³é?临æ?¶æµ?失败ï¼?"
-#: ../camel/providers/imapx/camel-imapx-server.c:5061
+#: ../camel/providers/imapx/camel-imapx-server.c:5298
#, c-format
msgid "Cannot create spool file: %s"
msgstr "æ? æ³?å??建è?±æ?ºæ??件ï¼?%s"
-#: ../camel/providers/imapx/camel-imapx-server.c:5076
+#: ../camel/providers/imapx/camel-imapx-server.c:5314
msgid "Cannot create spool file: "
msgstr "æ? æ³?å??建è?±æ?ºæ??件ï¼?"
-#: ../camel/providers/imapx/camel-imapx-store.c:428
-#: ../camel/providers/nntp/camel-nntp-store.c:1510
+#: ../camel/providers/imapx/camel-imapx-store.c:1136
+#: ../camel/providers/nntp/camel-nntp-store.c:1610
#, c-format
msgid "No such folder: %s"
msgstr "没æ??æ??件夹ï¼?%s"
-#: ../camel/providers/imapx/camel-imapx-stream.c:71
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
#, c-format
msgid "Source stream returned no data"
msgstr "æº?æµ?没è¿?å??æ?°æ?®"
-#: ../camel/providers/imapx/camel-imapx-stream.c:80
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
#, c-format
msgid "Source stream unavailable"
msgstr "�����"
-#: ../camel/providers/local/camel-local-folder.c:199
+#: ../camel/providers/local/camel-local-folder.c:182
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:209
-#: ../camel/providers/local/camel-local-folder.c:218
+#: ../camel/providers/local/camel-local-folder.c:192
+#: ../camel/providers/local/camel-local-folder.c:201
#, c-format
msgid "mailbox: %s (%s)"
msgstr "�件箱�%s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:227
+#: ../camel/providers/local/camel-local-folder.c:210
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:272
+#: ../camel/providers/local/camel-local-folder.c:469
msgid "Index message body data"
msgstr "索�信���"
-#: ../camel/providers/local/camel-local-folder.c:686
+#: ../camel/providers/local/camel-local-folder.c:685
#, c-format
msgid ""
"Cannot get message %s from folder %s\n"
"%s"
msgstr ""
-"æ? æ³?ä»?æ??件夹 %2$s è?·å??信件 %1$s\n"
+"æ? æ³?ä»?æ??件夹 %2$s è?·å??æ¶?æ?¯ %1$s\n"
"%3$s"
#: ../camel/providers/local/camel-local-provider.c:44
@@ -3450,7 +3461,7 @@ msgstr ""
#: ../camel/providers/local/camel-local-provider.c:84
#: ../camel/providers/local/camel-local-provider.c:103
msgid "_Apply filters to new messages in INBOX"
-msgstr "对 INBOX ä¸ç??æ?°ä¿¡ä»¶åº?ç?¨è¿?滤è§?å??(_A)"
+msgstr "对 INBOX ä¸ç??æ?°æ¶?æ?¯åº?ç?¨è¿?滤è§?å??(_A)"
#: ../camel/providers/local/camel-local-provider.c:91
msgid "Maildir-format mail directories"
@@ -3481,183 +3492,197 @@ msgstr ""
msgid "Standard Unix mbox spool directory"
msgstr "æ ?å?? Unix mbox è?±æ?ºç?®å½?"
-#: ../camel/providers/local/camel-local-store.c:149
-#: ../camel/providers/local/camel-local-store.c:284
-#: ../camel/providers/local/camel-mbox-store.c:371
-#: ../camel/providers/local/camel-spool-store.c:109
+#: ../camel/providers/local/camel-local-store.c:174
+#: ../camel/providers/local/camel-local-store.c:319
+#: ../camel/providers/local/camel-mbox-store.c:532
+#: ../camel/providers/local/camel-spool-store.c:318
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "å?å?¨æ ¹ç?®å½? %s ä¸?æ?¯ç»?对路å¾?"
-#: ../camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-local-store.c:183
#, c-format
msgid "Store root %s is not a regular directory"
msgstr "å?å?¨æ ¹ç?®å½? %s ä¸?æ?¯æ?®é??ç?®å½?"
-#: ../camel/providers/local/camel-local-store.c:169
-#: ../camel/providers/local/camel-local-store.c:179
-#: ../camel/providers/local/camel-local-store.c:297
+#: ../camel/providers/local/camel-local-store.c:194
+#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:332
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "æ? æ³?è?·å??æ??件夹ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-local-store.c:193
+#: ../camel/providers/local/camel-local-store.c:220
#, c-format
msgid "Local stores do not have an inbox"
msgstr "æ?¬å?°å?å?¨æ²¡æ??æ?¶ä»¶ç®±"
-#: ../camel/providers/local/camel-local-store.c:250
+#: ../camel/providers/local/camel-local-store.c:281
#, c-format
msgid "Local mail file %s"
msgstr "æ?¬å?°é?®ä»¶æ??件 %s"
-#: ../camel/providers/local/camel-local-store.c:358
+#: ../camel/providers/local/camel-local-store.c:393
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "æ? æ³?å°?æ??件夹 %s æ?¹å??为 %sï¼?%s"
-#: ../camel/providers/local/camel-local-store.c:431
+#: ../camel/providers/local/camel-local-store.c:467
#, c-format
msgid "Could not rename '%s': %s"
msgstr "æ? æ³?é??å?½å??â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-local-store.c:461
-#: ../camel/providers/local/camel-mbox-store.c:304
+#: ../camel/providers/local/camel-local-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:701
#, c-format
msgid "Could not delete folder index file '%s': %s"
msgstr "æ? æ³?å? é?¤æ??件夹索å¼?æ??件â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-local-store.c:489
-#: ../camel/providers/local/camel-mbox-store.c:333
+#: ../camel/providers/local/camel-local-store.c:526
+#: ../camel/providers/local/camel-mbox-store.c:730
#, c-format
msgid "Could not delete folder meta file '%s': %s"
msgstr "æ? æ³?å? é?¤æ??件夹å??æ??件â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-local-summary.c:537
+#: ../camel/providers/local/camel-local-summary.c:549
#, c-format
msgid "Unable to add message to summary: unknown reason"
-msgstr "æ? æ³?å°?信件添å? å?°æ¦?è¦?ä¸ï¼?æ?ªç?¥ç??å??å? "
+msgstr "æ? æ³?å°?æ¶?æ?¯æ·»å? å?°æ¦?è¦?ä¸ï¼?æ?ªç?¥ç??å??å? "
-#: ../camel/providers/local/camel-maildir-folder.c:195
+#: ../camel/providers/local/camel-maildir-folder.c:189
#, c-format
msgid "Cannot append message to maildir folder: %s: "
-msgstr "æ? æ³?å°?信件é??å? å?°é?®ä»¶ç?®å½?æ??件夹ï¼?%sï¼?"
+msgstr "æ? æ³?å°?æ¶?æ?¯é??å? å?°é?®ä»¶ç?®å½?æ??件夹ï¼?%sï¼?"
-#: ../camel/providers/local/camel-maildir-folder.c:283
-#: ../camel/providers/local/camel-maildir-folder.c:291
-#: ../camel/providers/local/camel-mbox-folder.c:440
-#: ../camel/providers/local/camel-mh-folder.c:227
-#: ../camel/providers/local/camel-mh-folder.c:235
+#: ../camel/providers/local/camel-maildir-folder.c:250
+#: ../camel/providers/local/camel-maildir-folder.c:260
+#: ../camel/providers/local/camel-mbox-folder.c:386
+#: ../camel/providers/local/camel-mh-folder.c:168
+#: ../camel/providers/local/camel-mh-folder.c:178
#, c-format
msgid "Cannot get message %s from folder %s: "
-msgstr "æ? æ³?ä»?æ??件夹 %2$s è?·å??信件 %1$sï¼?"
+msgstr "æ? æ³?ä»?æ??件夹 %2$s è?·å??æ¶?æ?¯ %1$sï¼?"
-#: ../camel/providers/local/camel-maildir-folder.c:399
+#: ../camel/providers/local/camel-maildir-folder.c:330
#, c-format
msgid "Cannot transfer message to destination folder: %s"
-msgstr "æ? æ³?å°?信件转移å?°ç?®æ ?æ??件夹ï¼?%s"
+msgstr "æ? æ³?å°?æ¶?æ?¯è½¬ç§»å?°ç?®æ ?æ??件夹ï¼?%s"
-#: ../camel/providers/local/camel-maildir-store.c:136
-#: ../camel/providers/local/camel-maildir-store.c:167
-#: ../camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:175
+#: ../camel/providers/local/camel-maildir-store.c:225
+#: ../camel/providers/local/camel-spool-store.c:143
+#: ../camel/providers/local/camel-spool-store.c:159
+#, c-format
+msgid "Could not scan folder '%s': %s"
+msgstr "æ? æ³?æ?«æ??æ??件夹â??%sâ??ï¼?%s"
+
+#: ../camel/providers/local/camel-maildir-store.c:337
+#: ../camel/providers/local/camel-maildir-store.c:368
+#: ../camel/providers/local/camel-mbox-store.c:381
+#: ../camel/providers/local/camel-mbox-store.c:395
#, c-format
msgid "Cannot create folder '%s': %s"
msgstr "æ? æ³?å??建æ??件夹â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-maildir-store.c:151
-#: ../camel/providers/local/camel-mbox-store.c:127
-#: ../camel/providers/local/camel-mh-store.c:215
+#: ../camel/providers/local/camel-maildir-store.c:352
+#: ../camel/providers/local/camel-mbox-store.c:347
+#: ../camel/providers/local/camel-mh-store.c:464
#, c-format
msgid "Cannot get folder '%s': %s"
msgstr "æ? æ³?è?·å??æ??件夹â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-maildir-store.c:157
-#: ../camel/providers/local/camel-mbox-store.c:137
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:358
+#: ../camel/providers/local/camel-mbox-store.c:357
+#: ../camel/providers/local/camel-mh-store.c:473
#, c-format
msgid "Cannot get folder '%s': folder does not exist."
msgstr "æ? æ³?è?·å¾?æ??件夹â??%sâ??ï¼?æ??件夹ä¸?å?å?¨ã??"
-#: ../camel/providers/local/camel-maildir-store.c:184
+#: ../camel/providers/local/camel-maildir-store.c:385
#, c-format
msgid "Cannot get folder '%s': not a maildir directory."
msgstr "æ? æ³?è?·å??æ??件夹â??%sâ??ï¼?ä¸?æ?¯ maildir ç?®å½?ã??"
-#: ../camel/providers/local/camel-maildir-store.c:242
-#: ../camel/providers/local/camel-maildir-store.c:282
-#: ../camel/providers/local/camel-mh-store.c:287
+#: ../camel/providers/local/camel-maildir-store.c:499
+#: ../camel/providers/local/camel-maildir-store.c:539
+#: ../camel/providers/local/camel-mh-store.c:584
#, c-format
msgid "Could not delete folder '%s': %s"
msgstr "æ? æ³?å? é?¤æ??件夹â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-maildir-store.c:501
msgid "not a maildir directory"
msgstr "�� maildir ��"
-#: ../camel/providers/local/camel-maildir-store.c:482
-#: ../camel/providers/local/camel-spool-store.c:364
-#: ../camel/providers/local/camel-spool-store.c:380
-#, c-format
-msgid "Could not scan folder '%s': %s"
-msgstr "æ? æ³?æ?«æ??æ??件夹â??%sâ??ï¼?%s"
-
#: ../camel/providers/local/camel-maildir-summary.c:435
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:565
#, 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:556
msgid "Checking folder consistency"
msgstr "æ£?æ?¥æ??件夹ä¸?è?´æ?§"
-#: ../camel/providers/local/camel-maildir-summary.c:641
+#: ../camel/providers/local/camel-maildir-summary.c:649
msgid "Checking for new messages"
-msgstr "���信件"
+msgstr "�����"
-#: ../camel/providers/local/camel-maildir-summary.c:732
-#: ../camel/providers/local/camel-mbox-summary.c:465
-#: ../camel/providers/local/camel-mbox-summary.c:679
-#: ../camel/providers/local/camel-mbox-summary.c:809
-#: ../camel/providers/local/camel-spool-summary.c:130
+#: ../camel/providers/local/camel-maildir-summary.c:742
+#: ../camel/providers/local/camel-mbox-summary.c:472
+#: ../camel/providers/local/camel-mbox-summary.c:694
+#: ../camel/providers/local/camel-mbox-summary.c:830
+#: ../camel/providers/local/camel-spool-summary.c:131
msgid "Storing folder"
msgstr "å?å?¨æ??件夹"
-#: ../camel/providers/local/camel-mbox-folder.c:124
-#: ../camel/providers/local/camel-spool-folder.c:125
-#, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "æ? æ³?å?¨ %s å??建æ??件夹é??ï¼?%s"
-
-#: ../camel/providers/local/camel-mbox-folder.c:194
+#: ../camel/providers/local/camel-mbox-folder.c:183
#, c-format
msgid "Cannot open mailbox: %s: "
msgstr "æ? æ³?æ??å¼?é?®ä»¶ç®±ï¼?%sï¼?"
-#: ../camel/providers/local/camel-mbox-folder.c:260
+#: ../camel/providers/local/camel-mbox-folder.c:249
#, c-format
msgid "Cannot append message to mbox file: %s: "
-msgstr "æ? æ³?å°?信件é??å? å?°é?®ä»¶ç®±æ??件ï¼?%sï¼?"
+msgstr "æ? æ³?å°?æ¶?æ?¯é??å? å?°é?®ä»¶ç®±æ??件ï¼?%sï¼?"
-#: ../camel/providers/local/camel-mbox-folder.c:433
+#: ../camel/providers/local/camel-mbox-folder.c:378
msgid "The folder appears to be irrecoverably corrupted."
msgstr "æ??件夹好å??å·²ç»?被ä¸?å?¯æ?¢å¤?å?°ç ´å??äº?ã??"
-#: ../camel/providers/local/camel-mbox-store.c:149
-#: ../camel/providers/local/camel-mbox-store.c:379
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../camel/providers/local/camel-spool-folder.c:70
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "æ? æ³?å?¨ %s å??建æ??件夹é??ï¼?%s"
+
+#: ../camel/providers/local/camel-mbox-store.c:369
+#: ../camel/providers/local/camel-mbox-store.c:540
#, c-format
msgid "Cannot create a folder by this name."
msgstr "æ? æ³?以æ¤å??称å??建æ??件夹ã??"
-#: ../camel/providers/local/camel-mbox-store.c:186
+#: ../camel/providers/local/camel-mbox-store.c:406
#, c-format
msgid "Cannot get folder '%s': not a regular file."
msgstr "æ? æ³?è?·å??æ??件夹â??%sâ??ï¼?ä¸?æ?¯æ?®é??æ??件"
-#: ../camel/providers/local/camel-mbox-store.c:218
-#: ../camel/providers/local/camel-mbox-store.c:231
-#: ../camel/providers/local/camel-mbox-store.c:260
+#: ../camel/providers/local/camel-mbox-store.c:556
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "æ? æ³?å??建ç?®å½?â??%sâ??ï¼?%s"
+
+#: ../camel/providers/local/camel-mbox-store.c:572
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "æ? æ³?å??建æ??件夹ï¼?%sï¼?%s"
+
+#: ../camel/providers/local/camel-mbox-store.c:574
+msgid "Folder already exists"
+msgstr "æ??件夹已ç»?å?å?¨"
+
+#: ../camel/providers/local/camel-mbox-store.c:615
+#: ../camel/providers/local/camel-mbox-store.c:628
+#: ../camel/providers/local/camel-mbox-store.c:657
#, c-format
msgid ""
"Could not delete folder '%s':\n"
@@ -3666,168 +3691,164 @@ msgstr ""
"æ? æ³?å? é?¤æ??件夹â??%sâ??ï¼?\n"
"%s"
-#: ../camel/providers/local/camel-mbox-store.c:241
+#: ../camel/providers/local/camel-mbox-store.c:638
#, c-format
msgid "'%s' is not a regular file."
msgstr "â??%sâ??并ä¸?æ?¯æ?®é??æ??件ã??"
-#: ../camel/providers/local/camel-mbox-store.c:250
+#: ../camel/providers/local/camel-mbox-store.c:647
#, 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:290
+#: ../camel/providers/local/camel-mbox-store.c:673
+#: ../camel/providers/local/camel-mbox-store.c:687
#, c-format
msgid "Could not delete folder summary file '%s': %s"
msgstr "æ? æ³?å? é?¤æ??件夹æ¦?è¦?æ??件â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-mbox-store.c:395
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "æ? æ³?å??建ç?®å½?â??%sâ??ï¼?%s"
-
-#: ../camel/providers/local/camel-mbox-store.c:411
-#, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "æ? æ³?å??建æ??件夹ï¼?%sï¼?%s"
-
-#: ../camel/providers/local/camel-mbox-store.c:413
-msgid "Folder already exists"
-msgstr "æ??件夹已ç»?å?å?¨"
-
-#: ../camel/providers/local/camel-mbox-store.c:507
+#: ../camel/providers/local/camel-mbox-store.c:767
#, c-format
msgid "The new folder name is illegal."
msgstr "æ??å®?ç??æ??件夹å??称ä¸?å??æ³?ã??"
-#: ../camel/providers/local/camel-mbox-store.c:522
+#: ../camel/providers/local/camel-mbox-store.c:782
#, c-format
msgid "Could not rename '%s': '%s': %s"
msgstr "æ? æ³?é??å?½å??â??%sâ??ï¼?â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-mbox-store.c:605
+#: ../camel/providers/local/camel-mbox-store.c:865
#, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "æ? æ³?å°?â??%sâ??é??å?½å??为 %sï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:473
+#: ../camel/providers/local/camel-mbox-summary.c:480
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "æ? æ³?æ??å¼?æ??件夹ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:533
+#: ../camel/providers/local/camel-mbox-summary.c:541
#, c-format
msgid "Fatal mail parser error near position %s in folder %s"
msgstr "é?®ä»¶è§£æ??å??ç??è?´å?½é??误ï¼?ä½?äº? %s (æ??件夹 %s)"
-#: ../camel/providers/local/camel-mbox-summary.c:615
+#: ../camel/providers/local/camel-mbox-summary.c:626
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "æ? æ³?æ£?æ?¥æ??件夹ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:686
-#: ../camel/providers/local/camel-mbox-summary.c:816
-#: ../camel/providers/local/camel-spool-summary.c:137
+#: ../camel/providers/local/camel-mbox-summary.c:701
+#: ../camel/providers/local/camel-mbox-summary.c:837
+#: ../camel/providers/local/camel-spool-summary.c:138
#, c-format
msgid "Could not open file: %s: %s"
msgstr "æ? æ³?æ??å¼?æ??件ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:700
-#: ../camel/providers/local/camel-spool-summary.c:152
+#: ../camel/providers/local/camel-mbox-summary.c:715
+#: ../camel/providers/local/camel-spool-summary.c:153
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "æ? æ³?æ??å¼?临æ?¶é?®ä»¶ç®±ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:715
-#: ../camel/providers/local/camel-mbox-summary.c:932
+#: ../camel/providers/local/camel-mbox-summary.c:732
+#: ../camel/providers/local/camel-mbox-summary.c:953
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "æ? æ³?å?³é?æ?¥æº?æ??件夹 %sï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:726
+#: ../camel/providers/local/camel-mbox-summary.c:743
#, c-format
msgid "Could not close temporary folder: %s"
msgstr "æ? æ³?å?³é?临æ?¶æ??件夹ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:760
#, c-format
msgid "Could not rename folder: %s"
msgstr "æ? æ³?é??å?½å??æ??件夹ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:829
-#: ../camel/providers/local/camel-mbox-summary.c:1070
+#: ../camel/providers/local/camel-mbox-summary.c:850
+#: ../camel/providers/local/camel-mbox-summary.c:1103
#, c-format
msgid "Could not store folder: %s"
msgstr "æ? æ³?å?å?¨æ??件夹ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:869
-#: ../camel/providers/local/camel-mbox-summary.c:1102
+#: ../camel/providers/local/camel-mbox-summary.c:890
+#: ../camel/providers/local/camel-mbox-summary.c:1135
#, 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
+#: ../camel/providers/local/camel-mbox-summary.c:899
+#: ../camel/providers/local/camel-mbox-summary.c:1144
#, c-format
msgid "Summary and folder mismatch, even after a sync"
msgstr "å?³ä½¿å??æ¥å??ï¼?æ¦?è¦?å??æ??件夹ä»?ç?¶ä¸?å?¹é??"
-#: ../camel/providers/local/camel-mbox-summary.c:1029
-#: ../camel/providers/local/camel-spool-summary.c:337
+#: ../camel/providers/local/camel-mbox-summary.c:1056
+#: ../camel/providers/local/camel-spool-summary.c:343
#, c-format
msgid "Unknown error: %s"
msgstr "æ?ªç?¥ç??é??误ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1211
+#: ../camel/providers/local/camel-mbox-summary.c:1214
+#: ../camel/providers/local/camel-mbox-summary.c:1244
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "å??å?¥ä¸´æ?¶ mailbox 失败ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:1200
+#: ../camel/providers/local/camel-mbox-summary.c:1233
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "å??å?¥ä¸´æ?¶ mailbox 失败ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-mh-folder.c:165
+#: ../camel/providers/local/camel-mh-folder.c:115
#, c-format
msgid "Cannot append message to mh folder: %s: "
-msgstr "æ? æ³?å°?信件é??å? å?° mh æ??件夹ï¼?%sï¼?"
+msgstr "æ? æ³?å°?æ¶?æ?¯é??å? å?° mh æ??件夹ï¼?%sï¼?"
-#: ../camel/providers/local/camel-mh-store.c:234
+#: ../camel/providers/local/camel-mh-store.c:483
#, c-format
msgid "Could not create folder '%s': %s"
msgstr "æ? æ³?å??建æ??件夹â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-mh-store.c:248
+#: ../camel/providers/local/camel-mh-store.c:497
#, c-format
msgid "Cannot get folder '%s': not a directory."
msgstr "æ? æ³?è?·å??æ??件夹â??%sâ??ï¼?ä¸?æ?¯ç?®å½?ã??"
-#: ../camel/providers/local/camel-mh-summary.c:228
+#: ../camel/providers/local/camel-mh-summary.c:230
#, c-format
msgid "Cannot open MH directory path: %s: %s"
msgstr "æ? æ³?æ??å¼? MH ç?®å½?ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-spool-store.c:118
+#: ../camel/providers/local/camel-spool-store.c:327
#, c-format
msgid "Spool '%s' cannot be opened: %s"
msgstr "æ? æ³?æ??å¼?è?±æ?ºæ??件â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../camel/providers/local/camel-spool-store.c:341
#, c-format
msgid "Spool '%s' is not a regular file or directory"
msgstr "è?±æ?ºæ??件â??%sâ??ä¸?æ?¯æ?®é??æ??件æ??ç?®å½?"
-#: ../camel/providers/local/camel-spool-store.c:158
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool mail file %s"
+msgstr "è?±æ?ºé?®ä»¶æ??件 %s"
+
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "è?±æ?ºæ??件夹æ ? %s"
+
+#: ../camel/providers/local/camel-spool-store.c:391
#, c-format
msgid "Folder '%s/%s' does not exist."
msgstr "æ??件夹â??%s/%sâ??ä¸?å?å?¨ã??"
-#: ../camel/providers/local/camel-spool-store.c:170
+#: ../camel/providers/local/camel-spool-store.c:403
#, c-format
msgid ""
"Could not open folder '%s':\n"
@@ -3836,12 +3857,12 @@ msgstr ""
"æ? æ³?æ??å¼?æ??件夹â??%sâ??ï¼?\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:409
#, c-format
msgid "Folder '%s' does not exist."
msgstr "æ??件夹â??%sâ??ä¸?å?å?¨ã??"
-#: ../camel/providers/local/camel-spool-store.c:183
+#: ../camel/providers/local/camel-spool-store.c:416
#, c-format
msgid ""
"Could not create folder '%s':\n"
@@ -3850,51 +3871,41 @@ msgstr ""
"æ? æ³?å??建æ??件夹â??%sâ??ï¼?\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:426
#, c-format
msgid "'%s' is not a mailbox file."
msgstr "â??%sâ??ä¸?æ?¯é?®ä»¶ç®±æ??件ã??"
-#: ../camel/providers/local/camel-spool-store.c:213
+#: ../camel/providers/local/camel-spool-store.c:462
#, c-format
msgid "Store does not support an INBOX"
msgstr "å?å?¨å¹¶ä¸?æ?¯æ??æ?¶ä»¶ç®±"
-#: ../camel/providers/local/camel-spool-store.c:226
+#: ../camel/providers/local/camel-spool-store.c:476
#, c-format
-msgid "Spool mail file %s"
-msgstr "è?±æ?ºé?®ä»¶æ??件 %s"
-
-#: ../camel/providers/local/camel-spool-store.c:226
-#, c-format
-msgid "Spool folder tree %s"
-msgstr "è?±æ?ºæ??件夹æ ? %s"
+msgid "Spool folders cannot be deleted"
+msgstr "è?±æ?ºæ??件夹æ? æ³?å? é?¤"
-#: ../camel/providers/local/camel-spool-store.c:238
+#: ../camel/providers/local/camel-spool-store.c:491
#, c-format
msgid "Spool folders cannot be renamed"
msgstr "è?±æ?ºæ??件夹æ? æ³?æ?¹å??"
-#: ../camel/providers/local/camel-spool-store.c:251
-#, c-format
-msgid "Spool folders cannot be deleted"
-msgstr "è?±æ?ºæ??件夹æ? æ³?å? é?¤"
-
-#: ../camel/providers/local/camel-spool-summary.c:166
-#: ../camel/providers/local/camel-spool-summary.c:178
-#: ../camel/providers/local/camel-spool-summary.c:190
+#: ../camel/providers/local/camel-spool-summary.c:169
+#: ../camel/providers/local/camel-spool-summary.c:181
+#: ../camel/providers/local/camel-spool-summary.c:193
#, c-format
msgid "Could not synchronize temporary folder %s: %s"
msgstr "æ? æ³?å??æ¥ä¸´æ?¶æ??件夹 %s: %s"
-#: ../camel/providers/local/camel-spool-summary.c:208
+#: ../camel/providers/local/camel-spool-summary.c:211
#, c-format
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
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
#, c-format
msgid ""
"Could not synchronize spool folder %s: %s\n"
@@ -3903,43 +3914,43 @@ msgstr ""
"æ? æ³?å??æ¥è?±æ?ºæ??件夹 %s: %s\n"
"æ??件夹å?¯è?½å·²æ??å??ï¼?å?¯æ?¬å·²å?æ?¾å?¨ '%s'"
-#: ../camel/providers/nntp/camel-nntp-folder.c:197
-#: ../camel/providers/nntp/camel-nntp-folder.c:271
-#: ../camel/providers/nntp/camel-nntp-folder.c:312
+#: ../camel/providers/nntp/camel-nntp-folder.c:200
+#: ../camel/providers/nntp/camel-nntp-folder.c:279
+#: ../camel/providers/nntp/camel-nntp-folder.c:393
#, c-format
msgid "Internal error: UID in invalid format: %s"
msgstr "å??é?¨é??误ï¼?UID ç??æ ¼å¼?æ? æ??ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:234
-#: ../camel/providers/nntp/camel-nntp-folder.c:238
-#: ../camel/providers/pop3/camel-pop3-folder.c:402
-#: ../camel/providers/pop3/camel-pop3-folder.c:630
-#: ../camel/providers/pop3/camel-pop3-folder.c:695
-#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#: ../camel/providers/nntp/camel-nntp-folder.c:241
+#: ../camel/providers/nntp/camel-nntp-folder.c:245
+#: ../camel/providers/pop3/camel-pop3-folder.c:369
+#: ../camel/providers/pop3/camel-pop3-folder.c:434
+#: ../camel/providers/pop3/camel-pop3-folder.c:446
+#: ../camel/providers/pop3/camel-pop3-folder.c:692
#, c-format
msgid "Cannot get message %s: %s"
-msgstr "æ? æ³?è?·å??信件 %sï¼?%s"
+msgstr "æ? æ³?è?·å??æ¶?æ?¯ %sï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:465
-#: ../camel/providers/nntp/camel-nntp-folder.c:471
-#: ../camel/providers/nntp/camel-nntp-folder.c:518
+#: ../camel/providers/nntp/camel-nntp-folder.c:477
+#: ../camel/providers/nntp/camel-nntp-folder.c:483
+#: ../camel/providers/nntp/camel-nntp-folder.c:530
#, c-format
msgid "Posting failed: %s"
msgstr "å??表失败ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:513
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
msgid "Posting failed: "
msgstr "å??表失败ï¼?"
-#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#: ../camel/providers/nntp/camel-nntp-folder.c:554
#, c-format
msgid "You cannot post NNTP messages while working offline!"
-msgstr "æ?¨ç¦»çº¿æ?¶æ? æ³?æ??é?? NNTP 信件ï¼?"
+msgstr "æ?¨ç¦»çº¿æ?¶æ? æ³?æ??é?? NNTP æ¶?æ?¯ï¼?"
-#: ../camel/providers/nntp/camel-nntp-folder.c:560
+#: ../camel/providers/nntp/camel-nntp-folder.c:574
#, c-format
msgid "You cannot copy messages from a NNTP folder!"
-msgstr "æ?¨æ? æ³?ä»? NNTP æ??件夹å¤?å?¶ä¿¡ä»¶ï¼?"
+msgstr "æ?¨æ? æ³?ä»? NNTP æ??件夹å¤?å?¶æ¶?æ?¯ï¼?"
#: ../camel/providers/nntp/camel-nntp-provider.c:44
msgid ""
@@ -3964,22 +3975,32 @@ msgid ""
"password."
msgstr "该é??项å°?以æ??æ??å¯?ç ?å??è¿?è¡? NNTP æ??å?¡å?¨è¿?è¡?认è¯?ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:265
+#: ../camel/providers/nntp/camel-nntp-store.c:77
+#, c-format
+msgid "Authentication requested but no username provided"
+msgstr "请æ±?äº?身份éª?è¯?ï¼?ä½?æ?ªæ??ä¾?ç?¨æ?·å??"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:89
+#, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "æ? æ³?认è¯?å?°æ??å?¡å?¨ï¼?%s"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:346
#, c-format
msgid "Could not read greeting from %s: "
msgstr "æ? æ³?é??读æ?¥è?ª %s ç??欢è¿?ä¿¡æ?¯ï¼?"
-#: ../camel/providers/nntp/camel-nntp-store.c:278
+#: ../camel/providers/nntp/camel-nntp-store.c:359
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "NNTP æ??å?¡å?¨ %s è¿?å??é??误ç ? %dï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:434
+#: ../camel/providers/nntp/camel-nntp-store.c:527
#, c-format
msgid "USENET News via %s"
msgstr "USENET æ?°é?» %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:927
+#: ../camel/providers/nntp/camel-nntp-store.c:1045
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -3990,7 +4011,7 @@ msgstr ""
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1024
+#: ../camel/providers/nntp/camel-nntp-store.c:1160
#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
@@ -4001,7 +4022,7 @@ msgstr ""
"\n"
"没æ??è¿?æ ·ç??æ?°é?»ç»?ã??é??ä¸é¡¹ç?®å?¯è?½æ?¯ç?¶æ??件夹ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1064
+#: ../camel/providers/nntp/camel-nntp-store.c:1202
#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
@@ -4012,102 +4033,90 @@ msgstr ""
"\n"
"æ?°é?»ç»?ä¸?å?å?¨ï¼?"
-#: ../camel/providers/nntp/camel-nntp-store.c:1094
+#: ../camel/providers/nntp/camel-nntp-store.c:1235
#, c-format
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸å??建æ??件夹ï¼?åº?该订é??ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1106
+#: ../camel/providers/nntp/camel-nntp-store.c:1251
#, c-format
msgid "You cannot rename a folder in a News store."
msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸é??å?½å??æ??件夹ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1119
+#: ../camel/providers/nntp/camel-nntp-store.c:1268
#, c-format
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸å? é?¤æ??件夹ï¼?åº?该é??订ã??"
-#: ../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:1269
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "æ? æ³?认è¯?å?°æ??å?¡å?¨ï¼?%s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1395
+#: ../camel/providers/nntp/camel-nntp-store.c:1479
msgid "NNTP Command failed: "
msgstr "NNTP �令失败�"
-#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#: ../camel/providers/nntp/camel-nntp-store.c:1553
#, c-format
msgid "Not connected."
msgstr "æ?ªè¿?æ?¥ã??"
-#: ../camel/providers/nntp/camel-nntp-summary.c:238
-#: ../camel/providers/nntp/camel-nntp-summary.c:340
+#: ../camel/providers/nntp/camel-nntp-summary.c:245
+#: ../camel/providers/nntp/camel-nntp-summary.c:356
#, c-format
msgid "%s: Scanning new messages"
-msgstr "%sï¼?æ£å?¨æ?«æ??æ?°ä¿¡ä»¶"
+msgstr "%sï¼?æ£å?¨æ?«æ??æ?°æ¶?æ?¯"
-#: ../camel/providers/nntp/camel-nntp-summary.c:249
+#: ../camel/providers/nntp/camel-nntp-summary.c:257
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "æ?¥è?ª xover ç??æ??å¤?æ??å?¡å?¨åº?ç?ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:356
+#: ../camel/providers/nntp/camel-nntp-summary.c:373
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "æ?¥è?ª head ç??æ??å¤?æ??å?¡å?¨åº?ç?ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:401
+#: ../camel/providers/nntp/camel-nntp-summary.c:418
#, c-format
msgid "Operation failed: %s"
msgstr "æ??ä½?失败ï¼?%s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:251
+#: ../camel/providers/pop3/camel-pop3-folder.c:277
+#: ../camel/providers/pop3/camel-pop3-folder.c:334
+#, c-format
+msgid "No message with UID %s"
+msgstr "没æ?? UID 为 %s ç??æ¶?æ?¯"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:342
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "æ£å?¨è?·å?? POP æ¶?æ?¯ %d"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:447
+msgid "Unknown reason"
+msgstr "æ?ªç?¥å??å? "
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:483
msgid "Retrieving POP summary"
msgstr "æ£å?¨è?·å?? POP æ¦?è¦?"
-#: ../camel/providers/pop3/camel-pop3-folder.c:274
+#: ../camel/providers/pop3/camel-pop3-folder.c:506
#, c-format
msgid "Cannot get POP summary: %s"
msgstr "æ? æ³?è?·å?? POP æ¦?è¦?ï¼?%s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:324
+#: ../camel/providers/pop3/camel-pop3-folder.c:558
msgid "Expunging old messages"
-msgstr "é??æ¯?æ?§ä¿¡ä»¶"
+msgstr "é??æ¯?æ?§æ¶?æ?¯"
-#: ../camel/providers/pop3/camel-pop3-folder.c:332
+#: ../camel/providers/pop3/camel-pop3-folder.c:572
msgid "Expunging deleted messages"
-msgstr "å½»åº?é??æ¯?å·²å? é?¤ç??信件"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:566
-#: ../camel/providers/pop3/camel-pop3-folder.c:596
-#, c-format
-msgid "No message with UID %s"
-msgstr "没æ?? UID 为 %s ç??信件"
-
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code. Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:603
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "æ£å?¨è?·å?? POP 信件 %d"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:707
-msgid "Unknown reason"
-msgstr "æ?ªç?¥å??å? "
+msgstr "å½»åº?é??æ¯?å·²å? é?¤ç??æ¶?æ?¯"
#: ../camel/providers/pop3/camel-pop3-provider.c:39
msgid "Message storage"
-msgstr "信件å?å?¨"
+msgstr "æ¶?æ?¯å?å?¨"
#: ../camel/providers/pop3/camel-pop3-provider.c:41
msgid "_Leave messages on server"
-msgstr "å?¨æ??å?¡å?¨ä¸?ä¿?ç??信件(_L)"
+msgstr "å?¨æ??å?¡å?¨ä¸?ä¿?ç??æ¶?æ?¯(_L)"
#: ../camel/providers/pop3/camel-pop3-provider.c:43
#, c-format
@@ -4148,38 +4157,38 @@ msgstr ""
msgid ": "
msgstr "ï¼?"
-#: ../camel/providers/pop3/camel-pop3-store.c:168
+#: ../camel/providers/pop3/camel-pop3-store.c:176
#, c-format
msgid "Failed to read a valid greeting from POP server %s"
msgstr "ä»? POP æ??å?¡å?¨ %s 读å??欢è¿?è¯?失败"
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/pop3/camel-pop3-store.c:217
-#: ../camel/providers/pop3/camel-pop3-store.c:224
+#: ../camel/providers/pop3/camel-pop3-store.c:194
+#: ../camel/providers/pop3/camel-pop3-store.c:225
+#: ../camel/providers/pop3/camel-pop3-store.c:232
#, 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:187
+#: ../camel/providers/pop3/camel-pop3-store.c:195
msgid "STLS not supported by server"
msgstr "æ??å?¡å?¨ä¸?æ?¯æ?? STLS"
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:205
+#: ../camel/providers/pop3/camel-pop3-store.c:213
#, c-format
msgid "Failed to connect to POP server %s in secure mode%s"
msgstr "以å®?å?¨æ¨¡å¼?è¿?æ?¥å?° POP æ??å?¡å?¨ %s 失败%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:218
+#: ../camel/providers/pop3/camel-pop3-store.c:226
msgid "TLS negotiations failed"
msgstr "TLS å??å??失败"
-#: ../camel/providers/pop3/camel-pop3-store.c:225
+#: ../camel/providers/pop3/camel-pop3-store.c:233
msgid "TLS is not available in this build"
msgstr "æ?¬æ¬¡ç¼?è¯?ä¸æ?ªå??å?« TLS"
-#: ../camel/providers/pop3/camel-pop3-store.c:300
-#: ../camel/providers/pop3/camel-pop3-store.c:452
+#: ../camel/providers/pop3/camel-pop3-store.c:312
+#: ../camel/providers/pop3/camel-pop3-store.c:467
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -4187,22 +4196,22 @@ msgid ""
msgstr "æ? æ³?è¿?æ?¥å?° POP æ??å?¡å?¨ %sï¼?ä¸?æ?¯æ??请æ±?认è¯?æ?ºå?¶ã??"
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:323
+#: ../camel/providers/pop3/camel-pop3-store.c:335
#, 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:340
+#: ../camel/providers/pop3/camel-pop3-store.c:352
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "æ? æ³?ç?»å½?å?° POP æ??å?¡å?¨ %sï¼?SASL å??è®®é??误"
-#: ../camel/providers/pop3/camel-pop3-store.c:357
+#: ../camel/providers/pop3/camel-pop3-store.c:369
#, c-format
msgid "Failed to authenticate on POP server %s: "
msgstr "认è¯?å?° POP æ??å?¡å?¨ %s 失败ï¼?"
-#: ../camel/providers/pop3/camel-pop3-store.c:421
+#: ../camel/providers/pop3/camel-pop3-store.c:434
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4211,7 +4220,7 @@ msgstr ""
"æ? æ³?è¿?æ?¥å?° POP æ??å?¡å?¨ %sï¼?\tæ?¥æ?¶å?°é??æ³?ç?? APOP IDã??å?¯è?½æ?¯å??å??æ?»å?»ã??请è??ç³»æ?¨ç??"
"管ç??å??ã??"
-#: ../camel/providers/pop3/camel-pop3-store.c:471
+#: ../camel/providers/pop3/camel-pop3-store.c:487
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4221,7 +4230,7 @@ msgstr ""
"å??é??å¯?ç ?é??误ï¼?%s"
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:484
+#: ../camel/providers/pop3/camel-pop3-store.c:500
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4231,7 +4240,7 @@ msgstr ""
"å??é??ç?¨æ?·å??é??误%s"
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:497
+#: ../camel/providers/pop3/camel-pop3-store.c:513
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4240,27 +4249,27 @@ msgstr ""
"æ? æ³?è¿?æ?¥å?° POP æ??å?¡å?¨ %sã??\n"
"å??é??å¯?ç ?é??误%s"
-#: ../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:666
+#: ../camel/providers/pop3/camel-pop3-store.c:553
#, c-format
msgid "POP3 server %s"
msgstr "POP3 æ??å?¡å?¨ %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:670
+#: ../camel/providers/pop3/camel-pop3-store.c:557
#, c-format
msgid "POP3 server for %s on %s"
msgstr "%2$s 为 %1$s æ??ä¾?ç?? POP æ??å?¡"
-#: ../camel/providers/pop3/camel-pop3-store.c:685
+#: ../camel/providers/pop3/camel-pop3-store.c:689
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "æ? æ³?è¿?æ?¥å?° POP æ??å?¡å?¨ %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:716
#, c-format
msgid "No such folder '%s'."
msgstr "没æ??æ??件夹â??%sâ??ã??"
-#: ../camel/providers/pop3/camel-pop3-store.c:709
+#: ../camel/providers/pop3/camel-pop3-store.c:733
#, c-format
msgid "POP3 stores have no folder hierarchy"
msgstr "POP3 ç??å?å?¨æ²¡æ??æ??件夹ç»?æ??"
@@ -4275,48 +4284,48 @@ msgid ""
"system."
msgstr "å°?é?®ä»¶ä¼ é??å?°æ?¬å?°ç³»ç»?ç??â??sendmailâ??æ?¥å??é??é?®ä»¶ã??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "é??è¿? sendmail ç¨?åº?å??é??é?®ä»¶"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
#, c-format
msgid "Could not parse recipient list"
msgstr "æ? æ³?解æ??æ?¶ä»¶äººå??表"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
#, c-format
msgid "Could not create pipe to sendmail: %s: mail not sent"
msgstr "æ? æ³?å??建å?° sendmail ç??管é??ï¼?%sï¼?é?®ä»¶æ?ªå??é??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
#, c-format
msgid "Could not fork sendmail: %s: mail not sent"
msgstr "æ? æ³?å??建 sendmail è¿?ç¨?ï¼?%sï¼?é?®ä»¶æ?ªå??é??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
msgid "Could not send message: "
-msgstr "æ? æ³?å??é??信件ï¼?"
+msgstr "æ? æ³?å??é??æ¶?æ?¯ï¼?"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr "sendmail 以信å?· %s é??å?ºï¼?é?®ä»¶æ?ªå??é??ã??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr "æ? æ³?æ?§è¡? %sï¼?é?®ä»¶æ?ªå??é??ã??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr "sendmail 以ç?¶æ??ç ? %d é??å?ºï¼?é?®ä»¶æ?ªå??é??ã??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
-msgid "sendmail"
-msgstr "sendmail"
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
-msgid "Mail delivery via the sendmail program"
-msgstr "é??è¿? sendmail ç¨?åº?å??é??é?®ä»¶"
-
#: ../camel/providers/smtp/camel-smtp-provider.c:43
msgid "SMTP"
msgstr "SMTP"
@@ -4325,312 +4334,312 @@ msgstr "SMTP"
msgid "For delivering mail by connecting to a remote mailhub using SMTP."
msgstr "è¦?æ??é??é?®ä»¶ï¼?åº?该使ç?¨ SMTP è¿?æ?¥å?°è¿?ç¨?ç??é?®ä»¶äº¤æ?¢æ??å?¡å?¨ã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:116
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+msgid "Welcome response error: "
+msgstr "欢è¿?åº?ç?é??误ï¼?"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:277
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "以å®?å?¨æ¨¡å¼?è¿?æ?¥ SMTP æ??å?¡å?¨ %s 失败ï¼?%s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS �令失败�"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP æ??å?¡å?¨ %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "é??è¿? %s å??é?? SMTP é?®ä»¶"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "SMTP æ??å?¡å?¨ %s ä¸?æ?¯æ??请æ±?ç??认è¯?ç±»å?? %sã??"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:488
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"æ? æ³?认è¯?å?° SMTP æ??å?¡å?¨ã??\n"
+"%s\n"
+"\n"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:606
+#, c-format
+msgid "Cannot send message: service not connected."
+msgstr "æ? æ³?å??é??æ¶?æ?¯ï¼?æ??å?¡æ?ªè¿?æ?¥ã??"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "æ? æ³?å??é??æ¶?æ?¯ï¼?å??件人å?°å??ä¸?å??æ³?ã??"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:617
+msgid "Sending message"
+msgstr "å??é??æ¶?æ?¯"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:642
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "æ? æ³?å??é??æ¶?æ?¯ï¼?没æ??å®?ä¹?æ?¶ä»¶äººã??"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:655
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "æ? æ³?å??é??æ¶?æ?¯ï¼?ä¸?个æ??å¤?个é??æ³?æ?¶ä»¶äºº"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
msgid "Syntax error, command unrecognized"
msgstr "è¯æ³?é??误ï¼?æ? æ³?è¯?å?«ç??å?½ä»¤"
-#: ../camel/providers/smtp/camel-smtp-transport.c:118
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
msgid "Syntax error in parameters or arguments"
msgstr "å??æ?°è¯æ³?é??误"
-#: ../camel/providers/smtp/camel-smtp-transport.c:120
+#: ../camel/providers/smtp/camel-smtp-transport.c:722
msgid "Command not implemented"
msgstr "�令����"
-#: ../camel/providers/smtp/camel-smtp-transport.c:122
+#: ../camel/providers/smtp/camel-smtp-transport.c:724
msgid "Command parameter not implemented"
msgstr "å?½ä»¤å??æ?°å°?æ?ªå®?ç?°"
-#: ../camel/providers/smtp/camel-smtp-transport.c:124
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
msgid "System status, or system help reply"
msgstr "ç³»ç»?ç?¶æ??ï¼?æ??ç³»ç»?æ±?å?©å°±ç»ª"
-#: ../camel/providers/smtp/camel-smtp-transport.c:126
+#: ../camel/providers/smtp/camel-smtp-transport.c:728
msgid "Help message"
-msgstr "帮�信件"
+msgstr "帮���"
-#: ../camel/providers/smtp/camel-smtp-transport.c:128
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
msgid "Service ready"
msgstr "æ??å?¡å°±ç»ª"
-#: ../camel/providers/smtp/camel-smtp-transport.c:130
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
msgid "Service closing transmission channel"
msgstr "æ??å?¡æ£å?¨å?³é?ä¼ è¾?é??é??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:132
+#: ../camel/providers/smtp/camel-smtp-transport.c:734
msgid "Service not available, closing transmission channel"
msgstr "æ??å?¡ä¸?å?¯ç?¨ï¼?æ£å?¨å?³é?ä¼ è¾?é??é??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:134
+#: ../camel/providers/smtp/camel-smtp-transport.c:736
msgid "Requested mail action okay, completed"
msgstr "é?®ä»¶å?¨ä½?请æ±?确认ï¼?å·²å®?æ??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:738
msgid "User not local; will forward to <forward-path>"
msgstr "ç?¨æ?·ä¸?å?¨æ?¬å?°ï¼?å°?转å??å?° <转å??è·¯å¾?>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:138
+#: ../camel/providers/smtp/camel-smtp-transport.c:740
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "é?®ä»¶å?¨ä½?请æ±?æ?ªå??ç??ï¼?é?®ä»¶ç®±æ? æ??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:140
+#: ../camel/providers/smtp/camel-smtp-transport.c:742
msgid "Requested action not taken: mailbox unavailable"
msgstr "å?¨ä½?请æ±?æ?ªå??ç??ï¼?é?®ä»¶ç®±æ? æ??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:142
+#: ../camel/providers/smtp/camel-smtp-transport.c:744
msgid "Requested action aborted: error in processing"
msgstr "å?¨ä½?请æ±?å·²æ?¾å¼?ï¼?å¤?ç??ä¸å?ºé??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:144
+#: ../camel/providers/smtp/camel-smtp-transport.c:746
msgid "User not local; please try <forward-path>"
msgstr "ç?¨æ?·ä¸?å?¨æ?¬å?°ï¼?请å°?è¯? <转å??è·¯å¾?>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:146
+#: ../camel/providers/smtp/camel-smtp-transport.c:748
msgid "Requested action not taken: insufficient system storage"
msgstr "å?¨ä½?请æ±?æ?ªå??ç??ï¼?ç³»ç»?å?å?¨ç©ºé?´ä¸?足"
-#: ../camel/providers/smtp/camel-smtp-transport.c:148
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "é?®ä»¶å?¨ä½?请æ±?å·²æ?¾å¼?ï¼?è¶?å®?é¢?å¾·å?å?¨å??é??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:150
+#: ../camel/providers/smtp/camel-smtp-transport.c:752
msgid "Requested action not taken: mailbox name not allowed"
msgstr "å?¨ä½?请æ±?æ?ªå??ç??ï¼?ä¸?å??许ç??é?®ä»¶ç®±å??称"
-#: ../camel/providers/smtp/camel-smtp-transport.c:152
+#: ../camel/providers/smtp/camel-smtp-transport.c:754
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "å¼?å§?è¾?å?¥é?®ä»¶ï¼?以 <CRLF>.<CRLF> ç»?æ??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:154
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
msgid "Transaction failed"
msgstr "��失败"
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
+#: ../camel/providers/smtp/camel-smtp-transport.c:760
msgid "A password transition is needed"
msgstr "å¿?é¡»ä¼ è¾?å¯?ç ?"
-#: ../camel/providers/smtp/camel-smtp-transport.c:160
+#: ../camel/providers/smtp/camel-smtp-transport.c:762
msgid "Authentication mechanism is too weak"
msgstr "认���太弱"
-#: ../camel/providers/smtp/camel-smtp-transport.c:162
+#: ../camel/providers/smtp/camel-smtp-transport.c:764
msgid "Encryption required for requested authentication mechanism"
msgstr "请æ±?ç??认è¯?æ?ºå?¶å¿?é¡»å? å¯?"
-#: ../camel/providers/smtp/camel-smtp-transport.c:164
+#: ../camel/providers/smtp/camel-smtp-transport.c:766
msgid "Temporary authentication failure"
msgstr "临�认�失败"
-#: ../camel/providers/smtp/camel-smtp-transport.c:252
-#: ../camel/providers/smtp/camel-smtp-transport.c:258
-msgid "Welcome response error: "
-msgstr "欢è¿?åº?ç?é??误ï¼?"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:294
-#: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:338
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "以å®?å?¨æ¨¡å¼?è¿?æ?¥ SMTP æ??å?¡å?¨ %s 失败ï¼?%s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:302
-#: ../camel/providers/smtp/camel-smtp-transport.c:314
-#: ../camel/providers/smtp/camel-smtp-transport.c:320
-msgid "STARTTLS command failed: "
-msgstr "STARTTLS �令失败�"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c: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:526
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"æ? æ³?认è¯?å?° SMTP æ??å?¡å?¨ã??\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:669
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP æ??å?¡å?¨ %s"
-
-#: ../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:691
-#, c-format
-msgid "Cannot send message: service not connected."
-msgstr "æ? æ³?å??é??信件ï¼?æ??å?¡æ?ªè¿?æ?¥ã??"
-
-#: ../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:702
-msgid "Sending message"
-msgstr "å??é??信件"
-
-#: ../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:730
-#, c-format
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "æ? æ³?å??é??信件ï¼?ä¸?个æ??å¤?个é??æ³?æ?¶ä»¶äºº"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:966
+#: ../camel/providers/smtp/camel-smtp-transport.c:1023
msgid "SMTP Greeting"
msgstr "SMTP 欢�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:990
-#: ../camel/providers/smtp/camel-smtp-transport.c:1005
-#: ../camel/providers/smtp/camel-smtp-transport.c:1012
+#: ../camel/providers/smtp/camel-smtp-transport.c:1050
+#: ../camel/providers/smtp/camel-smtp-transport.c:1067
+#: ../camel/providers/smtp/camel-smtp-transport.c:1075
msgid "HELO command failed: "
msgstr "HELO �令失败�%s\\"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1079
+#: ../camel/providers/smtp/camel-smtp-transport.c:1143
msgid "SMTP Authentication"
msgstr "SMTP 认�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1086
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
#, c-format
msgid "Error creating SASL authentication object."
msgstr "å??建 SASL 认è¯?对象é??误ã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1102
-#: ../camel/providers/smtp/camel-smtp-transport.c:1112
-#: ../camel/providers/smtp/camel-smtp-transport.c:1120
+#: ../camel/providers/smtp/camel-smtp-transport.c:1169
+#: ../camel/providers/smtp/camel-smtp-transport.c:1180
+#: ../camel/providers/smtp/camel-smtp-transport.c:1189
msgid "AUTH command failed: "
msgstr "AUTH �令失败�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1219
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#: ../camel/providers/smtp/camel-smtp-transport.c:1238
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#: ../camel/providers/smtp/camel-smtp-transport.c:1311
+#: ../camel/providers/smtp/camel-smtp-transport.c:1320
msgid "MAIL FROM command failed: "
msgstr "MAIL FROM �令失败�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1261
+#: ../camel/providers/smtp/camel-smtp-transport.c:1347
msgid "RCPT TO command failed: "
msgstr "RSET �令失败�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1275
-#: ../camel/providers/smtp/camel-smtp-transport.c:1283
+#: ../camel/providers/smtp/camel-smtp-transport.c:1363
+#: ../camel/providers/smtp/camel-smtp-transport.c:1372
#, c-format
msgid "RCPT TO <%s> failed: "
msgstr "RCPT TO <%s> 失败�"
-#: ../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:1414
#: ../camel/providers/smtp/camel-smtp-transport.c:1424
-#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1434
+#: ../camel/providers/smtp/camel-smtp-transport.c:1493
+#: ../camel/providers/smtp/camel-smtp-transport.c:1512
+#: ../camel/providers/smtp/camel-smtp-transport.c:1525
+#: ../camel/providers/smtp/camel-smtp-transport.c:1533
msgid "DATA command failed: "
msgstr "DATP �令失败�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1453
-#: ../camel/providers/smtp/camel-smtp-transport.c:1465
-#: ../camel/providers/smtp/camel-smtp-transport.c:1472
+#: ../camel/providers/smtp/camel-smtp-transport.c:1558
+#: ../camel/providers/smtp/camel-smtp-transport.c:1572
+#: ../camel/providers/smtp/camel-smtp-transport.c:1580
msgid "RSET command failed: "
msgstr "RSET �令失败�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1494
-#: ../camel/providers/smtp/camel-smtp-transport.c:1507
-#: ../camel/providers/smtp/camel-smtp-transport.c:1513
+#: ../camel/providers/smtp/camel-smtp-transport.c:1605
+#: ../camel/providers/smtp/camel-smtp-transport.c:1619
+#: ../camel/providers/smtp/camel-smtp-transport.c:1626
msgid "QUIT command failed: "
msgstr "QUIT �令失败�"
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:49
msgid "Business"
msgstr "å??å?¡"
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:50
msgid "Competition"
msgstr "å®?æ??"
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:51
msgid "Favorites"
msgstr "æ??ç?±"
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:52
msgid "Gifts"
msgstr "礼�"
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:53
msgid "Goals/Objectives"
msgstr "ç?®æ ?"
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:54
msgid "Holiday"
msgstr "å??æ?¥"
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:55
msgid "Holiday Cards"
msgstr "å??æ?¥å?¡"
#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:57
msgid "Hot Contacts"
msgstr "亲å¯?è??系人"
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:58
msgid "Ideas"
msgstr "��"
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:59
msgid "International"
msgstr "å?½é??"
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:60
msgid "Key Customer"
msgstr "��客�"
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:61
msgid "Miscellaneous"
msgstr "æ??ç±»"
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:62
msgid "Personal"
msgstr "个人"
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:63
msgid "Phone Calls"
msgstr "é??ç?µè¯?"
#. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:65
msgid "Status"
msgstr "ç?¶æ??"
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:66
msgid "Strategies"
msgstr "ç?ç?¥"
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:67
msgid "Suppliers"
msgstr "ä¾?åº?å??"
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:68
msgid "Time & Expenses"
msgstr "æ?¶é?´å??è?±è´¹"
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:69
msgid "VIP"
msgstr "VIP"
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:70
msgid "Waiting"
msgstr "ç?å??"
@@ -4772,26 +4781,26 @@ msgstr "å?¿å??访é?® LDAP æ??å?¡å?¨"
msgid "Failed to authenticate.\n"
msgstr "身份éª?è¯?失败ã??\n"
-#: ../libedataserverui/e-categories-dialog.c:145
+#: ../libedataserverui/e-categories-dialog.c:169
msgid "Category Icon"
msgstr "ç±»å?«å?¾æ ?"
-#: ../libedataserverui/e-categories-dialog.c:151
+#: ../libedataserverui/e-categories-dialog.c:175
msgid "_No Image"
msgstr "没æ??å?¾å??(_N)"
-#: ../libedataserverui/e-categories-dialog.c:368
+#: ../libedataserverui/e-categories-dialog.c:391
#, c-format
msgid ""
"There is already a category '%s' in the configuration. Please use another "
"name"
msgstr "é??ç½®ä¸å·²ç»?æ??ç±»å?«â??%sâ??äº?ã??请使ç?¨å?¦å¤?ä¸?个å??称"
-#: ../libedataserverui/e-categories-dialog.c:676
+#: ../libedataserverui/e-categories-dialog.c:699
msgid "Icon"
msgstr "å?¾æ ?"
-#: ../libedataserverui/e-categories-dialog.c:681
+#: ../libedataserverui/e-categories-dialog.c:704
msgid "Category"
msgstr "类�"
@@ -4828,19 +4837,19 @@ msgstr "类�"
msgid "Create category \"%s\""
msgstr "å??建å??ç±»â??%sâ??"
-#: ../libedataserverui/e-name-selector-dialog.c:319
+#: ../libedataserverui/e-name-selector-dialog.c:324
msgid "Select Contacts from Address Book"
msgstr "ä»?å?°å??ç°¿ä¸é??æ?©è??系人"
-#: ../libedataserverui/e-name-selector-dialog.c:658
+#: ../libedataserverui/e-name-selector-dialog.c:663
msgid "_Add"
msgstr "æ·»å? (_A)"
-#: ../libedataserverui/e-name-selector-dialog.c:662
+#: ../libedataserverui/e-name-selector-dialog.c:667
msgid "_Remove"
msgstr "å? é?¤(_R)"
-#: ../libedataserverui/e-name-selector-dialog.c:890
+#: ../libedataserverui/e-name-selector-dialog.c:895
#: ../libedataserverui/e-name-selector-dialog.ui.h:6
msgid "Any Category"
msgstr "任�类�"
@@ -4882,25 +4891,25 @@ 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:2636
+#: ../libedataserverui/e-name-selector-entry.c:2641
#, c-format
msgid "E_xpand %s Inline"
msgstr "����� %s(_X)"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2651
+#: ../libedataserverui/e-name-selector-entry.c:2656
#, c-format
msgid "Cop_y %s"
msgstr "�� %s(_Y)"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2661
+#: ../libedataserverui/e-name-selector-entry.c:2666
#, c-format
msgid "C_ut %s"
msgstr "å?ªå?? %s(_U)"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2678
+#: ../libedataserverui/e-name-selector-entry.c:2683
#, c-format
msgid "_Edit %s"
msgstr "ç¼?è¾? %s(_E)"
@@ -4919,19 +4928,19 @@ msgstr "å¯?é?¥ç?¯ä¸?å?¯ç?¨ï¼?没æ??ç?¨æ?·æ??主æ?ºå??"
msgid "You have the Caps Lock key on."
msgstr "æ?¨æ??å¼?äº? Caps Lockã??"
-#: ../libedataserverui/e-passwords.c:1241
+#: ../libedataserverui/e-passwords.c:1243
msgid "_Remember this passphrase"
msgstr "è®°ä½?æ¤å¯?ç ?å?¥(_R)"
-#: ../libedataserverui/e-passwords.c:1242
+#: ../libedataserverui/e-passwords.c:1244
msgid "_Remember this passphrase for the remainder of this session"
msgstr "æ?¬æ¬¡ä¼?è¯?è®°ä½?æ¤å¯?ç ?å?¥(_R)"
-#: ../libedataserverui/e-passwords.c:1247
+#: ../libedataserverui/e-passwords.c:1249
msgid "_Remember this password"
msgstr "è®°ä½?æ¤å¯?ç ?(_R)"
-#: ../libedataserverui/e-passwords.c:1248
+#: ../libedataserverui/e-passwords.c:1250
msgid "_Remember this password for the remainder of this session"
msgstr "æ?¬æ¬¡ä¼?è¯?è®°ä½?æ¤å¯?ç ?(_R)"
@@ -4940,7 +4949,7 @@ msgstr "æ?¬æ¬¡ä¼?è¯?è®°ä½?æ¤å¯?ç ?(_R)"
msgid "Select destination"
msgstr "é??æ?©ç?®ç??å?°"
-#: ../libedataserverui/e-source-selector-dialog.c:172
+#: ../libedataserverui/e-source-selector-dialog.c:174
msgid "_Destination"
msgstr "ç?®ç??(_D)"
@@ -4960,6 +4969,9 @@ msgstr "æ??å?¡å?¨ç??å??åº?æ? æ??"
msgid "Bad parameter"
msgstr "æ? æ??å??æ?°"
+#~ msgid "Verifying message"
+#~ msgstr "æ ¡éª?æ¶?æ?¯"
+
#~ msgid "UnknownUser"
#~ msgstr "����"
@@ -4973,10 +4985,10 @@ msgstr "æ? æ??å??æ?°"
#~ msgstr "离线模����"
#~ msgid "Cannot open message"
-#~ msgstr "æ? æ³?æ??å¼?信件"
+#~ msgstr "æ? æ³?æ??å¼?æ¶?æ?¯"
#~ msgid "Unsupported operation: append message: for %s"
-#~ msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?é??å? 信件ï¼?为 %s"
+#~ msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?é??å? æ¶?æ?¯ï¼?为 %s"
#~ msgid "Unsupported operation: search by expression: for %s"
#~ msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?æ??表达å¼?æ??ç´¢ï¼?æ??ç´¢ %s"
@@ -4998,13 +5010,13 @@ msgstr "æ? æ??å??æ?°"
#~ msgstr "å·²å??æ¶?ã??"
#~ msgid "This is a digitally signed message part"
-#~ msgstr "è¿?æ?¯ä¿¡ä»¶ç??æ?°å?ç¾å??é?¨å??"
+#~ msgstr "è¿?æ?¯æ¶?æ?¯ç??æ?°å?ç¾å??é?¨å??"
#~ msgid "Cannot verify message signature: could not create temp file: %s"
-#~ msgstr "æ? æ³?æ ¡éª?信件ç¾å??ï¼?æ? æ³?å??建临æ?¶æ??件ï¼?%s"
+#~ msgstr "æ? æ³?æ ¡éª?æ¶?æ?¯ç¾å??ï¼?æ? æ³?å??建临æ?¶æ??件ï¼?%s"
#~ msgid "Unable to parse message content"
-#~ msgstr "æ? æ³?å??æ??信件å??容"
+#~ msgstr "æ? æ³?å??æ??æ¶?æ?¯å??容"
#~ msgid "cannot create thread"
#~ msgstr "æ? æ³?å??建线索"
@@ -5191,10 +5203,10 @@ msgstr "æ? æ??å??æ?°"
#~ msgstr "å?¯ç?¨æ??äº?è¿?滤å?¨å??è??æ??æ??件夹è§?å??æ??é??ç??æ?©å±?é?®ä»¶å??表æ£?æµ?"
#~ msgid "Expire cached messages that haven't been read in X seconds"
-#~ msgstr "å°?è?¥å¹²ç§?æ?ªé??读ç??ç¼?å?信件设置为è¿?æ??"
+#~ msgstr "å°?è?¥å¹²ç§?æ?ªé??读ç??ç¼?å?æ¶?æ?¯è®¾ç½®ä¸ºè¿?æ??"
#~ msgid "Expire cached messages older than X seconds"
-#~ msgstr "å?¨è?¥å¹²ç§?å??å°?信件设置为è¿?æ??"
+#~ msgstr "å?¨è?¥å¹²ç§?å??å°?æ¶?æ?¯è®¾ç½®ä¸ºè¿?æ??"
#~ msgid "Cannot access folder '%s': %s"
#~ msgstr "æ? æ³?访é?®æ??件夹â??%sâ??ï¼?%s"
@@ -5212,34 +5224,34 @@ msgstr "æ? æ??å??æ?°"
#~ msgstr "æ? æ³?é??æ¯?æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
#~ msgid "Cannot get message %s from folder '%s': No such message"
-#~ msgstr "æ? æ³?ä»?æ??件夹â??%2$sâ??è?·å??信件 %1$sï¼?没æ??è¿?æ ·ç??信件"
+#~ msgstr "æ? æ³?ä»?æ??件夹â??%2$sâ??è?·å??æ¶?æ?¯ %1$sï¼?没æ??è¿?æ ·ç??æ¶?æ?¯"
#~ msgid "Cannot get message %s from folder '%s': Bad command"
-#~ msgstr "æ? æ³?ä»?æ??件夹â??%2$sâ??è?·å??信件 %1$sï¼?å?½ä»¤æ? æ??"
+#~ msgstr "æ? æ³?ä»?æ??件夹â??%2$sâ??è?·å??æ¶?æ?¯ %1$sï¼?å?½ä»¤æ? æ??"
#~ msgid "Cannot append message to folder '%s': Folder is read-only"
-#~ msgstr "æ? æ³?å°?信件追å? å?°æ??件夹â??%sâ??ï¼?æ??件夹为å?ªè¯»"
+#~ msgstr "æ? æ³?å°?æ¶?æ?¯è¿½å? å?°æ??件夹â??%sâ??ï¼?æ??件夹为å?ªè¯»"
#~ msgid "Cannot append message to folder '%s': Unknown error"
-#~ msgstr "æ? æ³?å°?信件追å? å?°æ??件夹â??%sâ??ï¼?æ?ªç?¥é??误"
+#~ msgstr "æ? æ³?å°?æ¶?æ?¯è¿½å? å?°æ??件夹â??%sâ??ï¼?æ?ªç?¥é??误"
#~ msgid "Cannot append message to folder '%s': Bad command"
-#~ msgstr "æ? æ³?å°?信件追å? å?°æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+#~ msgstr "æ? æ³?å°?æ¶?æ?¯è¿½å? å?°æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-#~ msgstr "æ? æ³?å°?信件ä»?æ??件夹â??%sâ??移å?¨å?°æ??件夹â??%sâ??ï¼?æ?ªç?¥é??误"
+#~ msgstr "æ? æ³?å°?æ¶?æ?¯ä»?æ??件夹â??%sâ??移å?¨å?°æ??件夹â??%sâ??ï¼?æ?ªç?¥é??误"
#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-#~ msgstr "æ? æ³?å°?信件ä»?æ??件夹â??%sâ??å¤?å?¶å?°æ??件夹â??%sâ??ï¼?æ?ªç?¥é??误"
+#~ msgstr "æ? æ³?å°?æ¶?æ?¯ä»?æ??件夹â??%sâ??å¤?å?¶å?°æ??件夹â??%sâ??ï¼?æ?ªç?¥é??误"
#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-#~ msgstr "æ? æ³?å°?信件ä»?æ??件夹â??%sâ??移å?¨å?°æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+#~ msgstr "æ? æ³?å°?æ¶?æ?¯ä»?æ??件夹â??%sâ??移å?¨å?°æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-#~ msgstr "æ? æ³?å°?信件ä»?æ??件夹â??%sâ??å¤?å?¶å?°æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+#~ msgstr "æ? æ³?å°?æ¶?æ?¯ä»?æ??件夹â??%sâ??å¤?å?¶å?°æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
#~ msgid "Check new messages for _Junk contents"
-#~ msgstr "æ£?æ?¥æ?°ä¿¡ä»¶ç??å??å?¾å??容(_J)"
+#~ msgstr "æ£?æ?¥æ?°æ¶?æ?¯ç??å??å?¾å??容(_J)"
#~ msgid "Only check for Junk messa_ges in the INBOX folder"
#~ msgstr "ä»?å?¨æ?¶ä»¶ç®±ä¸æ£?æ?¥å??å?¾é?®ä»¶(_G)"
@@ -5329,13 +5341,13 @@ msgstr "æ? æ??å??æ?°"
#~ msgstr "æ? æ³?é??订æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
#~ msgid "Scanning for changed messages"
-#~ msgstr "æ?«æ??æ?´æ?¹äº?ç??信件"
+#~ msgstr "æ?«æ??æ?´æ?¹äº?ç??æ¶?æ?¯"
#~ msgid "IMAP server %s is in an inconsistent state."
#~ msgstr "IMAP æ??å?¡å?¨ %s ç??ç?¶æ??ä¸?ä¸?è?´ã??"
#~ msgid "Fetching envelopes of new messages"
-#~ msgstr "è?·å??æ?°æ?°ä¿¡ä»¶ç??ä¿¡å°?"
+#~ msgstr "è?·å??æ?°æ?°æ¶?æ?¯ç??ä¿¡å°?"
#~ msgid "Unexpected token in response from IMAP server %s: "
#~ msgstr "æ?¥è?ª IMAP4 æ??å?¡å?¨ %s ç??æ??å¤?å??åº?ï¼?"
@@ -5365,16 +5377,16 @@ msgstr "æ? æ??å??æ?°"
#~ msgstr "é?®ä»¶ç?®å½?é??å? æ¶?æ?¯å·²å??æ¶?"
#~ msgid "Invalid message contents"
-#~ msgstr "æ? æ??ç??信件å??容"
+#~ msgstr "æ? æ??ç??æ¶?æ?¯å??容"
#~ msgid "Mail append canceled"
#~ msgstr "é?®ä»¶è¿½å? å·²å??æ¶?"
#~ msgid "Message construction failed."
-#~ msgstr "信件æ??建失败ã??"
+#~ msgstr "æ¶?æ?¯æ??建失败ã??"
#~ msgid "MH append message canceled"
-#~ msgstr "MH 追å? 信件已å??æ¶?"
+#~ msgstr "MH 追å? æ¶?æ?¯å·²å??æ¶?"
#~ msgid "Use cancel"
#~ msgstr "使ç?¨å??æ¶?"
@@ -5488,7 +5500,7 @@ msgstr "æ? æ??å??æ?°"
#~ msgstr "æ? æ³?以æ¤å??称å??建æ??件夹"
#~ msgid "This operation cannot be performed in off-line mode"
-#~ msgstr "该信件æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸ä½¿ç?¨"
+#~ msgstr "该æ¶?æ?¯æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸ä½¿ç?¨"
#~ msgid "%s's Folders"
#~ msgstr "%s ç??æ??件夹"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
