[evolution-data-server] Partly updated zh_CN.po
- From: Aron Xu <aronxu src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Partly updated zh_CN.po
- Date: Sun, 30 Aug 2009 05:21:31 +0000 (UTC)
commit 6285abec24b1eea6b4c002761b19f2f79b284f02
Author: Aron Xu <aronxu gnome org>
Date: Sun Aug 30 13:21:17 2009 +0800
Partly updated zh_CN.po
po/zh_CN.po | 2617 +++++++++++++++++++++++++++++------------------------------
1 files changed, 1296 insertions(+), 1321 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c366187..ac607f8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,173 +1,94 @@
-# Ximian Evolution ç??ç®?ä½?ä¸æ??ç¿»è¯?
+# Simplified Chinese translation to evolution-data-server.
+# Evolution ç??ç®?ä½?ä¸æ??ç¿»è¯?
# Copyright (C) 2003 Ximian Inc.
+# Copyright (C) 2009 Free Software Foundation.
# This file is distributed under the same license as the evolution package.
+#
# Wang Li <charles linux net cn>, 2002, 2003.
# Funda Wang <fundawang linux net cn>, 2003, 2005.
# Neo Willis <willis linux net>, 2003.
-# Partly comes from Sun_l10n group, 2003
+# Partly comes from Sun_l10n group, 2003.
+# Yang Zhang <zyangmath gmail com>, 2008.
+# Aron Xu <happyaron xu gmail com>, 2009.
#
msgid ""
msgstr ""
-"Project-Id-Version: Evolution-data-server\n"
+"Project-Id-Version: evolution-data-server master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-18 05:26+0000\n"
-"PO-Revision-Date: 2008-02-23 21:01+0800\n"
-"Last-Translator: Yang Zhang <zyangmath gmail com>\n"
-"Language-Team: zh_CN <i18n-translation lists linux net cn>\n"
+"POT-Creation-Date: 2009-08-30 13:09+0800\n"
+"PO-Revision-Date: 2008-08-30 13:21+0800\n"
+"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../addressbook/backends/file/e-book-backend-file.c:555
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2360
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
msgid "Loading..."
-msgstr "æ£å?¨è£?å?¥..."
-
-#: ../addressbook/backends/file/e-book-backend-file.c:558
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2293
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2315
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2358
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4282
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
+msgstr "æ£å?¨è½½å?¥..."
+
+#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
msgid "Searching..."
msgstr "æ£å?¨æ??ç´¢..."
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2725
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4446
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
#, c-format
msgid "Downloading contacts (%d)... "
msgstr "æ£å?¨ä¸?è½½è??系人(%d ä½?)..."
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2874
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3059
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3103
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
#, c-format
msgid "Updating contacts cache (%d)... "
msgstr "æ£å?¨æ?´æ?°è??系人ç¼?å?(%d)..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:788
msgid "Using Distinguished Name (DN)"
msgstr "使ç?¨å·²è¯?å?«ç??å§?å?? (DN)"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
msgid "Using Email Address"
msgstr "使ç?¨ç?µå?é?®ä»¶å?°å??"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1017
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
msgid "Reconnecting to LDAP server..."
msgstr "æ£å?¨é??æ?°è¿?æ?¥ LDAP æ??å?¡å?¨..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1613
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
msgid "Adding contact to LDAP server..."
msgstr "æ£å?¨å°?è??系人添å? å?° LDAP æ??å?¡å?¨..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1747
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
msgid "Removing contact from LDAP server..."
msgstr "æ£å?¨ä»? LDAP æ??å?¡å?¨å? é?¤è??系人..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2058
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
msgid "Modifying contact from LDAP server..."
msgstr "æ£å?¨ä¿®æ?¹ LDAP æ??å?¡å?¨ä¸?ç??è??系人..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4142
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
msgid "Receiving LDAP search results..."
msgstr "æ£å?¨æ?¥æ?¶ LDAP ç??æ??ç´¢ç»?æ??..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4304
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
msgid "Error performing search"
msgstr "æ?§è¡?æ??ç´¢é??误"
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: ../addressbook/libebook/e-book.c:252 ../addressbook/libebook/e-book.c:256
-#: ../addressbook/libebook/e-book.c:461 ../addressbook/libebook/e-book.c:465
-#: ../addressbook/libebook/e-book.c:604 ../addressbook/libebook/e-book.c:608
-#: ../addressbook/libebook/e-book.c:695 ../addressbook/libebook/e-book.c:699
-#: ../addressbook/libebook/e-book.c:995 ../addressbook/libebook/e-book.c:1000
-#: ../addressbook/libebook/e-book.c:1179 ../addressbook/libebook/e-book.c:1183
-#: ../addressbook/libebook/e-book.c:1338 ../addressbook/libebook/e-book.c:1342
-#: ../addressbook/libebook/e-book.c:1544 ../addressbook/libebook/e-book.c:1548
-#: ../addressbook/libebook/e-book.c:1787 ../addressbook/libebook/e-book.c:1791
-#: ../addressbook/libebook/e-book.c:2025 ../addressbook/libebook/e-book.c:2029
-#: ../addressbook/libebook/e-book.c:2234 ../addressbook/libebook/e-book.c:2238
-#: ../addressbook/libebook/e-book.c:3339
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "â??%2$sâ??å??ç??â??%1$sâ??"
-
-#: ../addressbook/libebook/e-book.c:265 ../addressbook/libebook/e-book.c:474
-#: ../addressbook/libebook/e-book.c:617 ../addressbook/libebook/e-book.c:708
-#: ../addressbook/libebook/e-book.c:1010 ../addressbook/libebook/e-book.c:1193
-#: ../addressbook/libebook/e-book.c:1352 ../addressbook/libebook/e-book.c:1557
-#: ../addressbook/libebook/e-book.c:1800 ../addressbook/libebook/e-book.c:2039
-#: ../addressbook/libebook/e-book.c:2247 ../addressbook/libebook/e-book.c:2593
-#: ../addressbook/libebook/e-book.c:2792
-#, c-format
-msgid "book busy"
-msgstr "é??讯簿å¿?"
-
-#: ../addressbook/libebook/e-book.c:296 ../addressbook/libebook/e-book.c:300
-#: ../addressbook/libebook/e-book.c:505 ../addressbook/libebook/e-book.c:509
-#: ../addressbook/libebook/e-book.c:644 ../addressbook/libebook/e-book.c:648
-#: ../addressbook/libebook/e-book.c:735 ../addressbook/libebook/e-book.c:739
-#: ../addressbook/libebook/e-book.c:1037 ../addressbook/libebook/e-book.c:1040
-#: ../addressbook/libebook/e-book.c:1223 ../addressbook/libebook/e-book.c:1226
-#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1383
-#: ../addressbook/libebook/e-book.c:1593 ../addressbook/libebook/e-book.c:1597
-#: ../addressbook/libebook/e-book.c:1847 ../addressbook/libebook/e-book.c:1851
-#: ../addressbook/libebook/e-book.c:2069 ../addressbook/libebook/e-book.c:2073
-#: ../addressbook/libebook/e-book.c:2273 ../addressbook/libebook/e-book.c:2277
-#: ../addressbook/libebook/e-book.c:2538 ../addressbook/libebook/e-book.c:2619
-#: ../addressbook/libebook/e-book.c:2623 ../addressbook/libebook/e-book.c:2818
-#: ../addressbook/libebook/e-book.c:2822 ../addressbook/libebook/e-book.c:3348
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "CORBA é??è¦?æ?§è¡?â??%sâ??è°?ç?¨"
-
-#: ../addressbook/libebook/e-book.c:2523
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%sï¼?没æ??å½?å??æ??ä½?"
-
-#: ../addressbook/libebook/e-book.c:2552
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%sï¼?æ? æ³?å??æ¶?"
-
-#: ../addressbook/libebook/e-book.c:2579 ../addressbook/libebook/e-book.c:2583
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "â??%2$sâ??å??ç??â??%1$sâ??"
-
-#: ../addressbook/libebook/e-book.c:2647
-#, c-format
-msgid "%s: canceled"
-msgstr "%sï¼?å·²å??æ¶?"
-
-#: ../addressbook/libebook/e-book.c:3203
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%sï¼?æ? æ??æ?¥æº?ã??"
-
-#: ../addressbook/libebook/e-book.c:3211 ../addressbook/libebook/e-book.c:3277
-#, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%sï¼?对äº? URIâ??%sâ??没æ??å?¯ç?¨ç??å·¥å??"
-
-#: ../addressbook/libebook/e-book.c:3223
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%sï¼?ä¸?è?½å??建 EBookListener"
-
-#: ../addressbook/libebook/e-book.c:3490
+#: ../addressbook/libebook/e-book.c:1837
#, c-format
msgid "%s: there was no self contact UID stored in gconf"
msgstr "%sï¼?gconf ä¸æ²¡æ??å?å?¨è?ªèº«è??系人ç?? UID"
-#: ../addressbook/libebook/e-book.c:3623
+#: ../addressbook/libebook/e-book.c:1967
#, c-format
msgid "%s: there was no source for uid `%s' stored in gconf."
msgstr "%sï¼?gconf ä¸æ²¡æ??å?å?¨ uidâ??%sâ??ç??æº?ã??"
@@ -358,7 +279,7 @@ msgstr "���记 URL"
#. Contact categories
#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:426
+#: ../libedataserverui/e-categories-dialog.c:632
msgid "Categories"
msgstr "类�"
@@ -623,8 +544,8 @@ msgid "Birth Date"
msgstr "ç??æ?¥"
#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:461
-#: ../libedataserver/e-categories.c:43
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
+#: ../libedataserver/e-categories.c:45
msgid "Anniversary"
msgstr "�年纪念�"
@@ -670,443 +591,327 @@ msgstr "å?°ç??ä¿¡æ?¯"
msgid "Telephone"
msgstr "��"
-#: ../addressbook/libebook/e-contact.c:1493
+#: ../addressbook/libebook/e-contact.c:278
+msgid "Skype Home Name 1"
+msgstr "Skype 家åºå±?å¹?å?? 1"
+
+#: ../addressbook/libebook/e-contact.c:279
+msgid "Skype Home Name 2"
+msgstr "Skype 家åºå±?å¹?å?? 2"
+
+#: ../addressbook/libebook/e-contact.c:280
+msgid "Skype Home Name 3"
+msgstr "Skype 家åºå±?å¹?å?? 3"
+
+#: ../addressbook/libebook/e-contact.c:281
+msgid "Skype Work Name 1"
+msgstr "Skype å·¥ä½?å±?å¹?å?? 1"
+
+#: ../addressbook/libebook/e-contact.c:282
+msgid "Skype Work Name 2"
+msgstr "Skype å·¥ä½?å±?å¹?å?? 2"
+
+#: ../addressbook/libebook/e-contact.c:283
+msgid "Skype Work Name 3"
+msgstr "Skype å·¥ä½?å±?å¹?å?? 3"
+
+#: ../addressbook/libebook/e-contact.c:284
+msgid "Skype Name List"
+msgstr "Skype å±?å¹?å??å??表"
+
+#: ../addressbook/libebook/e-contact.c:286
+#, fuzzy
+msgid "SIP address"
+msgstr "家åºå?°å??"
+
+#: ../addressbook/libebook/e-contact.c:1535
#: ../addressbook/libebook/e-destination.c:761
msgid "Unnamed List"
msgstr "æ?ªå?½å??ç??å??表"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:463
-#: ../libedataserver/e-categories.c:44
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
+#: ../libedataserver/e-categories.c:46
msgid "Birthday"
msgstr "ç??æ?¥"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:489
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
#, c-format
msgid "Birthday: %s"
msgstr "ç??æ?¥ï¼?%s"
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:513
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
#, c-format
msgid "Anniversary: %s"
msgstr "�年�%s"
-#: ../calendar/backends/file/e-cal-backend-file.c:214
+#: ../calendar/backends/file/e-cal-backend-file.c:234
msgid "Cannot save calendar data: Malformed URI."
msgstr "æ? æ³?ä¿?å?æ?¥å??æ?°æ?®ï¼?URI æ ¼å¼?é??误ã??"
-#: ../calendar/backends/file/e-cal-backend-file.c:221
-#: ../calendar/backends/file/e-cal-backend-file.c:227
+#: ../calendar/backends/file/e-cal-backend-file.c:241
+#: ../calendar/backends/file/e-cal-backend-file.c:247
msgid "Cannot save calendar data"
msgstr "æ? æ³?ä¿?å?æ?¥å??æ?°æ?®"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:335
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
msgid "Could not create thread for getting deltas"
msgstr "æ? æ³?为è?·å¾?å·®å¼?å??建线索"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:367
-#: ../calendar/backends/google/e-cal-backend-google.c:1194
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
-#: ../calendar/backends/http/e-cal-backend-http.c:569
-#: ../calendar/backends/weather/e-cal-backend-weather.c:466
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:376
+#: ../calendar/backends/google/e-cal-backend-google.c:1189
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1080
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1381
+#: ../calendar/backends/http/e-cal-backend-http.c:673
+#: ../calendar/backends/weather/e-cal-backend-weather.c:486
msgid "Could not create cache file"
msgstr "æ? æ³?å??建ç¼?å?æ??件"
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:380
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1093
msgid "Could not create thread for populating cache"
msgstr "æ? æ³?å??建å¢?æ®?ç¼?å?å??建线索"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1056
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1795
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
msgid "Reply Requested: by "
msgstr "请æ±?å??å¤?ï¼?ç?±"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1061
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1800
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
msgid "Reply Requested: When convenient"
msgstr "请æ±?å??å¤?ï¼?æ?¹ä¾¿æ?¶"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
#, c-format
msgid "Loading %s items"
msgstr "�� %s 项"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
msgid "Calendar"
msgstr "æ?¥å??"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
msgid "Invalid server URI"
msgstr "æ? æ??ç??æ??å?¡å?¨ URI"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
-#: ../calendar/libecal/e-cal.c:5082
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1075
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1107
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1145
-#: ../camel/providers/groupwise/camel-groupwise-store.c:594
-#: ../camel/providers/groupwise/camel-groupwise-store.c:746
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:184
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:995
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1098
+#: ../calendar/libecal/e-cal.c:5117
+#: ../calendar/libedata-cal/e-cal-backend-util.c:117
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1291
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1327
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
+#: ../camel/providers/groupwise/camel-groupwise-store.c:598
+#: ../camel/providers/groupwise/camel-groupwise-store.c:773
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
msgid "Authentication failed"
msgstr "认�失败"
-#: ../calendar/backends/http/e-cal-backend-http.c:269
+#: ../calendar/backends/http/e-cal-backend-http.c:330
msgid "Redirected to Invalid URI"
msgstr "å·²é??å®?å??å?°æ? æ?? URI"
-#: ../calendar/backends/http/e-cal-backend-http.c:290
+#: ../calendar/backends/http/e-cal-backend-http.c:353
msgid "Bad file format."
msgstr "æ? æ??ç??æ??ä»¶æ ¼å¼?ã??"
-#: ../calendar/backends/http/e-cal-backend-http.c:296
+#: ../calendar/backends/http/e-cal-backend-http.c:360
msgid "Not a calendar."
msgstr "ä¸?æ?¯æ?¥å??ã??"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:144
+#: ../calendar/backends/weather/e-cal-backend-weather.c:150
msgid "Could not retrieve weather data"
msgstr "æ? æ³?è?·å??天æ°?æ?°æ?®"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:216
-msgid "Fair"
-msgstr "�天"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:217
-msgid "Snow showers"
-msgstr "æ?´é?ª"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:218
-msgid "Snow"
-msgstr "é?ª"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:219
-msgid "Partly cloudy"
-msgstr "��"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:220
-msgid "Smoke"
-msgstr "ç??"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:221
-msgid "Thunderstorms"
-msgstr "���"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:222
-msgid "Cloudy"
-msgstr "��"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:223
-msgid "Drizzle"
-msgstr "ç»?é?¨"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:224
-msgid "Sunny"
-msgstr "æ?´"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:225
-msgid "Dust"
-msgstr "æ²?å°?"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:226
-msgid "Clear"
-msgstr "æ?´"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:227
-msgid "Mostly cloudy"
-msgstr "�天"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:228
-msgid "Windy"
-msgstr "�"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:229
-msgid "Rain showers"
-msgstr "æ?´é?¨"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:230
-msgid "Foggy"
-msgstr "é?¾"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:231
-msgid "Rain/snow mixed"
-msgstr "�夹�"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:232
-msgid "Sleet"
-msgstr "é?¹"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:233
-msgid "Very hot/humid"
-msgstr "é?·ç?"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:234
-msgid "Blizzard"
-msgstr "æ?´é?ª"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:235
-msgid "Freezing rain"
-msgstr "��"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:236
-msgid "Haze"
-msgstr "é?´é?¾"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:237
-msgid "Blowing snow"
-msgstr "���"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:238
-msgid "Freezing drizzle"
-msgstr "���"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+msgid "Weather: Fog"
+msgstr "天���"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:239
-msgid "Very cold/wind chill"
-msgstr "��"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:248
+msgid "Weather: Cloudy"
+msgstr "天����"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:240
-msgid "Rain"
-msgstr "é?¨"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+msgid "Weather: Cloudy Night"
+msgstr "天æ°?ï¼?å¤?äº?å¤?æ??"
#: ../calendar/backends/weather/e-cal-backend-weather.c:250
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
-#: ../calendar/backends/weather/e-cal-backend-weather.c:260
-#: ../calendar/backends/weather/e-cal-backend-weather.c:267
-msgid "Weather: Sunny"
-msgstr "天���"
+msgid "Weather: Overcast"
+msgstr "天���天"
#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+msgid "Weather: Showers"
+msgstr "天����"
+
#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-#: ../calendar/backends/weather/e-cal-backend-weather.c:268
-#: ../calendar/backends/weather/e-cal-backend-weather.c:271
msgid "Weather: Snow"
msgstr "天���"
#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Partly Cloudy"
-msgstr "天����"
+msgid "Weather: Sunny"
+msgstr "天���"
#: ../calendar/backends/weather/e-cal-backend-weather.c:254
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
-#: ../calendar/backends/weather/e-cal-backend-weather.c:264
-#: ../calendar/backends/weather/e-cal-backend-weather.c:270
-msgid "Weather: Fog"
-msgstr "天���"
+msgid "Weather: Clear Night"
+msgstr "天æ°?ï¼?æ?´æ??å¤?æ??"
#: ../calendar/backends/weather/e-cal-backend-weather.c:255
msgid "Weather: Thunderstorms"
msgstr "天�����"
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
-#: ../calendar/backends/weather/e-cal-backend-weather.c:261
-msgid "Weather: Cloudy"
-msgstr "天����"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
-#: ../calendar/backends/weather/e-cal-backend-weather.c:263
-#: ../calendar/backends/weather/e-cal-backend-weather.c:265
-#: ../calendar/backends/weather/e-cal-backend-weather.c:266
-#: ../calendar/backends/weather/e-cal-backend-weather.c:269
-#: ../calendar/backends/weather/e-cal-backend-weather.c:272
-#: ../calendar/backends/weather/e-cal-backend-weather.c:274
-msgid "Weather: Rain"
-msgstr "天���"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:349
-#, c-format
-msgid "%.1f°C - %s"
-msgstr "%.1f°C - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:351
-#, c-format
-msgid "%.1f°F - %s"
-msgstr "%.1f°F - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:354
-#, c-format
-msgid "%.1f/%.1f°C - %s"
-msgstr "%.1f/%.1f°C - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:356
-#, c-format
-msgid "%.1f/%.1f°F - %s"
-msgstr "%.1f/%.1f°F - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:362
-#, c-format
-msgid "%d%% chance of precipitation\n"
-msgstr "é??æ°´æ¦?ç?? %d%%\n"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:369
-#, c-format
-msgid "%.1fcm snow\n"
-msgstr "%.1f å??ç±³é?ª\n"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:371
-#, c-format
-msgid "%.1fin snow\n"
-msgstr "%.1f �寸�\n"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:374
-#, c-format
-msgid "%.1f-%.1fcm snow\n"
-msgstr "%.1f-%.1f å??ç±³é?ª\n"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:376
-#, c-format
-msgid "%.1f-%.1fin snow\n"
-msgstr "%.1f-%.1f �寸�\n"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:400
+msgid "Forecast"
+msgstr "天���"
-#: ../calendar/libecal/e-cal-component.c:1322
+#: ../calendar/libecal/e-cal-component.c:1320
msgid "Untitled appointment"
msgstr "æ? æ ?é¢?约ä¼?"
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:3945
msgid "1st"
msgstr "1æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:3946
msgid "2nd"
msgstr "2æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:3947
msgid "3rd"
msgstr "3æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:3948
msgid "4th"
msgstr "4æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:3949
msgid "5th"
msgstr "5æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:3950
msgid "6th"
msgstr "6æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:3951
msgid "7th"
msgstr "7æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3952
msgid "8th"
msgstr "8æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3953
msgid "9th"
msgstr "9æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3954
msgid "10th"
msgstr "10æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3955
msgid "11th"
msgstr "11æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3956
msgid "12th"
msgstr "12æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3957
msgid "13th"
msgstr "13æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:3958
msgid "14th"
msgstr "14æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:3959
msgid "15th"
msgstr "15æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:3960
msgid "16th"
msgstr "16æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:3961
msgid "17th"
msgstr "17æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:3962
msgid "18th"
msgstr "18å?«æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:3963
msgid "19th"
msgstr "19æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:3964
msgid "20th"
msgstr "20æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:3965
msgid "21st"
msgstr "21æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:3966
msgid "22nd"
msgstr "22æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:3967
msgid "23rd"
msgstr "23æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:3968
msgid "24th"
msgstr "24æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:3969
msgid "25th"
msgstr "25æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:3970
msgid "26th"
msgstr "26æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:3971
msgid "27th"
msgstr "27æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:3972
msgid "28th"
msgstr "28æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:3973
msgid "29th"
msgstr "29æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:3974
msgid "30th"
msgstr "30æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:3975
msgid "31st"
msgstr "31æ?¥"
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:712
msgid "High"
msgstr "é«?"
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:714
msgid "Normal"
msgstr "ä¸"
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:716
msgid "Low"
msgstr "ä½?"
#. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:710
msgid "Undefined"
msgstr "���"
-#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1693 ../libedataserverui/e-book-auth-util.c:199
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "为 %s è¾?å?¥å¯?ç ? (ç?¨æ?· %s)"
@@ -1115,112 +920,112 @@ 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:1679
+#: ../calendar/libecal/e-cal.c:1707
#, c-format
msgid "Enter password for %s to enable proxy for user %s"
msgstr "è¾?å?¥ %s ç??å¯?ç ?ï¼?以便为ç?¨æ?· %s å?¯ç?¨ä»£ç??æ??å?¡å?¨"
-#: ../calendar/libecal/e-cal.c:5054
+#: ../calendar/libecal/e-cal.c:5089
msgid "Invalid argument"
msgstr "æ? æ??å??æ?°"
-#: ../calendar/libecal/e-cal.c:5056
+#: ../calendar/libecal/e-cal.c:5091
msgid "Backend is busy"
msgstr "å??å?°ç¹?å¿?"
-#: ../calendar/libecal/e-cal.c:5058
-#: ../calendar/libedata-cal/e-cal-backend-util.c:97
+#: ../calendar/libecal/e-cal.c:5093
+#: ../calendar/libedata-cal/e-cal-backend-util.c:105
msgid "Repository is offline"
msgstr "��离线"
-#: ../calendar/libecal/e-cal.c:5060
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../calendar/libecal/e-cal.c:5095
+#: ../calendar/libedata-cal/e-cal-backend-util.c:129
msgid "No such calendar"
msgstr "没æ??è¿?æ ·ç??æ?¥å??"
-#: ../calendar/libecal/e-cal.c:5062
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../calendar/libecal/e-cal.c:5097
+#: ../calendar/libedata-cal/e-cal-backend-util.c:111
#: ../servers/groupwise/e-gw-connection.c:233
msgid "Object not found"
msgstr "���对象"
-#: ../calendar/libecal/e-cal.c:5064
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:5099
+#: ../calendar/libedata-cal/e-cal-backend-util.c:113
#: ../servers/groupwise/e-gw-connection.c:227
msgid "Invalid object"
msgstr "æ? æ??对象"
-#: ../calendar/libecal/e-cal.c:5066
+#: ../calendar/libecal/e-cal.c:5101
msgid "URI not loaded"
msgstr "URI ���"
-#: ../calendar/libecal/e-cal.c:5068
+#: ../calendar/libecal/e-cal.c:5103
msgid "URI already loaded"
msgstr "URI 已�载�"
-#: ../calendar/libecal/e-cal.c:5070
-#: ../calendar/libedata-cal/e-cal-backend-util.c:99
-#: ../servers/exchange/storage/e-storage.c:571
+#: ../calendar/libecal/e-cal.c:5105
+#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../servers/exchange/storage/e-storage.c:573
msgid "Permission denied"
msgstr "没æ??æ??é??"
-#: ../calendar/libecal/e-cal.c:5072
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libecal/e-cal.c:5107
+#: ../calendar/libedata-cal/e-cal-backend-util.c:131
#: ../servers/groupwise/e-gw-connection.c:235
msgid "Unknown User"
msgstr "����"
-#: ../calendar/libecal/e-cal.c:5074
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../calendar/libecal/e-cal.c:5109
+#: ../calendar/libedata-cal/e-cal-backend-util.c:115
msgid "Object ID already exists"
msgstr "对象 ID å·²ç»?å?å?¨"
-#: ../calendar/libecal/e-cal.c:5076
+#: ../calendar/libecal/e-cal.c:5111
msgid "Protocol not supported"
msgstr "ä¸?æ?¯æ??ç??å??è®®"
-#: ../calendar/libecal/e-cal.c:5078
+#: ../calendar/libecal/e-cal.c:5113
msgid "Operation has been canceled"
msgstr "æ??ä½?å·²å??æ¶?"
-#: ../calendar/libecal/e-cal.c:5080
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
+#: ../calendar/libecal/e-cal.c:5115
+#: ../calendar/libedata-cal/e-cal-backend-util.c:143
msgid "Could not cancel operation"
msgstr "æ? æ³?å??æ¶?æ??ä½?"
-#: ../calendar/libecal/e-cal.c:5084
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../calendar/libecal/e-cal.c:5119
+#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../camel/providers/smtp/camel-smtp-transport.c:217
msgid "Authentication required"
msgstr "�须认�"
-#: ../calendar/libecal/e-cal.c:5086
+#: ../calendar/libecal/e-cal.c:5121
msgid "A CORBA exception has occurred"
msgstr "å??ç??äº? CORBA å¼?常"
-#: ../calendar/libecal/e-cal.c:5088
-#: ../calendar/libedata-cal/e-cal-backend-util.c:138
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:434
-#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-engine.c:1570
-#: ../camel/providers/imap4/camel-imap4-engine.c:1609
-#: ../camel/providers/imap4/camel-imap4-engine.c:1654
-#: ../camel/providers/imap4/camel-imap4-engine.c:1710
-#: ../camel/providers/imap4/camel-imap4-store.c:315
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
-#: ../camel/providers/pop3/camel-pop3-store.c:553
-#: ../camel/providers/pop3/camel-pop3-store.c:560
-#: ../camel/providers/pop3/camel-pop3-store.c:566
-#: ../servers/exchange/storage/e-storage.c:585
+#: ../calendar/libecal/e-cal.c:5123
+#: ../calendar/libedata-cal/e-cal-backend-util.c:146
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
+#: ../camel/providers/imap/camel-imap-command.c:432
+#: ../camel/providers/imap/camel-imap-store.c:743
+#: ../camel/providers/imap4/camel-imap4-engine.c:1547
+#: ../camel/providers/imap4/camel-imap4-engine.c:1585
+#: ../camel/providers/imap4/camel-imap4-engine.c:1629
+#: ../camel/providers/imap4/camel-imap4-engine.c:1684
+#: ../camel/providers/imap4/camel-imap4-store.c:311
+#: ../camel/providers/imap4/camel-imap4-store.c:818
+#: ../camel/providers/imap4/camel-imap4-store.c:1574
+#: ../camel/providers/pop3/camel-pop3-store.c:552
+#: ../camel/providers/pop3/camel-pop3-store.c:559
+#: ../camel/providers/pop3/camel-pop3-store.c:565
+#: ../servers/exchange/storage/e-storage.c:587
#: ../servers/groupwise/e-gw-connection.c:241
msgid "Unknown error"
msgstr "æ?ªç?¥ç??é??误"
-#: ../calendar/libecal/e-cal.c:5090
-#: ../calendar/libedata-cal/e-cal-backend-util.c:95
-#: ../servers/exchange/storage/e-storage.c:553
+#: ../calendar/libecal/e-cal.c:5125
+#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../servers/exchange/storage/e-storage.c:555
msgid "No error"
msgstr "æ? é??误"
@@ -1317,47 +1122,47 @@ msgid ""
"be a boolean false (#f)"
msgstr "â??%sâ??ç??æ??æ??å??æ?°é?½åº?该为å?符串æ??è??å®?å?¯ä¸?ç??å??æ?°ä¸ºå¸?å°?å?? (#f)"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:101
+#: ../calendar/libedata-cal/e-cal-backend-util.c:109
msgid "Invalid range"
msgstr "æ? æ??è??å?´"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../calendar/libedata-cal/e-cal-backend-util.c:121
msgid "Unsupported field"
msgstr "ä¸?æ?¯æ??ç??å??"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libedata-cal/e-cal-backend-util.c:123
msgid "Unsupported method"
msgstr "ä¸?æ?¯æ??ç??æ?¹å¼?"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
+#: ../calendar/libedata-cal/e-cal-backend-util.c:125
msgid "Unsupported authentication method"
msgstr "ä¸?æ?¯æ??ç??身份éª?è¯?æ?¹å¼?"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../calendar/libedata-cal/e-cal-backend-util.c:127
msgid "TLS not available"
msgstr "TLS ���"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Offline unavailable"
-msgstr "离线���"
+#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+msgid "Offline mode unavailable"
+msgstr "离线模����"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
+#: ../calendar/libedata-cal/e-cal-backend-util.c:135
msgid "Search size limit exceeded"
msgstr "è¶?è¿?æ??索大å°?é??å?¶"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libedata-cal/e-cal-backend-util.c:137
msgid "Search time limit exceeded"
msgstr "è¶?è¿?æ??ç´¢æ?¶é?´é??å?¶"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
msgid "Invalid query"
msgstr "æ? æ??ç??æ?¥è¯¢"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../calendar/libedata-cal/e-cal-backend-util.c:141
msgid "Query refused"
msgstr "æ?¥è¯¢è¢«æ??ç»?"
-#: ../calendar/libedata-cal/e-cal-backend-util.c:140
+#: ../calendar/libedata-cal/e-cal-backend-util.c:148
msgid "Invalid server version"
msgstr "æ? æ??ç??æ??å?¡å?¨ç??æ?¬"
@@ -1405,16 +1210,16 @@ msgstr "æ?¨ä¸?è?½ç?¨æ¤å¯?ç ?导å?ºå¯?é?¥"
msgid "Unable to create cache path"
msgstr "æ? æ³?å??建ç¼?å?²è·¯å¾?"
-#: ../camel/camel-data-cache.c:381
+#: ../camel/camel-data-cache.c:402
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "æ? æ³?å? é?¤ç¼?å?²æ?¡ç?®ï¼?%sï¼?%s"
-#: ../camel/camel-db.c:107
+#: ../camel/camel-db.c:412
msgid "Insufficient memory"
msgstr "å??å?ä¸?足"
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:197
#, c-format
msgid ""
"Could not write log entry: %s\n"
@@ -1425,8 +1230,8 @@ msgstr ""
"å½?æ?¨é??æ?°è¿?æ?¥å?°ç½?ç»?æ?¶æ?¬æ??å?¡å?¨\n"
"ä¸?è¿?ä¸?æ¥ç??æ??ä½?ä¸?ä¼?é??å??ã??"
-#: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:299
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:320
#, c-format
msgid ""
"Could not open '%s':\n"
@@ -1437,123 +1242,120 @@ msgstr ""
"%s\n"
"对该æ??件夹ç??ä¿®æ?¹ä¸?ä¼?被é??æ?°å??æ¥ã??"
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:296
msgid "Resynchronizing with server"
msgstr "é??æ?°ä¸?æ??å?¡å?¨å??æ¥"
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:52
+#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
msgid "Copy folder content locally for offline operation"
msgstr "å°?æ??件夹å??容å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?"
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:111
+#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
msgid "Downloading new messages for offline mode"
msgstr "ä¸?è½½æ?°ä¿¡ä»¶ä»¥è¿?è¡?è?±æ?ºæ??ä½?"
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-disco-folder.c:466
#, c-format
msgid "Preparing folder '%s' for offline"
msgstr "å??å¤?è?±æ?ºæ??件夹â??%sâ??"
-#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/imap/camel-imap-store.c:1002
-#: ../camel/providers/imap/camel-imap-store.c:1810
-#: ../camel/providers/imap/camel-imap-store.c:2226
-#: ../camel/providers/imap/camel-imap-store.c:2989
+#: ../camel/camel-disco-store.c:400
+#: ../camel/providers/groupwise/camel-groupwise-store.c:223
+#: ../camel/providers/imap/camel-imap-store.c:1003
+#: ../camel/providers/imap/camel-imap-store.c:1813
+#: ../camel/providers/imap/camel-imap-store.c:2229
+#: ../camel/providers/imap/camel-imap-store.c:3014
msgid "You must be working online to complete this operation"
msgstr "æ?¨å¿?é¡»å?¨çº¿å·¥ä½?以便å®?æ??该æ??ä½?"
-#: ../camel/camel-exception.c:262
+#: ../camel/camel-exception.c:260
msgid "No description available"
msgstr "没æ??å?¯ç?¨ç??æ??è¿°"
-#: ../camel/camel-filter-driver.c:785
+#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
#, c-format
msgid "Failed to create child process '%s': %s"
msgstr "å??建å?è¿?ç¨?â??%sâ??失败ï¼?%s"
-#: ../camel/camel-filter-driver.c:827
+#: ../camel/camel-filter-driver.c:836
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "æ?¶å?° %s å??æ?¥ç??æ? æ??信件æµ?ï¼?%s"
-#: ../camel/camel-filter-driver.c:1016 ../camel/camel-filter-driver.c:1025
+#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
msgid "Syncing folders"
msgstr "å??æ¥æ??件夹"
-#: ../camel/camel-filter-driver.c:1114 ../camel/camel-filter-driver.c:1494
+#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "解æ??è¿?滤è§?å??å?ºé??ï¼?%sï¼?%s"
-#: ../camel/camel-filter-driver.c:1123 ../camel/camel-filter-driver.c:1503
+#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "æ?§è¡?è¿?滤è§?å??é??误ï¼?%sï¼?%s"
-#: ../camel/camel-filter-driver.c:1191
+#: ../camel/camel-filter-driver.c:1216
msgid "Unable to open spool folder"
msgstr "æ? æ³?æ??å¼?è?±æ?ºæ??件夹"
-#: ../camel/camel-filter-driver.c:1200
+#: ../camel/camel-filter-driver.c:1225
msgid "Unable to process spool folder"
msgstr "æ? æ³?å¤?ç??è?±æ?ºæ??件夹"
-#: ../camel/camel-filter-driver.c:1215
+#: ../camel/camel-filter-driver.c:1241
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "è?·å??第%då°?ä¿¡(%d%%)"
-#: ../camel/camel-filter-driver.c:1219
+#: ../camel/camel-filter-driver.c:1245
msgid "Cannot open message"
msgstr "æ? æ³?æ??å¼?信件"
-#: ../camel/camel-filter-driver.c:1220 ../camel/camel-filter-driver.c:1233
+#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
#, c-format
msgid "Failed on message %d"
msgstr "�第%d�信失败"
-#: ../camel/camel-filter-driver.c:1247 ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
msgid "Syncing folder"
msgstr "å??æ¥æ??件夹"
-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1343
+#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
msgid "Complete"
msgstr "å®?æ??"
-#: ../camel/camel-filter-driver.c:1308
+#: ../camel/camel-filter-driver.c:1338
#, c-format
msgid "Getting message %d of %d"
msgstr "è?·å??第%då°?ä¿¡ï¼?å?±%då°?"
-#: ../camel/camel-filter-driver.c:1323
+#: ../camel/camel-filter-driver.c:1353
#, c-format
msgid "Failed at message %d of %d"
msgstr "�第%d�信失败��%d�"
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:137
msgid "Failed to retrieve message"
msgstr "è?·å??信件失败"
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:399
msgid "Invalid arguments to (system-flag)"
msgstr "(system-flag)å??æ?°æ? æ??"
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:414
msgid "Invalid arguments to (user-tag)"
msgstr "(user-tag)å??æ?°æ? æ??"
-#: ../camel/camel-filter-search.c:581
-#, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "å??建å?è¿?ç¨?â??%sâ??失败ï¼?%s"
-
#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:737 ../camel/camel-filter-search.c:745
+#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "æ?§è¡?è¿?滤è§?å??æ??ç´¢é??误ï¼?%sï¼?%s"
-#: ../camel/camel-folder-search.c:332 ../camel/camel-folder-search.c:444
+#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:608
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -1562,7 +1364,8 @@ msgstr ""
"æ? æ³?解æ??æ??索表达å¼?ï¼?%sï¼?\n"
"%s"
-#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:454
+#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
+#: ../camel/camel-folder-search.c:618
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -1571,72 +1374,72 @@ msgstr ""
"æ?§è¡?æ??索表达å¼?é??误ï¼?%sï¼?\n"
"%s"
-#: ../camel/camel-folder-search.c:643 ../camel/camel-folder-search.c:685
+#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
#, c-format
msgid "(%s) requires a single bool result"
msgstr "(%s) é??è¦?ä¸?个å¸?å°?ç»?æ??"
-#: ../camel/camel-folder-search.c:738
+#: ../camel/camel-folder-search.c:905
#, c-format
msgid "(%s) not allowed inside %s"
msgstr "(%s) ä¸?å??许å?¨ %s ä¸ä½¿ç?¨"
-#: ../camel/camel-folder-search.c:744 ../camel/camel-folder-search.c:751
+#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
#, c-format
msgid "(%s) requires a match type string"
msgstr "(%s) é??è¦?ä¸?个å?¹é??ç±»å??å?符串"
-#: ../camel/camel-folder-search.c:778
+#: ../camel/camel-folder-search.c:945
#, c-format
msgid "(%s) expects an array result"
msgstr "(%s) é??è¦?ä¸?个æ?°ç»?ç»?æ??"
-#: ../camel/camel-folder-search.c:787
+#: ../camel/camel-folder-search.c:954
#, c-format
msgid "(%s) requires the folder set"
msgstr "(%s) é??è¦?æ??件夹é??"
-#: ../camel/camel-folder-search.c:882
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "对æ?ªç?¥ç??头è¿?è¡?æ?¥è¯¢ï¼?%s"
-
-#: ../camel/camel-folder.c:693
+#: ../camel/camel-folder.c:683
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?é??å? 信件ï¼?为 %s"
-#: ../camel/camel-folder.c:1349
+#: ../camel/camel-folder.c:1388
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?æ??表达å¼?æ??ç´¢ï¼?æ??ç´¢ %s"
-#: ../camel/camel-folder.c:1390
+#: ../camel/camel-folder.c:1429
+#, fuzzy, c-format
+msgid "Unsupported operation: count by expression: for %s"
+msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?æ??表达å¼?æ??ç´¢ï¼?æ??ç´¢ %s"
+
+#: ../camel/camel-folder.c:1468
#, c-format
msgid "Unsupported operation: search by UIDs: for %s"
msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?æ?? UID æ??ç´¢ï¼?æ??ç´¢ %s"
-#: ../camel/camel-folder.c:1506
+#: ../camel/camel-folder.c:1581
msgid "Moving messages"
msgstr "移�信件"
-#: ../camel/camel-folder.c:1506
+#: ../camel/camel-folder.c:1581
msgid "Copying messages"
msgstr "��信件"
-#: ../camel/camel-folder.c:1852
+#: ../camel/camel-folder.c:1922
msgid "Learning junk"
msgstr "å¦ä¹ å??å?¾é?®ä»¶"
-#: ../camel/camel-folder.c:1869
+#: ../camel/camel-folder.c:1939
msgid "Learning non-junk"
msgstr "å¦ä¹ é??å??å?¾é?®ä»¶"
-#: ../camel/camel-folder.c:1888
+#: ../camel/camel-folder.c:1958
msgid "Filtering new message(s)"
msgstr "�滤�信件"
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:752
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -1647,15 +1450,15 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:767
msgid "Failed to parse gpg userid hint."
msgstr "解æ?? gpg userid æ??示失败ã??"
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:791 ../camel/camel-gpg-context.c:805
msgid "Failed to parse gpg passphrase request."
msgstr "解æ?? gpg å¯?ç ?å?¥è¯·æ±?失败ã??"
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:825
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
@@ -1664,7 +1467,7 @@ msgstr ""
"æ?¨é??è¦?ä¸?个 PIN ç?¨æ?¥è§£é??æ?¨ç??æ?ºè?½å?¡ï¼?\n"
"â??%sâ??"
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:829
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -1673,95 +1476,96 @@ msgstr ""
"æ?¨é??è¦?ä¸?个å¯?ç ?å?¥ç?¨æ?¥è§£é??以ä¸?ç?¨æ?·ï¼?\n"
"â??%sâ??"
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:834
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr "GnuPG 对â??%sâ??ç??æ??å¤?å??åº?"
-#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1068
-#: ../camel/providers/nntp/camel-nntp-store.c:1281
+#: ../camel/camel-gpg-context.c:859 ../camel/camel-gpg-context.c:1068
+#: ../camel/providers/nntp/camel-nntp-store.c:1313
msgid "Canceled."
msgstr "å·²å??æ¶?ã??"
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:873
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr "解é??å¯?é?¥å¤±è´¥ï¼?ç»?å?ºäº? 3 个é??误ç??å¯?ç ?å?¥ã??"
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:881
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "æ?¥è?ª GnuPG ç??æ??å¤?åº?ç?ï¼?%s"
-#: ../camel/camel-gpg-context.c:937
+#: ../camel/camel-gpg-context.c:944
msgid "Failed to encrypt: No valid recipients specified."
msgstr "å? å¯?失败ï¼?没æ??æ??å®?æ??æ??ç??æ?¶ä»¶äººã??"
#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1206 ../camel/camel-gpg-context.c:1334
-#: ../camel/camel-gpg-context.c:1829 ../camel/camel-gpg-context.c:1874
+#: ../camel/camel-gpg-context.c:1206 ../camel/camel-gpg-context.c:1331
+#: ../camel/camel-gpg-context.c:1853 ../camel/camel-gpg-context.c:1898
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "�� gpg 失败�%s"
-#: ../camel/camel-gpg-context.c:1302 ../camel/camel-smime-context.c:392
+#: ../camel/camel-gpg-context.c:1299 ../camel/camel-smime-context.c:602
#, c-format
msgid "Could not generate signing data: %s"
msgstr "æ? æ³?ç??æ??ç¾å??æ?°æ?®ï¼?%s"
-#: ../camel/camel-gpg-context.c:1349 ../camel/camel-gpg-context.c:1534
-#: ../camel/camel-gpg-context.c:1619 ../camel/camel-gpg-context.c:1634
-#: ../camel/camel-gpg-context.c:1750 ../camel/camel-gpg-context.c:1765
-#: ../camel/camel-gpg-context.c:1845 ../camel/camel-gpg-context.c:1890
+#: ../camel/camel-gpg-context.c:1346 ../camel/camel-gpg-context.c:1547
+#: ../camel/camel-gpg-context.c:1563 ../camel/camel-gpg-context.c:1643
+#: ../camel/camel-gpg-context.c:1658 ../camel/camel-gpg-context.c:1774
+#: ../camel/camel-gpg-context.c:1789 ../camel/camel-gpg-context.c:1869
+#: ../camel/camel-gpg-context.c:1914
msgid "Failed to execute gpg."
msgstr "æ?§è¡? gpg 失败ã??"
-#: ../camel/camel-gpg-context.c:1368
+#: ../camel/camel-gpg-context.c:1365
msgid "This is a digitally signed message part"
msgstr "è¿?æ?¯ä¿¡ä»¶ç??æ?°å?ç¾å??é?¨å??"
-#: ../camel/camel-gpg-context.c:1453 ../camel/camel-gpg-context.c:1459
-#: ../camel/camel-gpg-context.c:1465 ../camel/camel-gpg-context.c:1480
-#: ../camel/camel-smime-context.c:695 ../camel/camel-smime-context.c:706
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-gpg-context.c:1451 ../camel/camel-gpg-context.c:1457
+#: ../camel/camel-gpg-context.c:1463 ../camel/camel-gpg-context.c:1478
+#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
+#: ../camel/camel-smime-context.c:928
msgid "Cannot verify message signature: Incorrect message format"
msgstr "æ? æ³?æ ¡éª?信件ç¾å??ï¼?ä¿¡ä»¶æ ¼å¼?ä¸?对"
-#: ../camel/camel-gpg-context.c:1519
+#: ../camel/camel-gpg-context.c:1517
#, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr "æ? æ³?æ ¡éª?信件ç¾å??ï¼?æ? æ³?å??建临æ?¶æ??件ï¼?%s"
-#: ../camel/camel-gpg-context.c:1602
+#: ../camel/camel-gpg-context.c:1626
#, c-format
msgid "Could not generate encrypting data: %s"
msgstr "æ? æ³?ç??æ??å? å¯?æ?°æ?®ï¼?%s"
-#: ../camel/camel-gpg-context.c:1652
+#: ../camel/camel-gpg-context.c:1676
msgid "This is a digitally encrypted message part"
msgstr "è¿?æ?¯ä¿¡ä»¶ç??æ?°å?å? å¯?é?¨å??"
-#: ../camel/camel-gpg-context.c:1705 ../camel/camel-gpg-context.c:1713
-#: ../camel/camel-gpg-context.c:1732
+#: ../camel/camel-gpg-context.c:1729 ../camel/camel-gpg-context.c:1737
+#: ../camel/camel-gpg-context.c:1756
msgid "Cannot decrypt message: Incorrect message format"
msgstr "æ? æ³?解å¯?信件ï¼?ä¿¡ä»¶æ ¼å¼?ä¸?对"
-#: ../camel/camel-gpg-context.c:1722
+#: ../camel/camel-gpg-context.c:1746
msgid "Failed to decrypt MIME part: protocol error"
msgstr "解å¯? MIME é?¨å??失败ï¼?å??è®®é??误"
-#: ../camel/camel-gpg-context.c:1787 ../camel/camel-smime-context.c:969
+#: ../camel/camel-gpg-context.c:1811 ../camel/camel-smime-context.c:1186
msgid "Encrypted content"
msgstr "å? å¯?å??容"
-#: ../camel/camel-gpg-context.c:1806
+#: ../camel/camel-gpg-context.c:1830
msgid "Unable to parse message content"
msgstr "æ? æ³?å??æ??信件å??容"
-#: ../camel/camel-gpg-context.c:1830 ../camel/camel-gpg-context.c:1875
-#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-utils.c:624
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-#: ../camel/providers/smtp/camel-smtp-transport.c:221
+#: ../camel/camel-gpg-context.c:1854 ../camel/camel-gpg-context.c:1899
+#: ../camel/camel-tcp-stream-openssl.c:627
+#: ../camel/providers/imap4/camel-imap4-utils.c:614
+#: ../camel/providers/smtp/camel-smtp-transport.c:165
+#: ../camel/providers/smtp/camel-smtp-transport.c:220
msgid "Unknown"
msgstr "��"
@@ -1775,12 +1579,12 @@ msgstr "æ? æ³?å??建é??å®?å?©æ??管é??ï¼?%s"
msgid "Cannot fork locking helper: %s"
msgstr "æ? æ³?å??建é??å®?å?©æ??è¿?ç¨?ï¼?%s"
-#: ../camel/camel-lock-client.c:204 ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
#, c-format
msgid "Could not lock '%s': protocol error with lock-helper"
msgstr "æ? æ³?é??å®?â??%sâ??ï¼?lock-helper å??è®®é??误"
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:216
#, c-format
msgid "Could not lock '%s'"
msgstr "æ? æ³?é??å®?â??%sâ??"
@@ -1859,54 +1663,54 @@ msgstr "å??å?¥é?®ä»¶ä¸´æ?¶æ??件é??误ï¼?%s"
msgid "Error copying mail temp file: %s"
msgstr "å¤?å?¶é?®ä»¶ä¸´æ?¶æ??件é??误ï¼?%s"
-#: ../camel/camel-multipart-signed.c:593
+#: ../camel/camel-multipart-signed.c:592
msgid "parse error"
msgstr "解æ??é??误"
-#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667
-#: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:447
-#: ../camel/providers/pop3/camel-pop3-store.c:547
+#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
+#: ../camel/camel-net-utils.c:806
+#: ../camel/providers/pop3/camel-pop3-store.c:446
+#: ../camel/providers/pop3/camel-pop3-store.c:546
msgid "Canceled"
msgstr "å·²å??æ¶?"
-#: ../camel/camel-net-utils.c:524
+#: ../camel/camel-net-utils.c:522
msgid "cannot create thread"
msgstr "æ? æ³?å??建线索"
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-net-utils.c:678
#, c-format
msgid "Resolving: %s"
msgstr "解æ??ï¼?%s"
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:700
msgid "Host lookup failed"
msgstr "主æ?ºæ?¥é??失败"
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:702
#, c-format
msgid "Host lookup failed: %s: %s"
msgstr "主æ?ºæ?¥é??失败ï¼?%sï¼?%s"
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:810
msgid "Resolving address"
msgstr "解æ??å?°å??"
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:830
msgid "Name lookup failed"
msgstr "å??称æ?¥é??失败"
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:833
#, c-format
msgid "Name lookup failed: %s"
msgstr "å??称æ?¥é??失败ï¼?%s"
-#: ../camel/camel-offline-folder.c:254
+#: ../camel/camel-offline-folder.c:249
#, c-format
msgid "Syncing messages in folder '%s' to disk"
msgstr "æ£å?¨å°?æ??件夹â??%sâ??ä¸ç??信件å??æ¥å?°ç£?ç??"
-#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
#, c-format
msgid "Cannot write offline journal for folder '%s': %s"
msgstr "æ? æ³?å??å?¥æ??件夹â??%sâ??ç??离线æ?¥è®°ï¼?%s"
@@ -1934,24 +1738,24 @@ msgstr "æ? æ³?è£?å?¥ %sï¼?%s"
msgid "Could not load %s: No initialization code in module."
msgstr "æ? æ³?è£?å?¥ %sï¼?模å??ä¸æ²¡æ??å??å§?å??代ç ?ã??"
-#: ../camel/camel-provider.c:373 ../camel/camel-session.c:177
+#: ../camel/camel-provider.c:379 ../camel/camel-session.c:182
#, c-format
msgid "No provider available for protocol '%s'"
msgstr "å??è®®â??%sâ??没æ??å?¯ç?¨ç??æ??ä¾?è??"
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:36
msgid "Anonymous"
msgstr "å?¿å??"
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:38
msgid "This option will connect to the server using an anonymous login."
msgstr "该é??项å°?è¿?æ?¥å?°å?¿å??ç?»å½?ç??æ??å?¡å?¨ä¸?ã??"
-#: ../camel/camel-sasl-anonymous.c:124 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
msgid "Authentication failed."
msgstr "认è¯?失败ã??"
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:130
#, c-format
msgid ""
"Invalid email address trace information:\n"
@@ -1960,7 +1764,7 @@ msgstr ""
"æ? æ??ç??ç?µå?é?®ä»¶è·?踪信æ?¯ï¼?\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:142
#, c-format
msgid ""
"Invalid opaque trace information:\n"
@@ -1969,7 +1773,7 @@ msgstr ""
"æ? æ??ç??诲涩è·?踪信æ?¯ï¼?\n"
"%s"
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:154
#, c-format
msgid ""
"Invalid trace information:\n"
@@ -1998,97 +1802,97 @@ msgid ""
"if the server supports it."
msgstr "å¦?æ??æ??å?¡å?¨æ?¯æ??ç??è¯?ï¼?该é??项å°?ç?¨å®?å?¨ DIGEST-MD5 å¯?ç ?è¿?æ?¥å?°æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-digest-md5.c:845
+#: ../camel/camel-sasl-digest-md5.c:844
msgid "Server challenge too long (>2048 octets)"
msgstr "æ??å?¡å?¨è´¨è¯¢è¿?é?¿ (>2048 å?è??)"
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:853
msgid "Server challenge invalid\n"
msgstr "æ??å?¡å?¨è´¨è¯¢æ? æ??\n"
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:859
msgid "Server challenge contained invalid \"Quality of Protection\" token"
msgstr "æ??å?¡å?¨è´¨è¯¢å?«æ??æ? æ??ç??â??å??è´¨ä¿?æ?¤â??æ ?å¿?"
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:889
msgid "Server response did not contain authorization data"
msgstr "æ??å?¡å?¨åº?ç?ä¸?å?«æ??认è¯?æ?°æ?®"
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:907
msgid "Server response contained incomplete authorization data"
msgstr "æ??å?¡å?¨åº?è¾¾å?«æ??ä¸?å®?æ?´ç??认è¯?æ?°æ?®"
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:917
msgid "Server response does not match"
msgstr "æ??å?¡å?¨åº?ç?ä¸?å?¹é??"
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:63
msgid "GSSAPI"
msgstr "GSSAPI"
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:65
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr "该é??项å°?ç?¨ Kerberos 5 认è¯?è¿?æ?¥å?°æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:159
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
msgstr "æ??æ??ä¾?ç??è¯?书ä¸?æ?¯æ??æ??å®?ç??æ?ºå?¶ï¼?æ??è??æ? æ³?被å®?ç?°æ??è¯?å?«ã??"
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:164
msgid "The provided target_name parameter was ill-formed."
msgstr "æ??ä¾?ç?? target_name å??æ?°æ ¼å¼?ä¸?对ã??"
-#: ../camel/camel-sasl-gssapi.c:172
+#: ../camel/camel-sasl-gssapi.c:167
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
msgstr "æ??ä¾?ç?? target_name å??æ?°å??å?«æ? æ??æ??ä¸?æ?¯æ??ç??å??称类å??ã??"
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:171
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:181
+#: ../camel/camel-sasl-gssapi.c:176
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
msgstr "input_token å??å?«æ? æ??ç??ç¾å??ï¼?æ??è??æ? æ³?éª?è¯?ç¾å??ã??"
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:180
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:190
+#: ../camel/camel-sasl-gssapi.c:185
msgid "The supplied context handle did not refer to a valid context."
msgstr "æ??ä¾?ç??ä¸?ä¸?æ??å?¥æ??æ??å¼?ç?¨ç??ä¸?ä¸?æ??æ? æ??ã??"
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../camel/camel-sasl-gssapi.c:188
msgid "The consistency checks performed on the input_token failed."
msgstr "对 input_token æ?§è¡?å®?æ?´æ?§æ£?æ?¥å¤±è´¥ã??"
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:191
msgid "The consistency checks performed on the credential failed."
msgstr "对è¯?书æ?§è¡?å®?æ?´æ?§æ£?æ?¥å¤±è´¥ã??"
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:194
msgid "The referenced credentials have expired."
msgstr "å¼?ç?¨ç??è¯?书已è¿?æ??ã??"
-#: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253
-#: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304
-#: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1272
+#: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
+#: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
+#: ../camel/camel-sasl-kerberos4.c:230
+#: ../camel/providers/imap/camel-imap-store.c:1274
msgid "Bad authentication response from server."
msgstr "æ?¥è?ªæ??å?¡å?¨ç??æ? æ??认è¯?åº?ç?ã??"
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:309
msgid "Unsupported security layer."
msgstr "ä¸?æ?¯æ??ç??å®?å?¨å±?ã??"
@@ -2100,7 +1904,7 @@ msgstr "Kerberos 4"
msgid "This option will connect to the server using Kerberos 4 authentication."
msgstr "该é??项å°?ç?¨ Kerberos 4 认è¯?è¿?æ?¥å?°æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-kerberos4.c:174
+#: ../camel/camel-sasl-kerberos4.c:173
#, c-format
msgid ""
"Could not get Kerberos ticket:\n"
@@ -2117,7 +1921,7 @@ msgstr "Login"
msgid "This option will connect to the server using a simple password."
msgstr "该é??项å°?以æ?®é??å¯?ç ?è¿?æ?¥å?°æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-login.c:135
+#: ../camel/camel-sasl-login.c:134
msgid "Unknown authentication state."
msgstr "æ?ªç?¥ç??认è¯?ç?¶æ??ã??"
@@ -2160,22 +1964,22 @@ msgstr "以é?? pop æº?è¿?è¡? SMTP ä¹?å??ç?? POP æ??æ??"
msgid "Regular expression compilation failed: %s: %s"
msgstr "常�表达���失败�%s�%s"
-#: ../camel/camel-service.c:270
+#: ../camel/camel-service.c:265
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URLâ??%sâ??é??è¦?ç?¨æ?·å??ç»?件"
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:269
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URLâ??%sâ??é??è¦?主æ?ºç»?件"
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:273
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URLâ??%sâ??é??è¦?è·¯å¾?ç»?件"
-#: ../camel/camel-session.c:303
+#: ../camel/camel-session.c:307
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -2184,373 +1988,373 @@ msgstr ""
"æ? æ³?å??建ç?®å½? %sï¼?\n"
"%s"
-#: ../camel/camel-session.c:478
+#: ../camel/camel-session.c:479
#, 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:234 ../camel/camel-smime-context.c:778
+#: ../camel/camel-session.c:817
+msgid "Camel session doesn't support forwarding of a message."
+msgstr ""
+
+#: ../camel/camel-smime-context.c:444 ../camel/camel-smime-context.c:993
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "æ? æ³?æ?¾å?°â??%sâ??ç??è¯?书"
-#: ../camel/camel-smime-context.c:240
+#: ../camel/camel-smime-context.c:450
msgid "Cannot create CMS message"
msgstr "æ? æ³?å??建 CMS 信件"
-#: ../camel/camel-smime-context.c:245
+#: ../camel/camel-smime-context.c:455
msgid "Cannot create CMS signed data"
msgstr "æ? æ³?å??建 CMS ç¾å??æ?°æ?®"
-#: ../camel/camel-smime-context.c:251
+#: ../camel/camel-smime-context.c:461
msgid "Cannot attach CMS signed data"
msgstr "æ? æ³?é??å? CMS ç¾å??æ?°æ?®"
-#: ../camel/camel-smime-context.c:258
+#: ../camel/camel-smime-context.c:468
msgid "Cannot attach CMS data"
msgstr "æ? æ³?é??å? CMS æ?°æ?®"
-#: ../camel/camel-smime-context.c:264
+#: ../camel/camel-smime-context.c:474
msgid "Cannot create CMS Signer information"
msgstr "æ? æ³?å??建 CMS ç¾å??è??ä¿¡æ?¯"
-#: ../camel/camel-smime-context.c:270
+#: ../camel/camel-smime-context.c:480
msgid "Cannot find certificate chain"
msgstr "����书�"
-#: ../camel/camel-smime-context.c:276
+#: ../camel/camel-smime-context.c:486
msgid "Cannot add CMS Signing time"
msgstr "æ? æ³?æ·»å? CMS ç¾å??æ?¶é?´"
-#: ../camel/camel-smime-context.c:298 ../camel/camel-smime-context.c:310
+#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
#, c-format
msgid "Encryption certificate for '%s' does not exist"
msgstr "â??%sâ??ç??å? å¯?è¯?书ä¸?å?å?¨"
-#: ../camel/camel-smime-context.c:317
+#: ../camel/camel-smime-context.c:527
msgid "Cannot add SMIMEEncKeyPrefs attribute"
msgstr "æ? æ³?æ·»å? SMIMEEncKeyPrefs å±?æ?§"
-#: ../camel/camel-smime-context.c:322
+#: ../camel/camel-smime-context.c:532
msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
msgstr "æ? æ³?æ·»å? MS SMIMEEncKeyPrefs å±?æ?§"
-#: ../camel/camel-smime-context.c:327
+#: ../camel/camel-smime-context.c:537
msgid "Cannot add encryption certificate"
msgstr "æ? æ³?æ·»å? å? å¯?è¯?书"
-#: ../camel/camel-smime-context.c:333
+#: ../camel/camel-smime-context.c:543
msgid "Cannot add CMS Signer information"
msgstr "æ? æ³?æ·»å? CMS ç¾å??è??ä¿¡æ?¯"
-#: ../camel/camel-smime-context.c:403 ../camel/camel-smime-context.c:851
+#: ../camel/camel-smime-context.c:613 ../camel/camel-smime-context.c:1065
msgid "Cannot create encoder context"
msgstr "æ? æ³?å??建ç¼?ç ?å?¨ä¸?ä¸?æ??"
-#: ../camel/camel-smime-context.c:409
+#: ../camel/camel-smime-context.c:619
msgid "Failed to add data to CMS encoder"
msgstr "å°?æ?°æ?®æ·»å? å?° CMS ç¼?ç ?å?¨å¤±è´¥"
-#: ../camel/camel-smime-context.c:414 ../camel/camel-smime-context.c:868
+#: ../camel/camel-smime-context.c:624 ../camel/camel-smime-context.c:1082
msgid "Failed to encode data"
msgstr "ç¼?ç ?æ?°æ?®å¤±è´¥"
-#: ../camel/camel-smime-context.c:487
+#: ../camel/camel-smime-context.c:697
msgid "Unverified"
msgstr "æ?ªæ ¡éª?"
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:699
msgid "Good signature"
msgstr "å®?好ç¾å??"
-#: ../camel/camel-smime-context.c:491
+#: ../camel/camel-smime-context.c:701
msgid "Bad signature"
msgstr "æ? æ??ç¾å??"
-#: ../camel/camel-smime-context.c:493
+#: ../camel/camel-smime-context.c:703
msgid "Content tampered with or altered in transit"
msgstr "å??容å?¨ä¼ é??è¿?ç¨?ä¸è¢«ç¯¡æ?¹"
-#: ../camel/camel-smime-context.c:495
+#: ../camel/camel-smime-context.c:705
msgid "Signing certificate not found"
msgstr "ç¾å??è¯?书æ?¾ä¸?å?°"
-#: ../camel/camel-smime-context.c:497
+#: ../camel/camel-smime-context.c:707
msgid "Signing certificate not trusted"
msgstr "ç¾å??è¯?书ä¸?å?¯ä¿¡"
-#: ../camel/camel-smime-context.c:499
+#: ../camel/camel-smime-context.c:709
msgid "Signature algorithm unknown"
msgstr "ç¾å??ç®?æ³?æ?ªç?¥"
-#: ../camel/camel-smime-context.c:501
+#: ../camel/camel-smime-context.c:711
msgid "Signature algorithm unsupported"
msgstr "ç¾å??ç®?æ³?ä¸?æ?¯æ??"
-#: ../camel/camel-smime-context.c:503
+#: ../camel/camel-smime-context.c:713
msgid "Malformed signature"
msgstr "ç¾å??æ ¼å¼?ä¸?对"
-#: ../camel/camel-smime-context.c:505
+#: ../camel/camel-smime-context.c:715
msgid "Processing error"
msgstr "å¤?ç??é??误"
-#: ../camel/camel-smime-context.c:542
+#: ../camel/camel-smime-context.c:753
msgid "No signed data in signature"
msgstr "ç¾å??ä¸æ²¡æ??ç¾å??æ?°æ?®"
-#: ../camel/camel-smime-context.c:549
+#: ../camel/camel-smime-context.c:758
msgid "Digests missing from enveloped data"
msgstr "ä¿¡å°?æ?°æ?®ç¼ºå°?æ??è¦?"
-#: ../camel/camel-smime-context.c:562 ../camel/camel-smime-context.c:572
+#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
msgid "Cannot calculate digests"
msgstr "æ? æ³?计ç®?æ??è¦?"
-#: ../camel/camel-smime-context.c:577
+#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
msgid "Cannot set message digests"
msgstr "æ? æ³?设置信件æ??è¦?"
-#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:592
+#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
msgid "Certificate import failed"
msgstr "�书导�失败"
-#: ../camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:817
#, c-format
msgid "Certificate is the only message, cannot verify certificates"
msgstr "å?ªæ??è¯?书ç??信件ï¼?æ? æ³?æ ¡éª?è¯?书"
-#: ../camel/camel-smime-context.c:605
+#: ../camel/camel-smime-context.c:820
#, c-format
msgid "Certificate is the only message, certificates imported and verified"
msgstr "å?ªæ??è¯?书ç??信件ï¼?è¯?书已导å?¥å¹¶æ ¡éª?"
-#: ../camel/camel-smime-context.c:609
+#: ../camel/camel-smime-context.c:824
msgid "Cannot find signature digests"
msgstr "æ?¾ä¸?å?°ç¾å??æ??è¦?"
-#: ../camel/camel-smime-context.c:625
+#: ../camel/camel-smime-context.c:840
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "ç¾å??è??ï¼?%s <%s>ï¼?%s\n"
-#: ../camel/camel-smime-context.c:726
+#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
msgid "Decoder failed"
msgstr "解ç ?å?¨å¤±è´¥"
-#: ../camel/camel-smime-context.c:785
+#: ../camel/camel-smime-context.c:1000
msgid "Cannot find common bulk encryption algorithm"
msgstr "æ?¾ä¸?å?°å?¬å?±æ?¹é??å? å¯?ç®?æ³?"
-#. PORT_GetError(); ??
-#: ../camel/camel-smime-context.c:794
+#: ../camel/camel-smime-context.c:1008
msgid "Cannot allocate slot for encryption bulk key"
msgstr "æ? æ³?为å? å¯?æ?¹é??å¯?é?¥å??é??å¯?é?¥æ§½"
-#: ../camel/camel-smime-context.c:805
+#: ../camel/camel-smime-context.c:1019
msgid "Cannot create CMS Message"
msgstr "æ? æ³?å??建 CMS 信件"
-#: ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:1025
msgid "Cannot create CMS Enveloped data"
msgstr "æ? æ³?å??建 CMS ä¿¡å°?æ?°æ?®"
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:1031
msgid "Cannot attach CMS Enveloped data"
msgstr "æ? æ³?é??å? CMS ä¿¡å°?æ?°æ?®"
-#: ../camel/camel-smime-context.c:823
+#: ../camel/camel-smime-context.c:1037
msgid "Cannot attach CMS data object"
msgstr "æ? æ³?é??å? CMS æ?°æ?®å¯¹è±¡"
-#: ../camel/camel-smime-context.c:832
+#: ../camel/camel-smime-context.c:1046
msgid "Cannot create CMS Recipient information"
msgstr "æ? æ³?å??建 CMS æ?¶ä»¶äººä¿¡æ?¯"
-#: ../camel/camel-smime-context.c:837
+#: ../camel/camel-smime-context.c:1051
msgid "Cannot add CMS Recipient information"
msgstr "æ? æ³?æ·»å? CMS æ?¶ä»¶äººä¿¡æ?¯"
-#: ../camel/camel-smime-context.c:862
+#: ../camel/camel-smime-context.c:1076
msgid "Failed to add data to encoder"
msgstr "å°?æ?°æ?®æ·»å? å?°ç¼?ç ?å?¨å¤±è´¥"
-#: ../camel/camel-smime-context.c:949
-#, c-format
-msgid "Decoder failed, error %d"
-msgstr "解ç ?å?¨å¤±è´¥ï¼?é??误å?· %d"
-
-#: ../camel/camel-smime-context.c:956
+#: ../camel/camel-smime-context.c:1172
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME 解å¯?ï¼?没æ??æ?¾å?°å? å¯?å??容"
-#: ../camel/camel-smime-context.c:983
+#: ../camel/camel-smime-context.c:1200
msgid "import keys: unimplemented"
msgstr "导��������"
-#: ../camel/camel-smime-context.c:991
+#: ../camel/camel-smime-context.c:1208
msgid "export keys: unimplemented"
msgstr "导��������"
-#: ../camel/camel-store.c:272
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
+#: ../camel/camel-store.c:283
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
msgid "Cannot get folder: Invalid operation on this store"
msgstr "æ? æ³?è?·å??æ??件夹ï¼?对该å?å?¨ç??æ? æ??æ??ä½?"
-#: ../camel/camel-store.c:305
+#: ../camel/camel-store.c:316
#, c-format
msgid "Cannot create folder '%s': folder exists"
msgstr "æ? æ³?å??建æ??件夹ï¼?%sï¼?æ??件夹已å?å?¨"
-#: ../camel/camel-store.c:369
+#: ../camel/camel-store.c:395
msgid "Cannot create folder: Invalid operation on this store"
msgstr "æ? æ³?å??建æ??件夹ï¼?对该å?å?¨ç??æ? æ??æ??ä½?"
-#: ../camel/camel-store.c:397
+#: ../camel/camel-store.c:423
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "æ? æ³?å??建æ??件夹ï¼?%sï¼?æ??件夹已å?å?¨"
-#: ../camel/camel-store.c:461 ../camel/camel-vee-store.c:384
+#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
#: ../camel/providers/local/camel-maildir-store.c:219
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "æ? æ³?å? é?¤æ??件夹ï¼?%sï¼?æ? æ??æ??ä½?"
-#: ../camel/camel-store.c:513 ../camel/camel-vee-store.c:421
+#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
#: ../camel/providers/local/camel-maildir-store.c:291
#, 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:854 ../camel/camel-vtrash-folder.c:53
-#: ../camel/providers/imap/camel-imap-store.c:1060
+#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
msgid "Trash"
msgstr "å??æ?¶ç«?"
#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:857 ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
msgid "Junk"
msgstr "å??å?¾"
-#: ../camel/camel-tcp-stream-openssl.c:572
+#: ../camel/camel-tcp-stream-openssl.c:564
msgid "Unable to get issuer's certificate"
msgstr "æ? æ³?è?·å??å??è¡?è??ç??è¯?书"
-#: ../camel/camel-tcp-stream-openssl.c:574
+#: ../camel/camel-tcp-stream-openssl.c:566
msgid "Unable to get Certificate Revocation List"
msgstr "æ? æ³?è?·å??è¯?书å??é??å??表ç¾å??"
-#: ../camel/camel-tcp-stream-openssl.c:576
+#: ../camel/camel-tcp-stream-openssl.c:568
msgid "Unable to decrypt certificate signature"
msgstr "æ? æ³?解å¯?认è¯?ç¾å??"
-#: ../camel/camel-tcp-stream-openssl.c:578
+#: ../camel/camel-tcp-stream-openssl.c:570
msgid "Unable to decrypt Certificate Revocation List signature"
msgstr "æ? æ³?解å¯?è¯?书å??é??å??表ç¾å??"
-#: ../camel/camel-tcp-stream-openssl.c:580
+#: ../camel/camel-tcp-stream-openssl.c:572
msgid "Unable to decode issuer's public key"
msgstr "æ? æ³?对å??è¡?è??ç??å?¬é?¥è¿?è¡?解ç ?"
-#: ../camel/camel-tcp-stream-openssl.c:582
+#: ../camel/camel-tcp-stream-openssl.c:574
msgid "Certificate signature failure"
msgstr "è¯?书ç¾å??失败"
-#: ../camel/camel-tcp-stream-openssl.c:584
+#: ../camel/camel-tcp-stream-openssl.c:576
msgid "Certificate Revocation List signature failure"
msgstr "è¯?书å??é??å??表ç¾å??失败"
-#: ../camel/camel-tcp-stream-openssl.c:586
+#: ../camel/camel-tcp-stream-openssl.c:578
msgid "Certificate not yet valid"
msgstr "è¯?书æ?ªç??æ??"
-#: ../camel/camel-tcp-stream-openssl.c:588
+#: ../camel/camel-tcp-stream-openssl.c:580
msgid "Certificate has expired"
msgstr "è¯?书已è¿?æ??"
-#: ../camel/camel-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "CRL å°?ä¸?æ? æ??"
+#: ../camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate Revocation List (CRL) not yet valid"
+msgstr "è¯?书å??é??å??表ç¾å??失败"
-#: ../camel/camel-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "CRL å·²è¿?æ??"
+#: ../camel/camel-tcp-stream-openssl.c:584
+#, fuzzy
+msgid "Certificate Revocation List (CRL) has expired"
+msgstr "è¯?书å??é??å??表ç¾å??失败"
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "CRL é??误"
+#: ../camel/camel-tcp-stream-openssl.c:589
+#, fuzzy
+msgid "Error in Certificate Revocation List (CRL)"
+msgstr "æ? æ³?è?·å??è¯?书å??é??å??表ç¾å??"
-#: ../camel/camel-tcp-stream-openssl.c:599
+#: ../camel/camel-tcp-stream-openssl.c:591
msgid "Out of memory"
msgstr "å??å?è??å°½"
-#: ../camel/camel-tcp-stream-openssl.c:601
+#: ../camel/camel-tcp-stream-openssl.c:593
msgid "Zero-depth self-signed certificate"
msgstr "é?¶æ·±åº¦è?ªç¾å??è¯?书"
-#: ../camel/camel-tcp-stream-openssl.c:603
+#: ../camel/camel-tcp-stream-openssl.c:595
msgid "Self-signed certificate in chain"
msgstr "é?¾ä¸ç??è?ªç¾å??è¯?书"
-#: ../camel/camel-tcp-stream-openssl.c:605
+#: ../camel/camel-tcp-stream-openssl.c:597
msgid "Unable to get issuer's certificate locally"
msgstr "æ? æ³?å?¨æ?¬å?°è?·å??å??è¡?è??ç??è¯?书"
-#: ../camel/camel-tcp-stream-openssl.c:607
+#: ../camel/camel-tcp-stream-openssl.c:599
msgid "Unable to verify leaf signature"
msgstr "æ? æ³?æ ¡éª?å?¶å?ç¾å??"
-#: ../camel/camel-tcp-stream-openssl.c:609
+#: ../camel/camel-tcp-stream-openssl.c:601
msgid "Certificate chain too long"
msgstr "�书���"
-#: ../camel/camel-tcp-stream-openssl.c:611
+#: ../camel/camel-tcp-stream-openssl.c:603
msgid "Certificate Revoked"
msgstr "è¯?书已æ?¤é??"
-#: ../camel/camel-tcp-stream-openssl.c:613
+#: ../camel/camel-tcp-stream-openssl.c:605
msgid "Invalid Certificate Authority (CA)"
msgstr "æ? æ??ç??è¯?书é¢?å??æ?ºæ??(CA)"
-#: ../camel/camel-tcp-stream-openssl.c:615
+#: ../camel/camel-tcp-stream-openssl.c:607
msgid "Path length exceeded"
msgstr "è¶?é?¿ç??è·¯å¾?é?¿åº¦"
-#: ../camel/camel-tcp-stream-openssl.c:617
+#: ../camel/camel-tcp-stream-openssl.c:609
msgid "Invalid purpose"
msgstr "æ? æ??ç?®ç??"
-#: ../camel/camel-tcp-stream-openssl.c:619
+#: ../camel/camel-tcp-stream-openssl.c:611
msgid "Certificate untrusted"
msgstr "ä¸?ä¿¡ä»»ç??è¯?书"
-#: ../camel/camel-tcp-stream-openssl.c:621
+#: ../camel/camel-tcp-stream-openssl.c:613
msgid "Certificate rejected"
msgstr "å·²æ??ç»?ç??è¯?书"
-#: ../camel/camel-tcp-stream-openssl.c:624
+#: ../camel/camel-tcp-stream-openssl.c:616
msgid "Subject/Issuer mismatch"
msgstr "主é¢?/å??è¡?è??ä¸?å?¹é??"
-#: ../camel/camel-tcp-stream-openssl.c:626
+#: ../camel/camel-tcp-stream-openssl.c:618
msgid "AKID/SKID mismatch"
msgstr "AKID/SKID ä¸?å?¹é??"
-#: ../camel/camel-tcp-stream-openssl.c:628
+#: ../camel/camel-tcp-stream-openssl.c:620
msgid "AKID/Issuer serial mismatch"
msgstr "AKID/å??è¡?è??åº?å??å?·ä¸?å?¹é??"
-#: ../camel/camel-tcp-stream-openssl.c:630
+#: ../camel/camel-tcp-stream-openssl.c:622
msgid "Key usage does not support certificate signing"
msgstr "å¯?é?¥ä¸?æ?¯æ??è¯?书ç¾å??"
-#: ../camel/camel-tcp-stream-openssl.c:633
+#: ../camel/camel-tcp-stream-openssl.c:625
msgid "Error in application verification"
msgstr "åº?ç?¨ç¨?åº?éª?è¯?é??误"
-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:873
#, c-format
msgid ""
"Issuer: %s\n"
@@ -2563,15 +2367,15 @@ msgstr ""
"æ??纹ï¼? %s\n"
"ç¾å??ï¼? %s"
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
msgid "GOOD"
msgstr "好"
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
msgid "BAD"
msgstr "å??"
-#: ../camel/camel-tcp-stream-openssl.c:708
+#: ../camel/camel-tcp-stream-openssl.c:700
#, c-format
msgid ""
"Bad certificate from %s:\n"
@@ -2591,7 +2395,7 @@ msgstr ""
"æ?¨ä»?ç?¶å¸?æ??æ?¥å??å??ï¼?"
#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:890
+#: ../camel/camel-tcp-stream-ssl.c:883
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -2606,7 +2410,7 @@ msgstr ""
"\n"
"æ?¨å¸?æ??æ?¥å??å??ï¼?"
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:927
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -2615,7 +2419,7 @@ msgstr ""
"�书���%s\n"
"å??è¡?è??ï¼?%s"
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:979
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -2624,7 +2428,7 @@ msgstr ""
"æ? æ??ç??è¯?书å??å??ï¼?%s\n"
"å??è¡?è??ï¼?%s"
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:997
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -2633,7 +2437,7 @@ msgstr ""
"è¯?书è¿?æ??ï¼?%s\n"
"å??è¡?è??ï¼?%s"
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:1014
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -2647,44 +2451,44 @@ msgstr ""
msgid "Could not parse URL '%s'"
msgstr "æ? æ³?解æ?? URLâ??%sâ??"
-#: ../camel/camel-vee-folder.c:585
+#: ../camel/camel-vee-folder.c:580
#, c-format
msgid "Error storing '%s': %s"
msgstr "å?å?¨â??%sâ??é??误ï¼?%s"
-#: ../camel/camel-vee-folder.c:631
+#: ../camel/camel-vee-folder.c:657
#, c-format
msgid "No such message %s in %s"
msgstr "å?¨ %2$s ä¸æ²¡æ??信件 %1$s"
-#: ../camel/camel-vee-folder.c:754 ../camel/camel-vee-folder.c:760
+#: ../camel/camel-vee-folder.c:816 ../camel/camel-vee-folder.c:822
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "æ? æ³?å°?信件移å?¨æ??å¤?å?¶å?°è??æ??æ??件夹ä¸"
-#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
+#: ../camel/camel-vee-store.c:353
msgid "Unmatched"
msgstr "æ? å?¹é??"
-#: ../camel/camel-vee-store.c:407
+#: ../camel/camel-vee-store.c:400
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "æ? æ³?å? é?¤æ??件夹ï¼?%sï¼?没æ??该æ??件夹"
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:422
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "æ? æ³?é??å?½å??æ??件夹ï¼?%sï¼?没æ??该æ??件夹"
-#: ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-vtrash-folder.c:55
msgid "Cannot copy messages to the Trash folder"
msgstr "æ? æ³?å°?信件å¤?å?¶å?°å??æ?¶ç«?æ??件夹"
-#: ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-vtrash-folder.c:57
msgid "Cannot copy messages to the Junk folder"
msgstr "æ? æ³?å°?信件å¤?å?¶å?°å??å?¾é?®ä»¶æ??件夹"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:116
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -2693,226 +2497,234 @@ msgstr ""
"æ? æ³?è?·å??信件ï¼?%s\n"
" %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:116
-#: ../camel/providers/local/camel-maildir-folder.c:251
-#: ../camel/providers/local/camel-mbox-folder.c:348
-#: ../camel/providers/local/camel-mh-folder.c:204
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/local/camel-maildir-folder.c:262
+#: ../camel/providers/local/camel-maildir-folder.c:291
+#: ../camel/providers/local/camel-mbox-folder.c:363
+#: ../camel/providers/local/camel-mbox-folder.c:414
+#: ../camel/providers/local/camel-mh-folder.c:226
msgid "No such message"
msgstr "没æ??该信件"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:128
-#: ../camel/providers/imap4/camel-imap4-folder.c:812
-#: ../camel/providers/nntp/camel-nntp-folder.c:156
-#: ../camel/providers/nntp/camel-nntp-folder.c:232
-#: ../camel/providers/nntp/camel-nntp-folder.c:373
-#: ../camel/providers/pop3/camel-pop3-folder.c:266
-#: ../camel/providers/pop3/camel-pop3-folder.c:560
-#: ../camel/providers/pop3/camel-pop3-folder.c:621
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
+#: ../camel/providers/imap4/camel-imap4-folder.c:814
+#: ../camel/providers/nntp/camel-nntp-folder.c:175
+#: ../camel/providers/nntp/camel-nntp-folder.c:250
+#: ../camel/providers/nntp/camel-nntp-folder.c:410
+#: ../camel/providers/pop3/camel-pop3-folder.c:268
+#: ../camel/providers/pop3/camel-pop3-folder.c:578
#: ../camel/providers/pop3/camel-pop3-folder.c:639
+#: ../camel/providers/pop3/camel-pop3-folder.c:657
msgid "User canceled"
msgstr "ç?¨æ?·å·²å??æ¶?"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:135
-#: ../camel/providers/imap4/camel-imap4-folder.c:817
-#: ../camel/providers/nntp/camel-nntp-folder.c:147
-#: ../camel/providers/nntp/camel-nntp-folder.c:149
-#: ../camel/providers/nntp/camel-nntp-folder.c:158
-#: ../camel/providers/nntp/camel-nntp-folder.c:234
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
+#: ../camel/providers/imap4/camel-imap4-folder.c:819
+#: ../camel/providers/nntp/camel-nntp-folder.c:166
+#: ../camel/providers/nntp/camel-nntp-folder.c:168
+#: ../camel/providers/nntp/camel-nntp-folder.c:177
+#: ../camel/providers/nntp/camel-nntp-folder.c:252
#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:563
-#: ../camel/providers/pop3/camel-pop3-folder.c:624
-#: ../camel/providers/pop3/camel-pop3-folder.c:631
+#: ../camel/providers/pop3/camel-pop3-folder.c:581
#: ../camel/providers/pop3/camel-pop3-folder.c:642
+#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:660
#, c-format
msgid "Cannot get message %s: %s"
msgstr "æ? æ³?è?·å??信件 %sï¼?%s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:152
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:160
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2164
-#: ../camel/providers/imap4/camel-imap4-folder.c:835
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2463
+#: ../camel/providers/imap4/camel-imap4-folder.c:837
msgid "This message is not available in offline mode."
msgstr "该信件æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸ä½¿ç?¨ã??"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:179
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1696
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1747
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:194
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:201
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1966
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2017
msgid "Could not get message"
msgstr "æ? æ³?è?·å¾?信件"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:818
-#: ../camel/providers/imap/camel-imap-folder.c:248
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
+#: ../camel/providers/imap/camel-imap-folder.c:296
#, c-format
msgid "Could not load summary for %s"
msgstr "æ? æ³?为 %s è£?å?¥æ¦?è¦?"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1071
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012
+#, fuzzy, c-format
+msgid "Checking for deleted messages %s"
+msgstr "���信件"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
msgid "Trash Folder Full. Please Empty."
msgstr "å??æ?¶ç«?æ??件夹已满ã??请æ¸?空ã??"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1248
-#: ../camel/providers/groupwise/camel-groupwise-store.c:623
-#: ../camel/providers/groupwise/camel-groupwise-store.c:736
-#: ../camel/providers/imap/camel-imap-folder.c:3161
-#: ../camel/providers/imap/camel-imap-folder.c:3238
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
+#: ../camel/providers/groupwise/camel-groupwise-store.c:633
+#: ../camel/providers/groupwise/camel-groupwise-store.c:763
+#: ../camel/providers/imap/camel-imap-folder.c:3421
+#: ../camel/providers/imap/camel-imap-folder.c:3497
#, c-format
msgid "Fetching summary information for new messages in %s"
msgstr "ä»? %s ä¸ç??æ?°ä¿¡ä»¶ä¸è?·å??æ¦?è¦?ä¿¡æ?¯"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2031
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2073
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2317
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
#, c-format
msgid "Cannot append message to folder '%s': %s"
msgstr "æ? æ³?å°?信件追å? å?°æ??件夹â??%sâ??ï¼?%s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
#, c-format
msgid "Cannot create message: %s"
msgstr "æ? æ³?å??建信件ï¼?%s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
#, c-format
msgid "Cannot get folder container %s"
msgstr "æ? æ³?è?·å¾?æ??件夹容å?¨ %s"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
+#: ../camel/providers/imap4/camel-imap4-journal.c:311
msgid "Cannot append message in offline mode: cache unavailable"
msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?追å? 信件ï¼?ç¼?å?ä¸?å?¯ç?¨"
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
+#: ../camel/providers/imap4/camel-imap4-journal.c:327
#, c-format
msgid "Cannot append message in offline mode: %s"
msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?追å? 信件ï¼?%s"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
+#: ../camel/providers/imap4/camel-imap4-provider.c:38
msgid "Checking for new mail"
msgstr "����件"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
+#: ../camel/providers/hula/camel-hula-provider.c:50
#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
+#: ../camel/providers/imap4/camel-imap4-provider.c:40
msgid "C_heck for new messages in all folders"
msgstr "å?¨æ??æ??æ??件夹ä¸æ£?æ?¥æ?°ä¿¡ä»¶(_H)"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
+#: ../camel/providers/imap4/camel-imap4-provider.c:51
#: ../camel/providers/local/camel-local-provider.c:46
#: ../camel/providers/local/camel-local-provider.c:86
#: ../camel/providers/local/camel-local-provider.c:106
msgid "Options"
msgstr "é??项"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
msgid "_Apply filters to new messages in Inbox on this server"
msgstr "åº?ç?¨è¿?滤è§?å??å?°æ¤æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡ä»¶(_A)"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
msgid "Check new messages for J_unk contents"
msgstr "æ£?æ?¥æ?°ä¿¡ä»¶ç??å??å?¾å??容(_U)"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
#: ../camel/providers/imap/camel-imap-provider.c:74
msgid "Only check for Junk messages in the IN_BOX folder"
msgstr "ä»?å?¨æ?¶ä»¶ç®±ä¸æ£?æ?¥å??å?¾é?®ä»¶(_B)"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
msgid "Automatically synchroni_ze account locally"
msgstr "è?ªå?¨å°?è¿?ç¨?é?®ä»¶å??æ¥å?°æ?¬å?°(_Z)"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
msgid "SOAP Settings"
msgstr "SOAP 设置"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
-msgid "Post Office Agent SOAP Port:"
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
+#, fuzzy
+msgid "Post Office Agent SOAP _Port:"
msgstr "é?®å±?代ç?? SOAP 端å?£ï¼?"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
msgid "Novell GroupWise"
msgstr "Novell GroupWise"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
msgid "For accessing Novell GroupWise servers"
msgstr "访é?® Novell GroupWise æ??å?¡å?¨"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
+#: ../camel/providers/hula/camel-hula-provider.c:93
#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:84
+#: ../camel/providers/imap4/camel-imap4-provider.c:83
#: ../camel/providers/imapp/camel-imapp-provider.c:67
#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:74
msgid "Password"
msgstr "å¯?ç ?"
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
msgid ""
"This option will connect to the GroupWise server using a plaintext password."
msgstr "该é??项å°?使ç?¨çº¯æ??æ?¬å¯?ç ?è¿?æ?¥å?° GroupWise æ??å?¡å?¨ã??"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:103
+#: ../camel/providers/groupwise/camel-groupwise-store.c:102
msgid "Host or user not available in url"
msgstr "URL ä¸ç??主æ?ºæ??ç?¨æ?·ä¸?å?¯ç?¨"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:206
-#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/groupwise/camel-groupwise-store.c:204
+#: ../camel/providers/imap/camel-imap-store.c:1358
msgid "You did not enter a password."
msgstr "æ?¨æ²¡æ??è¾?å?¥å¯?ç ?ã??"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:302
+#: ../camel/providers/groupwise/camel-groupwise-store.c:319
msgid "Some features may not work correctly with your current server version"
msgstr "æ??äº?ç?¹æ?§å?¯è?½æ? æ³?ä¸?æ?¨ç?®å??ç??æ??å?¡å?¨ç??æ?¬å?±å??å·¥ä½?"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:532
-#: ../camel/providers/imap/camel-imap-store.c:1846
-#: ../camel/providers/imap/camel-imap-store.c:2044
+#: ../camel/providers/groupwise/camel-groupwise-store.c:540
+#: ../camel/providers/imap/camel-imap-store.c:1849
+#: ../camel/providers/imap/camel-imap-store.c:2047
#, c-format
msgid "No such folder %s"
msgstr "没æ??æ??件夹 %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1219
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
msgid "Cannot create GroupWise folders in offline mode."
msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?å??建 GroupWise æ??件夹ã??"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1233
-#: ../camel/providers/imap/camel-imap-store.c:1921
-#: ../camel/providers/imap/camel-imap-store.c:2301
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
+#: ../camel/providers/imap/camel-imap-store.c:1924
+#: ../camel/providers/imap/camel-imap-store.c:2304
msgid "The parent folder is not allowed to contain subfolders"
msgstr "ç?¶æ??件夹ä¸?å??许å?«æ??å?æ??件夹"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1309
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1330
-#, c-format
-msgid "Cannot rename Groupwise folder '%s' to '%s'"
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
+#, fuzzy, c-format
+msgid "Cannot rename GroupWise folder '%s' to '%s'"
msgstr "æ? æ³?å°? GroupWise æ??件夹â??%sâ??é??å?½å??为â??%sâ??"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1362
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
#, c-format
msgid "GroupWise server %s"
msgstr "GroupWise æ??å?¡å?¨ %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1364
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
#, c-format
msgid "GroupWise service for %s on %s"
msgstr "%2$s 为 %1$s æ??ä¾?ç?? GroupWise æ??å?¡"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
#, c-format
msgid "GroupWise mail delivery via %s"
msgstr "é??è¿? %s å??é?? GroupWise é?®ä»¶"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
msgid "Sending Message"
msgstr "å??é??信件"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
msgid ""
"You have exceeded this account's storage limit. Your messages are queued in "
"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
@@ -2921,93 +2733,93 @@ msgstr ""
"æ?¨å·²ç»?è¾¾å?°äº?è´¦æ?·ç??å?å?¨é??å?¶ã??æ?¨ç??é?®ä»¶æ£å?¨å??件箱ä¸æ??é??ã??请å??å? é?¤/å?æ¡£æ??äº?é?®ä»¶ä¹?"
"å??å??å??é??/æ?¥æ?¶ã??\n"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
#, c-format
msgid "Could not send message: %s"
msgstr "æ? æ³?å??é??信件ï¼?%s"
-#: ../camel/providers/hula/camel-hula-provider.c:49
+#: ../camel/providers/hula/camel-hula-provider.c:48
#: ../camel/providers/imap/camel-imap-provider.c:44
msgid "Checking for New Mail"
msgstr "����件"
-#: ../camel/providers/hula/camel-hula-provider.c:54
+#: ../camel/providers/hula/camel-hula-provider.c:53
#: ../camel/providers/imap/camel-imap-provider.c:52
msgid "Connection to Server"
msgstr "è¿?æ?¥æ??å?¡å?¨"
-#: ../camel/providers/hula/camel-hula-provider.c:56
+#: ../camel/providers/hula/camel-hula-provider.c:55
#: ../camel/providers/imap/camel-imap-provider.c:54
msgid "_Use custom command to connect to server"
msgstr "使ç?¨è?ªå®?ä¹?å?½ä»¤è¿?æ?¥å?°æ??å?¡å?¨(_U)"
-#: ../camel/providers/hula/camel-hula-provider.c:58
+#: ../camel/providers/hula/camel-hula-provider.c:57
#: ../camel/providers/imap/camel-imap-provider.c:56
msgid "Command:"
msgstr "�令�"
-#: ../camel/providers/hula/camel-hula-provider.c:61
+#: ../camel/providers/hula/camel-hula-provider.c:60
#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
+#: ../camel/providers/imap4/camel-imap4-provider.c:43
#: ../camel/providers/nntp/camel-nntp-provider.c:44
msgid "Folders"
msgstr "æ??件夹"
-#: ../camel/providers/hula/camel-hula-provider.c:63
+#: ../camel/providers/hula/camel-hula-provider.c:62
#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
+#: ../camel/providers/imap4/camel-imap4-provider.c:45
msgid "_Show only subscribed folders"
msgstr "å?ªæ?¾ç¤ºè®¢é??äº?ç??æ??件夹(_S)"
-#: ../camel/providers/hula/camel-hula-provider.c:65
+#: ../camel/providers/hula/camel-hula-provider.c:64
#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
+#: ../camel/providers/imap4/camel-imap4-provider.c:47
msgid "O_verride server-supplied folder namespace"
msgstr "è¦?ç??æ??å?¡å?¨æ??ä¾?ç??æ??件夹å?½å??空é?´(_V)"
-#: ../camel/providers/hula/camel-hula-provider.c:67
+#: ../camel/providers/hula/camel-hula-provider.c:66
msgid "Namespace"
msgstr "å?½å??空é?´"
-#: ../camel/providers/hula/camel-hula-provider.c:78
+#: ../camel/providers/hula/camel-hula-provider.c:76
msgid "Hula"
msgstr "Hula"
-#: ../camel/providers/hula/camel-hula-provider.c:80
+#: ../camel/providers/hula/camel-hula-provider.c:78
msgid "For accessing Hula servers"
msgstr "访é?® Hula æ??å?¡å?¨"
-#: ../camel/providers/hula/camel-hula-provider.c:97
+#: ../camel/providers/hula/camel-hula-provider.c:95
msgid "This option will connect to the Hula server using a plaintext password."
msgstr "该é??项å°?使ç?¨çº¯æ??æ?¬å¯?ç ?è¿?æ?¥å?° Hula æ??å?¡å?¨ã??"
-#: ../camel/providers/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
+#: ../camel/providers/imap/camel-imap-command.c:181
+#: ../camel/providers/imap/camel-imap-command.c:265
msgid "No output stream"
msgstr "没æ??è¾?å?ºæµ?"
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
+#: ../camel/providers/imap/camel-imap-command.c:186
+#: ../camel/providers/imap/camel-imap-command.c:270
msgid "No input stream"
msgstr "没æ??è¾?å?¥æµ?"
-#: ../camel/providers/imap/camel-imap-command.c:231
-#: ../camel/providers/imap/camel-imap-command.c:280
-#: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3029
+#: ../camel/providers/imap/camel-imap-command.c:229
+#: ../camel/providers/imap/camel-imap-command.c:278
+#: ../camel/providers/imap/camel-imap-command.c:492
+#: ../camel/providers/imap/camel-imap-store.c:3051
msgid "Operation cancelled"
msgstr "æ??ä½?å·²å??æ¶?"
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3032
+#: ../camel/providers/imap/camel-imap-command.c:331
+#: ../camel/providers/imap/camel-imap-store.c:3056
#, 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:354
+#: ../camel/providers/imap/camel-imap-command.c:352
#, c-format
msgid ""
"Alert from IMAP server %s %s:\n"
@@ -3016,107 +2828,107 @@ msgstr ""
"æ?¥è?ª IMAP æ??å?¡å?¨ %s %s ç??æ??é??ï¼?\n"
"%s"
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:421
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "æ?¥è?ª IMAP æ??å?¡å?¨ç??æ??å¤?åº?ç?ï¼?%s"
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:431
#, c-format
msgid "IMAP command failed: %s"
msgstr "IMAP �令失败�%s"
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:506
msgid "Server response ended too soon."
msgstr "æ??å?¡å?¨åº?ç?ç»?æ??太快ã??"
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/providers/imap/camel-imap-command.c:712
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "IMAP æ??å?¡å?¨åº?ç?ä¸?å?«æ?? %s ä¿¡æ?¯"
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/providers/imap/camel-imap-command.c:748
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr "æ?¥è?ª IMAP æ??å?¡å?¨æ??å¤?ç?? OK åº?ç?ï¼?%s"
-#: ../camel/providers/imap/camel-imap-folder.c:88
+#: ../camel/providers/imap/camel-imap-folder.c:91
msgid "Always check for new mail in this folder"
msgstr "æ?»æ?¯æ£?æ?¥æ¤æ??件夹ä¸ç??æ?°é?®ä»¶(_B)"
-#: ../camel/providers/imap/camel-imap-folder.c:229
+#: ../camel/providers/imap/camel-imap-folder.c:277
#, c-format
msgid "Could not create directory %s: %s"
msgstr "æ? æ³?å??建ç?®å½? %sï¼?%s"
#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:843
+#: ../camel/providers/imap/camel-imap-folder.c:919
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "æ?«æ?? %s ä¸æ?´æ?¹äº?ç??信件"
-#: ../camel/providers/imap/camel-imap-folder.c:1838
+#: ../camel/providers/imap/camel-imap-folder.c:1987
#, c-format
msgid "Unexpected response status '%s' after APPEND command"
msgstr "APPEND å?½ä»¤å??è¿?å??äº?æ?ªç?¥ç??å??åº?ç?¶æ??â??%sâ??"
-#: ../camel/providers/imap/camel-imap-folder.c:1853
+#: ../camel/providers/imap/camel-imap-folder.c:2002
msgid "No response on continuation after APPEND command"
msgstr "APPEND å?½ä»¤å??ç»æ? å??åº?"
-#: ../camel/providers/imap/camel-imap-folder.c:1895
+#: ../camel/providers/imap/camel-imap-folder.c:2047
msgid "Unknown error occurred during APPEND command!"
msgstr "å?¨ APPEND å?½ä»¤æ?¶å??ç??äº?é??误ï¼?"
-#: ../camel/providers/imap/camel-imap-folder.c:2707
+#: ../camel/providers/imap/camel-imap-folder.c:2878
#, c-format
msgid "Unable to retrieve message: %s"
msgstr "æ? æ³?è?·å??信件ï¼?%s"
-#: ../camel/providers/imap/camel-imap-folder.c:2748
+#: ../camel/providers/imap/camel-imap-folder.c:2913
#, c-format
msgid "Cannot get message with message ID %s: %s"
msgstr "æ? æ³?è?·å??信件 ID %sï¼?%s"
-#: ../camel/providers/imap/camel-imap-folder.c:2749
+#: ../camel/providers/imap/camel-imap-folder.c:2914
msgid "No such message available."
msgstr "没æ??该信件ã??"
-#: ../camel/providers/imap/camel-imap-folder.c:2788
-#: ../camel/providers/imap/camel-imap-folder.c:3540
-#: ../camel/providers/nntp/camel-nntp-folder.c:220
+#: ../camel/providers/imap/camel-imap-folder.c:2975
+#: ../camel/providers/imap/camel-imap-folder.c:3808
+#: ../camel/providers/nntp/camel-nntp-folder.c:238
msgid "This message is not currently available"
msgstr "该信件ç?®å??ä¸?å?¯ç?¨"
-#: ../camel/providers/imap/camel-imap-folder.c:3367
+#: ../camel/providers/imap/camel-imap-folder.c:3624
#, c-format
msgid "Incomplete server response: no information provided for message %d"
msgstr "ä¸?å®?æ?´ç??æ??å?¡å?¨å??åº?ï¼?没æ??为第%då°?ä¿¡æ??ä¾?ä¿¡æ?¯"
-#: ../camel/providers/imap/camel-imap-folder.c:3375
+#: ../camel/providers/imap/camel-imap-folder.c:3632
#, c-format
msgid "Incomplete server response: no UID provided for message %d"
msgstr "ä¸?å®?æ?´ç??æ??å?¡å?¨å??åº?ï¼?没æ??为第%då°?ä¿¡æ??ä¾? UID"
-#: ../camel/providers/imap/camel-imap-folder.c:3578
+#: ../camel/providers/imap/camel-imap-folder.c:3846
msgid "Could not find message body in FETCH response."
msgstr "æ? æ³?å?¨ FETCH åº?ç?ä¸æ?¾å?°ä¿¡ä½?ã??"
-#: ../camel/providers/imap/camel-imap-message-cache.c:160
-#: ../camel/providers/imap/camel-imap-message-cache.c:220
+#: ../camel/providers/imap/camel-imap-message-cache.c:181
+#: ../camel/providers/imap/camel-imap-message-cache.c:244
#, c-format
msgid "Could not open cache directory: %s"
msgstr "æ? æ³?æ??å¼?ç¼?å?²å?¨ç?®å½?ï¼?%s"
-#: ../camel/providers/imap/camel-imap-message-cache.c:307
-#: ../camel/providers/imap/camel-imap-message-cache.c:364
-#: ../camel/providers/imap/camel-imap-message-cache.c:395
-#: ../camel/providers/imap/camel-imap-message-cache.c:427
+#: ../camel/providers/imap/camel-imap-message-cache.c:330
+#: ../camel/providers/imap/camel-imap-message-cache.c:387
+#: ../camel/providers/imap/camel-imap-message-cache.c:418
+#: ../camel/providers/imap/camel-imap-message-cache.c:450
#, c-format
msgid "Failed to cache message %s: %s"
msgstr "ç¼?å?信件 %s 失败ï¼?%s"
-#: ../camel/providers/imap/camel-imap-message-cache.c:478
+#: ../camel/providers/imap/camel-imap-message-cache.c:530
#, c-format
msgid "Failed to cache %s: %s"
msgstr "ç¼?å? %s 失败ï¼?%s"
@@ -3126,12 +2938,12 @@ msgid "Ch_eck for new messages in subscribed folders"
msgstr "å?¨è®¢é??ç??æ??件夹ä¸æ£?æ?¥æ?°ä¿¡ä»¶(_E)"
#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
+#: ../camel/providers/imap4/camel-imap4-provider.c:49
msgid "Namespace:"
msgstr "å?½å??空é?´ï¼?"
#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
+#: ../camel/providers/imap4/camel-imap4-provider.c:53
msgid "_Apply filters to new messages in INBOX on this server"
msgstr "åº?ç?¨è¿?滤è§?å??å?°æ?¬æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡ä»¶(_A)"
@@ -3140,7 +2952,7 @@ msgid "Check new messages for Jun_k contents"
msgstr "æ£?æ?¥æ?°ä¿¡ä»¶ç??å??å?¾å??容(_K)"
#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
+#: ../camel/providers/imap4/camel-imap4-provider.c:59
msgid "Automatically synchroni_ze remote mail locally"
msgstr "è?ªå?¨å°?è¿?ç¨?é?®ä»¶å??æ¥å?°æ?¬å?°(_Z)"
@@ -3157,116 +2969,103 @@ msgstr "IMAP æ??å?¡å?¨ä¸?ç??é?®ä»¶ç??读å??ã??"
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr "该é??项å°?使ç?¨çº¯æ??æ?¬å¯?ç ?è¿?æ?¥å?° IMAP æ??å?¡å?¨ã??"
-#: ../camel/providers/imap/camel-imap-store.c:436
-#: ../camel/providers/imap4/camel-imap4-store.c:214
+#: ../camel/providers/imap/camel-imap-store.c:437
+#: ../camel/providers/imap4/camel-imap4-store.c:210
#, c-format
msgid "IMAP server %s"
msgstr "IMAP æ??å?¡å?¨ %s"
-#: ../camel/providers/imap/camel-imap-store.c:438
-#: ../camel/providers/imap4/camel-imap4-store.c:216
+#: ../camel/providers/imap/camel-imap-store.c:439
+#: ../camel/providers/imap4/camel-imap4-store.c:212
#, c-format
msgid "IMAP service for %s on %s"
msgstr "%2$s 为 %1$s æ??ä¾?ç?? IMAP æ??å?¡"
-#: ../camel/providers/imap/camel-imap-store.c:567
-#: ../camel/providers/imap/camel-imap-store.c:582
-#: ../camel/providers/imap4/camel-imap4-store.c:251
-#: ../camel/providers/imap4/camel-imap4-store.c:266
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:171
-#: ../camel/providers/pop3/camel-pop3-store.c:185
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-#: ../camel/providers/smtp/camel-smtp-transport.c:275
+#: ../camel/providers/imap/camel-imap-store.c:568
+#: ../camel/providers/imap/camel-imap-store.c:583
+#: ../camel/providers/imap4/camel-imap4-store.c:247
+#: ../camel/providers/imap4/camel-imap4-store.c:262
+#: ../camel/providers/nntp/camel-nntp-store.c:182
+#: ../camel/providers/nntp/camel-nntp-store.c:197
+#: ../camel/providers/pop3/camel-pop3-store.c:170
+#: ../camel/providers/pop3/camel-pop3-store.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:274
#, c-format
msgid "Could not connect to %s: %s"
msgstr "æ? æ³?è¿?æ?¥å?° %sï¼?%s"
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:172
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
+#: ../camel/providers/imap/camel-imap-store.c:569
+#: ../camel/providers/imap4/camel-imap4-store.c:248
+#: ../camel/providers/nntp/camel-nntp-store.c:183
+#: ../camel/providers/pop3/camel-pop3-store.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:260
msgid "SSL unavailable"
msgstr "SSL ���"
-#: ../camel/providers/imap/camel-imap-store.c:579
-#: ../camel/providers/imap/camel-imap-store.c:861
+#: ../camel/providers/imap/camel-imap-store.c:580
+#: ../camel/providers/imap/camel-imap-store.c:862
msgid "Connection cancelled"
msgstr "è¿?æ?¥å·²å??æ¶?"
-#: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imap/camel-imap-store.c:715
-#: ../camel/providers/imap/camel-imap-store.c:741
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
+#: ../camel/providers/imap/camel-imap-store.c:691
+#: ../camel/providers/imap/camel-imap-store.c:710
+#: ../camel/providers/imap/camel-imap-store.c:716
+#: ../camel/providers/imap/camel-imap-store.c:742
+#: ../camel/providers/imap4/camel-imap4-store.c:310
+#: ../camel/providers/imap4/camel-imap4-store.c:325
+#: ../camel/providers/imap4/camel-imap4-store.c:334
#, 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:691
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../camel/providers/imap/camel-imap-store.c:692
+#: ../camel/providers/smtp/camel-smtp-transport.c:332
msgid "STARTTLS not supported"
msgstr "ä¸?æ?¯æ?? STARTTLS"
-#: ../camel/providers/imap/camel-imap-store.c:710
+#: ../camel/providers/imap/camel-imap-store.c:711
msgid "SSL negotiations failed"
msgstr "SSL å??å??失败"
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap4/camel-imap4-store.c:339
-#: ../camel/providers/smtp/camel-smtp-transport.c:372
+#: ../camel/providers/imap/camel-imap-store.c:717
+#: ../camel/providers/imap4/camel-imap4-store.c:335
+#: ../camel/providers/smtp/camel-smtp-transport.c:371
msgid "SSL is not available in this build"
msgstr "æ?¬æ¬¡ç¼?è¯?ä¸æ?ªå??å?« SSL"
-#: ../camel/providers/imap/camel-imap-store.c:864
+#: ../camel/providers/imap/camel-imap-store.c:865
#, 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:1052
-#: ../camel/providers/imap/camel-imap-store.c:2397
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:77
+#: ../camel/providers/imap/camel-imap-store.c:1053
+#: ../camel/providers/imap/camel-imap-store.c:2400
+#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
+#: ../camel/providers/imap4/camel-imap4-store.c:1403
+#: ../camel/providers/local/camel-maildir-folder.c:80
#: ../camel/providers/local/camel-maildir-store.c:219
#: ../camel/providers/local/camel-maildir-store.c:291
#: ../camel/providers/local/camel-maildir-store.c:517
#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:464
+#: ../camel/providers/local/camel-spool-store.c:463
#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
msgid "Inbox"
msgstr "�件箱"
-#: ../camel/providers/imap/camel-imap-store.c:1054
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "è??稿"
-
-#: ../camel/providers/imap/camel-imap-store.c:1056
-msgid "Sent"
-msgstr "å·²å??é??"
-
-#: ../camel/providers/imap/camel-imap-store.c:1058
-msgid "Templates"
-msgstr "模�"
-
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imap/camel-imap-store.c:1305
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP æ??å?¡å?¨ %s ä¸?æ?¯æ??è¦?æ±?ç??éª?è¯?ç±»å?? %s"
-#: ../camel/providers/imap/camel-imap-store.c:1313
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
+#: ../camel/providers/imap/camel-imap-store.c:1315
+#: ../camel/providers/smtp/camel-smtp-transport.c:506
#, c-format
msgid "No support for authentication type %s"
msgstr "ä¸?æ?¯æ??éª?è¯?ç±»å?? %s"
-#: ../camel/providers/imap/camel-imap-store.c:1385
+#: ../camel/providers/imap/camel-imap-store.c:1389
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3277,15 +3076,15 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/imap/camel-imap-store.c:1858
-#: ../camel/providers/imap/camel-imap-store.c:2239
-#: ../camel/providers/imap4/camel-imap4-store.c:959
+#: ../camel/providers/imap/camel-imap-store.c:1861
+#: ../camel/providers/imap/camel-imap-store.c:2242
+#: ../camel/providers/imap4/camel-imap4-store.c:954
#, 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:1975
+#: ../camel/providers/imap/camel-imap-store.c:1978
#: ../camel/providers/local/camel-maildir-store.c:192
#: ../camel/providers/local/camel-mbox-store.c:204
#: ../camel/providers/local/camel-mh-store.c:249
@@ -3293,321 +3092,328 @@ msgstr "æ??件夹å??â??%sâ??æ? æ??ï¼?å??å? æ?¯å?¶ä¸å?«æ??å?符â??%câ??"
msgid "Cannot create folder '%s': folder exists."
msgstr "æ? æ³?å??建æ??件夹â??%sâ??ï¼?æ??件夹已å?å?¨ã??"
-#: ../camel/providers/imap/camel-imap-store.c:2250
+#: ../camel/providers/imap/camel-imap-store.c:2253
#, c-format
msgid "Unknown parent folder: %s"
msgstr "æ?ªç?¥ç??ç?¶æ??件夹ï¼?%s"
-#: ../camel/providers/imap4/camel-imap4-command.c:576
-#: ../camel/providers/imap4/camel-imap4-command.c:583
+#: ../camel/providers/imap/camel-imap-store.c:3053
+#, fuzzy
+msgid "Server unexpectedly disconnected"
+msgstr "æ??å?¡å?¨æ??å¤?å?°ä¸æ¢äº?è¿?æ?¥ï¼?%s"
+
+#: ../camel/providers/imap4/camel-imap4-command.c:572
+#: ../camel/providers/imap4/camel-imap4-command.c:579
#, c-format
msgid "Failed sending command to IMAP server %s: %s"
msgstr "å?? IMAP æ??å?¡å?¨ %s å??é??å?½ä»¤å¤±è´¥ï¼?%s"
-#: ../camel/providers/imap4/camel-imap4-command.c:686
+#: ../camel/providers/imap4/camel-imap4-command.c:681
#, c-format
msgid "Unexpected response from IMAP4 server %s: %s"
msgstr "æ?¥è?ª IMAP4 æ??å?¡å?¨ %s ç??æ??å¤?å??åº?ï¼?%s"
-#: ../camel/providers/imap4/camel-imap4-engine.c:221
+#: ../camel/providers/imap4/camel-imap4-engine.c:215
#, c-format
msgid "Unexpected greeting from IMAP server %s."
msgstr "æ?¥è?ª IMAP æ??å?¡å?¨ %s ç??æ??å¤?åº?ç?ã??"
-#: ../camel/providers/imap4/camel-imap4-engine.c:450
+#: ../camel/providers/imap4/camel-imap4-engine.c:440
#, c-format
msgid "Cannot select folder '%s': Invalid mailbox name"
msgstr "æ? æ³?é??æ?©æ??件夹â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
-#: ../camel/providers/imap4/camel-imap4-engine.c:456
+#: ../camel/providers/imap4/camel-imap4-engine.c:446
#, c-format
msgid "Cannot select folder '%s': Bad command"
msgstr "æ? æ³?é??æ?©æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
+#: ../camel/providers/imap4/camel-imap4-engine.c:1414
#, c-format
msgid "Failed to send command to IMAP server %s: %s"
msgstr "å?? IMAP æ??å?¡å?¨ %s å??é??å?½ä»¤å¤±è´¥ï¼?%s"
-#: ../camel/providers/imap4/camel-imap4-engine.c:1435
+#: ../camel/providers/imap4/camel-imap4-engine.c:1416
msgid "service unavailable"
msgstr "æ??å?¡ä¸?å?¯ç?¨"
-#: ../camel/providers/imap4/camel-imap4-engine.c:1569
-#: ../camel/providers/imap4/camel-imap4-engine.c:1608
-#: ../camel/providers/imap4/camel-imap4-engine.c:1653
-#: ../camel/providers/imap4/camel-imap4-engine.c:1709
+#: ../camel/providers/imap4/camel-imap4-engine.c:1546
+#: ../camel/providers/imap4/camel-imap4-engine.c:1584
+#: ../camel/providers/imap4/camel-imap4-engine.c:1628
+#: ../camel/providers/imap4/camel-imap4-engine.c:1683
#, c-format
msgid "IMAP4 server %s unexpectedly disconnected: %s"
msgstr "IMAP4 æ??å?¡å?¨ %s æ??å¤?æ?å¼?è¿?æ?¥ï¼?%s"
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
+#: ../camel/providers/imap4/camel-imap4-folder.c:87
msgid ""
"Enable extended Mailing-List detection required for some filter and vFolder "
"rules"
msgstr "å?¯ç?¨æ??äº?è¿?滤å?¨å??è??æ??æ??件夹è§?å??æ??é??ç??æ?©å±?é?®ä»¶å??表æ£?æµ?"
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
+#: ../camel/providers/imap4/camel-imap4-folder.c:88
msgid "Expire cached messages that haven't been read in X seconds"
msgstr "å°?è?¥å¹²ç§?æ?ªé??读ç??ç¼?å?信件设置为è¿?æ??"
-#: ../camel/providers/imap4/camel-imap4-folder.c:91
+#: ../camel/providers/imap4/camel-imap4-folder.c:89
msgid "Expire cached messages older than X seconds"
msgstr "å?¨è?¥å¹²ç§?å??å°?信件设置为è¿?æ??"
-#: ../camel/providers/imap4/camel-imap4-folder.c:423
+#: ../camel/providers/imap4/camel-imap4-folder.c:427
#, c-format
msgid "Cannot access folder '%s': %s"
msgstr "æ? æ³?访é?®æ??件夹â??%sâ??ï¼?%s"
-#: ../camel/providers/imap4/camel-imap4-folder.c:482
+#: ../camel/providers/imap4/camel-imap4-folder.c:484
#, c-format
msgid "Cannot sync flags to folder '%s': Unknown error"
msgstr "æ? æ³?å°?æ ?å¿?ä¸?æ??件夹â??%sâ??å??æ¥ï¼?æ?ªç?¥"
-#: ../camel/providers/imap4/camel-imap4-folder.c:488
+#: ../camel/providers/imap4/camel-imap4-folder.c:490
#, c-format
msgid "Cannot sync flags to folder '%s': Bad command"
msgstr "æ? æ³?å°?æ ?å¿?ä¸?æ??件夹â??%sâ??å??æ¥ï¼?æ? æ??ç??å?½ä»¤"
-#: ../camel/providers/imap4/camel-imap4-folder.c:628
+#: ../camel/providers/imap4/camel-imap4-folder.c:630
#, c-format
msgid "Cannot expunge folder '%s': Unknown error"
msgstr "æ? æ³?é??æ¯?æ??件夹â??%sâ??ï¼?æ?ªç?¥"
-#: ../camel/providers/imap4/camel-imap4-folder.c:633
+#: ../camel/providers/imap4/camel-imap4-folder.c:635
#, c-format
msgid "Cannot expunge folder '%s': Bad command"
msgstr "æ? æ³?é??æ¯?æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
-#: ../camel/providers/imap4/camel-imap4-folder.c:889
+#: ../camel/providers/imap4/camel-imap4-folder.c:891
#, c-format
msgid "Cannot get message %s from folder '%s': No such message"
msgstr "æ? æ³?ä»?æ??件夹â??%2$sâ??è?·å??信件 %1$sï¼?没æ??è¿?æ ·ç??信件"
-#: ../camel/providers/imap4/camel-imap4-folder.c:894
+#: ../camel/providers/imap4/camel-imap4-folder.c:896
#, c-format
msgid "Cannot get message %s from folder '%s': Bad command"
msgstr "æ? æ³?ä»?æ??件夹â??%2$sâ??è?·å??信件 %1$sï¼?å?½ä»¤æ? æ??"
-#: ../camel/providers/imap4/camel-imap4-folder.c:938
+#: ../camel/providers/imap4/camel-imap4-folder.c:940
#, c-format
msgid "Cannot append message to folder '%s': Folder is read-only"
msgstr "æ? æ³?å°?信件追å? å?°æ??件夹â??%sâ??ï¼?æ??件夹为å?ªè¯»"
-#: ../camel/providers/imap4/camel-imap4-folder.c:1031
+#: ../camel/providers/imap4/camel-imap4-folder.c:1033
#, c-format
msgid "Cannot append message to folder '%s': Unknown error"
msgstr "æ? æ³?å°?信件追å? å?°æ??件夹â??%sâ??ï¼?æ?ªç?¥é??误"
-#: ../camel/providers/imap4/camel-imap4-folder.c:1061
+#: ../camel/providers/imap4/camel-imap4-folder.c:1063
#, c-format
msgid "Cannot append message to folder '%s': Bad command"
msgstr "æ? æ³?å°?信件追å? å?°æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
-#: ../camel/providers/imap4/camel-imap4-folder.c:1181
+#: ../camel/providers/imap4/camel-imap4-folder.c:1182
#, c-format
msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
msgstr "æ? æ³?å°?信件ä»?æ??件夹â??%sâ??移å?¨å?°æ??件夹â??%sâ??ï¼?æ?ªç?¥é??误"
-#: ../camel/providers/imap4/camel-imap4-folder.c:1185
+#: ../camel/providers/imap4/camel-imap4-folder.c:1186
#, c-format
msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
msgstr "æ? æ³?å°?信件ä»?æ??件夹â??%sâ??å¤?å?¶å?°æ??件夹â??%sâ??ï¼?æ?ªç?¥é??误"
-#: ../camel/providers/imap4/camel-imap4-folder.c:1193
+#: ../camel/providers/imap4/camel-imap4-folder.c:1194
#, c-format
msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
msgstr "æ? æ³?å°?信件ä»?æ??件夹â??%sâ??移å?¨å?°æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
-#: ../camel/providers/imap4/camel-imap4-folder.c:1197
+#: ../camel/providers/imap4/camel-imap4-folder.c:1198
#, c-format
msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
msgstr "æ? æ³?å°?信件ä»?æ??件夹â??%sâ??å¤?å?¶å?°æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
-#: ../camel/providers/imap4/camel-imap4-provider.c:56
+#: ../camel/providers/imap4/camel-imap4-provider.c:55
msgid "Check new messages for _Junk contents"
msgstr "æ£?æ?¥æ?°ä¿¡ä»¶ç??å??å?¾å??容(_J)"
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
+#: ../camel/providers/imap4/camel-imap4-provider.c:57
msgid "Only check for Junk messa_ges in the INBOX folder"
msgstr "ä»?å?¨æ?¶ä»¶ç®±ä¸æ£?æ?¥å??å?¾é?®ä»¶(_G)"
-#: ../camel/providers/imap4/camel-imap4-provider.c:67
+#: ../camel/providers/imap4/camel-imap4-provider.c:66
msgid "IMAP4rev1"
msgstr "IMAPrev1"
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
+#: ../camel/providers/imap4/camel-imap4-provider.c:68
msgid "For reading and storing mail on IMAPv4rev1 servers."
msgstr "IMAPv4rev1 æ??å?¡å?¨ä¸?é?®ä»¶ç??读å??ã??"
-#: ../camel/providers/imap4/camel-imap4-provider.c:86
+#: ../camel/providers/imap4/camel-imap4-provider.c:85
msgid ""
"This option will connect to the IMAPv4rev1 server using a plaintext password."
msgstr "该é??项å°?使ç?¨çº¯æ??æ?¬å¯?ç ?è¿?æ?¥å?° IMAPv4rev1 æ??å?¡å?¨ã??"
-#: ../camel/providers/imap4/camel-imap4-store.c:263
+#: ../camel/providers/imap4/camel-imap4-store.c:259
#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:195
-#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:182
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
+#: ../camel/providers/nntp/camel-nntp-store.c:194
+#: ../camel/providers/nntp/camel-nntp-store.c:213
+#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:271
msgid "Connection canceled"
msgstr "è¿?æ?¥å·²å??æ¶?"
-#: ../camel/providers/imap4/camel-imap4-store.c:300
+#: ../camel/providers/imap4/camel-imap4-store.c:296
#, c-format
msgid ""
"Failed to connect to IMAP server %s in secure mode: Server does not support "
"STARTTLS"
msgstr "以å®?å?¨æ¨¡å¼?è¿?æ?¥å?° IMAP æ??å?¡å?¨ %s 失败ï¼?æ??å?¡å?¨ä¸?æ?¯æ?? STARTTLS"
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:250
+#: ../camel/providers/imap4/camel-imap4-store.c:326
+#: ../camel/providers/pop3/camel-pop3-store.c:249
msgid "TLS negotiations failed"
msgstr "TLS å??å??失败"
-#: ../camel/providers/imap4/camel-imap4-store.c:415
+#: ../camel/providers/imap4/camel-imap4-store.c:411
#, c-format
msgid ""
"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
msgstr "æ? æ³?使ç?¨ %2$s 身份éª?è¯?ç®?æ³?对 IMAP æ??å?¡å?¨ %1$s è¿?è¡?身份éª?è¯?"
-#: ../camel/providers/imap4/camel-imap4-store.c:538
+#: ../camel/providers/imap4/camel-imap4-store.c:534
#, c-format
msgid "Cannot authenticate to IMAP server %s using %s"
msgstr "æ? æ³?使ç?¨ %2$s 认è¯?å?° IMAP æ??å?¡å?¨ %1$s"
-#: ../camel/providers/imap4/camel-imap4-store.c:701
-#: ../camel/providers/imap4/camel-imap4-store.c:969
+#: ../camel/providers/imap4/camel-imap4-store.c:697
+#: ../camel/providers/imap4/camel-imap4-store.c:964
msgid "Cannot create IMAP folders in offline mode."
msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?å??建 IMAP æ??件夹ã??"
-#: ../camel/providers/imap4/camel-imap4-store.c:740
+#: ../camel/providers/imap4/camel-imap4-store.c:736
#, c-format
msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
msgstr "æ? æ³?è?·å?? IMAP æ??å?¡å?¨ %2$s ä¸?ç??æ??件夹 %1$sï¼?æ?ªç?¥é??误"
-#: ../camel/providers/imap4/camel-imap4-store.c:821
+#: ../camel/providers/imap4/camel-imap4-store.c:816
#, c-format
msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
msgstr "æ? æ³?å?¨ IMAP æ??å?¡å?¨ %2$s ä¸?为â??%1$sâ??è?·å¾? LIST ä¿¡æ?¯ï¼?%3$s"
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
+#: ../camel/providers/imap4/camel-imap4-store.c:818
+#: ../camel/providers/imap4/camel-imap4-store.c:1574
msgid "Bad command"
msgstr "æ? æ??å?½ä»¤"
-#: ../camel/providers/imap4/camel-imap4-store.c:902
+#: ../camel/providers/imap4/camel-imap4-store.c:897
#, c-format
msgid "Cannot create folder '%s': Invalid mailbox name"
msgstr "æ? æ³?å??建æ??件夹â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
-#: ../camel/providers/imap4/camel-imap4-store.c:907
+#: ../camel/providers/imap4/camel-imap4-store.c:902
#, c-format
msgid "Cannot create folder '%s': Bad command"
msgstr "æ? æ³?å??建æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
+#: ../camel/providers/imap4/camel-imap4-store.c:1008
#, c-format
msgid "Cannot delete folder '%s': Special folder"
msgstr "æ? æ³?å? é?¤æ??件夹â??%sâ??ï¼?ç?¹æ®?æ??件夹"
-#: ../camel/providers/imap4/camel-imap4-store.c:1020
+#: ../camel/providers/imap4/camel-imap4-store.c:1015
msgid "Cannot delete IMAP folders in offline mode."
msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?å? é?¤ IMAP æ??件夹ã??"
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
+#: ../camel/providers/imap4/camel-imap4-store.c:1074
#, c-format
msgid "Cannot delete folder '%s': Invalid mailbox name"
msgstr "æ? æ³?å? é?¤æ??件夹â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
+#: ../camel/providers/imap4/camel-imap4-store.c:1079
#, c-format
msgid "Cannot delete folder '%s': Bad command"
msgstr "æ? æ³?å? é?¤æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
+#: ../camel/providers/imap4/camel-imap4-store.c:1099
#, c-format
msgid "Cannot rename folder '%s' to '%s': Special folder"
msgstr "æ? æ³?å°?æ??件夹â??%sâ??é??å?½å??为â??%sâ??ï¼?ç?¹æ®?æ??件夹"
-#: ../camel/providers/imap4/camel-imap4-store.c:1111
+#: ../camel/providers/imap4/camel-imap4-store.c:1106
msgid "Cannot rename IMAP folders in offline mode."
msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?é??å?½å?? IMAP æ??件夹ã??"
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
+#: ../camel/providers/imap4/camel-imap4-store.c:1137
#, c-format
msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
msgstr "æ? æ³?å°?æ??件夹â??%sâ??é??å?½å??为â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
+#: ../camel/providers/imap4/camel-imap4-store.c:1142
#, c-format
msgid "Cannot rename folder '%s' to '%s': Bad command"
msgstr "æ? æ³?å°?æ??件夹â??%sâ??é??å?½å??为â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
-#: ../camel/providers/imap4/camel-imap4-store.c:1575
+#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
+#. * The fourth one is an error message.
+#: ../camel/providers/imap4/camel-imap4-store.c:1572
#, c-format
msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
msgstr "æ? æ³?å?¨ IMAP æ??å?¡å?¨ %3$s ä¸?为模å¼?â??%2$sâ??è?·å?? %1$s ä¿¡æ?¯ï¼?%4$s"
-#: ../camel/providers/imap4/camel-imap4-store.c:1636
+#: ../camel/providers/imap4/camel-imap4-store.c:1633
msgid "Cannot subscribe to IMAP folders in offline mode."
msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?订é?? IMAP æ??件夹ã??"
-#: ../camel/providers/imap4/camel-imap4-store.c:1681
+#: ../camel/providers/imap4/camel-imap4-store.c:1678
#, c-format
msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
msgstr "æ? æ³?订é??æ??件夹â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
-#: ../camel/providers/imap4/camel-imap4-store.c:1686
+#: ../camel/providers/imap4/camel-imap4-store.c:1683
#, c-format
msgid "Cannot subscribe to folder '%s': Bad command"
msgstr "æ? æ³?订é??æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
-#: ../camel/providers/imap4/camel-imap4-store.c:1708
+#: ../camel/providers/imap4/camel-imap4-store.c:1705
msgid "Cannot unsubscribe from IMAP folders in offline mode."
msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?é??订 IMAP æ??件夹ã??"
-#: ../camel/providers/imap4/camel-imap4-store.c:1753
+#: ../camel/providers/imap4/camel-imap4-store.c:1750
#, c-format
msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
msgstr "æ? æ³?é??订æ??件夹â??%sâ??ï¼?æ? æ??ç??é?®ç®±å??"
-#: ../camel/providers/imap4/camel-imap4-store.c:1758
+#: ../camel/providers/imap4/camel-imap4-store.c:1755
#, c-format
msgid "Cannot unsubscribe from folder '%s': Bad command"
msgstr "æ? æ³?é??订æ??件夹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
-#: ../camel/providers/imap4/camel-imap4-summary.c:1596
+#: ../camel/providers/imap4/camel-imap4-summary.c:1590
msgid "Scanning for changed messages"
msgstr "æ?«æ??æ?´æ?¹äº?ç??信件"
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
+#: ../camel/providers/imap4/camel-imap4-summary.c:1611
#, c-format
msgid "IMAP server %s is in an inconsistent state."
msgstr "IMAP æ??å?¡å?¨ %s ç??ç?¶æ??ä¸?ä¸?è?´ã??"
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
+#: ../camel/providers/imap4/camel-imap4-summary.c:1638
msgid "Fetching envelopes of new messages"
msgstr "è?·å??æ?°æ?°ä¿¡ä»¶ç??ä¿¡å°?"
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
+#: ../camel/providers/imap4/camel-imap4-utils.c:429
#, c-format
msgid "Unexpected token in response from IMAP server %s: "
msgstr "æ?¥è?ª IMAP4 æ??å?¡å?¨ %s ç??æ??å¤?å??åº?ï¼?"
-#: ../camel/providers/imap4/camel-imap4-utils.c:460
+#: ../camel/providers/imap4/camel-imap4-utils.c:452
msgid "No data"
msgstr "æ? æ?°æ?®"
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
+#: ../camel/providers/imap4/camel-imap4-utils.c:613
#, c-format
msgid "IMAP server %s unexpectedly disconnected: %s"
msgstr "IMAP4 æ??å?¡å?¨ %s æ??å¤?æ?å¼?è¿?æ?¥ï¼?%s"
#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
msgid "Message storage"
msgstr "信件å?å?¨"
@@ -3632,30 +3438,30 @@ msgstr ""
msgid "Could not connect to %s (port %s): %s"
msgstr "æ? æ³?è¿?æ?¥å?° %s(端å?£ %s)ï¼?%s"
-#: ../camel/providers/imapp/camel-imapp-store.c:349
+#: ../camel/providers/imapp/camel-imapp-store.c:348
#, c-format
msgid "Could not connect to POP server on %s"
msgstr "æ? æ³?è¿?æ?¥å?° %s ä¸?ç?? POP æ??å?¡å?¨"
-#: ../camel/providers/local/camel-local-folder.c:174
+#: ../camel/providers/local/camel-local-folder.c:178
msgid "Index message body data"
msgstr "索�信���"
#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:390
+#: ../camel/providers/local/camel-local-folder.c:395
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:394
-#: ../camel/providers/local/camel-local-folder.c:397
-#, c-format
-msgid "mailbox:%s (%s)"
+#: ../camel/providers/local/camel-local-folder.c:399
+#: ../camel/providers/local/camel-local-folder.c:402
+#, fuzzy, c-format
+msgid "mailbox: %s (%s)"
msgstr "�件箱�%s (%s)"
#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:401
+#: ../camel/providers/local/camel-local-folder.c:406
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
@@ -3718,80 +3524,82 @@ msgstr ""
msgid "Standard Unix mbox spool directory"
msgstr "æ ?å?? Unix mbox spool ç?®å½?"
-#: ../camel/providers/local/camel-local-store.c:171
-#: ../camel/providers/local/camel-local-store.c:282
+#: ../camel/providers/local/camel-local-store.c:165
+#: ../camel/providers/local/camel-local-store.c:276
#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../camel/providers/local/camel-spool-store.c:128
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "å?å?¨æ ¹ç?®å½? %s ä¸?æ?¯ç»?对路å¾?"
-#: ../camel/providers/local/camel-local-store.c:178
+#: ../camel/providers/local/camel-local-store.c:172
#, c-format
msgid "Store root %s is not a regular directory"
msgstr "å?å?¨æ ¹ç?®å½? %s ä¸?æ?¯æ?®é??ç?®å½?"
-#: ../camel/providers/local/camel-local-store.c:187
-#: ../camel/providers/local/camel-local-store.c:195
-#: ../camel/providers/local/camel-local-store.c:293
+#: ../camel/providers/local/camel-local-store.c:181
+#: ../camel/providers/local/camel-local-store.c:189
+#: ../camel/providers/local/camel-local-store.c:287
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "æ? æ³?è?·å??æ??件夹ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-local-store.c:207
+#: ../camel/providers/local/camel-local-store.c:201
msgid "Local stores do not have an inbox"
msgstr "æ?¬å?°å?å?¨æ²¡æ??æ?¶ä»¶ç®±"
-#: ../camel/providers/local/camel-local-store.c:253
+#: ../camel/providers/local/camel-local-store.c:247
#, c-format
msgid "Local mail file %s"
msgstr "æ?¬å?°é?®ä»¶æ??件 %s"
-#: ../camel/providers/local/camel-local-store.c:348
+#: ../camel/providers/local/camel-local-store.c:342
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "æ? æ³?å°?æ??件夹 %s æ?¹å??为 %sï¼?%s"
-#: ../camel/providers/local/camel-local-store.c:416
+#: ../camel/providers/local/camel-local-store.c:410
#, c-format
msgid "Could not rename '%s': %s"
msgstr "æ? æ³?é??å?½å??â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-local-store.c:441
+#: ../camel/providers/local/camel-local-store.c:435
#: ../camel/providers/local/camel-mbox-store.c:300
#, c-format
msgid "Could not delete folder index file '%s': %s"
msgstr "æ? æ³?å? é?¤æ??件夹索å¼?æ??件â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-local-store.c:464
+#: ../camel/providers/local/camel-local-store.c:458
#: ../camel/providers/local/camel-mbox-store.c:324
#, c-format
msgid "Could not delete folder meta file '%s': %s"
msgstr "æ? æ³?å? é?¤æ??件夹å??æ??件â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-local-summary.c:506
+#: ../camel/providers/local/camel-local-summary.c:515
msgid "Unable to add message to summary: unknown reason"
msgstr "æ? æ³?å°?信件添å? å?°æ¦?è¦?ä¸ï¼?æ?ªç?¥ç??å??å? "
-#: ../camel/providers/local/camel-maildir-folder.c:220
+#: ../camel/providers/local/camel-maildir-folder.c:228
msgid "Maildir append message canceled"
msgstr "é?®ä»¶ç?®å½?é??å? æ¶?æ?¯å·²å??æ¶?"
-#: ../camel/providers/local/camel-maildir-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:231
#, c-format
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "æ? æ³?å°?信件é??å? å?°é?®ä»¶ç?®å½?æ??件夹ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-maildir-folder.c:250
-#: ../camel/providers/local/camel-maildir-folder.c:264
-#: ../camel/providers/local/camel-maildir-folder.c:273
-#: ../camel/providers/local/camel-mbox-folder.c:347
-#: ../camel/providers/local/camel-mbox-folder.c:368
-#: ../camel/providers/local/camel-mbox-folder.c:399
-#: ../camel/providers/local/camel-mbox-folder.c:407
-#: ../camel/providers/local/camel-mh-folder.c:203
-#: ../camel/providers/local/camel-mh-folder.c:214
-#: ../camel/providers/local/camel-mh-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:261
+#: ../camel/providers/local/camel-maildir-folder.c:290
+#: ../camel/providers/local/camel-maildir-folder.c:304
+#: ../camel/providers/local/camel-maildir-folder.c:312
+#: ../camel/providers/local/camel-mbox-folder.c:362
+#: ../camel/providers/local/camel-mbox-folder.c:413
+#: ../camel/providers/local/camel-mbox-folder.c:434
+#: ../camel/providers/local/camel-mbox-folder.c:465
+#: ../camel/providers/local/camel-mbox-folder.c:473
+#: ../camel/providers/local/camel-mh-folder.c:225
+#: ../camel/providers/local/camel-mh-folder.c:236
+#: ../camel/providers/local/camel-mh-folder.c:244
#, c-format
msgid ""
"Cannot get message: %s from folder %s\n"
@@ -3800,7 +3608,7 @@ msgstr ""
"æ? æ³?ä»?æ??件夹 %2$s è?·å??信件ï¼?%1$s\n"
" %3$s"
-#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:313
msgid "Invalid message contents"
msgstr "æ? æ??ç??信件å??容"
@@ -3843,60 +3651,60 @@ msgid "not a maildir directory"
msgstr "�� maildir ��"
#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
+#: ../camel/providers/local/camel-spool-store.c:330
+#: ../camel/providers/local/camel-spool-store.c:344
#, c-format
msgid "Could not scan folder '%s': %s"
msgstr "æ? æ³?æ?«æ??æ??件夹â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-maildir-summary.c:433
-#: ../camel/providers/local/camel-maildir-summary.c:567
+#: ../camel/providers/local/camel-maildir-summary.c:437
+#: ../camel/providers/local/camel-maildir-summary.c:556
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "æ? æ³?æ??å¼?é?®ä»¶ç?®å½?è·¯å¾?ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-maildir-summary.c:560
+#: ../camel/providers/local/camel-maildir-summary.c:549
msgid "Checking folder consistency"
msgstr "æ£?æ?¥æ??件夹ä¸?è?´æ?§"
-#: ../camel/providers/local/camel-maildir-summary.c:664
+#: ../camel/providers/local/camel-maildir-summary.c:658
msgid "Checking for new messages"
msgstr "���信件"
-#: ../camel/providers/local/camel-maildir-summary.c:756
-#: ../camel/providers/local/camel-mbox-summary.c:517
-#: ../camel/providers/local/camel-mbox-summary.c:690
-#: ../camel/providers/local/camel-mbox-summary.c:786
-#: ../camel/providers/local/camel-spool-summary.c:141
+#: ../camel/providers/local/camel-maildir-summary.c:748
+#: ../camel/providers/local/camel-mbox-summary.c:526
+#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-mbox-summary.c:842
+#: ../camel/providers/local/camel-spool-summary.c:150
msgid "Storing folder"
msgstr "å?å?¨æ??件夹"
-#: ../camel/providers/local/camel-mbox-folder.c:156
+#: ../camel/providers/local/camel-mbox-folder.c:167
#: ../camel/providers/local/camel-spool-folder.c:150
#, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr "æ? æ³?å?¨ %s å??建æ??件夹é??ï¼?%s"
-#: ../camel/providers/local/camel-mbox-folder.c:217
+#: ../camel/providers/local/camel-mbox-folder.c:231
#, c-format
msgid "Cannot open mailbox: %s: %s\n"
msgstr "æ? æ³?æ??å¼?é?®ä»¶ç®±ï¼?%sï¼?%s\n"
-#: ../camel/providers/local/camel-mbox-folder.c:278
+#: ../camel/providers/local/camel-mbox-folder.c:297
msgid "Mail append canceled"
msgstr "é?®ä»¶è¿½å? å·²å??æ¶?"
-#: ../camel/providers/local/camel-mbox-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:300
#, c-format
msgid "Cannot append message to mbox file: %s: %s"
msgstr "æ? æ³?å°?信件é??å? å?°é?®ä»¶ç®±æ??件ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-mbox-folder.c:400
+#: ../camel/providers/local/camel-mbox-folder.c:466
msgid "The folder appears to be irrecoverably corrupted."
msgstr "æ??件夹好å??å·²ç»?被ä¸?å?¯æ?¢å¤?å?°ç ´å??äº?ã??"
-#: ../camel/providers/local/camel-mbox-folder.c:408
-#: ../camel/providers/local/camel-mh-folder.c:224
+#: ../camel/providers/local/camel-mbox-folder.c:474
+#: ../camel/providers/local/camel-mh-folder.c:245
msgid "Message construction failed."
msgstr "信件æ??建失败ã??"
@@ -3965,85 +3773,85 @@ msgstr "æ? æ³?é??å?½å??â??%sâ??ï¼?â??%sâ??ï¼?%s"
msgid "Could not rename '%s' to %s: %s"
msgstr "æ? æ³?å°?â??%sâ??é??å?½å??为 %sï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:523
+#: ../camel/providers/local/camel-mbox-summary.c:532
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "æ? æ³?æ??å¼?æ??件夹ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:571
+#: ../camel/providers/local/camel-mbox-summary.c:582
#, c-format
msgid "Fatal mail parser error near position %ld in folder %s"
msgstr "å?¨æ??件夹 %2$s ä¸é?»è¿? %1$ld ç??ä½?ç½®å?ºç?°è?´å?½ç??解æ??é??误"
-#: ../camel/providers/local/camel-mbox-summary.c:627
+#: ../camel/providers/local/camel-mbox-summary.c:659
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "æ? æ³?æ£?æ?¥æ??件夹ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:695
-#: ../camel/providers/local/camel-mbox-summary.c:791
-#: ../camel/providers/local/camel-spool-summary.c:146
+#: ../camel/providers/local/camel-mbox-summary.c:727
+#: ../camel/providers/local/camel-mbox-summary.c:847
+#: ../camel/providers/local/camel-spool-summary.c:155
#, c-format
msgid "Could not open file: %s: %s"
msgstr "æ? æ³?æ??å¼?æ??件ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:707
-#: ../camel/providers/local/camel-spool-summary.c:159
+#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-spool-summary.c:168
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "æ? æ³?æ??å¼?临æ?¶é?®ä»¶ç®±ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:720
-#: ../camel/providers/local/camel-mbox-summary.c:896
+#: ../camel/providers/local/camel-mbox-summary.c:752
+#: ../camel/providers/local/camel-mbox-summary.c:956
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "æ? æ³?å?³é?æ?¥æº?æ??件夹 %sï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:729
+#: ../camel/providers/local/camel-mbox-summary.c:761
#, c-format
msgid "Could not close temporary folder: %s"
msgstr "æ? æ³?å?³é?临æ?¶æ??件夹ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:744
+#: ../camel/providers/local/camel-mbox-summary.c:776
#, c-format
msgid "Could not rename folder: %s"
msgstr "æ? æ³?é??å?½å??æ??件夹ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:802
-#: ../camel/providers/local/camel-mbox-summary.c:1024
+#: ../camel/providers/local/camel-mbox-summary.c:858
+#: ../camel/providers/local/camel-mbox-summary.c:1083
#, c-format
msgid "Could not store folder: %s"
msgstr "æ? æ³?å?å?¨æ??件夹ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:838
-#: ../camel/providers/local/camel-mbox-summary.c:846
-#: ../camel/providers/local/camel-mbox-summary.c:1055
-#: ../camel/providers/local/camel-mbox-summary.c:1063
+#: ../camel/providers/local/camel-mbox-summary.c:897
+#: ../camel/providers/local/camel-mbox-summary.c:905
+#: ../camel/providers/local/camel-mbox-summary.c:1113
+#: ../camel/providers/local/camel-mbox-summary.c:1121
msgid "Summary and folder mismatch, even after a sync"
msgstr "å?³ä½¿å??æ¥å??ï¼?æ¦?è¦?å??æ??件夹ä»?ç?¶ä¸?å?¹é??"
-#: ../camel/providers/local/camel-mbox-summary.c:989
-#: ../camel/providers/local/camel-spool-summary.c:327
+#: ../camel/providers/local/camel-mbox-summary.c:1046
+#: ../camel/providers/local/camel-spool-summary.c:334
#, c-format
msgid "Unknown error: %s"
msgstr "æ?ªç?¥ç??é??误ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:1127
-#: ../camel/providers/local/camel-mbox-summary.c:1153
+#: ../camel/providers/local/camel-mbox-summary.c:1189
+#: ../camel/providers/local/camel-mbox-summary.c:1215
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "å??å?¥ä¸´æ?¶ mailbox 失败ï¼?%s"
-#: ../camel/providers/local/camel-mbox-summary.c:1144
+#: ../camel/providers/local/camel-mbox-summary.c:1206
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "å??å?¥ä¸´æ?¶ mailbox 失败ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-mh-folder.c:176
+#: ../camel/providers/local/camel-mh-folder.c:180
msgid "MH append message canceled"
msgstr "MH 追å? 信件已å??æ¶?"
-#: ../camel/providers/local/camel-mh-folder.c:179
+#: ../camel/providers/local/camel-mh-folder.c:183
#, c-format
msgid "Cannot append message to mh folder: %s: %s"
msgstr "æ? æ³?å°?信件é??å? å?° mh æ??件夹ï¼?%sï¼?%s"
@@ -4058,27 +3866,27 @@ msgstr "æ? æ³?å??建æ??件夹â??%sâ??ï¼?%s"
msgid "Cannot get folder '%s': not a directory."
msgstr "æ? æ³?è?·å??æ??件夹â??%sâ??ï¼?ä¸?æ?¯ç?®å½?ã??"
-#: ../camel/providers/local/camel-mh-summary.c:246
+#: ../camel/providers/local/camel-mh-summary.c:240
#, c-format
msgid "Cannot open MH directory path: %s: %s"
msgstr "æ? æ³?æ??å¼? MH ç?®å½?ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:134
#, c-format
msgid "Spool '%s' cannot be opened: %s"
msgstr "æ? æ³?æ??å¼?è?±æ?ºæ??件â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:146
#, c-format
msgid "Spool '%s' is not a regular file or directory"
msgstr "è?±æ?ºæ??件â??%sâ??ä¸?æ?¯æ?®é??æ??件æ??ç?®å½?"
-#: ../camel/providers/local/camel-spool-store.c:166
+#: ../camel/providers/local/camel-spool-store.c:165
#, c-format
msgid "Folder '%s/%s' does not exist."
msgstr "æ??件夹â??%s/%sâ??ä¸?å?å?¨ã??"
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:175
#, c-format
msgid ""
"Could not open folder '%s':\n"
@@ -4087,12 +3895,12 @@ msgstr ""
"æ? æ³?æ??å¼?æ??件夹â??%sâ??ï¼?\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:179
#, c-format
msgid "Folder '%s' does not exist."
msgstr "æ??件夹â??%sâ??ä¸?å?å?¨ã??"
-#: ../camel/providers/local/camel-spool-store.c:185
+#: ../camel/providers/local/camel-spool-store.c:184
#, c-format
msgid ""
"Could not create folder '%s':\n"
@@ -4101,48 +3909,48 @@ msgstr ""
"æ? æ³?å??建æ??件夹â??%sâ??ï¼?\n"
"%s"
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:192
#, c-format
msgid "'%s' is not a mailbox file."
msgstr "â??%sâ??ä¸?æ?¯é?®ä»¶ç®±æ??件ã??"
-#: ../camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:209
msgid "Store does not support an INBOX"
msgstr "å?å?¨å¹¶ä¸?æ?¯æ??æ?¶ä»¶ç®±"
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:221
#, c-format
msgid "Spool mail file %s"
msgstr "è?±æ?ºé?®ä»¶æ??件 %s"
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:221
#, c-format
msgid "Spool folder tree %s"
msgstr "è?±æ?ºæ??件夹æ ? %s"
-#: ../camel/providers/local/camel-spool-store.c:230
+#: ../camel/providers/local/camel-spool-store.c:229
msgid "Spool folders cannot be renamed"
msgstr "è?±æ?ºæ??件夹æ? æ³?æ?¹å??"
-#: ../camel/providers/local/camel-spool-store.c:238
+#: ../camel/providers/local/camel-spool-store.c:237
msgid "Spool folders cannot be deleted"
msgstr "è?±æ?ºæ??件夹æ? æ³?å? é?¤"
-#: ../camel/providers/local/camel-spool-summary.c:172
-#: ../camel/providers/local/camel-spool-summary.c:182
-#: ../camel/providers/local/camel-spool-summary.c:192
+#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:190
+#: ../camel/providers/local/camel-spool-summary.c:200
#, c-format
msgid "Could not sync temporary folder %s: %s"
msgstr "æ? æ³?å??æ¥ä¸´æ?¶æ??件夹 %sï¼?%s"
-#: ../camel/providers/local/camel-spool-summary.c:208
+#: ../camel/providers/local/camel-spool-summary.c:216
#, c-format
msgid "Could not sync spool folder %s: %s"
msgstr "æ? æ³?å??æ¥è?±æ?ºæ??件夹 %sï¼?%s"
-#: ../camel/providers/local/camel-spool-summary.c:239
-#: ../camel/providers/local/camel-spool-summary.c:256
-#: ../camel/providers/local/camel-spool-summary.c:267
+#: ../camel/providers/local/camel-spool-summary.c:246
+#: ../camel/providers/local/camel-spool-summary.c:263
+#: ../camel/providers/local/camel-spool-summary.c:274
#, c-format
msgid ""
"Could not sync spool folder %s: %s\n"
@@ -4151,25 +3959,26 @@ msgstr ""
"æ? æ³?å??æ¥è?±æ?ºæ??件夹 %sï¼?%s\n"
"æ??件夹å?¯è?½å·²æ??å??ï¼?å?¯æ?¬ä¿?å?å?¨â??%sâ??"
-#: ../camel/providers/nntp/camel-nntp-folder.c:176
-#: ../camel/providers/nntp/camel-nntp-folder.c:208
+#: ../camel/providers/nntp/camel-nntp-folder.c:137
+#: ../camel/providers/nntp/camel-nntp-folder.c:194
+#: ../camel/providers/nntp/camel-nntp-folder.c:226
#, c-format
msgid "Internal error: UID in invalid format: %s"
msgstr "å??é?¨é??误ï¼?UID ç??æ ¼å¼?æ? æ??ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:330
-#: ../camel/providers/nntp/camel-nntp-folder.c:333
-#: ../camel/providers/nntp/camel-nntp-folder.c:375
-#: ../camel/providers/nntp/camel-nntp-folder.c:377
+#: ../camel/providers/nntp/camel-nntp-folder.c:367
+#: ../camel/providers/nntp/camel-nntp-folder.c:370
+#: ../camel/providers/nntp/camel-nntp-folder.c:412
+#: ../camel/providers/nntp/camel-nntp-folder.c:414
#, c-format
msgid "Posting failed: %s"
msgstr "å??表失败ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:395
+#: ../camel/providers/nntp/camel-nntp-folder.c:432
msgid "You cannot post NNTP messages while working offline!"
msgstr "æ?¨ç¦»çº¿æ?¶æ? æ³?æ??é?? NNTP 信件ï¼?"
-#: ../camel/providers/nntp/camel-nntp-folder.c:406
+#: ../camel/providers/nntp/camel-nntp-folder.c:443
msgid "You cannot copy messages from a NNTP folder!"
msgstr "æ?¨æ? æ³?ä»? NNTP æ??件夹å¤?å?¶ä¿¡ä»¶ï¼?"
@@ -4196,22 +4005,22 @@ msgid ""
"password."
msgstr "该é??项å°?以æ??æ??å¯?ç ?å??è¿?è¡? NNTP æ??å?¡å?¨è¿?è¡?认è¯?ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:216
#, c-format
msgid "Could not read greeting from %s: %s"
msgstr "æ? æ³?é??读æ?¥è?ª %s ç??欢è¿?ä¿¡æ?¯ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:228
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "NNTP æ??å?¡å?¨ %s è¿?å??é??误ç ? %dï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:410
#, c-format
msgid "USENET News via %s"
msgstr "USENET æ?°é?» %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:798
+#: ../camel/providers/nntp/camel-nntp-store.c:819
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -4222,7 +4031,7 @@ msgstr ""
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:892
+#: ../camel/providers/nntp/camel-nntp-store.c:913
msgid ""
"You cannot subscribe to this newsgroup:\n"
"\n"
@@ -4232,7 +4041,7 @@ msgstr ""
"\n"
"没æ??è¿?æ ·ç??æ?°é?»ç»?ã??é??ä¸é¡¹ç?®å?¯è?½æ?¯ç?¶æ??件夹ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:924
+#: ../camel/providers/nntp/camel-nntp-store.c:945
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
"\n"
@@ -4242,121 +4051,122 @@ msgstr ""
"\n"
"æ?°é?»ç»?ä¸?å?å?¨ï¼?"
-#: ../camel/providers/nntp/camel-nntp-store.c:949
+#: ../camel/providers/nntp/camel-nntp-store.c:970
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸å??建æ??件夹ï¼?åº?该订é??ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:957
+#: ../camel/providers/nntp/camel-nntp-store.c:978
msgid "You cannot rename a folder in a News store."
msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸é??å?½å??æ??件夹ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:965
+#: ../camel/providers/nntp/camel-nntp-store.c:986
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸å? é?¤æ??件夹ï¼?åº?该é??订ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1154
+#: ../camel/providers/nntp/camel-nntp-store.c:1180
msgid "Authentication requested but no username provided"
msgstr "请æ±?äº?身份éª?è¯?ï¼?ä½?æ?ªæ??ä¾?ç?¨æ?·å??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1166
+#: ../camel/providers/nntp/camel-nntp-store.c:1192
#, c-format
msgid "Cannot authenticate to server: %s"
msgstr "æ? æ³?认è¯?å?°æ??å?¡å?¨ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1283
+#: ../camel/providers/nntp/camel-nntp-store.c:1315
#, c-format
msgid "NNTP Command failed: %s"
msgstr "NNTP �令失败�%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1337
+#: ../camel/providers/nntp/camel-nntp-store.c:1369
msgid "Not connected."
msgstr "æ?ªè¿?æ?¥ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1390
+#: ../camel/providers/nntp/camel-nntp-store.c:1422
#, c-format
msgid "No such folder: %s"
msgstr "没æ??æ??件夹ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:273
-#: ../camel/providers/nntp/camel-nntp-summary.c:369
+#: ../camel/providers/nntp/camel-nntp-summary.c:272
+#: ../camel/providers/nntp/camel-nntp-summary.c:370
#, c-format
msgid "%s: Scanning new messages"
msgstr "%sï¼?æ£å?¨æ?«æ??æ?°ä¿¡ä»¶"
-#: ../camel/providers/nntp/camel-nntp-summary.c:280
+#: ../camel/providers/nntp/camel-nntp-summary.c:279
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "æ?¥è?ª xover ç??æ??å¤?æ??å?¡å?¨åº?ç?ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:383
+#: ../camel/providers/nntp/camel-nntp-summary.c:384
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "æ?¥è?ª head ç??æ??å¤?æ??å?¡å?¨åº?ç?ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:423
+#: ../camel/providers/nntp/camel-nntp-summary.c:420
msgid "Use cancel"
msgstr "使ç?¨å??æ¶?"
-#: ../camel/providers/nntp/camel-nntp-summary.c:425
+#: ../camel/providers/nntp/camel-nntp-summary.c:422
#, c-format
msgid "Operation failed: %s"
msgstr "æ??ä½?失败ï¼?%s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:251
+#: ../camel/providers/pop3/camel-pop3-folder.c:253
msgid "Retrieving POP summary"
msgstr "æ£å?¨è?·å?? POP æ¦?è¦?"
-#: ../camel/providers/pop3/camel-pop3-folder.c:269
+#: ../camel/providers/pop3/camel-pop3-folder.c:271
#, c-format
msgid "Cannot get POP summary: %s"
msgstr "æ? æ³?è?·å?? POP æ¦?è¦?ï¼?%s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:312
+#: ../camel/providers/pop3/camel-pop3-folder.c:314
msgid "Expunging old messages"
msgstr "é??æ¯?æ?§ä¿¡ä»¶"
-#: ../camel/providers/pop3/camel-pop3-folder.c:320
+#: ../camel/providers/pop3/camel-pop3-folder.c:322
msgid "Expunging deleted messages"
msgstr "å½»åº?é??æ¯?å·²å? é?¤ç??信件"
-#: ../camel/providers/pop3/camel-pop3-folder.c:534
+#: ../camel/providers/pop3/camel-pop3-folder.c:530
+#: ../camel/providers/pop3/camel-pop3-folder.c:552
#, 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:541
+#: ../camel/providers/pop3/camel-pop3-folder.c:559
#, c-format
msgid "Retrieving POP message %d"
msgstr "æ£å?¨è?·å?? POP 信件 %d"
-#: ../camel/providers/pop3/camel-pop3-folder.c:631
+#: ../camel/providers/pop3/camel-pop3-folder.c:649
msgid "Unknown reason"
msgstr "æ?ªç?¥å??å? "
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
msgid "_Leave messages on server"
msgstr "å?¨æ??å?¡å?¨ä¸?ä¿?ç??信件(_L)"
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
#, c-format
msgid "_Delete after %s day(s)"
msgstr "%s 天ä¹?å??å? é?¤(_D)"
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:49
msgid "Disable _support for all POP3 extensions"
msgstr "ç¦?ç?¨æ??æ?? POP3 æ?©å±?ç??æ?¯æ??(_S)"
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:57
msgid "POP"
msgstr "POP"
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:59
msgid "For connecting to and downloading mail from POP servers."
msgstr "å?³äº?è¿?æ?¥å?° POP æ??å?¡å?¨å??ä»? POP æ??å?¡å?¨ä¸?è½½é?®ä»¶ã??"
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/pop3/camel-pop3-provider.c:76
msgid ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
@@ -4364,7 +4174,7 @@ msgstr ""
"该é??项使 Evolution å?¨è¿?æ?¥å?° POP æ??å?¡å?¨æ?¶ä½¿ç?¨æ??æ??å¯?ç ?ã??è¿?æ?¯è®¸å¤? POP æ??å?¡å?¨å?¯ä¸?"
"æ?¯æ??ç??é??项ã??"
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:86
msgid ""
"This option will connect to the POP server using an encrypted password via "
"the APOP protocol. This may not work for all users even on servers that "
@@ -4373,56 +4183,56 @@ msgstr ""
"该é??项使 Evolution å?¨è¿?æ?¥å?° POP æ??å?¡å?¨æ?¶ä½¿ç?¨ APOP å??è®®ã??å?³ä½¿æ?¯å£°ç§°æ?¯æ??è¿?ä¸?å??"
"è?½ç??æ??å?¡å?¨ï¼?ä¹?ä¸?ä¸?å®?è?½ä½¿æ??æ??ç?¨æ?·å·¥ä½?ã??"
-#: ../camel/providers/pop3/camel-pop3-store.c:208
+#: ../camel/providers/pop3/camel-pop3-store.c:207
#, c-format
msgid "Failed to read a valid greeting from POP server %s"
msgstr "ä»? POP æ??å?¡å?¨ %s 读å??欢è¿?è¯?失败"
-#: ../camel/providers/pop3/camel-pop3-store.c:225
-#: ../camel/providers/pop3/camel-pop3-store.c:239
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-#: ../camel/providers/pop3/camel-pop3-store.c:255
+#: ../camel/providers/pop3/camel-pop3-store.c:224
+#: ../camel/providers/pop3/camel-pop3-store.c:238
+#: ../camel/providers/pop3/camel-pop3-store.c:248
+#: ../camel/providers/pop3/camel-pop3-store.c:254
#, c-format
msgid "Failed to connect to POP server %s in secure mode: %s"
msgstr "以å®?å?¨æ¨¡å¼?è¿?æ?¥å?° POP æ??å?¡å?¨ %s 失败ï¼?%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:226
+#: ../camel/providers/pop3/camel-pop3-store.c:225
msgid "STLS not supported by server"
msgstr "æ??å?¡å?¨ä¸?æ?¯æ?? STLS"
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../camel/providers/pop3/camel-pop3-store.c:255
msgid "TLS is not available in this build"
msgstr "æ?¬æ¬¡ç¼?è¯?ä¸æ?ªå??å?« TLS"
-#: ../camel/providers/pop3/camel-pop3-store.c:362
+#: ../camel/providers/pop3/camel-pop3-store.c:361
#, c-format
msgid "Could not connect to POP server %s"
msgstr "æ? æ³?è¿?æ?¥å?° POP æ??å?¡å?¨ %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:403
-#: ../camel/providers/pop3/camel-pop3-store.c:536
+#: ../camel/providers/pop3/camel-pop3-store.c:402
+#: ../camel/providers/pop3/camel-pop3-store.c:535
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
"mechanism."
msgstr "æ? æ³?è¿?æ?¥å?° POP æ??å?¡å?¨ %sï¼?ä¸?æ?¯æ??请æ±?认è¯?æ?ºå?¶ã??"
-#: ../camel/providers/pop3/camel-pop3-store.c:419
+#: ../camel/providers/pop3/camel-pop3-store.c:418
#, 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:431
+#: ../camel/providers/pop3/camel-pop3-store.c:430
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "æ? æ³?ç?»å½?å?° POP æ??å?¡å?¨ %sï¼?SASL å??è®®é??误"
-#: ../camel/providers/pop3/camel-pop3-store.c:450
+#: ../camel/providers/pop3/camel-pop3-store.c:449
#, c-format
msgid "Failed to authenticate on POP server %s: %s"
msgstr "认è¯?å?° POP æ??å?¡å?¨ %s 失败ï¼?%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:509
+#: ../camel/providers/pop3/camel-pop3-store.c:508
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4431,8 +4241,8 @@ msgstr ""
"æ? æ³?è¿?æ?¥å?° POP æ??å?¡å?¨ %sï¼?\tæ?¥æ?¶å?°é??æ³?ç?? APOP IDã??å?¯è?½æ?¯å??å??æ?»å?»ã??请è??ç³»æ?¨ç??"
"管ç??å??ã??"
-#: ../camel/providers/pop3/camel-pop3-store.c:550
-#: ../camel/providers/pop3/camel-pop3-store.c:563
+#: ../camel/providers/pop3/camel-pop3-store.c:549
+#: ../camel/providers/pop3/camel-pop3-store.c:562
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4441,7 +4251,7 @@ msgstr ""
"æ? æ³?è¿?æ?¥å?° POP æ??å?¡å?¨ %sã??\n"
"å??é??å¯?ç ?é??误ï¼?%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:557
+#: ../camel/providers/pop3/camel-pop3-store.c:556
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4450,7 +4260,7 @@ msgstr ""
"æ? æ³?è¿?æ?¥å?° POP æ??å?¡å?¨ %sã??\n"
"å??é??ç?¨æ?·å??é??误ï¼?%s"
-#: ../camel/providers/pop3/camel-pop3-store.c:663
+#: ../camel/providers/pop3/camel-pop3-store.c:669
#, c-format
msgid "No such folder '%s'."
msgstr "没æ??æ??件夹â??%sâ??ã??"
@@ -4465,173 +4275,173 @@ msgid ""
"system."
msgstr "å°?é?®ä»¶ä¼ é??å?°æ?¬å?°ç³»ç»?ç??â??sendmailâ??æ?¥å??é??é?®ä»¶ã??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
msgid "Could not parse recipient list"
msgstr "æ? æ³?解æ??æ?¶ä»¶äººå??表"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
#, c-format
msgid "Could not create pipe to sendmail: %s: mail not sent"
msgstr "æ? æ³?å??建å?° sendmail ç??管é??ï¼?%sï¼?é?®ä»¶æ?ªå??é??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
#, c-format
msgid "Could not fork sendmail: %s: mail not sent"
msgstr "æ? æ³?å??建 sendmail è¿?ç¨?ï¼?%sï¼?é?®ä»¶æ?ªå??é??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr "sendmail 以信å?· %s é??å?ºï¼?é?®ä»¶æ?ªå??é??ã??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr "æ? æ³?æ?§è¡? %sï¼?é?®ä»¶æ?ªå??é??ã??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr "sendmail 以ç?¶æ??ç ? %d é??å?ºï¼?é?®ä»¶æ?ªå??é??ã??"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
msgid "sendmail"
msgstr "sendmail"
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
msgid "Mail delivery via the sendmail program"
msgstr "é??è¿? sendmail ç¨?åº?å??é??é?®ä»¶"
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
msgid "SMTP"
msgstr "SMTP"
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
msgid "For delivering mail by connecting to a remote mailhub using SMTP."
msgstr "è¦?æ??é??é?®ä»¶ï¼?åº?该使ç?¨ SMTP è¿?æ?¥å?°è¿?ç¨?ç??é?®ä»¶äº¤æ?¢æ??å?¡å?¨ã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:167
msgid "Syntax error, command unrecognized"
msgstr "è¯æ³?é??误ï¼?æ? æ³?è¯?å?«ç??å?½ä»¤"
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
msgid "Syntax error in parameters or arguments"
msgstr "å??æ?°è¯æ³?é??误"
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:171
msgid "Command not implemented"
msgstr "�令����"
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:173
msgid "Command parameter not implemented"
msgstr "å?½ä»¤å??æ?°å°?æ?ªå®?ç?°"
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:175
msgid "System status, or system help reply"
msgstr "ç³»ç»?ç?¶æ??ï¼?æ??ç³»ç»?æ±?å?©å°±ç»ª"
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:177
msgid "Help message"
msgstr "帮�信件"
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:179
msgid "Service ready"
msgstr "æ??å?¡å°±ç»ª"
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:181
msgid "Service closing transmission channel"
msgstr "æ??å?¡æ£å?¨å?³é?ä¼ è¾?é??é??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:183
msgid "Service not available, closing transmission channel"
msgstr "æ??å?¡ä¸?å?¯ç?¨ï¼?æ£å?¨å?³é?ä¼ è¾?é??é??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:185
msgid "Requested mail action okay, completed"
msgstr "é?®ä»¶å?¨ä½?请æ±?确认ï¼?å·²å®?æ??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:187
msgid "User not local; will forward to <forward-path>"
msgstr "ç?¨æ?·ä¸?å?¨æ?¬å?°ï¼?å°?转å??å?° <转å??è·¯å¾?>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:189
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "é?®ä»¶å?¨ä½?请æ±?æ?ªå??ç??ï¼?é?®ä»¶ç®±æ? æ??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
msgid "Requested action not taken: mailbox unavailable"
msgstr "å?¨ä½?请æ±?æ?ªå??ç??ï¼?é?®ä»¶ç®±æ? æ??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
msgid "Requested action aborted: error in processing"
msgstr "å?¨ä½?请æ±?å·²æ?¾å¼?ï¼?å¤?ç??ä¸å?ºé??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:195
msgid "User not local; please try <forward-path>"
msgstr "ç?¨æ?·ä¸?å?¨æ?¬å?°ï¼?请å°?è¯? <转å??è·¯å¾?>"
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:197
msgid "Requested action not taken: insufficient system storage"
msgstr "å?¨ä½?请æ±?æ?ªå??ç??ï¼?ç³»ç»?å?å?¨ç©ºé?´ä¸?足"
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:199
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "é?®ä»¶å?¨ä½?请æ±?å·²æ?¾å¼?ï¼?è¶?å®?é¢?å¾·å?å?¨å??é??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:201
msgid "Requested action not taken: mailbox name not allowed"
msgstr "å?¨ä½?请æ±?æ?ªå??ç??ï¼?ä¸?å??许ç??é?®ä»¶ç®±å??称"
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:203
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "å¼?å§?è¾?å?¥é?®ä»¶ï¼?以 <CRLF>.<CRLF> ç»?æ??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:205
msgid "Transaction failed"
msgstr "��失败"
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:209
msgid "A password transition is needed"
msgstr "å¿?é¡»ä¼ è¾?å¯?ç ?"
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:211
msgid "Authentication mechanism is too weak"
msgstr "认���太弱"
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
msgid "Encryption required for requested authentication mechanism"
msgstr "请æ±?ç??认è¯?æ?ºå?¶å¿?é¡»å? å¯?"
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
msgid "Temporary authentication failure"
msgstr "临�认�失败"
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
+#: ../camel/providers/smtp/camel-smtp-transport.c:296
msgid "Welcome response error"
msgstr "欢è¿?åº?ç?é??误"
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:331
+#: ../camel/providers/smtp/camel-smtp-transport.c:364
+#: ../camel/providers/smtp/camel-smtp-transport.c:370
#, 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:341
+#: ../camel/providers/smtp/camel-smtp-transport.c:340
#, c-format
msgid "STARTTLS command failed: %s"
msgstr "STARTTLS �令失败�%s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
+#: ../camel/providers/smtp/camel-smtp-transport.c:355
msgid "STARTTLS command failed"
msgstr "STARTTLS �令失败"
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../camel/providers/smtp/camel-smtp-transport.c:496
#, c-format
msgid "SMTP server %s does not support requested authentication type %s."
msgstr "SMTP æ??å?¡å?¨ %s ä¸?æ?¯æ??请æ±?ç??认è¯?ç±»å?? %sã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:564
+#: ../camel/providers/smtp/camel-smtp-transport.c:567
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -4642,93 +4452,93 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/smtp/camel-smtp-transport.c:697
+#: ../camel/providers/smtp/camel-smtp-transport.c:700
#, c-format
msgid "SMTP server %s"
msgstr "SMTP æ??å?¡å?¨ %s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:699
+#: ../camel/providers/smtp/camel-smtp-transport.c:702
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "é??è¿? %s å??é?? SMTP é?®ä»¶"
-#: ../camel/providers/smtp/camel-smtp-transport.c:717
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
msgid "Cannot send message: service not connected."
msgstr "æ? æ³?å??é??信件ï¼?æ??å?¡æ?ªè¿?æ?¥ã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
msgid "Cannot send message: sender address not valid."
msgstr "æ? æ³?å??é??信件ï¼?å??件人å?°å??ä¸?å??æ³?ã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
msgid "Sending message"
msgstr "å??é??信件"
-#: ../camel/providers/smtp/camel-smtp-transport.c:742
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
msgid "Cannot send message: no recipients defined."
msgstr "æ? æ³?å??é??信件ï¼?没æ??å®?ä¹?æ?¶ä»¶äººã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
msgid "Cannot send message: one or more invalid recipients"
msgstr "æ? æ³?å??é??信件ï¼?ä¸?个æ??å¤?个é??æ³?æ?¶ä»¶äºº"
-#: ../camel/providers/smtp/camel-smtp-transport.c:982
+#: ../camel/providers/smtp/camel-smtp-transport.c:985
msgid "SMTP Greeting"
msgstr "SMTP 欢�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1007
+#: ../camel/providers/smtp/camel-smtp-transport.c:1010
#, c-format
msgid "HELO command failed: %s"
msgstr "HELO �令失败�%s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1024
+#: ../camel/providers/smtp/camel-smtp-transport.c:1027
msgid "HELO command failed"
msgstr "HELO �令失败"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1090
+#: ../camel/providers/smtp/camel-smtp-transport.c:1093
msgid "SMTP Authentication"
msgstr "SMTP 认�"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1096
+#: ../camel/providers/smtp/camel-smtp-transport.c:1099
msgid "Error creating SASL authentication object."
msgstr "å??建 SASL 认è¯?对象é??误ã??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1113
-#: ../camel/providers/smtp/camel-smtp-transport.c:1124
+#: ../camel/providers/smtp/camel-smtp-transport.c:1116
+#: ../camel/providers/smtp/camel-smtp-transport.c:1127
#, c-format
msgid "AUTH command failed: %s"
msgstr "AUTH �令失败�%s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1130
+#: ../camel/providers/smtp/camel-smtp-transport.c:1133
msgid "AUTH command failed"
msgstr "AUTH �令失败"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1200
+#: ../camel/providers/smtp/camel-smtp-transport.c:1203
msgid "Bad authentication response from server.\n"
msgstr "æ?¥è?ªæ??å?¡å?¨ç??é??误认è¯?åº?ç?ã??\n"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1227
+#: ../camel/providers/smtp/camel-smtp-transport.c:1230
#, c-format
msgid "MAIL FROM command failed: %s: mail not sent"
msgstr "MAIL FROM å?½ä»¤å¤±è´¥ï¼?%sï¼?é?®ä»¶æ?ªå??é??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1244
+#: ../camel/providers/smtp/camel-smtp-transport.c:1247
msgid "MAIL FROM command failed"
msgstr "MAIL FROM �令失败"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1268
+#: ../camel/providers/smtp/camel-smtp-transport.c:1271
#, c-format
msgid "RCPT TO command failed: %s: mail not sent"
msgstr "RCPT TO å?½ä»¤å¤±è´¥ï¼?%sï¼?é?®ä»¶æ?ªå??é??"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1287
+#: ../camel/providers/smtp/camel-smtp-transport.c:1290
#, c-format
msgid "RCPT TO <%s> failed"
msgstr "RCPT TO <%s> 失败"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1327
-#: ../camel/providers/smtp/camel-smtp-transport.c:1396
-#: ../camel/providers/smtp/camel-smtp-transport.c:1415
+#: ../camel/providers/smtp/camel-smtp-transport.c:1330
+#: ../camel/providers/smtp/camel-smtp-transport.c:1399
+#: ../camel/providers/smtp/camel-smtp-transport.c:1418
#, c-format
msgid "DATA command failed: %s: mail not sent"
msgstr "DATA å?½ä»¤å¤±è´¥ï¼?%sï¼?é?®ä»¶æ?ªå??é??"
@@ -4736,108 +4546,108 @@ msgstr "DATA å?½ä»¤å¤±è´¥ï¼?%sï¼?é?®ä»¶æ?ªå??é??"
#. we should have gotten instructions on how to use the DATA command:
#. * 354 Enter mail, end with "." on a line by itself
#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1344
-#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1347
+#: ../camel/providers/smtp/camel-smtp-transport.c:1434
msgid "DATA command failed"
msgstr "DATP �令失败"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1454
+#: ../camel/providers/smtp/camel-smtp-transport.c:1457
#, c-format
msgid "RSET command failed: %s"
msgstr "RSET �令失败�%s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1470
+#: ../camel/providers/smtp/camel-smtp-transport.c:1473
msgid "RSET command failed"
msgstr "RSET �令失败"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1493
+#: ../camel/providers/smtp/camel-smtp-transport.c:1496
#, c-format
msgid "QUIT command failed: %s"
msgstr "QUIT �令失败�%s"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1507
+#: ../camel/providers/smtp/camel-smtp-transport.c:1510
msgid "QUIT command failed"
msgstr "QUIT �令失败"
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:47
msgid "Business"
msgstr "å??å?¡"
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:48
msgid "Competition"
msgstr "å®?æ??"
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:49
msgid "Favorites"
msgstr "æ??ç?±"
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
msgid "Gifts"
msgstr "礼�"
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
msgid "Goals/Objectives"
msgstr "ç?®æ ?"
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
msgid "Holiday"
msgstr "å??æ?¥"
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
msgid "Holiday Cards"
msgstr "å??æ?¥å?¡"
#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
msgid "Hot Contacts"
msgstr "亲å¯?è??系人"
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:56
msgid "Ideas"
msgstr "��"
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:57
msgid "International"
msgstr "å?½é??"
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
msgid "Key Customer"
msgstr "��客�"
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
msgid "Miscellaneous"
msgstr "æ??ç±»"
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
msgid "Personal"
msgstr "个人"
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
msgid "Phone Calls"
msgstr "é??ç?µè¯?"
#. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:63
msgid "Status"
msgstr "ç?¶æ??"
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:64
msgid "Strategies"
msgstr "ç?ç?¥"
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:65
msgid "Suppliers"
msgstr "ä¾?åº?å??"
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
msgid "Time & Expenses"
msgstr "æ?¶é?´å??è?±è´¹"
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
msgid "VIP"
msgstr "VIP"
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
msgid "Waiting"
msgstr "ç?å??"
@@ -4845,7 +4655,7 @@ msgstr "ç?å??"
#. in 12-hour format.
#. strftime format of a weekday, a date and a
#. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1911
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1900
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%Y-%m-%d %A%p%I:%M:%S"
@@ -4853,7 +4663,7 @@ msgstr "%Y-%m-%d %A%p%I:%M:%S"
#. in 24-hour format.
#. strftime format of a weekday, a date and a
#. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1891
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%Y-%m-%d %A %H:%M:%S"
@@ -4861,7 +4671,7 @@ msgstr "%Y-%m-%d %A %H:%M:%S"
#. in 12-hour format, without seconds.
#. strftime format of a weekday, a date and a
#. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1654 ../libedataserver/e-time-utils.c:1907
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1896
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%Y-%m-%d %A%p%I:%M"
@@ -4869,78 +4679,78 @@ msgstr "%Y-%m-%d %A%p%I:%M"
#. in 24-hour format, without seconds.
#. strftime format of a weekday, a date and a
#. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1659 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1887
msgid "%a %m/%d/%Y %H:%M"
msgstr "%Y-%m-%d %A %H:%M"
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1664
+#: ../libedataserver/e-time-utils.c:1655
msgid "%a %m/%d/%Y %I %p"
msgstr "%Y-%m-%d %A%p%I"
#. strptime format of a weekday, a date and a time,
#. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1669
+#: ../libedataserver/e-time-utils.c:1660
msgid "%a %m/%d/%Y %H"
msgstr "%Y-%m-%d %A %H"
#. strptime format of a weekday and a date.
#. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1773
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1763
+#: ../libedataserver/e-time-utils.c:1882
msgid "%a %m/%d/%Y"
msgstr "%Y-%m-%d %A"
#. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1680
+#: ../libedataserver/e-time-utils.c:1670
msgid "%m/%d/%Y %I:%M:%S %p"
msgstr "%Y-%m-%d%p%I:%M:%S"
#. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1684
+#: ../libedataserver/e-time-utils.c:1674
msgid "%m/%d/%Y %H:%M:%S"
msgstr "%Y-%m-%d %H:%M:%S"
#. strptime format of a date and a time, in 12-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1679
msgid "%m/%d/%Y %I:%M %p"
msgstr "%Y-%m-%d%p%I:%M"
#. strptime format of a date and a time, in 24-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1684
msgid "%m/%d/%Y %H:%M"
msgstr "%Y-%m-%d %H:%M"
#. strptime format of a date and a time, in 12-hour format,
#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1699
+#: ../libedataserver/e-time-utils.c:1689
msgid "%m/%d/%Y %I %p"
msgstr "%Y-%m-%d%p%I"
#. strptime format of a date and a time, in 24-hour format,
#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1704
+#: ../libedataserver/e-time-utils.c:1694
msgid "%m/%d/%Y %H"
msgstr "%Y-%m-%d %H"
#. strptime format of a weekday and a date.
#. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1707 ../libedataserver/e-time-utils.c:1776
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1766
msgid "%m/%d/%Y"
msgstr "%Y-%m-%d"
#. strptime format for a time of day, in 12-hour format.
#. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1834 ../libedataserver/e-time-utils.c:1956
+#: ../libedataserver/e-time-utils.c:1824 ../libedataserver/e-time-utils.c:1944
msgid "%I:%M:%S %p"
msgstr "%p%I:%M:%S"
#. strptime format for a time of day, in 24-hour format.
#. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1838 ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1828 ../libedataserver/e-time-utils.c:1936
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
@@ -4948,24 +4758,24 @@ msgstr "%H:%M:%S"
#. in 12-hour format.
#. strftime format of a time in 12-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1843 ../libedataserver/e-time-utils.c:1953
+#: ../libedataserver/e-time-utils.c:1833 ../libedataserver/e-time-utils.c:1941
msgid "%I:%M %p"
msgstr "%p%I:%M"
#. strptime format for time of day, without seconds 24-hour format.
#. strftime format of a time in 24-hour format,
#. without seconds.
-#: ../libedataserver/e-time-utils.c:1847 ../libedataserver/e-time-utils.c:1945
+#: ../libedataserver/e-time-utils.c:1837 ../libedataserver/e-time-utils.c:1933
msgid "%H:%M"
msgstr "%H:%M"
#. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1850
+#: ../libedataserver/e-time-utils.c:1840
msgid "%H%M"
msgstr "%H%M"
#. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1854
+#: ../libedataserver/e-time-utils.c:1844
msgid "%I %p"
msgstr "%p%I"
@@ -4977,282 +4787,295 @@ msgstr "å?¿å??访é?® LDAP æ??å?¡å?¨"
msgid "Failed to authenticate.\n"
msgstr "身份éª?è¯?失败ã??\n"
-#: ../libedataserverui/e-categories-dialog.c:261
+#: ../libedataserverui/e-categories-dialog.c:338
#, c-format
msgid ""
"There is already a category '%s' in the configuration. Please use another "
"name"
msgstr "é??ç½®ä¸å·²ç»?æ??ç±»å?«â??%sâ??äº?ã??请使ç?¨å?¦å¤?ä¸?个å??称"
-#: ../libedataserverui/e-categories-dialog.c:462
+#: ../libedataserverui/e-categories-dialog.c:641
msgid "Icon"
msgstr "å?¾æ ?"
-#: ../libedataserverui/e-categories-dialog.c:467
+#: ../libedataserverui/e-categories-dialog.c:646
msgid "Category"
msgstr "类�"
-#: ../libedataserverui/e-categories-dialog.glade.h:1
+#: ../libedataserverui/e-categories-dialog.ui.h:1
msgid "Category Icon"
msgstr "ç±»å?«å?¾æ ?"
-#: ../libedataserverui/e-categories-dialog.glade.h:2
+#: ../libedataserverui/e-categories-dialog.ui.h:2
msgid "Category Properties"
msgstr "类���"
-#: ../libedataserverui/e-categories-dialog.glade.h:3
+#: ../libedataserverui/e-categories-dialog.ui.h:3
msgid "Category _Icon"
msgstr "ç±»å?«å?¾æ ?(_I)"
-#: ../libedataserverui/e-categories-dialog.glade.h:4
+#: ../libedataserverui/e-categories-dialog.ui.h:4
msgid "Category _Name"
msgstr "ç±»å?«å??称(_N)"
-#: ../libedataserverui/e-categories-dialog.glade.h:5
+#: ../libedataserverui/e-categories-dialog.ui.h:5
msgid "Item(s) belong to these _categories:"
msgstr "项�����类�(_C)�"
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.ui.h:6
msgid "_Available Categories:"
msgstr "��类�(_A)�"
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.ui.h:7
msgid "_Edit"
msgstr "ç¼?è¾?(_E)"
-#: ../libedataserverui/e-categories-dialog.glade.h:8
+#: ../libedataserverui/e-categories-dialog.ui.h:8
msgid "categories"
msgstr "类�"
-#: ../libedataserverui/e-name-selector-dialog.c:266
+#: ../libedataserverui/e-category-completion.c:290
+#, fuzzy, c-format
+msgid "Create category \"%s\""
+msgstr "ç±»å?«å??表"
+
+#: ../libedataserverui/e-cell-renderer-color.c:222
+msgid "Color Info"
+msgstr "��信�"
+
+#: ../libedataserverui/e-cell-renderer-color.c:223
+msgid "The color to render"
+msgstr "ç?¨äº?渲æ??ç??é¢?è?²"
+
+#: ../libedataserverui/e-name-selector-dialog.c:292
msgid "Select Contacts from Address Book"
msgstr "ä»?å?°å??ç°¿ä¸é??æ?©è??系人"
-#: ../libedataserverui/e-name-selector-dialog.c:546
+#: ../libedataserverui/e-name-selector-dialog.c:579
msgid "_Add"
msgstr "æ·»å? (_A)"
-#: ../libedataserverui/e-name-selector-dialog.c:571
+#: ../libedataserverui/e-name-selector-dialog.c:604
msgid "_Remove"
msgstr "å? é?¤(_R)"
-#: ../libedataserverui/e-name-selector-dialog.c:744
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:781
+#: ../libedataserverui/e-name-selector-dialog.ui.h:6
msgid "Any Category"
msgstr "任�类�"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
+#: ../libedataserverui/e-name-selector-dialog.ui.h:1
msgid "*"
msgstr "*"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
+#: ../libedataserverui/e-name-selector-dialog.ui.h:2
msgid "<b>Co_ntacts</b>"
msgstr "<b>è??系人(_N)</b>"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
+#: ../libedataserverui/e-name-selector-dialog.ui.h:3
msgid "<b>Show Contacts</b>"
msgstr "<b>æ?¾ç¤ºè??系人</b>"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
+#: ../libedataserverui/e-name-selector-dialog.ui.h:4
msgid "Address B_ook:"
msgstr "å?°å??ç°¿(_O)ï¼?"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.ui.h:5
msgid "Address Book"
msgstr "å?°å??ç°¿"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
+#: ../libedataserverui/e-name-selector-dialog.ui.h:7
msgid "Cate_gory:"
msgstr "类�(_G)�"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
+#: ../libedataserverui/e-name-selector-dialog.ui.h:8
#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
msgid "Contacts"
msgstr "è??系人"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
+#: ../libedataserverui/e-name-selector-dialog.ui.h:9
msgid "Search"
msgstr "æ??ç´¢"
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
+#: ../libedataserverui/e-name-selector-dialog.ui.h:10
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:2240
+#: ../libedataserverui/e-name-selector-entry.c:2455
#, c-format
msgid "E_xpand %s Inline"
msgstr "����� %s(_X)"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2255
+#: ../libedataserverui/e-name-selector-entry.c:2470
#, c-format
msgid "Cop_y %s"
msgstr "�� %s(_Y)"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2265
+#: ../libedataserverui/e-name-selector-entry.c:2480
#, c-format
msgid "C_ut %s"
msgstr "å?ªå?? %s(_U)"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2282
+#: ../libedataserverui/e-name-selector-entry.c:2497
#, c-format
msgid "_Edit %s"
msgstr "ç¼?è¾? %s(_E)"
-#: ../libedataserverui/e-name-selector-list.c:466
+#: ../libedataserverui/e-name-selector-list.c:469
#, c-format
msgid "_Delete %s"
msgstr "å? é?¤ %s(_D)"
-#: ../libedataserverui/e-passwords.c:218
+#: ../libedataserverui/e-passwords.c:234
#, c-format
msgid "Keyring key is unusable: no user or host name"
msgstr "å¯?é?¥ç?¯ä¸?å?¯ç?¨ï¼?没æ??ç?¨æ?·æ??主æ?ºå??"
-#: ../libedataserverui/e-passwords.c:1055
+#: ../libedataserverui/e-passwords.c:1093
msgid "You have the Caps Lock key on."
msgstr "æ?¨æ??å¼?äº? Caps Lockã??"
-#: ../libedataserverui/e-passwords.c:1175
+#: ../libedataserverui/e-passwords.c:1215
msgid "_Remember this passphrase"
msgstr "è®°ä½?æ¤å¯?ç ?å?¥(_R)"
-#: ../libedataserverui/e-passwords.c:1176
+#: ../libedataserverui/e-passwords.c:1216
msgid "_Remember this passphrase for the remainder of this session"
msgstr "æ?¬æ¬¡ä¼?è¯?è®°ä½?æ¤å¯?ç ?å?¥(_R)"
-#: ../libedataserverui/e-passwords.c:1181
+#: ../libedataserverui/e-passwords.c:1221
msgid "_Remember this password"
msgstr "è®°ä½?æ¤å¯?ç ?(_R)"
-#: ../libedataserverui/e-passwords.c:1182
+#: ../libedataserverui/e-passwords.c:1222
msgid "_Remember this password for the remainder of this session"
msgstr "æ?¬æ¬¡ä¼?è¯?è®°ä½?æ¤å¯?ç ?(_R)"
#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:95
+#: ../libedataserverui/e-source-selector-dialog.c:100
msgid "Select destination"
msgstr "é??æ?©ç?®ç??å?°"
-#: ../libedataserverui/e-source-selector-dialog.c:148
+#: ../libedataserverui/e-source-selector-dialog.c:156
msgid "_Destination"
msgstr "ç?®ç??(_D)"
-#: ../servers/exchange/lib/e2k-autoconfig.c:1683
-#: ../servers/exchange/storage/exchange-account.c:953
+#: ../servers/exchange/lib/e2k-autoconfig.c:1694
+#: ../servers/exchange/storage/exchange-account.c:954
#, c-format
msgid "Enter password for %s"
msgstr "è¾?å?¥ %s ç??å¯?ç ?"
-#: ../servers/exchange/lib/e2k-autoconfig.c:1684
-#: ../servers/exchange/storage/exchange-account.c:958
+#: ../servers/exchange/lib/e2k-autoconfig.c:1695
+#: ../servers/exchange/storage/exchange-account.c:959
msgid "Enter password"
msgstr "è¾?å?¥å¯?ç ?"
#. i18n: These are Outlook's words for the default roles in
#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:847
+#: ../servers/exchange/lib/e2k-security-descriptor.c:844
msgid "Owner"
msgstr "æ??æ??è??"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
+#: ../servers/exchange/lib/e2k-security-descriptor.c:854
msgid "Publishing Editor"
msgstr "å??å¸?ç¼?è¾?å?¨"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
+#: ../servers/exchange/lib/e2k-security-descriptor.c:862
msgid "Editor"
msgstr "ç¼?è¾?å?¨"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
+#: ../servers/exchange/lib/e2k-security-descriptor.c:869
msgid "Publishing Author"
msgstr "å??å¸?ä½?è??"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
+#: ../servers/exchange/lib/e2k-security-descriptor.c:875
msgid "Author"
msgstr "ä½?è??"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
+#: ../servers/exchange/lib/e2k-security-descriptor.c:880
msgid "Non-editing Author"
msgstr "é??ç¼?è¾?ä½?è??"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
+#: ../servers/exchange/lib/e2k-security-descriptor.c:884
msgid "Reviewer"
msgstr "å¤?æ?¥è??"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
+#: ../servers/exchange/lib/e2k-security-descriptor.c:886
msgid "Contributor"
msgstr "è´¡ç?®è??"
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
+#: ../servers/exchange/lib/e2k-security-descriptor.c:888
msgid "None"
msgstr "æ? "
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
+#: ../servers/exchange/lib/e2k-security-descriptor.c:903
msgid "Custom"
msgstr "���"
-#: ../servers/exchange/storage/e-storage.c:555
+#: ../servers/exchange/storage/e-storage.c:557
msgid "Generic error"
msgstr "常è§?é??误"
-#: ../servers/exchange/storage/e-storage.c:557
+#: ../servers/exchange/storage/e-storage.c:559
msgid "A folder with the same name already exists"
msgstr "å·²ç»?å?å?¨å??å??æ??件夹"
-#: ../servers/exchange/storage/e-storage.c:559
+#: ../servers/exchange/storage/e-storage.c:561
msgid "The specified folder type is not valid"
msgstr "æ??å®?ç??æ??件类å??æ? æ??"
-#: ../servers/exchange/storage/e-storage.c:561
+#: ../servers/exchange/storage/e-storage.c:563
msgid "I/O error"
msgstr "I/O é??误"
-#: ../servers/exchange/storage/e-storage.c:563
+#: ../servers/exchange/storage/e-storage.c:565
msgid "Not enough space to create the folder"
msgstr "没æ??足å¤?ç??空é?´å??建æ??件夹"
-#: ../servers/exchange/storage/e-storage.c:565
+#: ../servers/exchange/storage/e-storage.c:567
msgid "The folder is not empty"
msgstr "æ??件夹为空"
-#: ../servers/exchange/storage/e-storage.c:567
+#: ../servers/exchange/storage/e-storage.c:569
msgid "The specified folder was not found"
msgstr "æ??å®?ç??æ??件æ?ªæ?¾å?°"
-#: ../servers/exchange/storage/e-storage.c:569
+#: ../servers/exchange/storage/e-storage.c:571
msgid "Function not implemented in this storage"
msgstr "å??è?½æ?ªå?¨æ¤å?å?¨ä¸å®?ç?°"
-#: ../servers/exchange/storage/e-storage.c:573
+#: ../servers/exchange/storage/e-storage.c:575
msgid "Operation not supported"
msgstr "æ??ä½?ä¸?æ?¯æ??"
-#: ../servers/exchange/storage/e-storage.c:575
+#: ../servers/exchange/storage/e-storage.c:577
msgid "The specified type is not supported in this storage"
msgstr "æ¤å?å?¨ä¸?æ?¯æ??æ??å®?ç±»å??"
-#: ../servers/exchange/storage/e-storage.c:577
+#: ../servers/exchange/storage/e-storage.c:579
msgid "The specified folder cannot be modified or removed"
msgstr "æ? æ³?ä¿®æ?¹æ??å? é?¤æ??å®?ç??æ??件夹"
-#: ../servers/exchange/storage/e-storage.c:579
+#: ../servers/exchange/storage/e-storage.c:581
msgid "Cannot make a folder a child of one of its descendants"
msgstr "æ? æ³?å°?æ??件夹å??æ??å?¶å?æ??件夹ç??å?æ??件夹"
-#: ../servers/exchange/storage/e-storage.c:581
+#: ../servers/exchange/storage/e-storage.c:583
msgid "Cannot create a folder with that name"
msgstr "æ? æ³?以æ¤å??称å??建æ??件夹"
-#: ../servers/exchange/storage/e-storage.c:583
+#: ../servers/exchange/storage/e-storage.c:585
msgid "This operation cannot be performed in off-line mode"
msgstr "该信件æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸ä½¿ç?¨"
#. i18n: This is the title of an "other user's folders"
#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:644
+#: ../servers/exchange/storage/exchange-account.c:639
#, c-format
msgid "%s's Folders"
msgstr "%s ç??æ??件夹"
@@ -5279,6 +5102,10 @@ msgstr "å?¨å±?å?°å??å??表"
msgid "Deleted Items"
msgstr "å·²å? 项"
+#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
+msgid "Drafts"
+msgstr "è??稿"
+
#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
msgid "Journal"
msgstr "�记"
@@ -5331,16 +5158,164 @@ msgstr "Evolution æ?°æ?®æ??å?¡å?¨æ?¥å?£æ£?æ?¥æ??å?¡"
msgid "Evolution Data Server logging service"
msgstr "Evolution æ?°æ?®æ??å?¡å?¨æ?¥å¿?æ??å?¡"
-#. dialog display isn't working out
-#: ../src/server.c:109
-#, c-format
-msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-msgstr "å??ç??äº?å¤?个段é??误ï¼?æ? æ³?æ?¾ç¤ºé??误对è¯?æ¡?\n"
+#~ msgid "\"%s\" on book before \"%s\""
+#~ msgstr "â??%2$sâ??å??ç??â??%1$sâ??"
-#: ../libedataserverui/e-cell-renderer-color.c:210
-msgid "Color Info"
-msgstr "��信�"
+#~ msgid "book busy"
+#~ msgstr "é??讯簿å¿?"
-#: ../libedataserverui/e-cell-renderer-color.c:211
-msgid "The color to render"
-msgstr "ç?¨äº?渲æ??ç??é¢?è?²"
+#~ msgid "CORBA exception making \"%s\" call"
+#~ msgstr "CORBA é??è¦?æ?§è¡?â??%sâ??è°?ç?¨"
+
+#~ msgid "%s: there is no current operation"
+#~ msgstr "%sï¼?没æ??å½?å??æ??ä½?"
+
+#~ msgid "%s: could not cancel"
+#~ msgstr "%sï¼?æ? æ³?å??æ¶?"
+
+#~ msgid "\"%s\" on book after \"%s\""
+#~ msgstr "â??%2$sâ??å??ç??â??%1$sâ??"
+
+#~ msgid "%s: canceled"
+#~ msgstr "%sï¼?å·²å??æ¶?"
+
+#~ msgid "%s: Invalid source."
+#~ msgstr "%sï¼?æ? æ??æ?¥æº?ã??"
+
+#~ msgid "%s: no factories available for URI `%s'"
+#~ msgstr "%sï¼?对äº? URIâ??%sâ??没æ??å?¯ç?¨ç??å·¥å??"
+
+#~ msgid "%s: Could not create EBookListener"
+#~ msgstr "%sï¼?ä¸?è?½å??建 EBookListener"
+
+#~ msgid "Fair"
+#~ msgstr "�天"
+
+#~ msgid "Snow showers"
+#~ msgstr "æ?´é?ª"
+
+#~ msgid "Snow"
+#~ msgstr "é?ª"
+
+#~ msgid "Partly cloudy"
+#~ msgstr "��"
+
+#~ msgid "Smoke"
+#~ msgstr "ç??"
+
+#~ msgid "Thunderstorms"
+#~ msgstr "���"
+
+#~ msgid "Cloudy"
+#~ msgstr "��"
+
+#~ msgid "Drizzle"
+#~ msgstr "ç»?é?¨"
+
+#~ msgid "Sunny"
+#~ msgstr "æ?´"
+
+#~ msgid "Dust"
+#~ msgstr "æ²?å°?"
+
+#~ msgid "Clear"
+#~ msgstr "æ?´"
+
+#~ msgid "Mostly cloudy"
+#~ msgstr "�天"
+
+#~ msgid "Windy"
+#~ msgstr "�"
+
+#~ msgid "Rain showers"
+#~ msgstr "æ?´é?¨"
+
+#~ msgid "Foggy"
+#~ msgstr "é?¾"
+
+#~ msgid "Rain/snow mixed"
+#~ msgstr "�夹�"
+
+#~ msgid "Sleet"
+#~ msgstr "é?¹"
+
+#~ msgid "Very hot/humid"
+#~ msgstr "é?·ç?"
+
+#~ msgid "Blizzard"
+#~ msgstr "æ?´é?ª"
+
+#~ msgid "Freezing rain"
+#~ msgstr "��"
+
+#~ msgid "Haze"
+#~ msgstr "é?´é?¾"
+
+#~ msgid "Blowing snow"
+#~ msgstr "���"
+
+#~ msgid "Freezing drizzle"
+#~ msgstr "���"
+
+#~ msgid "Very cold/wind chill"
+#~ msgstr "��"
+
+#~ msgid "Rain"
+#~ msgstr "é?¨"
+
+#~ msgid "Weather: Partly Cloudy"
+#~ msgstr "天����"
+
+#~ msgid "%.1f°C - %s"
+#~ msgstr "%.1f°C - %s"
+
+#~ msgid "%.1f°F - %s"
+#~ msgstr "%.1f°F - %s"
+
+#~ msgid "%.1f/%.1f°C - %s"
+#~ msgstr "%.1f/%.1f°C - %s"
+
+#~ msgid "%.1f/%.1f°F - %s"
+#~ msgstr "%.1f/%.1f°F - %s"
+
+#~ msgid "%d%% chance of precipitation\n"
+#~ msgstr "é??æ°´æ¦?ç?? %d%%\n"
+
+#~ msgid "%.1fcm snow\n"
+#~ msgstr "%.1f å??ç±³é?ª\n"
+
+#~ msgid "%.1fin snow\n"
+#~ msgstr "%.1f �寸�\n"
+
+#~ msgid "%.1f-%.1fcm snow\n"
+#~ msgstr "%.1f-%.1f å??ç±³é?ª\n"
+
+#~ msgid "%.1f-%.1fin snow\n"
+#~ msgstr "%.1f-%.1f �寸�\n"
+
+#~ msgid "Failed to create create child process '%s': %s"
+#~ msgstr "å??建å?è¿?ç¨?â??%sâ??失败ï¼?%s"
+
+#~ msgid "Performing query on unknown header: %s"
+#~ msgstr "对æ?ªç?¥ç??头è¿?è¡?æ?¥è¯¢ï¼?%s"
+
+#~ msgid "Decoder failed, error %d"
+#~ msgstr "解ç ?å?¨å¤±è´¥ï¼?é??误å?· %d"
+
+#~ msgid "CRL not yet valid"
+#~ msgstr "CRL å°?ä¸?æ? æ??"
+
+#~ msgid "CRL has expired"
+#~ msgstr "CRL å·²è¿?æ??"
+
+#~ msgid "Error in CRL"
+#~ msgstr "CRL é??误"
+
+#~ msgid "Sent"
+#~ msgstr "å·²å??é??"
+
+#~ msgid "Templates"
+#~ msgstr "模�"
+
+#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
+#~ msgstr "å??ç??äº?å¤?个段é??误ï¼?æ? æ³?æ?¾ç¤ºé??误对è¯?æ¡?\n"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
