[evolution-data-server] Updated Traditional Chinese translation(Hong Kong and Taiwan)

From: Chao-Hsiung Liao <chliao src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [evolution-data-server] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Fri, 22 Jan 2010 14:36:57 +0000 (UTC)
commit 6cc6c9a5662fe7eb0ad0e317c82b2ddfadb797b5
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Fri Jan 22 22:36:48 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1791 ++++++++++++++++++++++++++---------------------------------
 po/zh_TW.po | 1791 ++++++++++++++++++++++++++---------------------------------
 2 files changed, 1596 insertions(+), 1986 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 5e398f7..1d7d3f1 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,10 +6,10 @@
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005. 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server 2.27.90\n"
+"Project-Id-Version: evolution-data-server 2.29.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-28 20:54+0800\n"
-"PO-Revision-Date: 2009-07-28 20:54+0800\n"
+"POT-Creation-Date: 2010-01-22 22:35+0800\n"
+"PO-Revision-Date: 2010-01-22 22:36+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
 #: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2329
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "è¼?å?¥ä¸..."
@@ -28,33 +28,33 @@ msgstr "è¼?å?¥ä¸..."
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
 #: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2260
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2282
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2327
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
+#: ../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:4524
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "æ??å°?ä¸..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2695
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4688
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "æ£å?¨ä¸?è¼?è?¯çµ¡äºº (%d)..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2844
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3072
+#: ../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:788
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:786
 msgid "Using Distinguished Name (DN)"
 msgstr "ä½¿ç?¨è¾¨èª?ç??å??ç¨± (DN)"
 
 # mail/mail-config.glade.h:29
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:789
 msgid "Using Email Address"
 msgstr "ä½¿ç?¨é?»å?é?µä»¶å?°å??"
 
@@ -80,113 +80,16 @@ msgstr "æ£å?¨ç§»é?¤ LDAP ä¼ºæ??å?¨ä¸ç??è?¯çµ¡äºº..."
 msgid "Modifying contact from LDAP server..."
 msgstr "æ£å?¨ä¿®æ?¹ LDAP ä¼ºæ??å?¨ä¸ç??è?¯çµ¡äºº..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4385
 msgid "Receiving LDAP search results..."
 msgstr "æ£å?¨æ?¥æ?¶ LDAP æ??å°?çµ?æ??..."
 
 # executive-summary/component/e-summary.c:940
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4546
 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:287 ../addressbook/libebook/e-book.c:291
-#: ../addressbook/libebook/e-book.c:495 ../addressbook/libebook/e-book.c:499
-#: ../addressbook/libebook/e-book.c:637 ../addressbook/libebook/e-book.c:641
-#: ../addressbook/libebook/e-book.c:727 ../addressbook/libebook/e-book.c:731
-#: ../addressbook/libebook/e-book.c:1024 ../addressbook/libebook/e-book.c:1029
-#: ../addressbook/libebook/e-book.c:1206 ../addressbook/libebook/e-book.c:1210
-#: ../addressbook/libebook/e-book.c:1365 ../addressbook/libebook/e-book.c:1369
-#: ../addressbook/libebook/e-book.c:1570 ../addressbook/libebook/e-book.c:1574
-#: ../addressbook/libebook/e-book.c:1813 ../addressbook/libebook/e-book.c:1817
-#: ../addressbook/libebook/e-book.c:2050 ../addressbook/libebook/e-book.c:2054
-#: ../addressbook/libebook/e-book.c:2257 ../addressbook/libebook/e-book.c:2261
-#: ../addressbook/libebook/e-book.c:3445
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "å?¨é??è¨?é??ä¸ã??%sã??å?¨ã??%sã??ä¹?å??"
-
-#: ../addressbook/libebook/e-book.c:300 ../addressbook/libebook/e-book.c:508
-#: ../addressbook/libebook/e-book.c:650 ../addressbook/libebook/e-book.c:740
-#: ../addressbook/libebook/e-book.c:1039 ../addressbook/libebook/e-book.c:1220
-#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1583
-#: ../addressbook/libebook/e-book.c:1826 ../addressbook/libebook/e-book.c:2064
-#: ../addressbook/libebook/e-book.c:2270 ../addressbook/libebook/e-book.c:2679
-#: ../addressbook/libebook/e-book.c:2877
-#, c-format
-msgid "book busy"
-msgstr "é??è¨?é??å¿?ç¢?ä¸"
-
-#: ../addressbook/libebook/e-book.c:331 ../addressbook/libebook/e-book.c:335
-#: ../addressbook/libebook/e-book.c:539 ../addressbook/libebook/e-book.c:543
-#: ../addressbook/libebook/e-book.c:677 ../addressbook/libebook/e-book.c:681
-#: ../addressbook/libebook/e-book.c:767 ../addressbook/libebook/e-book.c:771
-#: ../addressbook/libebook/e-book.c:1066 ../addressbook/libebook/e-book.c:1069
-#: ../addressbook/libebook/e-book.c:1250 ../addressbook/libebook/e-book.c:1253
-#: ../addressbook/libebook/e-book.c:1406 ../addressbook/libebook/e-book.c:1410
-#: ../addressbook/libebook/e-book.c:1619 ../addressbook/libebook/e-book.c:1623
-#: ../addressbook/libebook/e-book.c:1873 ../addressbook/libebook/e-book.c:1877
-#: ../addressbook/libebook/e-book.c:2094 ../addressbook/libebook/e-book.c:2098
-#: ../addressbook/libebook/e-book.c:2296 ../addressbook/libebook/e-book.c:2300
-#: ../addressbook/libebook/e-book.c:2531 ../addressbook/libebook/e-book.c:2705
-#: ../addressbook/libebook/e-book.c:2709 ../addressbook/libebook/e-book.c:2903
-#: ../addressbook/libebook/e-book.c:2907 ../addressbook/libebook/e-book.c:3454
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "CORBA ä¾?å¤?é? æ??ã??%sã??å?¼å?«"
-
-# ui/evolution-mail.xml.h:3
-#: ../addressbook/libebook/e-book.c:2520
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%sï¼?ç?®å??æ²?æ??æ??ä½?"
-
-#: ../addressbook/libebook/e-book.c:2549 ../addressbook/libebook/e-book.c:2594
-#: ../addressbook/libebook/e-book.c:2633
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%sï¼?ç?¡æ³?å??æ¶?"
-
-#: ../addressbook/libebook/e-book.c:2665 ../addressbook/libebook/e-book.c:2669
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "å?¨é??è¨?é??ä¸ã??%sã??å?¨ã??%sã??ä¹?å¾?"
-
-# camel/camel-remote-store.c:337
-# camel/camel-remote-store.c:399
-# camel/camel-remote-store.c:470
-# camel/providers/imap/camel-imap-command.c:287
-#: ../addressbook/libebook/e-book.c:2733
-#, c-format
-msgid "%s: canceled"
-msgstr "%sï¼?å·²å??æ¶?"
-
-#: ../addressbook/libebook/e-book.c:3310
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%sï¼?ç?¡æ??ç??ä¾?æº?ã??"
-
-# camel/camel-session.c:295
-# camel/camel-session.c:364
-#: ../addressbook/libebook/e-book.c:3318 ../addressbook/libebook/e-book.c:3383
-#, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%sï¼?URIã??%sã??æ²?æ??å?¯ç?¨ç??è£½é? å» "
-
-#: ../addressbook/libebook/e-book.c:3329
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%sï¼?ç?¡æ³?å»ºç«? EBookListener"
-
-#: ../addressbook/libebook/e-book.c:3595
-#, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%sï¼?æ²?æ??å?²å?æ?¼ gconf ä¸ç??æ?¬èº«è?¯çµ¡äºº UID"
-
-#: ../addressbook/libebook/e-book.c:3727
+#: ../addressbook/libebook/e-book.c:2121
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%sï¼?æ²?æ??å?²å?æ?¼ gconf ä¸ç?? uid `%s' ä¾?æº?ã??"
@@ -430,7 +333,7 @@ msgstr "ç¶²èª? URL"
 # calendar/gui/e-calendar-table.c:150
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:609
+#: ../libedataserverui/e-categories-dialog.c:669
 msgid "Categories"
 msgstr "å??é¡?"
 
@@ -725,7 +628,7 @@ msgstr "å?ºç??æ?¥æ??"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
 #: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:713
 #: ../libedataserver/e-categories.c:45
 msgid "Anniversary"
 msgstr "é?±å¹´ç´?å¿µæ?¥"
@@ -817,20 +720,97 @@ msgstr "SIP ä½?å??"
 msgid "Unnamed List"
 msgstr "æ?ªå?½å??ç??æ¸?å?®"
 
+#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#, c-format
+msgid "Empty URI"
+msgstr "ç©ºç?? URI"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:305
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:323
+#: ../calendar/libedata-cal/e-data-cal-factory.c:332
+#, c-format
+msgid "Invalid source"
+msgstr "ç?¡æ??ç??ä¾?æº?"
+
+# camel/camel-filter-driver.c:671
+#: ../addressbook/libedata-book/e-data-book.c:301
+msgid "Cannot open book"
+msgstr "ä¸?è?½é??å??æ?¸ç±?"
+
+#: ../addressbook/libedata-book/e-data-book.c:319
+msgid "Cannot remove book"
+msgstr "ä¸?è?½ç§»é?¤æ?¸ç±?"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../addressbook/libedata-book/e-data-book.c:346
+msgid "Cannot get contact"
+msgstr "ä¸?è?½å??å¾?è?¯çµ¡äºº"
+
+#: ../addressbook/libedata-book/e-data-book.c:358
+msgid "Empty query"
+msgstr "ç©ºç??æ?¥è©¢"
+
+# camel/providers/pop3/camel-pop3-store.c:199
+#: ../addressbook/libedata-book/e-data-book.c:402
+msgid "Cannot authenticate user"
+msgstr "ä¸?è?½é©?è?ä½¿ç?¨è??"
+
+#: ../addressbook/libedata-book/e-data-book.c:414
+#: ../addressbook/libedata-book/e-data-book.c:429
+msgid "Cannot add contact"
+msgstr "ä¸?è?½å? å?¥è?¯çµ¡äºº"
+
+# mail/mail-crypto.c:251
+#: ../addressbook/libedata-book/e-data-book.c:444
+#: ../addressbook/libedata-book/e-data-book.c:459
+msgid "Cannot modify contact"
+msgstr "ä¸?è?½ä¿®æ?¹è?¯çµ¡äºº"
+
+# mail/mail-crypto.c:251
+#: ../addressbook/libedata-book/e-data-book.c:494
+msgid "Cannot remove contacts"
+msgstr "ä¸?è?½ç§»é?¤è?¯çµ¡äºº"
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: ../addressbook/libedata-book/e-data-book.c:569
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+msgid "Invalid query"
+msgstr "ç?¡æ??ç??æ?¥è©¢"
+
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#: ../addressbook/libedata-book/e-data-book.c:598
+msgid "Cannot get changes"
+msgstr "ä¸?è?½å??å¾?æ?´æ?¹"
+
+# calendar/gui/e-itip-control.c:883
+#: ../addressbook/libedata-book/e-data-book.c:699
+msgid "Cannot complete operation"
+msgstr "ä¸?è?½å®?æ??æ¤é ?æ??ä½?"
+
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
 #: ../libedataserver/e-categories.c:46
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:744
 #, c-format
 msgid "Birthday: %s"
 msgstr "ç??æ?¥ï¼?%s"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:768
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ç´?å¿µæ?¥ï¼?%s"
@@ -845,33 +825,33 @@ msgid "Cannot save calendar data"
 msgstr "ä¸?è?½å?²å?è¡?äº?æ??è³?æ??"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
 msgid "Could not create thread for getting deltas"
 msgstr "ç?¡æ³?å»ºç«?å??å¾? deltas ç??å?·è¡?ç·?"
 
 # camel/providers/local/camel-mbox-store.c:110
-#: ../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:659
-#: ../calendar/backends/weather/e-cal-backend-weather.c:486
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
+#: ../calendar/backends/google/e-cal-backend-google.c:1142
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1079
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1380
+#: ../calendar/backends/http/e-cal-backend-http.c:676
+#: ../calendar/backends/weather/e-cal-backend-weather.c:490
 msgid "Could not create cache file"
 msgstr "ç?¡æ³?å»ºç«?å¿«å??æª?æ¡?"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1093
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1092
 msgid "Could not create thread for populating cache"
 msgstr "ç?¡æ³?å»ºç«?ç§»æ¤?å¿«å??ç??å?·è¡?ç·?"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2122
 msgid "Reply Requested: by "
 msgstr "è¦?æ±?å??è¦?ï¼?æ ¹æ??"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2127
 msgid "Reply Requested: When convenient"
 msgstr "è¦?æ±?å??è¦?ï¼?ç?¶æ??ç©ºæ??"
 
@@ -882,27 +862,26 @@ msgstr "è¼?å?¥ %s å??é ?ç?®"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:917
 msgid "Calendar"
 msgstr "è¡?äº?æ??"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
 msgid "Invalid server URI"
 msgstr "ç?¡æ??ç??ä¼ºæ??å?¨ URI"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: ../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/backends/groupwise/e-cal-backend-groupwise.c:994
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1003
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1097
+#: ../calendar/libecal/e-cal.c:3953
 #: ../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-folder.c:1335
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1371
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1386
 #: ../camel/providers/groupwise/camel-groupwise-store.c:598
 #: ../camel/providers/groupwise/camel-groupwise-store.c:773
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:154
@@ -911,18 +890,18 @@ msgid "Authentication failed"
 msgstr "é©?è?å¤±æ??"
 
 # mail/mail-config.glade.h:37
-#: ../calendar/backends/http/e-cal-backend-http.c:316
+#: ../calendar/backends/http/e-cal-backend-http.c:333
 msgid "Redirected to Invalid URI"
 msgstr "é??æ?°æ??å??ç?¡æ??ç?? URI"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/backends/http/e-cal-backend-http.c:339
+#: ../calendar/backends/http/e-cal-backend-http.c:356
 msgid "Bad file format."
 msgstr "é?¯èª¤ç??æª?æ¡?æ ¼å¼?ã??"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../calendar/backends/http/e-cal-backend-http.c:346
+#: ../calendar/backends/http/e-cal-backend-http.c:363
 msgid "Not a calendar."
 msgstr "ä¸¦é??è¡?äº?æ??ã??"
 
@@ -931,205 +910,205 @@ msgstr "ä¸¦é??è¡?äº?æ??ã??"
 msgid "Could not retrieve weather data"
 msgstr "ç?¡æ³?å??å¾?å¤©æ°£è³?æ??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:249
 msgid "Weather: Fog"
 msgstr "å¤©æ°£ï¼?èµ·é?§"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-msgid "Weather: Cloudy"
-msgstr "å¤©æ°£ï¼?å¤?é?²"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:250
 msgid "Weather: Cloudy Night"
 msgstr "å¤©æ°£ï¼?å¤?é?²ç??å¤?æ??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+msgid "Weather: Cloudy"
+msgstr "å¤©æ°£ï¼?å¤?é?²"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
 msgid "Weather: Overcast"
 msgstr "å¤©æ°£ï¼?å¤?é?²"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
 msgid "Weather: Showers"
 msgstr "å¤©æ°£ï¼?é?£é?¨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Snow"
 msgstr "å¤©æ°£ï¼?ä¸?é?ª"
 
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+msgid "Weather: Clear Night"
+msgstr "å¤©æ°£ï¼?æ?´æ??ç??å¤?æ??"
+
 # ui/evolution-event-editor.xml.h:9
 # ui/evolution-task-editor-dialog.xml.h:10
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Sunny"
 msgstr "å¤©æ°£ï¼?è?·é?½"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
-msgid "Weather: Clear Night"
-msgstr "å¤©æ°£ï¼?æ?´æ??ç??å¤?æ??"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
 msgid "Weather: Thunderstorms"
 msgstr "å¤©æ°£ï¼?é?·æ?´"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:400
+#: ../calendar/backends/weather/e-cal-backend-weather.c:403
 msgid "Forecast"
 msgstr "å¤©æ°£é ?å ±"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: ../calendar/libecal/e-cal-component.c:1320
+#: ../calendar/libecal/e-cal-component.c:1316
 msgid "Untitled appointment"
 msgstr "æ?ªå?½å??ç??ç´?æ??"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3945
+#: ../calendar/libecal/e-cal-recur.c:3951
 msgid "1st"
 msgstr "1æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3946
+#: ../calendar/libecal/e-cal-recur.c:3952
 msgid "2nd"
 msgstr "2æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3947
+#: ../calendar/libecal/e-cal-recur.c:3953
 msgid "3rd"
 msgstr "3æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3948
+#: ../calendar/libecal/e-cal-recur.c:3954
 msgid "4th"
 msgstr "4æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3949
+#: ../calendar/libecal/e-cal-recur.c:3955
 msgid "5th"
 msgstr "5æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3950
+#: ../calendar/libecal/e-cal-recur.c:3956
 msgid "6th"
 msgstr "6æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3957
 msgid "7th"
 msgstr "7æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3958
 msgid "8th"
 msgstr "8æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3959
 msgid "9th"
 msgstr "9æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3960
 msgid "10th"
 msgstr "10æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3961
 msgid "11th"
 msgstr "11æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3962
 msgid "12th"
 msgstr "12æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3963
 msgid "13th"
 msgstr "13æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3964
 msgid "14th"
 msgstr "14æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3965
 msgid "15th"
 msgstr "15æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3966
 msgid "16th"
 msgstr "16æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3967
 msgid "17th"
 msgstr "17æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3968
 msgid "18th"
 msgstr "18æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3969
 msgid "19th"
 msgstr "19æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3970
 msgid "20th"
 msgstr "20æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:3971
 msgid "21st"
 msgstr "21æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:3972
 msgid "22nd"
 msgstr "22æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:3973
 msgid "23rd"
 msgstr "23æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:3974
 msgid "24th"
 msgstr "24æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:3975
 msgid "25th"
 msgstr "25æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:3976
 msgid "26th"
 msgstr "26æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:3977
 msgid "27th"
 msgstr "27æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:3978
 msgid "28th"
 msgstr "28æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:3979
 msgid "29th"
 msgstr "29æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:3980
 msgid "30th"
 msgstr "30æ?¥"
 
 # calendar/gui/print.c:306
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "31st"
 msgstr "31æ?¥"
 
@@ -1138,11 +1117,11 @@ msgstr "31æ?¥"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:10
 # calendar/gui/e-calendar-table.c:345
 # mail/message-list.c:689
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:712
+#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:715
 msgid "High"
 msgstr "é«?"
 
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:714
+#: ../calendar/libecal/e-cal-util.c:690 ../calendar/libecal/e-cal-util.c:717
 msgid "Normal"
 msgstr "ä¸?è?¬"
 
@@ -1151,7 +1130,7 @@ msgstr "ä¸?è?¬"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:12
 # calendar/gui/e-calendar-table.c:347
 # mail/message-list.c:687
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:692 ../calendar/libecal/e-cal-util.c:719
 msgid "Low"
 msgstr "ä½?"
 
@@ -1159,12 +1138,12 @@ msgstr "ä½?"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:710
+#: ../calendar/libecal/e-cal-util.c:713
 msgid "Undefined"
 msgstr "æ?ªæ??å®?"
 
 # camel/camel-smime-context.c:194
-#: ../calendar/libecal/e-cal.c:1693 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1138 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
@@ -1174,36 +1153,36 @@ msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1707
+#: ../calendar/libecal/e-cal.c:1152
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "è¼¸å?¥ %s ç??å¯?ç¢¼ä»¥ä¾¿ä½¿ç?¨è?? %s è?½ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libecal/e-cal.c:5089
+#: ../calendar/libecal/e-cal.c:3925
 msgid "Invalid argument"
 msgstr "ç?¡æ??ç??å??æ?¸"
 
-#: ../calendar/libecal/e-cal.c:5091
+#: ../calendar/libecal/e-cal.c:3927
 msgid "Backend is busy"
 msgstr "å¾?ç«¯å¿?ç¢?ä¸"
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
-#: ../calendar/libecal/e-cal.c:5093
+#: ../calendar/libecal/e-cal.c:3929
 #: ../calendar/libedata-cal/e-cal-backend-util.c:105
 msgid "Repository is offline"
 msgstr "å??åº«å·²é?¢ç·?"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../calendar/libecal/e-cal.c:5095
+#: ../calendar/libecal/e-cal.c:3931
 #: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "No such calendar"
 msgstr "ç?¡æ¤è¡?äº?æ??"
 
-#: ../calendar/libecal/e-cal.c:5097
+#: ../calendar/libecal/e-cal.c:3933
 #: ../calendar/libedata-cal/e-cal-backend-util.c:111
 #: ../servers/groupwise/e-gw-connection.c:233
 msgid "Object not found"
@@ -1211,43 +1190,42 @@ msgstr "æ?¾ä¸?å?°ç?©ä»¶"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libecal/e-cal.c:5099
+#: ../calendar/libecal/e-cal.c:3935
 #: ../calendar/libedata-cal/e-cal-backend-util.c:113
 #: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid object"
 msgstr "ç?¡æ??ç??ç?©ä»¶"
 
 # addressbook/conduit/address-conduit.c:214
-#: ../calendar/libecal/e-cal.c:5101
+#: ../calendar/libecal/e-cal.c:3937
 msgid "URI not loaded"
 msgstr "URI æ?ªè¼?å?¥"
 
-#: ../calendar/libecal/e-cal.c:5103
+#: ../calendar/libecal/e-cal.c:3939
 msgid "URI already loaded"
 msgstr "URI å·²è¼?å?¥"
 
 # shell/e-storage.c:475
-#: ../calendar/libecal/e-cal.c:5105
+#: ../calendar/libecal/e-cal.c:3941
 #: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:573
 msgid "Permission denied"
 msgstr "æ¬?é??ä¸?è¶³"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:5107
+#: ../calendar/libecal/e-cal.c:3943
 #: ../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:5109
+#: ../calendar/libecal/e-cal.c:3945
 #: ../calendar/libedata-cal/e-cal-backend-util.c:115
 msgid "Object ID already exists"
 msgstr "ç?©ä»¶ ID å·²å?å?¨"
 
 # shell/e-storage.c:477
-#: ../calendar/libecal/e-cal.c:5111
+#: ../calendar/libecal/e-cal.c:3947
 msgid "Protocol not supported"
 msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
 
@@ -1255,34 +1233,34 @@ msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../calendar/libecal/e-cal.c:5113
+#: ../calendar/libecal/e-cal.c:3949
 msgid "Operation has been canceled"
 msgstr "æ??ä½?å·²å??æ¶?"
 
 # calendar/gui/e-itip-control.c:883
-#: ../calendar/libecal/e-cal.c:5115
+#: ../calendar/libecal/e-cal.c:3951
 #: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Could not cancel operation"
 msgstr "ç?¡æ³?å??æ¶?æ??ä½?"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
-#: ../calendar/libecal/e-cal.c:5119
+#: ../calendar/libecal/e-cal.c:3955
 #: ../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:5121
+#: ../calendar/libecal/e-cal.c:3957
 msgid "A CORBA exception has occurred"
 msgstr "ç?¼ç?? CORBA ä¾?å¤?"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:5123
+#: ../calendar/libecal/e-cal.c:3959
 #: ../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/imap/camel-imap-store.c:741
 #: ../camel/providers/imap4/camel-imap4-engine.c:1547
 #: ../camel/providers/imap4/camel-imap4-engine.c:1585
 #: ../camel/providers/imap4/camel-imap4-engine.c:1629
@@ -1290,18 +1268,14 @@ msgstr "ç?¼ç?? CORBA ä¾?å¤?"
 #: ../camel/providers/imap4/camel-imap4-store.c:311
 #: ../camel/providers/imap4/camel-imap4-store.c:818
 #: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:552
-#: ../camel/providers/pop3/camel-pop3-store.c:559
-#: ../camel/providers/pop3/camel-pop3-store.c:565
-#: ../servers/exchange/storage/e-storage.c:587
+#: ../camel/providers/pop3/camel-pop3-store.c:582
 #: ../servers/groupwise/e-gw-connection.c:241
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
 # shell/e-storage.c:459
-#: ../calendar/libecal/e-cal.c:5125
+#: ../calendar/libecal/e-cal.c:3961
 #: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:555
 msgid "No error"
 msgstr "æ²?æ??é?¯èª¤"
 
@@ -1435,12 +1409,6 @@ msgstr "è¶?é??æ??å°?å¤§å°?é??å?¶"
 msgid "Search time limit exceeded"
 msgstr "è¶?é??æ??å°?æ??é??é??å?¶"
 
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "ç?¡æ??ç??æ?¥è©¢"
-
 #: ../calendar/libedata-cal/e-cal-backend-util.c:141
 msgid "Query refused"
 msgstr "æ?¥è©¢è¢«æ??çµ?"
@@ -1451,6 +1419,145 @@ msgstr "æ?¥è©¢è¢«æ??çµ?"
 msgid "Invalid server version"
 msgstr "ç?¡æ??ç??ä¼ºæ??å?¨ç??æ?¬"
 
+#: ../calendar/libedata-cal/e-data-cal.c:491
+#, c-format
+msgid "Cannot retrieve calendar address"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ä½?å??"
+
+#: ../calendar/libedata-cal/e-data-cal.c:509
+#, c-format
+msgid "Cannot retrieve calendar alarm e-mail address"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??é¬§é?´é?»å?é?µä»¶ä½?å??"
+
+#: ../calendar/libedata-cal/e-data-cal.c:527
+#, c-format
+msgid "Cannot retrieve calendar's ldap attribute"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?? ldap å±¬æ?§"
+
+# camel/camel-filter-driver.c:671
+#: ../calendar/libedata-cal/e-data-cal.c:545
+#, c-format
+msgid "Cannot retrieve calendar scheduling information"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??è¡?ç¨?è³?è¨?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:562
+#, c-format
+msgid "Cannot open calendar"
+msgstr "ä¸?è?½é??å??è¡?äº?æ??"
+
+#: ../calendar/libedata-cal/e-data-cal.c:579
+#, c-format
+msgid "Cannot refresh calendar"
+msgstr "ä¸?è?½é??æ?°æ?´ç??è¡?äº?æ??"
+
+#: ../calendar/libedata-cal/e-data-cal.c:596
+#, c-format
+msgid "Cannot remove calendar"
+msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??"
+
+# mail/mail-crypto.c:251
+#: ../calendar/libedata-cal/e-data-cal.c:615
+#, c-format
+msgid "Cannot create calendar object"
+msgstr "ä¸?è?½å»ºç«?è¡?äº?æ??ç?©ä»¶"
+
+#: ../calendar/libedata-cal/e-data-cal.c:637
+#, c-format
+msgid "Cannot modify calender object"
+msgstr "ä¸?è?½ä¿®æ?¹è¡?äº?æ??ç?©ä»¶"
+
+#: ../calendar/libedata-cal/e-data-cal.c:661
+#, c-format
+msgid "Cannot remove calendar object"
+msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??ç?©ä»¶"
+
+#: ../calendar/libedata-cal/e-data-cal.c:680
+#, c-format
+msgid "Cannot receive calendar objects"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶"
+
+#: ../calendar/libedata-cal/e-data-cal.c:697
+#, c-format
+msgid "Cannot discard calendar alarm"
+msgstr "ä¸?è?½å??æ¶?è¡?äº?æ??é¬§é?´"
+
+#: ../calendar/libedata-cal/e-data-cal.c:716
+#, c-format
+msgid "Cannot send calendar objects"
+msgstr "ä¸?è?½å?³é??è¡?äº?æ??ç?©ä»¶"
+
+#: ../calendar/libedata-cal/e-data-cal.c:751
+#, c-format
+msgid "Cannot retrieve default calendar object path"
+msgstr "ä¸?è?½å??å¾?é ?è¨ç??è¡?äº?æ??ç?©ä»¶è·¯å¾?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:769
+#, c-format
+msgid "Cannot retrieve calendar object path"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶è·¯å¾?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:787
+#, c-format
+msgid "Cannot retrieve calendar object list"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶æ¸?å?®"
+
+# mail/mail-ops.c:1872
+#: ../calendar/libedata-cal/e-data-cal.c:825
+#, c-format
+msgid "Could not retrieve attachment list"
+msgstr "ä¸?è?½å??å¾?é??ä»¶æ¸?å?®"
+
+# camel/providers/local/camel-mbox-store.c:110
+#: ../calendar/libedata-cal/e-data-cal.c:847
+#, c-format
+msgid "Could not complete calendar query"
+msgstr "ä¸?è?½å®?æ??è¡?äº?æ??æ?¥è©¢"
+
+# mail/mail-ops.c:1872
+#: ../calendar/libedata-cal/e-data-cal.c:865
+#, c-format
+msgid "Could not retrieve calendar time zone"
+msgstr "ä¸?è?½å??å¾?å¤©æ°£è¡?äº?æ??æ??å??"
+
+# calendar/gui/e-itip-control.c:883
+#: ../calendar/libedata-cal/e-data-cal.c:883
+#, c-format
+msgid "Could not add calendar time zone"
+msgstr "ä¸?è?½å? å?¥è¡?äº?æ??æ??å??"
+
+#: ../calendar/libedata-cal/e-data-cal.c:900
+#, c-format
+msgid "Could not set default calendar time zone"
+msgstr "ä¸?è?½è¨å®?é ?è¨ç??è¡?äº?æ??æ??å??"
+
+#: ../calendar/libedata-cal/e-data-cal.c:921
+#, c-format
+msgid "Cannot retrieve calendar changes"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??æ?´æ?¹"
+
+#: ../calendar/libedata-cal/e-data-cal.c:971
+#, c-format
+msgid "Cannot retrieve calendar free/busy list"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç©ºé??/å¿?ç¢?æ¸?å?®"
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#, c-format
+msgid "Invalid URI"
+msgstr "ç?¡æ??ç?? URI"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "æ²?æ??ã??%2$sã??ç??ã??%1$sã??ç??å¾?ç«¯å·¥å» "
+
+# camel/providers/local/camel-mbox-store.c:110
+#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#, c-format
+msgid "Could not instantiate backend"
+msgstr "ç?¡æ³?å¯¦é«?å??å¾?ç«¯ç¨?å¼?"
+
 # camel/camel-cipher-context.c:171
 #: ../camel/camel-cipher-context.c:102
 msgid "Signing is not supported by this cipher"
@@ -1502,17 +1609,17 @@ msgid "You may not export keys with this cipher"
 msgstr "ä½ ä¸?è?½å?¯å?ºé??ç¨®å? å¯?æ?¹å¼?ç??å¯?ç¢¼å??"
 
 # mail/mail-ops.c:1728
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-data-cache.c:135
 msgid "Unable to create cache path"
 msgstr "ç?¡æ³?å»ºç«?å¿«å??è·¯å¾?"
 
 # camel/providers/imap/camel-imap-message-cache.c:150
-#: ../camel/camel-data-cache.c:402
+#: ../camel/camel-data-cache.c:401
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ç?¡æ³?ç§»é?¤å¿«å??é ?ç?®ï¼? %sï¼? %s"
 
-#: ../camel/camel-db.c:412
+#: ../camel/camel-db.c:411
 msgid "Insufficient memory"
 msgstr "è¨?æ?¶é«?ä¸?è¶³"
 
@@ -1561,10 +1668,10 @@ msgstr "æº?å??è³?æ??å¤¾ã??%sã??ä¾?é?¢ç·?ä½¿ç?¨"
 # camel/camel-disco-store.c:271
 #: ../camel/camel-disco-store.c:400
 #: ../camel/providers/groupwise/camel-groupwise-store.c:223
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:3014
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imap/camel-imap-store.c:1843
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imap/camel-imap-store.c:3068
 msgid "You must be working online to complete this operation"
 msgstr "ä½ å¿?é ?æ?¼ç¶²ä¸?å·¥ä½?æ??è?½å®?æ??æ¤æ??ä½?"
 
@@ -1735,53 +1842,54 @@ msgstr "(%s) æ??æ??é?£å??çµ?æ??"
 msgid "(%s) requires the folder set"
 msgstr "(%s) é??è¦?è³?æ??å¤¾è¨å®?"
 
-#: ../camel/camel-folder.c:683
+#: ../camel/camel-folder.c:669
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "ä¸?æ?¯æ?´ç??æ??ä½?ï¼?æ·»å? é?µä»¶ï¼? %s"
 
 # camel/camel-folder-search.c:338
-#: ../camel/camel-folder.c:1388
+#: ../camel/camel-folder.c:1374
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "ä¸?æ?¯æ?´ç??æ??ä½?ï¼?ä»¥è©?å?¥æ??å°?ï¼? %s"
 
 # camel/camel-folder-search.c:338
-#: ../camel/camel-folder.c:1429
+#: ../camel/camel-folder.c:1415
 #, c-format
 msgid "Unsupported operation: count by expression: for %s"
 msgstr "ä¸?æ?¯æ?´ç??æ??ä½?ï¼?ä»¥è©?å?¥è¨?æ?¸ï¼?ç?¨æ?¼ %s"
 
-#: ../camel/camel-folder.c:1468
+#: ../camel/camel-folder.c:1454
 #, c-format
 msgid "Unsupported operation: search by UIDs: for %s"
 msgstr "ä¸?æ?¯æ?´ç??æ??ä½?ï¼?ä»¥ UIDs æ??å°?ï¼? %s"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:1567
+#: ../camel/providers/local/camel-maildir-folder.c:387
 msgid "Moving messages"
 msgstr "æ£å?¨ç§»å??é?µä»¶"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:1567
 msgid "Copying messages"
 msgstr "æ£å?¨è¤?è£½é?µä»¶"
 
 # widgets/misc/e-messagebox.c:159
-#: ../camel/camel-folder.c:1922
+#: ../camel/camel-folder.c:1908
 msgid "Learning junk"
 msgstr "äº?è§£å??å?¾é?µä»¶"
 
-#: ../camel/camel-folder.c:1939
+#: ../camel/camel-folder.c:1926
 msgid "Learning non-junk"
 msgstr "äº?è§£é??å??å?¾é?µä»¶"
 
 # mail/mail-ops.c:1565
-#: ../camel/camel-folder.c:1958
+#: ../camel/camel-folder.c:1946
 msgid "Filtering new message(s)"
 msgstr "å??å?? %d å°?é?µä»¶"
 
-#: ../camel/camel-gpg-context.c:751
+#: ../camel/camel-gpg-context.c:760
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1792,15 +1900,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:766
+#: ../camel/camel-gpg-context.c:775
 msgid "Failed to parse gpg userid hint."
 msgstr "è§£æ?? gpg userid æ??ç¤ºæ??å¤±æ??ã??"
 
-#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:804
+#: ../camel/camel-gpg-context.c:799 ../camel/camel-gpg-context.c:813
 msgid "Failed to parse gpg passphrase request."
 msgstr "è§£æ?? gpg å¯?èª?è¦?æ±?æ??å¤±æ??ã??"
 
-#: ../camel/camel-gpg-context.c:824
+#: ../camel/camel-gpg-context.c:833
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1809,7 +1917,7 @@ msgstr ""
 "é??è¦? PIN æ??è?½ç?ºä½ ç??æ?ºæ?§å?¡è§£é??ï¼?\n"
 "ã??%sã??"
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:837
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1819,106 +1927,101 @@ msgstr ""
 "ã??%sã??"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:842
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG å?³å??å°?ã??%sã??æ?ªé ?æ??ç??è¦?æ±?"
 
 # mail/mail-send-recv.c:471
-#: ../camel/camel-gpg-context.c:858 ../camel/camel-gpg-context.c:1067
+#: ../camel/camel-gpg-context.c:867 ../camel/camel-gpg-context.c:1113
 #: ../camel/providers/nntp/camel-nntp-store.c:1313
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../camel/camel-gpg-context.c:872
+#: ../camel/camel-gpg-context.c:881
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "è§£é??ç§?å¯?å¯?ç¢¼å??æ??å¤±æ??ï¼?è¼¸å?¥äº? 3 æ¬¡é?¯èª¤ç??å¯?èª? ã??"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/camel-gpg-context.c:880
+#: ../camel/camel-gpg-context.c:889
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "å¾? GnuPG å?³å??æ??å¤?ç??å??æ??ï¼? %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/camel-gpg-context.c:943
+#: ../camel/camel-gpg-context.c:988
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ä¸?è?½å? å¯?é?µä»¶ï¼?æ²?æ??æ??ä¾?æ??æ??ç??æ?¶ä»¶è??ã??"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
 #. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1205 ../camel/camel-gpg-context.c:1330
-#: ../camel/camel-gpg-context.c:1852 ../camel/camel-gpg-context.c:1897
+#: ../camel/camel-gpg-context.c:1262 ../camel/camel-gpg-context.c:1387
+#: ../camel/camel-gpg-context.c:1953 ../camel/camel-gpg-context.c:1998
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "å?·è¡? gpg å¤±æ??ï¼? %s"
 
 # mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1298 ../camel/camel-smime-context.c:602
+#: ../camel/camel-gpg-context.c:1355 ../camel/camel-smime-context.c:605
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "ç?¡æ³?ç?¢ç??ç°½ç½²è³?æ??ï¼?%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-gpg-context.c:1345 ../camel/camel-gpg-context.c:1546
-#: ../camel/camel-gpg-context.c:1562 ../camel/camel-gpg-context.c:1642
-#: ../camel/camel-gpg-context.c:1657 ../camel/camel-gpg-context.c:1773
-#: ../camel/camel-gpg-context.c:1788 ../camel/camel-gpg-context.c:1868
-#: ../camel/camel-gpg-context.c:1913
+#: ../camel/camel-gpg-context.c:1402 ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1646 ../camel/camel-gpg-context.c:1728
+#: ../camel/camel-gpg-context.c:1743 ../camel/camel-gpg-context.c:1859
+#: ../camel/camel-gpg-context.c:1874 ../camel/camel-gpg-context.c:1969
+#: ../camel/camel-gpg-context.c:2014
 msgid "Failed to execute gpg."
 msgstr "å?·è¡? gpg å¤±æ??ã??"
 
-#: ../camel/camel-gpg-context.c:1364
-msgid "This is a digitally signed message part"
-msgstr "é??æ?¯æ??æ?¸ç¢¼ç°½ç½²ç??é?µä»¶"
-
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1450 ../camel/camel-gpg-context.c:1456
-#: ../camel/camel-gpg-context.c:1462 ../camel/camel-gpg-context.c:1477
-#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
+#: ../camel/camel-gpg-context.c:1534 ../camel/camel-gpg-context.c:1540
+#: ../camel/camel-gpg-context.c:1546 ../camel/camel-gpg-context.c:1561
+#: ../camel/camel-smime-context.c:929 ../camel/camel-smime-context.c:940
+#: ../camel/camel-smime-context.c:947
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ä¸?è?½é©?è?æ¤é?µä»¶ç??ç°½ç½²ï¼?é?¯èª¤ç??è¨?æ?¯æ ¼å¼?"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1516
+#: ../camel/camel-gpg-context.c:1600
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "ä¸?è?½é©?è?æ¤é?µä»¶ç??ç°½ç½²ï¼?ç?¡æ³?å»ºç«?æ?«å?æª?æ¡?ï¼?%s"
 
 # mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1625
+#: ../camel/camel-gpg-context.c:1711
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "ç?¡æ³?ç?¢ç??å? å¯?è³?æ??ï¼?%s"
 
-#: ../camel/camel-gpg-context.c:1675
+#: ../camel/camel-gpg-context.c:1761
 msgid "This is a digitally encrypted message part"
 msgstr "é??æ?¯æ?¸ç¢¼å??å? å¯?è¨?æ?¯é?¨ä»½"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1728 ../camel/camel-gpg-context.c:1736
-#: ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-gpg-context.c:1814 ../camel/camel-gpg-context.c:1822
+#: ../camel/camel-gpg-context.c:1841
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ä¸?è?½è§£å¯?æ¤é?µä»¶ï¼?é?¯èª¤ç??è¨?æ?¯æ ¼å¼?"
 
-#: ../camel/camel-gpg-context.c:1745
+#: ../camel/camel-gpg-context.c:1831
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "è§£å¯? MIME çµ?ä»¶æ??å¤±æ??ï¼?é??è¨?å??å®?é?¯èª¤"
 
-#: ../camel/camel-gpg-context.c:1810 ../camel/camel-smime-context.c:1186
+#: ../camel/camel-gpg-context.c:1909 ../camel/camel-smime-context.c:1205
 msgid "Encrypted content"
 msgstr "å? å¯?å?§å®¹"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: ../camel/camel-gpg-context.c:1829
+#: ../camel/camel-gpg-context.c:1930
 msgid "Unable to parse message content"
 msgstr "ç?¡æ³?å¾?ç·¨è¼¯å?¨å??å¾?é?µä»¶"
 
-#: ../camel/camel-gpg-context.c:1853 ../camel/camel-gpg-context.c:1898
-#: ../camel/camel-tcp-stream-openssl.c:627
+#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:1999
 #: ../camel/providers/imap4/camel-imap4-utils.c:614
 #: ../camel/providers/smtp/camel-smtp-transport.c:165
 #: ../camel/providers/smtp/camel-smtp-transport.c:220
@@ -2052,14 +2155,14 @@ msgstr "è§£æ??é?¯èª¤"
 # camel/camel-service.c:544
 # camel/camel-service.c:580
 #: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:806
-#: ../camel/providers/pop3/camel-pop3-store.c:446
-#: ../camel/providers/pop3/camel-pop3-store.c:546
+#: ../camel/camel-net-utils.c:805
+#: ../camel/providers/pop3/camel-pop3-store.c:476
+#: ../camel/providers/pop3/camel-pop3-store.c:576
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-net-utils.c:522
+#: ../camel/camel-net-utils.c:521
 msgid "cannot create thread"
 msgstr "ç?¡æ³?å»ºç«?å?·è¡?ç·?"
 
@@ -2081,16 +2184,16 @@ msgid "Host lookup failed: %s: %s"
 msgstr "æ??å°?ä¸»æ©?å¤±æ??ï¼? %s ï¼?%s"
 
 # camel/camel-service.c:548
-#: ../camel/camel-net-utils.c:810
+#: ../camel/camel-net-utils.c:809
 msgid "Resolving address"
 msgstr "è§£æ??ä½?å??"
 
-#: ../camel/camel-net-utils.c:830
+#: ../camel/camel-net-utils.c:829
 msgid "Name lookup failed"
 msgstr "æ?¥è©¢å??ç¨±å¤±æ??"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/camel-net-utils.c:833
+#: ../camel/camel-net-utils.c:832
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "æ??å°?å??ç¨±å¤±æ??ï¼? %s"
@@ -2138,7 +2241,7 @@ msgstr "ç?¡æ³?è¼?å?¥ %sï¼?æ¨¡çµ?å?§æ²?æ??å??å§?ç¢¼ã??"
 
 # camel/camel-session.c:295
 # camel/camel-session.c:364
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "æ²?æ??é??è¨?å??å®?ã??%sã??ç??æ??ä¾?è??"
@@ -2243,99 +2346,78 @@ msgstr "ä¼ºæ??å?¨å??æ??å??å?«ä¸?å®?æ?´ç??æ??æ¬?è³?æ??"
 msgid "Server response does not match"
 msgstr "ä¼ºæ??å?¨å??æ??ä¸?ç¬¦"
 
-#: ../camel/camel-sasl-gssapi.c:63
+#: ../camel/camel-sasl-gssapi.c:72
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
 # camel/camel-sasl-kerberos4.c:42
-#: ../camel/camel-sasl-gssapi.c:65
+#: ../camel/camel-sasl-gssapi.c:74
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ Kerberos 5 é©?è?é?£ç·?è?³ä¼ºæ??å?¨ã??"
 
-#: ../camel/camel-sasl-gssapi.c:159
+#: ../camel/camel-sasl-gssapi.c:168
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr "æ??ä¾?ç??è?ä»¶ä¸?æ?¯æ?´æ??å®?ç??æ©?å?¶ï¼?æ??è??æ?¯å?·è¡?ç?¡æ³?è¾¨è?ã??"
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:173
 msgid "The provided target_name parameter was ill-formed."
 msgstr "æ??ä¾?ç?? target_name å??æ?¸æ ¼å¼?é?¯èª¤ã??"
 
-#: ../camel/camel-sasl-gssapi.c:167
+#: ../camel/camel-sasl-gssapi.c:176
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "æ??ä¾?ç?? target_name å??æ?¸å??å?«ç?¡æ??æ??ä¸?æ?¯æ?´ç??å??ç¨±é¡?å??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:171
+#: ../camel/camel-sasl-gssapi.c:180
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr "input_token å??å?«ä¸?å??ç??é??é??ï¼?é??é??  input_chan_bindingsï¼?é?£çµ?è?³é??äº?æ??å®?ç??å??æ?¸ã??"
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:185
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "input_token å??å?«ç?¡æ??ç??ç°½ç½²ï¼?æ??è??ç?¡æ³?ç¢ºèª?ç??ç°½ç½²ã??"
 
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../camel/camel-sasl-gssapi.c:189
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 msgstr "æ??ä¾?ç??è?ä»¶ä¸?é?©ç?¨æ?¼ç¶²çµ¡ä½?ç½®ï¼?æ??è??è?ä»¶è?å?¥æ??æ¨?æ?ªå??ç?§ä»»ä½?è?æ?¸ã??"
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:194
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "æ??ä¾?ç??ç¶²çµ¡ä½?ç½®è?å?¥æ??æ¨?æ?ªå??ç?§æ??æ??ç??ç¶²çµ¡ä½?ç½®ã??"
 
-#: ../camel/camel-sasl-gssapi.c:188
+#: ../camel/camel-sasl-gssapi.c:197
 msgid "The consistency checks performed on the input_token failed."
 msgstr "å?¨ input_token å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:191
+#: ../camel/camel-sasl-gssapi.c:200
 msgid "The consistency checks performed on the credential failed."
 msgstr "å?¨è?ä»¶å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:203
 msgid "The referenced credentials have expired."
 msgstr "å??ç?§ç??è?ä»¶å·²ç¶?é??æ??ã??"
 
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
-#: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
-#: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
-#: ../camel/camel-sasl-kerberos4.c:230
-#: ../camel/providers/imap/camel-imap-store.c:1274
+#: ../camel/camel-sasl-gssapi.c:209 ../camel/camel-sasl-gssapi.c:316
+#: ../camel/camel-sasl-gssapi.c:358 ../camel/camel-sasl-gssapi.c:373
+#: ../camel/providers/imap/camel-imap-store.c:1272
 msgid "Bad authentication response from server."
 msgstr "ä¾?è?ªä¼ºæ??å?¨ç??ä¸?è?¯è¨±å?¯å??æ??ã??"
 
 # mail/mail-config.glade.h:1
-#: ../camel/camel-sasl-gssapi.c:309
+#: ../camel/camel-sasl-gssapi.c:383
 msgid "Unsupported security layer."
 msgstr "ä¸?æ?¯æ?´ç??é¡?å??"
 
-# camel/camel-sasl-kerberos4.c:40
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-# camel/camel-sasl-kerberos4.c:42
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ Kerberos 4 é©?è?é?£ç·?è?³ä¼ºæ??å?¨ã??"
-
-# camel/camel-sasl-kerberos4.c:161
-#: ../camel/camel-sasl-kerberos4.c:173
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"ç?¡æ³?å??å¾? Kerberos ticketï¼?\n"
-"%s"
-
 # camel/camel-sasl-login.c:32
 #: ../camel/camel-sasl-login.c:36
 msgid "Login"
@@ -2389,7 +2471,7 @@ msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP å??æ?¼ SMTP å??è¨±ä½¿ç?¨é?? POP ä¾?æº?"
 
 # camel/camel-search-private.c:111
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:147
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "æ£è¦?è¡¨ç¤ºå¼?ç·¨è¯å¤±æ??ï¼? %sï¼? %s"
@@ -2413,7 +2495,7 @@ msgid "URL '%s' needs a path component"
 msgstr "URLã??%sã??é??è¦? path å??ä»¶"
 
 # camel/camel-session.c:479
-#: ../camel/camel-session.c:307
+#: ../camel/camel-session.c:305
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2423,148 +2505,148 @@ msgstr ""
 "%s"
 
 # camel/providers/pop3/camel-pop3-store.c:361
-#: ../camel/camel-session.c:479
+#: ../camel/camel-session.c:477
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "è«?è¼¸å?¥ %2$s æ?¼ä¸»æ©? %3$s ç?? %1$s å¯?ç¢¼ã??"
 
-#: ../camel/camel-session.c:817
+#: ../camel/camel-session.c:815
 msgid "Camel session doesn't support forwarding of a message."
 msgstr "Camel ä½?æ¥é??æ®µä¸?æ?¯æ?´è½?é??è¨?æ?¯ã??"
 
 # camel/camel-smime-context.c:327
-#: ../camel/camel-smime-context.c:444 ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "æ?¾ä¸?å?° '%s' ç??è?æ?¸"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:453
 msgid "Cannot create CMS message"
 msgstr "ç?¡æ³?å»ºç«? CMS è¨?æ?¯"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot create CMS signed data"
 msgstr "ç?¡æ³?å»ºç«? CMS signedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot attach CMS signed data"
 msgstr "ç?¡æ³?é??å?  CMS signedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot attach CMS data"
 msgstr "ç?¡æ³?é??å?  CMS è³?æ??"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot create CMS Signer information"
 msgstr "ç?¡æ³?å»ºç«? CMS SignerInfo"
 
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:483
 msgid "Cannot find certificate chain"
 msgstr "æ?¾ä¸?å?°è?æ?¸é??"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:489
 msgid "Cannot add CMS Signing time"
 msgstr "ç?¡æ³?æ?°å¢? CMS SigningTime"
 
 # composer/e-msg-composer.c:1092
-#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ç??å? å¯?è?æ?¸ä¸?å?å?¨"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:530
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "ç?¡æ³?æ?°å¢? SMIMEEncKeyPrefs å±¬æ?§"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:535
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "ç?¡æ³?æ?°å¢? MS SMIMEEncKeyPrefs å±¬æ?§"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:540
 msgid "Cannot add encryption certificate"
 msgstr "ç?¡æ³?æ?°å¢?å? å¯?è?æ?¸"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:546
 msgid "Cannot add CMS Signer information"
 msgstr "ç?¡æ³?æ?°å¢? CMS SignerInfo"
 
 # mail/mail-crypto.c:251
-#: ../camel/camel-smime-context.c:613 ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
 msgid "Cannot create encoder context"
 msgstr "ç?¡æ³?å»ºç«?ç·¨ç¢¼å?¨ç¶²çµ¡ä½?ç½®"
 
 # camel/camel-movemail.c:274
-#: ../camel/camel-smime-context.c:619
+#: ../camel/camel-smime-context.c:622
 msgid "Failed to add data to CMS encoder"
 msgstr "ç?¡æ³?æ?°å¢?è³?æ??è?³ CMS ç·¨ç¢¼å?¨"
 
-#: ../camel/camel-smime-context.c:624 ../camel/camel-smime-context.c:1082
+#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1101
 msgid "Failed to encode data"
 msgstr "ç?¡æ³?ç·¨ç¢¼è³?æ??"
 
 # calendar/gui/calendar-model.c:1064
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:700
 msgid "Unverified"
 msgstr "æ?ªæ??å®?"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:702
 msgid "Good signature"
 msgstr "è?¯å¥½ç??ç°½ç½²"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:704
 msgid "Bad signature"
 msgstr "é?¯èª¤ç??ç°½ç½²"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:706
 msgid "Content tampered with or altered in transit"
 msgstr "å?§å®¹å?¨å?³é??æ??è¢«ç«?æ?¹æ??æ?´æ?¹"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:708
 msgid "Signing certificate not found"
 msgstr "æ?¾ä¸?å?°ç°½ç½²è?æ?¸"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:710
 msgid "Signing certificate not trusted"
 msgstr "ç°½ç½²è?æ?¸ä¸?å??ä¿¡ä»»"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:712
 msgid "Signature algorithm unknown"
 msgstr "æ?ªç?¥ç??ç°½ç½²æ¼?ç®?æ³?"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:714
 msgid "Signature algorithm unsupported"
 msgstr "ä¸?æ?¯æ?´é??ç¨®ç°½ç½²æ¼?ç®?æ³?"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:716
 msgid "Malformed signature"
 msgstr "æ ¼å¼?ä¸?è?¯ç??ç°½ç½²"
 
 # shell/e-storage.c:467
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:718
 msgid "Processing error"
 msgstr "è§£æ??é?¯èª¤"
 
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:772
 msgid "No signed data in signature"
 msgstr "ç°½ç½²ä¸æ²?æ??è¢«ç°½ç½²ç??è³?æ??"
 
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:777
 msgid "Digests missing from enveloped data"
 msgstr "å??è£¹ç??è³?æ??ä¸é?ºæ¼?æ??è¦?"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
 msgid "Cannot calculate digests"
 msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
 
@@ -2575,95 +2657,95 @@ msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
 msgid "Cannot set message digests"
 msgstr "ç?¡æ³?è¨å®?é?µä»¶æ??è¦?"
 
 # mail/mail-crypto.c:59
-#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
 msgid "Certificate import failed"
 msgstr "è?æ?¸å?¯å?¥å¤±æ??"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:836
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "é??è?æ?¸è¨?æ?¯ï¼?ç?¡æ³?é©?è?è?æ?¸"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:839
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "é??è?æ?¸è¨?æ?¯ã??å?¯å?¥å??é©?è?ç??è?æ?¸"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:843
 msgid "Cannot find signature digests"
 msgstr "æ?¾ä¸?å?°ç°½ç½²æ??è¦?"
 
 # mail/mail-config.glade.h:72
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:859
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ç°½ç½²è??ï¼? %s<%s>ï¼? %s\n"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1184
 msgid "Decoder failed"
 msgstr "è§£ç¢¼å?¨å¤±æ??"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1019
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "æ?¾ä¸?å?°ä¸?è?¬å¤§é??å? å¯?æ¼?ç®?æ³?"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1027
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "ç?¡æ³?é??ç½®æ??æ§½çµ¦å? å¯?å¤§é??å¯?ç¢¼å??"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1038
 msgid "Cannot create CMS Message"
 msgstr "ç?¡æ³?å»ºç«? CMS è¨?æ?¯"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1044
 msgid "Cannot create CMS Enveloped data"
 msgstr "ç?¡æ³?å»ºç«? CMS EnvelopedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1050
 msgid "Cannot attach CMS Enveloped data"
 msgstr "ç?¡æ³?é??å?  CMS EnvelopedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot attach CMS data object"
 msgstr "ç?¡æ³?é??å?  CMS è³?æ??ç?©ä»¶"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1065
 msgid "Cannot create CMS Recipient information"
 msgstr "ç?¡æ³?å»ºç«? CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1070
 msgid "Cannot add CMS Recipient information"
 msgstr "ç?¡æ³?æ?°å¢? CMS RecipientInfo"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1095
 msgid "Failed to add data to encoder"
 msgstr "ç?¡æ³?æ?°å¢?è³?æ??è?³ç·¨ç¢¼å?¨"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1191
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME è§£å¯?ï¼?æ?¾ä¸?å?°å? å¯?å?§å®¹"
 
 # camel/providers/smtp/camel-smtp-transport.c:172
-#: ../camel/camel-smime-context.c:1200
+#: ../camel/camel-smime-context.c:1219
 msgid "import keys: unimplemented"
 msgstr "å?¯å?¥å¯?ç¢¼å??ï¼?æ?ªå?·è¡?"
 
-#: ../camel/camel-smime-context.c:1208
+#: ../camel/camel-smime-context.c:1227
 msgid "export keys: unimplemented"
 msgstr "å?¯å?ºå¯?ç¢¼å??ï¼?æ?ªå?·è¡?"
 
@@ -2723,127 +2805,7 @@ msgstr "å??æ?¶ç?"
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
-#: ../camel/camel-tcp-stream-openssl.c:564
-msgid "Unable to get issuer's certificate"
-msgstr "ç?¡æ³?å??å¾?ç?¼ç?§è??ç??è?æ?¸ã??"
-
-#: ../camel/camel-tcp-stream-openssl.c:566
-msgid "Unable to get Certificate Revocation List"
-msgstr "ç?¡æ³?å??å¾?è?æ?¸æ??é?·æ¸?å?®"
-
-#: ../camel/camel-tcp-stream-openssl.c:568
-msgid "Unable to decrypt certificate signature"
-msgstr "ç?¡æ³?è§£å¯?è?æ?¸ç°½ç½²"
-
-#: ../camel/camel-tcp-stream-openssl.c:570
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "ç?¡æ³?è§£å¯?è?æ?¸è¨»é?·ç°½ç½²"
-
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to decode issuer's public key"
-msgstr "ç?¡æ³?è§£ç¢¼ç?¼ç?§è??ç??å?¬é??å¯?ç¢¼å??"
-
-# mail/mail-crypto.c:59
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Certificate signature failure"
-msgstr "è?æ?¸ç°½ç½²å¤±æ??"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Certificate Revocation List signature failure"
-msgstr "è?æ?¸æ?¤é?·æ¸?å?®ç°½ç½²å¤±æ??"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Certificate not yet valid"
-msgstr "è?æ?¸å°?æ?ªç??æ??"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Certificate has expired"
-msgstr "è?æ?¸å·²ç¶?å¤±æ??"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate Revocation List (CRL) not yet valid"
-msgstr "è?æ?¸æ?¤é?·æ¸?å?® (CRL) å°?æ?ªç??æ??"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List (CRL) has expired"
-msgstr "è?æ?¸æ?¤é?·æ¸?å?® (CRL) å·²é?¾æ??"
-
-#: ../camel/camel-tcp-stream-openssl.c:589
-msgid "Error in Certificate Revocation List (CRL)"
-msgstr "è?æ?¸æ?¤é?·æ¸?å?® (CRL) ç?¼ç??é?¯èª¤"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:394
-#: ../camel/camel-tcp-stream-openssl.c:591
-msgid "Out of memory"
-msgstr "è¨?æ?¶é«?ä¸?è¶³"
-
-#: ../camel/camel-tcp-stream-openssl.c:593
-msgid "Zero-depth self-signed certificate"
-msgstr "é?¶æ·±åº¦ è?ªæ??ç°½ç½²ç??è?æ?¸"
-
-#: ../camel/camel-tcp-stream-openssl.c:595
-msgid "Self-signed certificate in chain"
-msgstr "å?¨è?æ?¸é??ä¸ç??è?ªæ??ç°½ç½²è?æ?¸"
-
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Unable to get issuer's certificate locally"
-msgstr "ç?¡æ³?è?ªæ?¬å?°ç«¯å??å¾?ç?¼ç?§è??ç??è?æ?¸"
-
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Unable to verify leaf signature"
-msgstr "é©?è? leaf è?æ?¸å¤±æ??ã??"
-
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Certificate chain too long"
-msgstr "è?æ?¸é??å¤ªé?·"
-
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Certificate Revoked"
-msgstr "è?æ?¸å·²è¨»é?·"
-
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Invalid Certificate Authority (CA)"
-msgstr "ç?¡æ??ç??è?æ?¸æ©?æ§? (CA)"
-
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Path length exceeded"
-msgstr "è·¯å¾?é?·åº¦é??é?·"
-
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Invalid purpose"
-msgstr "ç?¡æ??ç??ç?®ç??"
-
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate untrusted"
-msgstr "è?æ?¸ä¸?è¢«ä¿¡ä»»"
-
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Certificate rejected"
-msgstr "è?æ?¸è¢«æ??çµ?"
-
-#: ../camel/camel-tcp-stream-openssl.c:616
-msgid "Subject/Issuer mismatch"
-msgstr "ä¸»æ?¨/ç?¼ç?§è??ä¸?ç¬¦"
-
-#: ../camel/camel-tcp-stream-openssl.c:618
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID ä¸?ç¬¦"
-
-#: ../camel/camel-tcp-stream-openssl.c:620
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/ç?¼ç?§è??åº?å??ä¸?ç¬¦"
-
-#: ../camel/camel-tcp-stream-openssl.c:622
-msgid "Key usage does not support certificate signing"
-msgstr "å¯?ç¢¼å??ç??ç?¨é??ä¸¦ä¸?æ?¯æ?´è?æ?¸ç°½ç½²"
-
-#: ../camel/camel-tcp-stream-openssl.c:625
-msgid "Error in application verification"
-msgstr "æ??ç?¨ç¨?å¼?é©?è?æ??é?¯èª¤"
-
-#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:873
+#: ../camel/camel-tcp-stream-ssl.c:870
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2856,39 +2818,18 @@ msgstr ""
 "æ??ç´?æª?:              %s\n"
 "ç°½ç½²:              %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:876
 msgid "GOOD"
 msgstr "è?¯å¥½"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:876
 msgid "BAD"
 msgstr "ä¸?è?¯"
 
 # camel/camel-tcp-stream-openssl.c:428
 # camel/camel-tcp-stream-ssl.c:364
-#: ../camel/camel-tcp-stream-openssl.c:700
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"ä¾?è?ª %s ç??ä¸?è?¯è?æ?¸ï¼?\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"ä½ ç?¡è«?å¦?ä½?é?½è¦?æ?¥å??å??ï¼?"
-
-# camel/camel-tcp-stream-openssl.c:428
-# camel/camel-tcp-stream-ssl.c:364
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:883
+#: ../camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2903,7 +2844,7 @@ msgstr ""
 "\n"
 "ä½ æ?³è¦?æ?¥å??å??ï¼?"
 
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:924
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2912,7 +2853,7 @@ msgstr ""
 "è?æ?¸å??é¡?ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:979
+#: ../camel/camel-tcp-stream-ssl.c:976
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2921,7 +2862,7 @@ msgstr ""
 "ä¸?æ£ç¢ºç??è?æ?¸ç¶²å??ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:997
+#: ../camel/camel-tcp-stream-ssl.c:994
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2930,7 +2871,7 @@ msgstr ""
 "è?æ?¸å·²é?¾æ??ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1014
+#: ../camel/camel-tcp-stream-ssl.c:1011
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2946,19 +2887,19 @@ msgid "Could not parse URL '%s'"
 msgstr "ç?¡æ³?è§£æ?? URLã??%sã??"
 
 # shell/e-shell-importer.c:384
-#: ../camel/camel-vee-folder.c:580
+#: ../camel/camel-vee-folder.c:577
 #, c-format
 msgid "Error storing '%s': %s"
 msgstr "å?²å?ã??%sã??ç?¼ç??é?¯èª¤ï¼?%s"
 
 # camel/camel-vee-folder.c:451
-#: ../camel/camel-vee-folder.c:657
+#: ../camel/camel-vee-folder.c:654
 #, c-format
 msgid "No such message %s in %s"
 msgstr "æ²?æ?? %s é??é¡?é?µä»¶å?¨ %s ä¸"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/camel-vee-folder.c:816 ../camel/camel-vee-folder.c:822
+#: ../camel/camel-vee-folder.c:813 ../camel/camel-vee-folder.c:819
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ä¸?è?½è¤?è£½æ??ç§»å??é?µä»¶å?°è??æ?¬è³?æ??å¤¾ä¸"
 
@@ -2997,7 +2938,7 @@ msgstr "ç?¡æ³?è¤?è£½è¨?æ?¯å?°ã??å??å?¾é?µä»¶ã??è³?æ??å¤¾"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3009,12 +2950,13 @@ msgstr ""
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:255
-#: ../camel/providers/local/camel-maildir-folder.c:281
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
+#: ../camel/providers/local/camel-maildir-folder.c:264
+#: ../camel/providers/local/camel-maildir-folder.c:293
+#: ../camel/providers/local/camel-maildir-folder.c:401
 #: ../camel/providers/local/camel-mbox-folder.c:363
 #: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:216
+#: ../camel/providers/local/camel-mh-folder.c:226
 msgid "No such message"
 msgstr "ç?¡æ¤é?µä»¶"
 
@@ -3022,11 +2964,11 @@ msgstr "ç?¡æ¤é?µä»¶"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
 #: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
+#: ../camel/providers/nntp/camel-nntp-folder.c:173
+#: ../camel/providers/nntp/camel-nntp-folder.c:248
+#: ../camel/providers/nntp/camel-nntp-folder.c:408
 #: ../camel/providers/pop3/camel-pop3-folder.c:268
 #: ../camel/providers/pop3/camel-pop3-folder.c:578
 #: ../camel/providers/pop3/camel-pop3-folder.c:639
@@ -3041,12 +2983,12 @@ msgstr "ä½¿ç?¨è??å·²å??æ¶?"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
 #: ../camel/providers/imap4/camel-imap4-folder.c:819
+#: ../camel/providers/nntp/camel-nntp-folder.c:164
 #: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:252
+#: ../camel/providers/nntp/camel-nntp-folder.c:175
+#: ../camel/providers/nntp/camel-nntp-folder.c:250
 #: ../camel/providers/pop3/camel-pop3-folder.c:388
 #: ../camel/providers/pop3/camel-pop3-folder.c:581
 #: ../camel/providers/pop3/camel-pop3-folder.c:642
@@ -3058,51 +3000,53 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼? %s"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2463
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2507
 #: ../camel/providers/imap4/camel-imap4-folder.c:837
 msgid "This message is not available in offline mode."
 msgstr "é??å°?é?µä»¶ç?¡æ³?å?¨é?¢ç·?æ¨¡å¼?ä¸?ä½¿ç?¨ã??"
 
 # camel/camel-movemail.c:306
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:194
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:201
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1966
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2017
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2010
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061
 msgid "Could not get message"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ã??"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
-#: ../camel/providers/imap/camel-imap-folder.c:296
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:983
+#: ../camel/providers/imap/camel-imap-folder.c:295
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "ç?¡æ³?è¼?å?¥ %s ç??æ??è¦?"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1056
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "æª¢æ?¥å?ªé?¤ç??é?µä»¶ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1331
 msgid "Trash Folder Full. Please Empty."
 msgstr "å??æ?¶ç?è³?æ??å¤¾å·²æ»¿ã??è«?å°?å®?æ¸?ç©ºã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1565
 #: ../camel/providers/groupwise/camel-groupwise-store.c:633
 #: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3421
-#: ../camel/providers/imap/camel-imap-folder.c:3497
+#: ../camel/providers/imap/camel-imap-folder.c:3429
+#: ../camel/providers/imap/camel-imap-folder.c:3505
+#: ../camel/providers/imapx/camel-imapx-server.c:2603
+#: ../camel/providers/imapx/camel-imapx-server.c:2687
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "æ£å??å¾? %s ä¸æ?°é?µä»¶ç??æ??è¦?è³?è¨?"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2317
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2361
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2404
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "ä¸?è?½å°?é?µä»¶å? å?¥è?³è³?æ??å¤¾ã??%sã??ï¼?%s"
@@ -3114,7 +3058,7 @@ msgstr "ä¸?è?½å°?é?µä»¶å? å?¥è?³è³?æ??å¤¾ã??%sã??ï¼?%s"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2392
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "ç?¡æ³?å»ºç«?é?µä»¶ï¼? %s"
@@ -3211,7 +3155,7 @@ msgstr "ç?¨æ?¼å?å?? Novell Groupwise ä¼ºæ??å?¨"
 #: ../camel/providers/hula/camel-hula-provider.c:93
 #: ../camel/providers/imap/camel-imap-provider.c:100
 #: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
 #: ../camel/providers/nntp/camel-nntp-provider.c:74
 #: ../camel/providers/pop3/camel-pop3-provider.c:74
 msgid "Password"
@@ -3231,7 +3175,7 @@ msgstr "ç¶²å??ä¸ç??ä½¿ç?¨è??æ??ä¸»æ©?ç?¡æ³?ä½¿ç?¨"
 # camel/providers/imap/camel-imap-store.c:505
 # camel/providers/smtp/camel-smtp-transport.c:410
 #: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1358
+#: ../camel/providers/imap/camel-imap-store.c:1356
 msgid "You did not enter a password."
 msgstr "ä½ æ²?æ??è¼¸å?¥å¯?ç¢¼ã??"
 
@@ -3242,8 +3186,9 @@ msgstr "æ??äº?å??è?½å?¯è?½ç?¡æ³?å?¨ä½ ç?®å??ç??ä¼ºæ??å?¨ç??æ?¬ä¸?æ£å¸¸é??ä½?"
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
 #: ../camel/providers/groupwise/camel-groupwise-store.c:540
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/imap/camel-imap-store.c:1879
+#: ../camel/providers/imap/camel-imap-store.c:2077
+#: ../camel/providers/imapx/camel-imapx-store.c:245
 #, c-format
 msgid "No such folder %s"
 msgstr "æ²?æ??é??å??è³?æ??å¤¾ %s"
@@ -3254,8 +3199,8 @@ msgid "Cannot create GroupWise folders in offline mode."
 msgstr "å?¨é?¢ç·?æ¨¡å¼?ä¸ä¸?è?½å»ºç«? GroupWise è³?æ??å¤¾ã??"
 
 #: ../camel/providers/groupwise/camel-groupwise-store.c:1280
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/imap/camel-imap-store.c:1954
+#: ../camel/providers/imap/camel-imap-store.c:2334
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "æ¯?è³?æ??å¤¾ä¸¦ä¸?å??è¨±å??å?«å?è³?æ??å¤¾"
 
@@ -3389,13 +3334,13 @@ msgstr "æ²?æ??è¼¸å?¥ä¸²æµ?"
 #: ../camel/providers/imap/camel-imap-command.c:229
 #: ../camel/providers/imap/camel-imap-command.c:278
 #: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3051
+#: ../camel/providers/imap/camel-imap-store.c:3105
 msgid "Operation cancelled"
 msgstr "æ??ä½?ç¨?åº?å·²å??æ¶?"
 
 # camel/camel-remote-store.c:476
 #: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3056
+#: ../camel/providers/imap/camel-imap-store.c:3110
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ä¼ºæ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼? %s"
@@ -3442,38 +3387,39 @@ msgid "Unexpected OK response from IMAP server: %s"
 msgstr "å¾? IMAP ä¼ºæ??å?¨å?³å??ä¸?ç?¶ç?? OK å??æ??ï¼? %s"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap/camel-imap-folder.c:91
+#: ../camel/providers/imap/camel-imap-folder.c:90
 msgid "Always check for new mail in this folder"
 msgstr "æ°¸é? æª¢æ?¥é??å??è³?æ??å¤¾ä¸æ?¯å?¦æ??æ?°é?µä»¶"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/imap/camel-imap-folder.c:277
+#: ../camel/providers/imap/camel-imap-folder.c:276
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ç?¡æ³?å»ºç«?ç?®é?? %sï¼?%s"
 
 # mail/mail-ops.c:1649
 #. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:919
+#: ../camel/providers/imap/camel-imap-folder.c:918
+#: ../camel/providers/imapx/camel-imapx-server.c:2633
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "æ??æ?? %s ä¸æ?´æ?¹é??ç??é?µä»¶"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1987
+#: ../camel/providers/imap/camel-imap-folder.c:1986
 #, c-format
 msgid "Unexpected response status '%s' after APPEND command"
 msgstr "å?¨ APPEND æ??ä»¤å¾?å?³å??æ?ªé ?æ??ç??å??æ??ç??æ??ã??%sã??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2002
+#: ../camel/providers/imap/camel-imap-folder.c:2001
 msgid "No response on continuation after APPEND command"
 msgstr "å?¨ APPEND æ??ä»¤å¾?æ²?æ??æ??çº?å??æ??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2047
+#: ../camel/providers/imap/camel-imap-folder.c:2046
 msgid "Unknown error occurred during APPEND command!"
 msgstr "å?¨ APPEND æ??ä»¤æ??é??ç?¼ç??æ?ªç?¥ç??é?¯èª¤ï¼?"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:2877
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "ç?¡æ³?å¾?å??å??é?µä»¶ï¼? %s"
@@ -3485,7 +3431,7 @@ msgstr "ç?¡æ³?å¾?å??å??é?µä»¶ï¼? %s"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:2912
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
@@ -3493,31 +3439,31 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
-#: ../camel/providers/imap/camel-imap-folder.c:2914
+#: ../camel/providers/imap/camel-imap-folder.c:2913
 msgid "No such message available."
 msgstr "æ²?æ??é??å??é?µä»¶ã??"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: ../camel/providers/imap/camel-imap-folder.c:2975
-#: ../camel/providers/imap/camel-imap-folder.c:3808
-#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/imap/camel-imap-folder.c:2974
+#: ../camel/providers/imap/camel-imap-folder.c:3819
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
 msgid "This message is not currently available"
 msgstr "é??å°?é?µä»¶ç?®å??ä»?æ?ªå?¯ç?¨"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3624
+#: ../camel/providers/imap/camel-imap-folder.c:3632
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ä¸?å®?æ?´ç??ä¼ºæ??å?¨å??æ??ï¼?æ?ªæ??ä¾?ä»»ä½?è³?è¨?çµ¦è¨?æ?¯ %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:3640
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ä¸?å®?æ?´ç??ä¼ºæ??å?¨å??æ??ï¼?æ?ªæ??ä¾? UID çµ¦è¨?æ?¯ %d"
 
 # camel/providers/imap/camel-imap-folder.c:1075
 # camel/providers/imap/camel-imap-folder.c:1314
-#: ../camel/providers/imap/camel-imap-folder.c:3846
+#: ../camel/providers/imap/camel-imap-folder.c:3857
 msgid "Could not find message body in FETCH response."
 msgstr "å?¨ FETCH ç??å??æ??å?§æ?¾ä¸?å?°é?µä»¶ç??å?§æ??ã??"
 
@@ -3585,19 +3531,19 @@ msgstr "ç?¨ä½?è®?å??å??å?²å?é?µä»¶æ?¼ IMAP ä¼ºæ??å?¨ã??"
 
 # camel/providers/imap/camel-imap-provider.c:82
 #: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ç°¡æ??ç??å¯?ç¢¼é?£ç·?è?³ IMAP ä¼ºæ??å?¨ã??"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
-#: ../camel/providers/imap/camel-imap-store.c:437
+#: ../camel/providers/imap/camel-imap-store.c:435
 #: ../camel/providers/imap4/camel-imap4-store.c:210
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP ä¼ºæ??å?¨ %s"
 
 # camel/camel-remote-store.c:195
-#: ../camel/providers/imap/camel-imap-store.c:439
+#: ../camel/providers/imap/camel-imap-store.c:437
 #: ../camel/providers/imap4/camel-imap4-store.c:212
 #, c-format
 msgid "IMAP service for %s on %s"
@@ -3605,59 +3551,64 @@ msgstr "%s ç?? IMAP æ??å??æ?¼ %s"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
+#: ../camel/providers/imap/camel-imap-store.c:566
+#: ../camel/providers/imap/camel-imap-store.c:581
 #: ../camel/providers/imap4/camel-imap4-store.c:247
 #: ../camel/providers/imap4/camel-imap4-store.c:262
 #: ../camel/providers/nntp/camel-nntp-store.c:182
 #: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:170
-#: ../camel/providers/pop3/camel-pop3-store.c:184
+#: ../camel/providers/pop3/camel-pop3-store.c:192
+#: ../camel/providers/pop3/camel-pop3-store.c:206
 #: ../camel/providers/smtp/camel-smtp-transport.c:259
 #: ../camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "ç?¡æ³?é?£æ?¥å?° %sï¼?%s"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
+#: ../camel/providers/imap/camel-imap-store.c:567
 #: ../camel/providers/imap4/camel-imap4-store.c:248
 #: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:171
+#: ../camel/providers/pop3/camel-pop3-store.c:193
 #: ../camel/providers/smtp/camel-smtp-transport.c:260
 msgid "SSL unavailable"
 msgstr "SSL ç?¡æ³?ä½¿ç?¨"
 
 # camel/camel-remote-store.c:252
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
+#: ../camel/providers/imap/camel-imap-store.c:578
+#: ../camel/providers/imap/camel-imap-store.c:860
+#: ../camel/providers/imapx/camel-imapx-server.c:1993
 msgid "Connection cancelled"
 msgstr "é?£ç·?å·²å??æ¶?"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
+#: ../camel/providers/imap/camel-imap-store.c:689
+#: ../camel/providers/imap/camel-imap-store.c:708
+#: ../camel/providers/imap/camel-imap-store.c:714
+#: ../camel/providers/imap/camel-imap-store.c:740
 #: ../camel/providers/imap4/camel-imap4-store.c:310
 #: ../camel/providers/imap4/camel-imap4-store.c:325
 #: ../camel/providers/imap4/camel-imap4-store.c:334
+#: ../camel/providers/imapx/camel-imapx-server.c:2033
+#: ../camel/providers/imapx/camel-imapx-server.c:2047
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "ä»¥å®?å?¨æ¨¡å¼?é?£ç·?å?° IMAP ä¼ºæ??å?¨ %s æ??å¤±æ??äº?ï¼? %s"
 
 # shell/e-storage.c:477
-#: ../camel/providers/imap/camel-imap-store.c:692
+#: ../camel/providers/imap/camel-imap-store.c:690
+#: ../camel/providers/imapx/camel-imapx-server.c:2034
 #: ../camel/providers/smtp/camel-smtp-transport.c:332
 msgid "STARTTLS not supported"
 msgstr "ä¸?æ?¯æ?´ STARTTLS"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:709
+#: ../camel/providers/imapx/camel-imapx-server.c:2048
 msgid "SSL negotiations failed"
 msgstr "SSL å??å??å¤±æ??"
 
-#: ../camel/providers/imap/camel-imap-store.c:717
+#: ../camel/providers/imap/camel-imap-store.c:715
 #: ../camel/providers/imap4/camel-imap4-store.c:335
 #: ../camel/providers/smtp/camel-smtp-transport.c:371
 msgid "SSL is not available in this build"
@@ -3665,43 +3616,44 @@ msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ SSL"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:863
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ç?¡æ³?ä»¥æ??ä»¤ã??%sã??é?£ç·?ï¼? %s"
 
 # mail/local-config.glade.h:8
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
+#: ../camel/providers/imap/camel-imap-store.c:1051
+#: ../camel/providers/imap/camel-imap-store.c:2430
 #: ../camel/providers/imap4/camel-imap4-store-summary.c:356
 #: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/local/camel-maildir-folder.c:80
+#: ../camel/providers/imapx/camel-imapx-store.c:409
+#: ../camel/providers/imapx/camel-imapx-store.c:640
+#: ../camel/providers/local/camel-maildir-folder.c:81
 #: ../camel/providers/local/camel-maildir-store.c:219
 #: ../camel/providers/local/camel-maildir-store.c:291
 #: ../camel/providers/local/camel-maildir-store.c:517
 #: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:463
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
+#: ../camel/providers/local/camel-spool-store.c:461
 msgid "Inbox"
 msgstr "æ?¶ä»¶å?£"
 
 # camel/providers/imap/camel-imap-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1305
+#: ../camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ä¼ºæ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?é¡?å?? %s"
 
 # camel/providers/imap/camel-imap-store.c:466
 # camel/providers/smtp/camel-smtp-transport.c:366
-#: ../camel/providers/imap/camel-imap-store.c:1315
+#: ../camel/providers/imap/camel-imap-store.c:1313
 #: ../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:531
-#: ../camel/providers/imap/camel-imap-store.c:1389
+#: ../camel/providers/imap/camel-imap-store.c:1387
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3712,8 +3664,8 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
+#: ../camel/providers/imap/camel-imap-store.c:1891
+#: ../camel/providers/imap/camel-imap-store.c:2272
 #: ../camel/providers/imap4/camel-imap4-store.c:954
 #, c-format
 msgid ""
@@ -3722,22 +3674,22 @@ msgstr "è³?æ??å¤¾å??ç¨±ã??%sã??ç?¡æ??ï¼?å? ç?ºå®?å??æ?¬å?ç¬¦ã??%cã??"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap/camel-imap-store.c:1978
+#: ../camel/providers/imap/camel-imap-store.c:2008
 #: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
+#: ../camel/providers/local/camel-mbox-store.c:202
 #: ../camel/providers/local/camel-mh-store.c:249
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?è³?æ??å¤¾å·²å?å?¨ã??"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/providers/imap/camel-imap-store.c:2253
+#: ../camel/providers/imap/camel-imap-store.c:2283
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ä¸?æ??ç??æ¯?è³?æ??å¤¾ï¼? %s"
 
 # camel/camel-remote-store.c:476
-#: ../camel/providers/imap/camel-imap-store.c:3053
+#: ../camel/providers/imap/camel-imap-store.c:3107
 msgid "Server unexpectedly disconnected"
 msgstr "ä¼ºæ??å?¨çª?ç?¶ä¸æ?·é?£ç·?"
 
@@ -3939,10 +3891,9 @@ msgstr "æ¤é?¸é ?æ??ä½¿ç?¨ç´?æ??å?å¯?ç¢¼ï¼?é?£ç·?å?° IMAPv4rev1 ä¼ºæ??å?¨ã??"
 
 # camel/camel-remote-store.c:252
 #: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/imapp/camel-imapp-store.c:249
 #: ../camel/providers/nntp/camel-nntp-store.c:194
 #: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/pop3/camel-pop3-store.c:203
 #: ../camel/providers/smtp/camel-smtp-transport.c:271
 msgid "Connection canceled"
 msgstr "é?£ç·?å·²å??æ¶?"
@@ -3958,7 +3909,7 @@ msgstr "ä»¥å®?å?¨æ¨¡å¼?é?£ç·?å?° IMAP ä¼ºæ??å?¨ %s æ??å¤±æ??äº?ï¼? ä¼ºæ??å?¨ä¸?
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
 #: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:275
 msgid "TLS negotiations failed"
 msgstr "TLS å??å??å¤±æ??"
 
@@ -4142,18 +4093,30 @@ msgstr "æ²?æ??è³?æ??"
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "IMAP ä¼ºæ??å?¨ %s æ??å¤?ä¸æ?·é?£ç·?ï¼?%s"
 
+# camel/providers/imap/camel-imap-folder.c:191
+#: ../camel/providers/imapx/camel-imapx-folder.c:84
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "ç?¡æ³?å»ºç«? %s ç??è³?æ??å¤¾æ??è¦?"
+
+# camel/providers/local/camel-mbox-store.c:110
+#: ../camel/providers/imapx/camel-imapx-folder.c:92
+#, c-format
+msgid "Could not create cache for %s"
+msgstr "ç?¡æ³?å»ºç«? %s ç??å¿«å??"
+
 # camel/providers/pop3/camel-pop3-provider.c:37
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 #: ../camel/providers/pop3/camel-pop3-provider.c:43
 msgid "Message storage"
 msgstr "é?µä»¶å?²å?ç©ºé??"
 
 # camel/providers/imap/camel-imap-provider.c:63
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "IMAP+"
 msgstr "IMAP"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:50
 msgid ""
 "Experimental IMAP 4(.1) client\n"
 "This is untested and unsupported code, you want to use plain imap instead.\n"
@@ -4167,13 +4130,20 @@ msgstr ""
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-server.c:1996
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼? %s"
 
+# camel/providers/pop3/camel-pop3-store.c:361
+#: ../camel/providers/imapx/camel-imapx-server.c:2076
+#: ../camel/providers/imapx/camel-imapx-store.c:147
+#, c-format
+msgid "%sPlease enter the IMAP password for %s %s"
+msgstr "%sè«?è¼¸å?¥ %s %s ç?? IMAP å¯?ç¢¼"
+
 # camel/providers/pop3/camel-pop3-store.c:322
-#: ../camel/providers/imapp/camel-imapp-store.c:348
+#: ../camel/providers/imapx/camel-imapx-store.c:130
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %s"
@@ -4268,62 +4238,62 @@ msgid "Standard Unix mbox spool directory"
 msgstr "æ¨?æº? Unix mbox æ??ç¨?å?¨ç?®é??"
 
 # camel/providers/local/camel-local-store.c:127
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:128
+#: ../camel/providers/local/camel-local-store.c:163
+#: ../camel/providers/local/camel-local-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:126
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "å?²å?æ ¹ç?®é?? %s ä¸?æ?¯çµ?å°?è·¯å¾?"
 
 # camel/providers/local/camel-local-store.c:134
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:170
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "å?²å?æ ¹ç?®é?? %s ä¸?æ?¯å??æ³?ç??ç?®é??"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../camel/providers/local/camel-local-store.c:179
+#: ../camel/providers/local/camel-local-store.c:187
+#: ../camel/providers/local/camel-local-store.c:285
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ï¼?%sï¼?%s"
 
 # camel/providers/local/camel-local-store.c:173
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:199
 msgid "Local stores do not have an inbox"
 msgstr "æ?¬å?°ç«¯ç??å?å?²æ²?æ??æ?¶ä»¶å?£"
 
 # camel/providers/local/camel-local-store.c:183
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:245
 #, c-format
 msgid "Local mail file %s"
 msgstr "æ?¬å?°ç«¯é?µä»¶æª?æ¡? %s"
 
 # camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:340
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ç?¡æ³?å°?è³?æ??å¤¾ %s é??æ?°å?½å??ç?º %sï¼? %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:408
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "ç?¡æ³?é??æ?°å?½å??ã??%sã??ï¼?%s "
 
 # camel/providers/local/camel-local-store.c:289
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-local-store.c:433
+#: ../camel/providers/local/camel-mbox-store.c:298
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ç´¢å¼?æª?æ¡?ã??%sã??ï¼? %s"
 
 # camel/providers/local/camel-local-store.c:279
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:456
+#: ../camel/providers/local/camel-mbox-store.c:322
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ä¸ç¹¼æª?æ¡?ã??%sã??ï¼?%s"
@@ -4335,14 +4305,14 @@ msgstr "ç?¡æ³?æ?°å¢?é?µä»¶å?°æ??è¦?è³?è¨?ï¼?ä¸?æ??ç??å??å? "
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/providers/local/camel-maildir-folder.c:229
+#: ../camel/providers/local/camel-maildir-folder.c:230
 msgid "Maildir append message canceled"
 msgstr "Maildir å¢?æ·»é?µä»¶å·²å??æ¶?"
 
 # camel/providers/local/camel-maildir-folder.c:150
 # camel/providers/local/camel-maildir-folder.c:158
 # camel/providers/local/camel-maildir-folder.c:169
-#: ../camel/providers/local/camel-maildir-folder.c:232
+#: ../camel/providers/local/camel-maildir-folder.c:233
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "ç?¡æ³?å°?é?µä»¶å?²å?å?° maildir è³?æ??å¤¾ï¼? %sï¼? %s"
@@ -4350,18 +4320,19 @@ msgstr "ç?¡æ³?å°?é?µä»¶å?²å?å?° maildir è³?æ??å¤¾ï¼? %sï¼? %s"
 # camel/providers/local/camel-mbox-folder.c:335
 # camel/providers/local/camel-mbox-folder.c:367
 # camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/local/camel-maildir-folder.c:254
-#: ../camel/providers/local/camel-maildir-folder.c:280
-#: ../camel/providers/local/camel-maildir-folder.c:294
-#: ../camel/providers/local/camel-maildir-folder.c:303
+#: ../camel/providers/local/camel-maildir-folder.c:263
+#: ../camel/providers/local/camel-maildir-folder.c:292
+#: ../camel/providers/local/camel-maildir-folder.c:306
+#: ../camel/providers/local/camel-maildir-folder.c:314
+#: ../camel/providers/local/camel-maildir-folder.c:400
 #: ../camel/providers/local/camel-mbox-folder.c:362
 #: ../camel/providers/local/camel-mbox-folder.c:413
 #: ../camel/providers/local/camel-mbox-folder.c:434
 #: ../camel/providers/local/camel-mbox-folder.c:465
 #: ../camel/providers/local/camel-mbox-folder.c:473
-#: ../camel/providers/local/camel-mh-folder.c:215
-#: ../camel/providers/local/camel-mh-folder.c:226
-#: ../camel/providers/local/camel-mh-folder.c:235
+#: ../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"
@@ -4372,16 +4343,21 @@ msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../camel/providers/local/camel-maildir-folder.c:304
+#: ../camel/providers/local/camel-maildir-folder.c:315
 msgid "Invalid message contents"
 msgstr "ç?¡æ??ç??é?µä»¶å?§æ??"
 
+# camel/providers/local/camel-mbox-summary.c:644
+#: ../camel/providers/local/camel-maildir-folder.c:419
+msgid "Cannot transfer message to destination folder"
+msgstr "ä¸?è?½å°?é?µä»¶å?³è¼¸å?°ç?®ç??ç«¯è³?æ??å¤¾"
+
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 #: ../camel/providers/local/camel-maildir-store.c:148
 #: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-mbox-store.c:174
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
@@ -4389,7 +4365,7 @@ msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 #: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
+#: ../camel/providers/local/camel-mbox-store.c:145
 #: ../camel/providers/local/camel-mh-store.c:217
 #, c-format
 msgid "Cannot get folder '%s': %s"
@@ -4399,7 +4375,7 @@ msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
 #: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
+#: ../camel/providers/local/camel-mbox-store.c:153
 #: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
@@ -4429,37 +4405,37 @@ msgstr "ä¸?æ?¯ä¸?å?? maildir ç?®é??"
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
 #: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:330
-#: ../camel/providers/local/camel-spool-store.c:344
+#: ../camel/providers/local/camel-spool-store.c:328
+#: ../camel/providers/local/camel-spool-store.c:342
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "ç?¡æ³?æ??æ??è³?æ??å¤¾ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-maildir-summary.c:405
 # camel/providers/local/camel-maildir-summary.c:526
-#: ../camel/providers/local/camel-maildir-summary.c:437
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-summary.c:432
+#: ../camel/providers/local/camel-maildir-summary.c:551
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "ä¸?è?½é??å?? maildir ç?®é??è·¯å¾?ï¼?%sï¼? %s"
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:544
 msgid "Checking folder consistency"
 msgstr "æª¢æ?¥è³?æ??å¤¾ç??ä¸?è?´æ?§"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/local/camel-maildir-summary.c:658
+#: ../camel/providers/local/camel-maildir-summary.c:637
 msgid "Checking for new messages"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: ../camel/providers/local/camel-maildir-summary.c:744
+#: ../camel/providers/local/camel-maildir-summary.c:724
 #: ../camel/providers/local/camel-mbox-summary.c:526
-#: ../camel/providers/local/camel-mbox-summary.c:708
-#: ../camel/providers/local/camel-mbox-summary.c:828
+#: ../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 "å?²å?è³?æ??å¤¾"
@@ -4498,28 +4474,28 @@ msgstr "è³?æ??å¤¾å¥½å??å·²ç¶?æ??æ¯?ä¸¦ä¸?ä¸?è?½å¾©å??ã??"
 
 # camel/providers/local/camel-mbox-folder.c:381
 #: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:236
+#: ../camel/providers/local/camel-mh-folder.c:245
 msgid "Message construction failed."
 msgstr "è¨?æ?¯çµ?æ§?å¤±æ??ã??"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:164
+#: ../camel/providers/local/camel-mbox-store.c:363
 msgid "Cannot create a folder by this name."
 msgstr "ç?¡æ³?å»ºç«?ä»¥æ¤ç?ºå??ç??è³?æ??å¤¾"
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ã??%sã??ï¼?ä¸?æ?¯ä¸?è?¬æª?æ¡?ã??"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:226
+#: ../camel/providers/local/camel-mbox-store.c:237
+#: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -4530,54 +4506,54 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:245
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "ã??%sã??ä¸?æ?¯æ?®é??ç??æª?æ¡?ã??"
 
 # camel/providers/local/camel-mbox-store.c:153
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:252
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "è³?æ??å¤¾ã??%sã??å?§ä»?æ??æª?æ¡?ã??æ??ä»¥ä¸?å?ªé?¤ã??"
 
 # camel/providers/local/camel-local-store.c:279
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
+#: ../camel/providers/local/camel-mbox-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:286
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ç?¡æ³?å?ªé?¤è³?æ??å¤¾æ??è¦?æª?æ¡?ã??%sã??ï¼? %s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:376
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "ä¸?è?½å»ºç«?ç?®é??ã??%sã??ï¼? %sã??"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:390
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ï¼?%sï¼?%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:394
+#: ../camel/providers/local/camel-mbox-store.c:392
 msgid "Folder already exists"
 msgstr "è³?æ??å¤¾å·²å?å?¨"
 
 # shell/e-shell-folder-creation-dialog.c:156
-#: ../camel/providers/local/camel-mbox-store.c:485
+#: ../camel/providers/local/camel-mbox-store.c:483
 msgid "The new folder name is illegal."
 msgstr "æ??å®?ç??è³?æ??å¤¾å??ç¨±ä¸?å??æ³?ï¼? %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:496
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "ç?¡æ³?é??æ?°å?½å??ã??%sã??ï¼?ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:577
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "ç?¡æ³?å°? '%s' é??æ?°å?½å??æ?? %sï¼?%s"
@@ -4597,21 +4573,21 @@ msgstr "é? è¿? %ld (æ?¼è³?æ??å¤¾ %s)ç??ä½?ç½®ç?¼ç??å?´é??ç??é?µä»¶å??æ??é?¯èª¤"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mbox-summary.c:645
+#: ../camel/providers/local/camel-mbox-summary.c:659
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ä¸?è?½æª¢æ?¥è³?æ??å¤¾ï¼?%sï¼? %s"
 
 # camel/providers/local/camel-mbox-store.c:94
-#: ../camel/providers/local/camel-mbox-summary.c:713
-#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../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:524
-#: ../camel/providers/local/camel-mbox-summary.c:725
+#: ../camel/providers/local/camel-mbox-summary.c:739
 #: ../camel/providers/local/camel-spool-summary.c:168
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
@@ -4619,27 +4595,27 @@ msgstr "ä¸?è?½é??å??æ?«å? mailboxï¼?%s"
 
 # camel/providers/local/camel-mbox-summary.c:635
 # camel/providers/local/camel-mbox-summary.c:804
-#: ../camel/providers/local/camel-mbox-summary.c:738
-#: ../camel/providers/local/camel-mbox-summary.c:942
+#: ../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:644
-#: ../camel/providers/local/camel-mbox-summary.c:747
+#: ../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:655
-#: ../camel/providers/local/camel-mbox-summary.c:762
+#: ../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:655
-#: ../camel/providers/local/camel-mbox-summary.c:844
-#: ../camel/providers/local/camel-mbox-summary.c:1069
+#: ../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 "
@@ -4648,40 +4624,40 @@ msgstr "ç?¡æ³?å?²å?è³?æ??å¤¾ï¼?%s "
 # camel/providers/local/camel-mbox-summary.c:557
 # camel/providers/local/camel-mbox-summary.c:746
 # camel/providers/local/camel-mbox-summary.c:754
-#: ../camel/providers/local/camel-mbox-summary.c:883
-#: ../camel/providers/local/camel-mbox-summary.c:891
-#: ../camel/providers/local/camel-mbox-summary.c:1099
-#: ../camel/providers/local/camel-mbox-summary.c:1107
+#: ../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:879
-#: ../camel/providers/local/camel-mbox-summary.c:1032
+#: ../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:617
-#: ../camel/providers/local/camel-mbox-summary.c:1175
-#: ../camel/providers/local/camel-mbox-summary.c:1201
+#: ../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 "å¯«å?¥æ?«å?é?µç®±å¤±æ??ï¼?  %s"
 
 # camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1192
+#: ../camel/providers/local/camel-mbox-summary.c:1206
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "å¯«å?¥æ?«å?é?µç®±å¤±æ??ï¼? %sï¼? %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-mh-folder.c:180
 msgid "MH append message canceled"
 msgstr "MH å¢?æ·»é?µä»¶å·²å??æ¶?"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/local/camel-mh-folder.c:184
+#: ../camel/providers/local/camel-mh-folder.c:183
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° mh è³?æ??å¤¾ï¼? %sï¼? %s"
@@ -4706,13 +4682,13 @@ msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ã??%sã??ï¼?ä¸?æ?¯ç?®é??ã??"
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "ä¸?è?½é??å?? MH ç?®é??è·¯å¾?ï¼? %sï¼? %s"
 
-#: ../camel/providers/local/camel-spool-store.c:134
+#: ../camel/providers/local/camel-spool-store.c:132
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "æ??ç¨?å?¨ã??%sã??ä¸?è?½è¢«é??å??ï¼?%s"
 
 # camel/providers/local/camel-local-store.c:134
-#: ../camel/providers/local/camel-spool-store.c:146
+#: ../camel/providers/local/camel-spool-store.c:144
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "æ??ç¨?å?¨ã??%sã??ä¸?æ?¯ä¸?è?¬æª?æ¡?æ??ç?®é??ã??"
@@ -4720,14 +4696,14 @@ msgstr "æ??ç¨?å?¨ã??%sã??ä¸?æ?¯ä¸?è?¬æª?æ¡?æ??ç?®é??ã??"
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-spool-store.c:165
+#: ../camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "è³?æ??å¤¾ã??%s/%sã??ä¸?å?å?¨ã??"
 
 # camel/providers/local/camel-maildir-store.c:96
 # camel/providers/local/camel-mh-store.c:90
-#: ../camel/providers/local/camel-spool-store.c:175
+#: ../camel/providers/local/camel-spool-store.c:173
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4739,14 +4715,14 @@ msgstr ""
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-spool-store.c:179
+#: ../camel/providers/local/camel-spool-store.c:177
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "è³?æ??å¤¾ã??%sã??ä¸?å?å?¨ã??"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-spool-store.c:184
+#: ../camel/providers/local/camel-spool-store.c:182
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4757,31 +4733,31 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-spool-store.c:192
+#: ../camel/providers/local/camel-spool-store.c:190
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "ã??%sã??ä¸?æ?¯ mailbox æª?æ¡?ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:207
 msgid "Store does not support an INBOX"
 msgstr "å?²å?ä¸¦ä¸?æ?¯æ?´ INBOX"
 
 # camel/providers/local/camel-local-store.c:183
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:219
 #, c-format
 msgid "Spool mail file %s"
 msgstr "æ??ç¨?é?µä»¶æª?æ¡? %s"
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:219
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "æ??ç¨?è³?æ??å¤¾æ¨¹ç??çµ?æ§? %s"
 
-#: ../camel/providers/local/camel-spool-store.c:229
+#: ../camel/providers/local/camel-spool-store.c:227
 msgid "Spool folders cannot be renamed"
 msgstr "æ??ç¨?è³?æ??å¤¾ä¸?è?½é??æ?°å?½å??"
 
-#: ../camel/providers/local/camel-spool-store.c:237
+#: ../camel/providers/local/camel-spool-store.c:235
 msgid "Spool folders cannot be deleted"
 msgstr "æ??ç¨?è³?æ??å¤¾ä¸?è?½å?ªé?¤"
 
@@ -4811,9 +4787,9 @@ msgstr ""
 "ç?¡æ³?å??æ¥æ??ç¨?è³?æ??å¤¾ %sï¼? %s\n"
 "è³?æ??å¤¾å?¯è?½æ??æ¯?ï¼?è¤?è£½å?²å?æ?¼ã??%sã??"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:194
-#: ../camel/providers/nntp/camel-nntp-folder.c:226
+#: ../camel/providers/nntp/camel-nntp-folder.c:135
+#: ../camel/providers/nntp/camel-nntp-folder.c:192
+#: ../camel/providers/nntp/camel-nntp-folder.c:224
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "å?§é?¨é?¯èª¤ï¼?UID æ ¼å¼?ç?¡æ??ï¼?%s"
@@ -4822,20 +4798,20 @@ msgstr "å?§é?¨é?¯èª¤ï¼?UID æ ¼å¼?ç?¡æ??ï¼?%s"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/nntp/camel-nntp-folder.c:367
-#: ../camel/providers/nntp/camel-nntp-folder.c:370
+#: ../camel/providers/nntp/camel-nntp-folder.c:365
+#: ../camel/providers/nntp/camel-nntp-folder.c:368
+#: ../camel/providers/nntp/camel-nntp-folder.c:410
 #: ../camel/providers/nntp/camel-nntp-folder.c:412
-#: ../camel/providers/nntp/camel-nntp-folder.c:414
 #, c-format
 msgid "Posting failed: %s"
 msgstr "å¼µè²¼å¤±æ??ï¼?%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:432
+#: ../camel/providers/nntp/camel-nntp-folder.c:430
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "é?¢ç·?å·¥ä½?æ??ç?¡æ³?å¼µè²¼ NNTP è¨?æ?¯ï¼?"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/nntp/camel-nntp-folder.c:443
+#: ../camel/providers/nntp/camel-nntp-folder.c:441
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "ä½ ç?¡æ³?å¾? NNTP è³?æ??å¤¾è¤?è£½è¨?æ?¯ï¼?"
 
@@ -5073,61 +5049,66 @@ msgid ""
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨å? å¯?ç??å¯?ç¢¼ç¶?ç?± APOP é??è¨?å??å®?é?£ç·?å?° POP ä¼ºæ??å?¨ã??ä¸?é??å°±ç®?ä¼ºæ??å?¨è?²ç¨±è?½å¤ æ?¯æ?´ï¼?ä½?å°?æ?¼æ??æ??ä½¿ç?¨è??ä¾?è¬?é?½æ?ªå¿?ä¸?å®?å?¯è¡?ã??"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:207
+#: ../camel/providers/pop3/camel-pop3-store.c:229
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "ç?¡æ³?å¾? POP ä¼ºæ??å?¨ %s è®?å??æ??æ??ç??å??å??èª?"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/pop3/camel-pop3-store.c:224
-#: ../camel/providers/pop3/camel-pop3-store.c:238
-#: ../camel/providers/pop3/camel-pop3-store.c:248
-#: ../camel/providers/pop3/camel-pop3-store.c:254
+#: ../camel/providers/pop3/camel-pop3-store.c:246
+#: ../camel/providers/pop3/camel-pop3-store.c:274
+#: ../camel/providers/pop3/camel-pop3-store.c:280
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "ç?¡æ³?ä»¥å®?å?¨æ¨¡å¼?é?£ç·?å?° POP ä¼ºæ??å?¨ %sï¼? %s"
 
 # shell/e-storage.c:477
-#: ../camel/providers/pop3/camel-pop3-store.c:225
+#: ../camel/providers/pop3/camel-pop3-store.c:247
 msgid "STLS not supported by server"
 msgstr "ä¼ºæ??å?¨ä¸?æ?¯æ?´ STLS"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:255
+# camel/providers/pop3/camel-pop3-store.c:379
+#: ../camel/providers/pop3/camel-pop3-store.c:262
+#, 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:281
 msgid "TLS is not available in this build"
 msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ TLS"
 
 # camel/providers/pop3/camel-pop3-store.c:322
-#: ../camel/providers/pop3/camel-pop3-store.c:361
+#: ../camel/providers/pop3/camel-pop3-store.c:387
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %s"
 
 # camel/providers/pop3/camel-pop3-store.c:409
-#: ../camel/providers/pop3/camel-pop3-store.c:402
-#: ../camel/providers/pop3/camel-pop3-store.c:535
+#: ../camel/providers/pop3/camel-pop3-store.c:428
+#: ../camel/providers/pop3/camel-pop3-store.c:565
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %sï¼?ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?æ©?å?¶ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:418
+#: ../camel/providers/pop3/camel-pop3-store.c:446
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "å?¨ POP ä¼ºæ??å?¨ %2$s ä»¥ SASL ã??%1$sã??ç?»å?¥å¤±æ??ï¼? %3$s"
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr "å?¨ POP ä¼ºæ??å?¨ %2$s ä»¥ SASL ã??%1$sã??ç?»å?¥å¤±æ??%3$s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:430
+#: ../camel/providers/pop3/camel-pop3-store.c:460
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "ä¸?è?½ç?»å?¥ POP ä¼ºæ??å?¨ %sï¼? SASL é??è¨?å??å®?é?¯èª¤"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:449
+#: ../camel/providers/pop3/camel-pop3-store.c:479
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "ç?¡æ³?é©?è? POP ä¼ºæ??å?¨ %sï¼?%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:508
+#: ../camel/providers/pop3/camel-pop3-store.c:538
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -5135,8 +5116,7 @@ msgid ""
 msgstr "ç?¡æ³?é?£ç·?è?³ POP ä¼ºæ??å?¨ %sï¼?\tæ?¶å?°ç?¡æ??ç?? APOP IDã??æ?¨æ¸¬å?¯è?½æ?¯ä½¿ç?¨è??å??å??æ?»æ??ã??è«?è?¯çµ¡ä½ ç??ç³»çµ±ç®¡ç??è??ã??"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:549
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:579
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5146,17 +5126,27 @@ msgstr ""
 "å?³é??å¯?ç¢¼æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:556
+#: ../camel/providers/pop3/camel-pop3-store.c:588
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending username%s"
 msgstr ""
 "ç?¡æ³?é?£ç·? POP ä¼ºæ??å?¨ %sã??\n"
-"å?³é??ä½¿ç?¨è??å??ç¨±ç?¼ç??é?¯èª¤ï¼?%s"
+"å?³é??ä½¿ç?¨è??å??ç¨±ç?¼ç??é?¯èª¤%s"
+
+# camel/providers/pop3/camel-pop3-store.c:417
+#: ../camel/providers/pop3/camel-pop3-store.c:597
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password%s"
+msgstr ""
+"ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %sã??\n"
+"å?³é??å¯?ç¢¼æ??ç?¼ç??é?¯èª¤%s"
 
 # camel/providers/pop3/camel-pop3-store.c:484
-#: ../camel/providers/pop3/camel-pop3-store.c:669
+#: ../camel/providers/pop3/camel-pop3-store.c:703
 #, c-format
 msgid "No such folder '%s'."
 msgstr "æ²?æ??é??å??è³?æ??å¤¾ã??%sã??ã??"
@@ -5633,7 +5623,7 @@ msgstr "æ£å?¨ç?å¾?"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1900
+#: ../libedataserver/e-time-utils.c:1633 ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
@@ -5643,7 +5633,7 @@ msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1891
+#: ../libedataserver/e-time-utils.c:1638 ../libedataserver/e-time-utils.c:1889
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
@@ -5652,7 +5642,7 @@ msgstr "%Y/%m/%d (%a) %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1896
+#: ../libedataserver/e-time-utils.c:1643 ../libedataserver/e-time-utils.c:1894
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -5661,21 +5651,21 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1887
+#: ../libedataserver/e-time-utils.c:1648 ../libedataserver/e-time-utils.c:1885
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 # e-util/e-time-utils.c:283
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1655
+#: ../libedataserver/e-time-utils.c:1653
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 # e-util/e-time-utils.c:274
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1660
+#: ../libedataserver/e-time-utils.c:1658
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
@@ -5684,43 +5674,43 @@ msgstr "%a %m/%d/%Y %H"
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1763
-#: ../libedataserver/e-time-utils.c:1882
+#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1761
+#: ../libedataserver/e-time-utils.c:1880
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 # calendar/gui/calendar-model.c:797
 # e-util/e-time-utils.c:287
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1670
+#: ../libedataserver/e-time-utils.c:1668
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 # calendar/gui/calendar-model.c:794
 # e-util/e-time-utils.c:278
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1674
+#: ../libedataserver/e-time-utils.c:1672
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 # e-util/e-time-utils.c:283
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1679
+#: ../libedataserver/e-time-utils.c:1677
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 # e-util/e-time-utils.c:274
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1684
+#: ../libedataserver/e-time-utils.c:1682
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 # e-util/e-time-utils.c:283
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1687
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
@@ -5731,7 +5721,7 @@ msgstr "%m/%d/%Y %I %p"
 # widgets/misc/e-dateedit.c:1465
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1692
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
@@ -5742,21 +5732,21 @@ msgstr "%m/%d/%Y %H"
 # widgets/misc/e-dateedit.c:1465
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1766
+#: ../libedataserver/e-time-utils.c:1695 ../libedataserver/e-time-utils.c:1764
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 # e-util/e-time-utils.c:323
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1824 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1822 ../libedataserver/e-time-utils.c:1942
 msgid "%I:%M:%S %p"
 msgstr "%p %I:%M:%S"
 
 # e-util/e-time-utils.c:315
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1828 ../libedataserver/e-time-utils.c:1936
+#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1934
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5768,7 +5758,7 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1833 ../libedataserver/e-time-utils.c:1941
+#: ../libedataserver/e-time-utils.c:1831 ../libedataserver/e-time-utils.c:1939
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
@@ -5779,7 +5769,7 @@ msgstr "%p %I:%M"
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1837 ../libedataserver/e-time-utils.c:1933
+#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1931
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -5788,7 +5778,7 @@ msgstr "%H:%M"
 # widgets/misc/e-dateedit.c:1318
 # widgets/misc/e-dateedit.c:1497
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1840
+#: ../libedataserver/e-time-utils.c:1838
 msgid "%H%M"
 msgstr "%H%M"
 
@@ -5797,7 +5787,7 @@ msgstr "%H%M"
 # widgets/misc/e-dateedit.c:1321
 # widgets/misc/e-dateedit.c:1500
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1844
+#: ../libedataserver/e-time-utils.c:1842
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -5809,59 +5799,63 @@ msgstr "æ£ä»¥å?¿å??æ?¹å¼?å?å?? LDAP ä¼ºæ??å?¨"
 msgid "Failed to authenticate.\n"
 msgstr "é©?è?è?æ?¸å¤±æ??ã??\n"
 
-#: ../libedataserverui/e-categories-dialog.c:327
+# calendar/gui/e-calendar-table.c:150
+#: ../libedataserverui/e-categories-dialog.c:143
+msgid "Category Icon"
+msgstr "å??é¡?å??ç¤º"
+
+#: ../libedataserverui/e-categories-dialog.c:149
+msgid "_No Image"
+msgstr "æ²?æ??å??ç??(_N)"
+
+#: ../libedataserverui/e-categories-dialog.c:370
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "å?¨çµ?æ??ä¸å·²ç¶?æ??å??ç?ºã??%sã??ç??å??é¡?ã??è«?ä½¿ç?¨å?¦å¤?ç??å??ç¨±"
 
-#: ../libedataserverui/e-categories-dialog.c:618
+#: ../libedataserverui/e-categories-dialog.c:678
 msgid "Icon"
 msgstr "å??ç¤º"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-categories-dialog.c:623
+#: ../libedataserverui/e-categories-dialog.c:683
 msgid "Category"
 msgstr "å??é¡?"
 
-# calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.glade.h:1
-msgid "Category Icon"
-msgstr "å??é¡?å??ç¤º"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: ../libedataserverui/e-categories-dialog.glade.h:2
+#: ../libedataserverui/e-categories-dialog.ui.h:1
 msgid "Category Properties"
 msgstr "å??é¡?å±¬æ?§"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.glade.h:3
+#: ../libedataserverui/e-categories-dialog.ui.h:2
 msgid "Category _Icon"
 msgstr "å??é¡?å??ç¤º(_I)"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.glade.h:4
+#: ../libedataserverui/e-categories-dialog.ui.h:3
 msgid "Category _Name"
 msgstr "å??é¡?å??ç¨±(_N)"
 
 # addressbook/contact-editor/e-contact-editor.c:603
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "å±¬æ?¼é??äº?å??é¡?ç??é ?ç?®(_C):"
+#: ../libedataserverui/e-categories-dialog.ui.h:4
+msgid "Item(s) _belong to these categories:"
+msgstr "å±¬æ?¼é??äº?å??é¡?ç??é ?ç?®(_B):"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.ui.h:5
 msgid "_Available Categories:"
 msgstr "å?¯ç?¨ç??å??é¡?(_A):"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.ui.h:6
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.glade.h:8
+#: ../libedataserverui/e-categories-dialog.ui.h:7
 msgid "categories"
 msgstr "å??é¡?"
 
@@ -5879,84 +5873,83 @@ msgstr "è?²å½©è³?è¨?"
 msgid "The color to render"
 msgstr "è¦?ç¹ªè£½ç??è?²å½©"
 
-#: ../libedataserverui/e-name-selector-dialog.c:276
+#: ../libedataserverui/e-name-selector-dialog.c:292
 msgid "Select Contacts from Address Book"
 msgstr "å¾?é??è¨?é??é?¸å??è?¯çµ¡äºº"
 
-#: ../libedataserverui/e-name-selector-dialog.c:563
+#: ../libedataserverui/e-name-selector-dialog.c:587
 msgid "_Add"
 msgstr "å? å?¥(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:588
+#: ../libedataserverui/e-name-selector-dialog.c:612
 msgid "_Remove"
 msgstr "ç§»é?¤(_R)"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.c:765
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:789
+#: ../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>"
 
 # ui/evolution-addressbook.xml.h:17
-#: ../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 "é??è¨?é??"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
+#: ../libedataserverui/e-name-selector-dialog.ui.h:7
 msgid "Cate_gory:"
 msgstr "å??é¡?(_G):"
 
 # ui/evolution-addressbook.xml.h:17
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
+#: ../libedataserverui/e-name-selector-dialog.ui.h:8
 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:2455
+#: ../libedataserverui/e-name-selector-entry.c:2508
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "å±?é??è¡?å?§ %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2470
+#: ../libedataserverui/e-name-selector-entry.c:2523
 #, c-format
 msgid "Cop_y %s"
 msgstr "è¤?è£½(_Y) %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2480
+#: ../libedataserverui/e-name-selector-entry.c:2533
 #, c-format
 msgid "C_ut %s"
 msgstr "å?ªä¸?(_U) %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2497
+#: ../libedataserverui/e-name-selector-entry.c:2550
 #, c-format
 msgid "_Edit %s"
 msgstr "ç·¨è¼¯ %s(_E)"
@@ -6001,185 +5994,6 @@ msgstr "é?¸å??ç?®ç??å?°"
 msgid "_Destination"
 msgstr "ç?®ç??ç«¯(_D)"
 
-# camel/camel-smime-context.c:194
-#: ../servers/exchange/lib/e2k-autoconfig.c:1694
-#: ../servers/exchange/storage/exchange-account.c:955
-#, c-format
-msgid "Enter password for %s"
-msgstr "è¼¸å?¥ %s ç??å¯?ç¢¼ "
-
-#: ../servers/exchange/lib/e2k-autoconfig.c:1695
-#: ../servers/exchange/storage/exchange-account.c:960
-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:844
-msgid "Owner"
-msgstr "æ??æ??è??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:854
-msgid "Publishing Editor"
-msgstr "ç?¼ä½?ç·¨è¼¯è??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:862
-msgid "Editor"
-msgstr "ç·¨è¼¯è??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:869
-msgid "Publishing Author"
-msgstr "ç?¼ä½?ä½?è??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:875
-msgid "Author"
-msgstr "ä½?è??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:880
-msgid "Non-editing Author"
-msgstr "æ²?æ??ç·¨è¼¯ä¸ç??ä½?è??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:884
-msgid "Reviewer"
-msgstr "è®?è??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:886
-msgid "Contributor"
-msgstr "æ?£ä½?è??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:888
-msgid "None"
-msgstr "æ²?æ??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:903
-msgid "Custom"
-msgstr "è?ªé?¸"
-
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "Generic error"
-msgstr "ä¸?è?¬é?¯èª¤"
-
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "A folder with the same name already exists"
-msgstr "å?·ç?¸å??å??ç¨±ç??è³?æ??å¤¾å·²å?å?¨"
-
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "The specified folder type is not valid"
-msgstr "æ??å®?ç??è³?æ??å¤¾é¡?å??ç?¡æ??"
-
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "I/O error"
-msgstr "I/O é?¯èª¤"
-
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "Not enough space to create the folder"
-msgstr "æ²?æ??è¶³å¤ ç??ç©ºé??å»ºç«?è³?æ??å¤¾"
-
-# camel/providers/imap/camel-imap-provider.c:43
-# mail/mail-config.glade.h:13
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The folder is not empty"
-msgstr "è³?æ??å¤¾ä¸?æ?¯ç©ºç??"
-
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "The specified folder was not found"
-msgstr "æ?¾ä¸?å?°æ??å®?ç??è³?æ??å¤¾"
-
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Function not implemented in this storage"
-msgstr "å?¨é??å??å?²å?è£?ç½®ä¸?æ²?æ??å¯¦ä½?æ¤å??è?½"
-
-# shell/e-storage.c:477
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "Operation not supported"
-msgstr "ä¸?æ?¯æ?´ç??æ??ä½?"
-
-# camel/camel-cipher-context.c:251
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified type is not supported in this storage"
-msgstr "æ¤å?²å?è£?ç½®ä¸?æ?¯æ?´æ??å®?ç??é??å??é¡?å??"
-
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "The specified folder cannot be modified or removed"
-msgstr "æ??å®?ç??è³?æ??å¤¾ç?¡æ³?è¢«ç·¨è¼¯æ??ç§»é?¤"
-
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "ç?¡æ³?å°?è³?æ??å¤¾ç½®æ?¼å?¶å?è³?æ??å¤¾ä¹?ä¸?"
-
-# camel/providers/local/camel-mbox-folder.c:152
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "Cannot create a folder with that name"
-msgstr "ç?¡æ³?å»ºç«?ä»¥æ¤ç?ºå??ç??è³?æ??å¤¾"
-
-# camel/providers/imap/camel-imap-folder.c:1047
-# camel/providers/imap/camel-imap-folder.c:1281
-#: ../servers/exchange/storage/e-storage.c:585
-msgid "This operation cannot be performed in off-line mode"
-msgstr "é??å??æ??ä½?ç?¡æ³?å?¨é?¢ç·?æ¨¡å¼?ä¸?é?²è¡?"
-
-# camel/providers/imap/camel-imap-provider.c:48
-# shell/e-shell-view.c:552
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:640
-#, c-format
-msgid "%s's Folders"
-msgstr "%s ç??è³?æ??å¤¾"
-
-#: ../servers/exchange/storage/exchange-account.c:1260
-msgid "Personal Folders"
-msgstr "å??äººè³?æ??å¤¾"
-
-#: ../servers/exchange/storage/exchange-account.c:1275
-msgid "Favorite Public Folders"
-msgstr "å??å¥½ç??å?¬é??è³?æ??å¤¾"
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1292
-msgid "All Public Folders"
-msgstr "æ??æ??ç??å?¬é??è³?æ??å¤¾"
-
-# addressbook/backend/ebook/e-card.c:3346
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1306
-msgid "Global Address List"
-msgstr "å?¨å??å?°å??æ¸?å?®"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-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 "æ?¥èª?"
-
-# addressbook/gui/widgets/e-addressbook-view.c:736
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "å??è¨»"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "å¯?ä»¶å?£"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "å?³é??é ?ç?®"
-
-# camel/camel-store.c:378
-# mail/mail-ops.c:1007
-# mail/mail-ops.c:1014
-# mail/mail-ops.c:1032
-# mail/mail-ops.c:1033
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "å·¥ä½?"
-
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
 #: ../servers/groupwise/e-gw-connection.c:225
@@ -6202,20 +6016,11 @@ msgstr "ç?¡æ??ç??ä¼ºæ??å?¨å??æ??"
 msgid "Bad parameter"
 msgstr "é?¯èª¤ç??å??æ?¸"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Evolution é??è¨?é??æª?æ¡?å¾?ç«¯"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Evolution è¡?äº?æ??æª?æ¡?å?? webcal å¾?ç«¯"
+#~ msgid "\"%s\" on book before \"%s\""
+#~ msgstr "å?¨é??è¨?é??ä¸ã??%sã??å?¨ã??%sã??ä¹?å??"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "Evolution è³?æ??ä¼ºæ??å?¨ä»?é?¢æª¢æ?¥æ??å??"
+#~ msgid "book busy"
+#~ msgstr "é??è¨?é??å¿?ç¢?ä¸"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Evolution è³?æ??ä¼ºæ??å?¨ç?»å?¥æ??å??"
+#~ msgid "CORBA exception making \"%s\" call"
+#~ msgstr "CORBA ä¾?å¤?é? æ??ã??%sã??å?¼å?«"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d16da94..c695684 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,10 +6,10 @@
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005. 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server 2.27.90\n"
+"Project-Id-Version: evolution-data-server 2.29.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-28 20:54+0800\n"
-"PO-Revision-Date: 2009-07-24 15:20+0800\n"
+"POT-Creation-Date: 2010-01-22 22:35+0800\n"
+"PO-Revision-Date: 2010-01-22 10:06+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
 #: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2329
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "è¼?å?¥ä¸..."
@@ -28,33 +28,33 @@ msgstr "è¼?å?¥ä¸..."
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
 #: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2260
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2282
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2327
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
+#: ../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:4524
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "æ??å°?ä¸..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2695
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4688
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "æ£å?¨ä¸?è¼?é?£çµ¡äºº (%d)..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2844
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3072
+#: ../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:788
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:786
 msgid "Using Distinguished Name (DN)"
 msgstr "ä½¿ç?¨è¾¨èª?ç??å??ç¨± (DN)"
 
 # mail/mail-config.glade.h:29
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:789
 msgid "Using Email Address"
 msgstr "ä½¿ç?¨é?»å?é?µä»¶å?°å??"
 
@@ -80,113 +80,16 @@ msgstr "æ£å?¨ç§»é?¤ LDAP ä¼ºæ??å?¨ä¸ç??é?£çµ¡äºº..."
 msgid "Modifying contact from LDAP server..."
 msgstr "æ£å?¨ä¿®æ?¹ LDAP ä¼ºæ??å?¨ä¸ç??é?£çµ¡äºº..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4385
 msgid "Receiving LDAP search results..."
 msgstr "æ£å?¨æ?¥æ?¶ LDAP æ??å°?çµ?æ??..."
 
 # executive-summary/component/e-summary.c:940
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4546
 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:287 ../addressbook/libebook/e-book.c:291
-#: ../addressbook/libebook/e-book.c:495 ../addressbook/libebook/e-book.c:499
-#: ../addressbook/libebook/e-book.c:637 ../addressbook/libebook/e-book.c:641
-#: ../addressbook/libebook/e-book.c:727 ../addressbook/libebook/e-book.c:731
-#: ../addressbook/libebook/e-book.c:1024 ../addressbook/libebook/e-book.c:1029
-#: ../addressbook/libebook/e-book.c:1206 ../addressbook/libebook/e-book.c:1210
-#: ../addressbook/libebook/e-book.c:1365 ../addressbook/libebook/e-book.c:1369
-#: ../addressbook/libebook/e-book.c:1570 ../addressbook/libebook/e-book.c:1574
-#: ../addressbook/libebook/e-book.c:1813 ../addressbook/libebook/e-book.c:1817
-#: ../addressbook/libebook/e-book.c:2050 ../addressbook/libebook/e-book.c:2054
-#: ../addressbook/libebook/e-book.c:2257 ../addressbook/libebook/e-book.c:2261
-#: ../addressbook/libebook/e-book.c:3445
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "å?¨é??è¨?é??ä¸ã??%sã??å?¨ã??%sã??ä¹?å??"
-
-#: ../addressbook/libebook/e-book.c:300 ../addressbook/libebook/e-book.c:508
-#: ../addressbook/libebook/e-book.c:650 ../addressbook/libebook/e-book.c:740
-#: ../addressbook/libebook/e-book.c:1039 ../addressbook/libebook/e-book.c:1220
-#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1583
-#: ../addressbook/libebook/e-book.c:1826 ../addressbook/libebook/e-book.c:2064
-#: ../addressbook/libebook/e-book.c:2270 ../addressbook/libebook/e-book.c:2679
-#: ../addressbook/libebook/e-book.c:2877
-#, c-format
-msgid "book busy"
-msgstr "é??è¨?é??å¿?ç¢?ä¸"
-
-#: ../addressbook/libebook/e-book.c:331 ../addressbook/libebook/e-book.c:335
-#: ../addressbook/libebook/e-book.c:539 ../addressbook/libebook/e-book.c:543
-#: ../addressbook/libebook/e-book.c:677 ../addressbook/libebook/e-book.c:681
-#: ../addressbook/libebook/e-book.c:767 ../addressbook/libebook/e-book.c:771
-#: ../addressbook/libebook/e-book.c:1066 ../addressbook/libebook/e-book.c:1069
-#: ../addressbook/libebook/e-book.c:1250 ../addressbook/libebook/e-book.c:1253
-#: ../addressbook/libebook/e-book.c:1406 ../addressbook/libebook/e-book.c:1410
-#: ../addressbook/libebook/e-book.c:1619 ../addressbook/libebook/e-book.c:1623
-#: ../addressbook/libebook/e-book.c:1873 ../addressbook/libebook/e-book.c:1877
-#: ../addressbook/libebook/e-book.c:2094 ../addressbook/libebook/e-book.c:2098
-#: ../addressbook/libebook/e-book.c:2296 ../addressbook/libebook/e-book.c:2300
-#: ../addressbook/libebook/e-book.c:2531 ../addressbook/libebook/e-book.c:2705
-#: ../addressbook/libebook/e-book.c:2709 ../addressbook/libebook/e-book.c:2903
-#: ../addressbook/libebook/e-book.c:2907 ../addressbook/libebook/e-book.c:3454
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "CORBA ä¾?å¤?é? æ??ã??%sã??å?¼å?«"
-
-# ui/evolution-mail.xml.h:3
-#: ../addressbook/libebook/e-book.c:2520
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%sï¼?ç?®å??æ²?æ??æ??ä½?"
-
-#: ../addressbook/libebook/e-book.c:2549 ../addressbook/libebook/e-book.c:2594
-#: ../addressbook/libebook/e-book.c:2633
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%sï¼?ç?¡æ³?å??æ¶?"
-
-#: ../addressbook/libebook/e-book.c:2665 ../addressbook/libebook/e-book.c:2669
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "å?¨é??è¨?é??ä¸ã??%sã??å?¨ã??%sã??ä¹?å¾?"
-
-# camel/camel-remote-store.c:337
-# camel/camel-remote-store.c:399
-# camel/camel-remote-store.c:470
-# camel/providers/imap/camel-imap-command.c:287
-#: ../addressbook/libebook/e-book.c:2733
-#, c-format
-msgid "%s: canceled"
-msgstr "%sï¼?å·²å??æ¶?"
-
-#: ../addressbook/libebook/e-book.c:3310
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%sï¼?ç?¡æ??ç??ä¾?æº?ã??"
-
-# camel/camel-session.c:295
-# camel/camel-session.c:364
-#: ../addressbook/libebook/e-book.c:3318 ../addressbook/libebook/e-book.c:3383
-#, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%sï¼?URIã??%sã??æ²?æ??å?¯ç?¨ç??è£½é? å» "
-
-#: ../addressbook/libebook/e-book.c:3329
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%sï¼?ç?¡æ³?å»ºæ§? EBookListener"
-
-#: ../addressbook/libebook/e-book.c:3595
-#, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%sï¼?æ²?æ??å?²å?æ?¼ gconf ä¸ç??æ?¬èº«é?£çµ¡äºº UID"
-
-#: ../addressbook/libebook/e-book.c:3727
+#: ../addressbook/libebook/e-book.c:2121
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%sï¼?æ²?æ??å?²å?æ?¼ gconf ä¸ç?? uid `%s' ä¾?æº?ã??"
@@ -430,7 +333,7 @@ msgstr "ç¶²èª? URL"
 # calendar/gui/e-calendar-table.c:150
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:609
+#: ../libedataserverui/e-categories-dialog.c:669
 msgid "Categories"
 msgstr "å??é¡?"
 
@@ -725,7 +628,7 @@ msgstr "å?ºç??æ?¥æ??"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
 #: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:713
 #: ../libedataserver/e-categories.c:45
 msgid "Anniversary"
 msgstr "é?±å¹´ç´?å¿µæ?¥"
@@ -817,20 +720,97 @@ msgstr "SIP ä½?å??"
 msgid "Unnamed List"
 msgstr "æ?ªå?½å??ç??æ¸?å?®"
 
+#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#, c-format
+msgid "Empty URI"
+msgstr "ç©ºç?? URI"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:305
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:323
+#: ../calendar/libedata-cal/e-data-cal-factory.c:332
+#, c-format
+msgid "Invalid source"
+msgstr "ç?¡æ??ç??ä¾?æº?"
+
+# camel/camel-filter-driver.c:671
+#: ../addressbook/libedata-book/e-data-book.c:301
+msgid "Cannot open book"
+msgstr "ä¸?è?½é??å??æ?¸ç±?"
+
+#: ../addressbook/libedata-book/e-data-book.c:319
+msgid "Cannot remove book"
+msgstr "ä¸?è?½ç§»é?¤æ?¸ç±?"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../addressbook/libedata-book/e-data-book.c:346
+msgid "Cannot get contact"
+msgstr "ä¸?è?½å??å¾?é?£çµ¡äºº"
+
+#: ../addressbook/libedata-book/e-data-book.c:358
+msgid "Empty query"
+msgstr "ç©ºç??æ?¥è©¢"
+
+# camel/providers/pop3/camel-pop3-store.c:199
+#: ../addressbook/libedata-book/e-data-book.c:402
+msgid "Cannot authenticate user"
+msgstr "ä¸?è?½é©?è?ä½¿ç?¨è??"
+
+#: ../addressbook/libedata-book/e-data-book.c:414
+#: ../addressbook/libedata-book/e-data-book.c:429
+msgid "Cannot add contact"
+msgstr "ä¸?è?½å? å?¥é?£çµ¡äºº"
+
+# mail/mail-crypto.c:251
+#: ../addressbook/libedata-book/e-data-book.c:444
+#: ../addressbook/libedata-book/e-data-book.c:459
+msgid "Cannot modify contact"
+msgstr "ä¸?è?½ä¿®æ?¹é?£çµ¡äºº"
+
+# mail/mail-crypto.c:251
+#: ../addressbook/libedata-book/e-data-book.c:494
+msgid "Cannot remove contacts"
+msgstr "ä¸?è?½ç§»é?¤é?£çµ¡äºº"
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: ../addressbook/libedata-book/e-data-book.c:569
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+msgid "Invalid query"
+msgstr "ç?¡æ??ç??æ?¥è©¢"
+
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#: ../addressbook/libedata-book/e-data-book.c:598
+msgid "Cannot get changes"
+msgstr "ä¸?è?½å??å¾?è®?æ?´"
+
+# calendar/gui/e-itip-control.c:883
+#: ../addressbook/libedata-book/e-data-book.c:699
+msgid "Cannot complete operation"
+msgstr "ä¸?è?½å®?æ??æ¤é ?æ??ä½?"
+
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
 #: ../libedataserver/e-categories.c:46
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:744
 #, c-format
 msgid "Birthday: %s"
 msgstr "ç??æ?¥ï¼?%s"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:768
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ç´?å¿µæ?¥ï¼?%s"
@@ -845,33 +825,33 @@ msgid "Cannot save calendar data"
 msgstr "ä¸?è?½å?²å?è¡?äº?æ??è³?æ??"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
 msgid "Could not create thread for getting deltas"
 msgstr "ç?¡æ³?å»ºæ§?å??å¾? deltas ç??å?·è¡?ç·?"
 
 # camel/providers/local/camel-mbox-store.c:110
-#: ../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:659
-#: ../calendar/backends/weather/e-cal-backend-weather.c:486
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
+#: ../calendar/backends/google/e-cal-backend-google.c:1142
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1079
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1380
+#: ../calendar/backends/http/e-cal-backend-http.c:676
+#: ../calendar/backends/weather/e-cal-backend-weather.c:490
 msgid "Could not create cache file"
 msgstr "ç?¡æ³?å»ºæ§?å¿«å??æª?æ¡?"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1093
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1092
 msgid "Could not create thread for populating cache"
 msgstr "ç?¡æ³?å»ºæ§?ç§»æ¤?å¿«å??ç??å?·è¡?ç·?"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2122
 msgid "Reply Requested: by "
 msgstr "è¦?æ±?å??è¦?ï¼?ä¾?"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2127
 msgid "Reply Requested: When convenient"
 msgstr "è¦?æ±?å??è¦?ï¼?ç?¶æ??ç©ºæ??"
 
@@ -882,27 +862,26 @@ msgstr "è¼?å?¥ %s å??é ?ç?®"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:917
 msgid "Calendar"
 msgstr "è¡?äº?æ??"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
 msgid "Invalid server URI"
 msgstr "ç?¡æ??ç??ä¼ºæ??å?¨ URI"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: ../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/backends/groupwise/e-cal-backend-groupwise.c:994
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1003
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1097
+#: ../calendar/libecal/e-cal.c:3953
 #: ../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-folder.c:1335
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1371
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1386
 #: ../camel/providers/groupwise/camel-groupwise-store.c:598
 #: ../camel/providers/groupwise/camel-groupwise-store.c:773
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:154
@@ -911,18 +890,18 @@ msgid "Authentication failed"
 msgstr "é©?è?å¤±æ??"
 
 # mail/mail-config.glade.h:37
-#: ../calendar/backends/http/e-cal-backend-http.c:316
+#: ../calendar/backends/http/e-cal-backend-http.c:333
 msgid "Redirected to Invalid URI"
 msgstr "é??æ?°æ??å??ç?¡æ??ç?? URI"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/backends/http/e-cal-backend-http.c:339
+#: ../calendar/backends/http/e-cal-backend-http.c:356
 msgid "Bad file format."
 msgstr "é?¯èª¤ç??æª?æ¡?æ ¼å¼?ã??"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../calendar/backends/http/e-cal-backend-http.c:346
+#: ../calendar/backends/http/e-cal-backend-http.c:363
 msgid "Not a calendar."
 msgstr "ä¸¦é??è¡?äº?æ??ã??"
 
@@ -931,205 +910,205 @@ msgstr "ä¸¦é??è¡?äº?æ??ã??"
 msgid "Could not retrieve weather data"
 msgstr "ç?¡æ³?å??å¾?å¤©æ°£è³?æ??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:249
 msgid "Weather: Fog"
 msgstr "å¤©æ°£ï¼?èµ·é?§"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-msgid "Weather: Cloudy"
-msgstr "å¤©æ°£ï¼?å¤?é?²"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:250
 msgid "Weather: Cloudy Night"
 msgstr "å¤©æ°£ï¼?å¤?é?²ç??å¤?æ??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+msgid "Weather: Cloudy"
+msgstr "å¤©æ°£ï¼?å¤?é?²"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
 msgid "Weather: Overcast"
 msgstr "å¤©æ°£ï¼?å¤?é?²"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
 msgid "Weather: Showers"
 msgstr "å¤©æ°£ï¼?é?£é?¨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Snow"
 msgstr "å¤©æ°£ï¼?ä¸?é?ª"
 
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+msgid "Weather: Clear Night"
+msgstr "å¤©æ°£ï¼?æ?´æ??ç??å¤?æ??"
+
 # ui/evolution-event-editor.xml.h:9
 # ui/evolution-task-editor-dialog.xml.h:10
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Sunny"
 msgstr "å¤©æ°£ï¼?è?·é?½"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
-msgid "Weather: Clear Night"
-msgstr "å¤©æ°£ï¼?æ?´æ??ç??å¤?æ??"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
 msgid "Weather: Thunderstorms"
 msgstr "å¤©æ°£ï¼?é?·æ?´"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:400
+#: ../calendar/backends/weather/e-cal-backend-weather.c:403
 msgid "Forecast"
 msgstr "å¤©æ°£é ?å ±"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: ../calendar/libecal/e-cal-component.c:1320
+#: ../calendar/libecal/e-cal-component.c:1316
 msgid "Untitled appointment"
 msgstr "æ?ªå?½å??ç??ç´?æ??"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3945
+#: ../calendar/libecal/e-cal-recur.c:3951
 msgid "1st"
 msgstr "1æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3946
+#: ../calendar/libecal/e-cal-recur.c:3952
 msgid "2nd"
 msgstr "2æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3947
+#: ../calendar/libecal/e-cal-recur.c:3953
 msgid "3rd"
 msgstr "3æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3948
+#: ../calendar/libecal/e-cal-recur.c:3954
 msgid "4th"
 msgstr "4æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3949
+#: ../calendar/libecal/e-cal-recur.c:3955
 msgid "5th"
 msgstr "5æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3950
+#: ../calendar/libecal/e-cal-recur.c:3956
 msgid "6th"
 msgstr "6æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3957
 msgid "7th"
 msgstr "7æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3958
 msgid "8th"
 msgstr "8æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3959
 msgid "9th"
 msgstr "9æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3960
 msgid "10th"
 msgstr "10æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3961
 msgid "11th"
 msgstr "11æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3962
 msgid "12th"
 msgstr "12æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3963
 msgid "13th"
 msgstr "13æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3964
 msgid "14th"
 msgstr "14æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3965
 msgid "15th"
 msgstr "15æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3966
 msgid "16th"
 msgstr "16æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3967
 msgid "17th"
 msgstr "17æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3968
 msgid "18th"
 msgstr "18æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3969
 msgid "19th"
 msgstr "19æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3970
 msgid "20th"
 msgstr "20æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:3971
 msgid "21st"
 msgstr "21æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:3972
 msgid "22nd"
 msgstr "22æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:3973
 msgid "23rd"
 msgstr "23æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:3974
 msgid "24th"
 msgstr "24æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:3975
 msgid "25th"
 msgstr "25æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:3976
 msgid "26th"
 msgstr "26æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:3977
 msgid "27th"
 msgstr "27æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:3978
 msgid "28th"
 msgstr "28æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:3979
 msgid "29th"
 msgstr "29æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:3980
 msgid "30th"
 msgstr "30æ?¥"
 
 # calendar/gui/print.c:306
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "31st"
 msgstr "31æ?¥"
 
@@ -1138,11 +1117,11 @@ msgstr "31æ?¥"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:10
 # calendar/gui/e-calendar-table.c:345
 # mail/message-list.c:689
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:712
+#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:715
 msgid "High"
 msgstr "é«?"
 
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:714
+#: ../calendar/libecal/e-cal-util.c:690 ../calendar/libecal/e-cal-util.c:717
 msgid "Normal"
 msgstr "ä¸?è?¬"
 
@@ -1151,7 +1130,7 @@ msgstr "ä¸?è?¬"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:12
 # calendar/gui/e-calendar-table.c:347
 # mail/message-list.c:687
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:692 ../calendar/libecal/e-cal-util.c:719
 msgid "Low"
 msgstr "ä½?"
 
@@ -1159,12 +1138,12 @@ msgstr "ä½?"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:710
+#: ../calendar/libecal/e-cal-util.c:713
 msgid "Undefined"
 msgstr "æ?ªæ??å®?"
 
 # camel/camel-smime-context.c:194
-#: ../calendar/libecal/e-cal.c:1693 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1138 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
@@ -1174,36 +1153,36 @@ msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1707
+#: ../calendar/libecal/e-cal.c:1152
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "è¼¸å?¥ %s ç??å¯?ç¢¼ä»¥ä¾¿ä½¿ç?¨è?? %s è?½ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libecal/e-cal.c:5089
+#: ../calendar/libecal/e-cal.c:3925
 msgid "Invalid argument"
 msgstr "ç?¡æ??ç??å??æ?¸"
 
-#: ../calendar/libecal/e-cal.c:5091
+#: ../calendar/libecal/e-cal.c:3927
 msgid "Backend is busy"
 msgstr "å¾?ç«¯å¿?ç¢?ä¸"
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
-#: ../calendar/libecal/e-cal.c:5093
+#: ../calendar/libecal/e-cal.c:3929
 #: ../calendar/libedata-cal/e-cal-backend-util.c:105
 msgid "Repository is offline"
 msgstr "å??åº«å·²é?¢ç·?"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../calendar/libecal/e-cal.c:5095
+#: ../calendar/libecal/e-cal.c:3931
 #: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "No such calendar"
 msgstr "ç?¡æ¤è¡?äº?æ??"
 
-#: ../calendar/libecal/e-cal.c:5097
+#: ../calendar/libecal/e-cal.c:3933
 #: ../calendar/libedata-cal/e-cal-backend-util.c:111
 #: ../servers/groupwise/e-gw-connection.c:233
 msgid "Object not found"
@@ -1211,43 +1190,42 @@ msgstr "æ?¾ä¸?å?°ç?©ä»¶"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libecal/e-cal.c:5099
+#: ../calendar/libecal/e-cal.c:3935
 #: ../calendar/libedata-cal/e-cal-backend-util.c:113
 #: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid object"
 msgstr "ç?¡æ??ç??ç?©ä»¶"
 
 # addressbook/conduit/address-conduit.c:214
-#: ../calendar/libecal/e-cal.c:5101
+#: ../calendar/libecal/e-cal.c:3937
 msgid "URI not loaded"
 msgstr "URI æ?ªè¼?å?¥"
 
-#: ../calendar/libecal/e-cal.c:5103
+#: ../calendar/libecal/e-cal.c:3939
 msgid "URI already loaded"
 msgstr "URI å·²è¼?å?¥"
 
 # shell/e-storage.c:475
-#: ../calendar/libecal/e-cal.c:5105
+#: ../calendar/libecal/e-cal.c:3941
 #: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:573
 msgid "Permission denied"
 msgstr "æ¬?é??ä¸?è¶³"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:5107
+#: ../calendar/libecal/e-cal.c:3943
 #: ../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:5109
+#: ../calendar/libecal/e-cal.c:3945
 #: ../calendar/libedata-cal/e-cal-backend-util.c:115
 msgid "Object ID already exists"
 msgstr "ç?©ä»¶ ID å·²å?å?¨"
 
 # shell/e-storage.c:477
-#: ../calendar/libecal/e-cal.c:5111
+#: ../calendar/libecal/e-cal.c:3947
 msgid "Protocol not supported"
 msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
 
@@ -1255,34 +1233,34 @@ msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../calendar/libecal/e-cal.c:5113
+#: ../calendar/libecal/e-cal.c:3949
 msgid "Operation has been canceled"
 msgstr "æ??ä½?å·²å??æ¶?"
 
 # calendar/gui/e-itip-control.c:883
-#: ../calendar/libecal/e-cal.c:5115
+#: ../calendar/libecal/e-cal.c:3951
 #: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Could not cancel operation"
 msgstr "ç?¡æ³?å??æ¶?æ??ä½?"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
-#: ../calendar/libecal/e-cal.c:5119
+#: ../calendar/libecal/e-cal.c:3955
 #: ../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:5121
+#: ../calendar/libecal/e-cal.c:3957
 msgid "A CORBA exception has occurred"
 msgstr "ç?¼ç?? CORBA ä¾?å¤?"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:5123
+#: ../calendar/libecal/e-cal.c:3959
 #: ../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/imap/camel-imap-store.c:741
 #: ../camel/providers/imap4/camel-imap4-engine.c:1547
 #: ../camel/providers/imap4/camel-imap4-engine.c:1585
 #: ../camel/providers/imap4/camel-imap4-engine.c:1629
@@ -1290,18 +1268,14 @@ msgstr "ç?¼ç?? CORBA ä¾?å¤?"
 #: ../camel/providers/imap4/camel-imap4-store.c:311
 #: ../camel/providers/imap4/camel-imap4-store.c:818
 #: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:552
-#: ../camel/providers/pop3/camel-pop3-store.c:559
-#: ../camel/providers/pop3/camel-pop3-store.c:565
-#: ../servers/exchange/storage/e-storage.c:587
+#: ../camel/providers/pop3/camel-pop3-store.c:582
 #: ../servers/groupwise/e-gw-connection.c:241
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
 # shell/e-storage.c:459
-#: ../calendar/libecal/e-cal.c:5125
+#: ../calendar/libecal/e-cal.c:3961
 #: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:555
 msgid "No error"
 msgstr "æ²?æ??é?¯èª¤"
 
@@ -1437,12 +1411,6 @@ msgstr "è¶?é??æ??å°?å¤§å°?é??å?¶"
 msgid "Search time limit exceeded"
 msgstr "è¶?é??æ??å°?æ??é??é??å?¶"
 
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "ç?¡æ??ç??æ?¥è©¢"
-
 #: ../calendar/libedata-cal/e-cal-backend-util.c:141
 msgid "Query refused"
 msgstr "æ?¥è©¢è¢«æ??çµ?"
@@ -1453,6 +1421,145 @@ msgstr "æ?¥è©¢è¢«æ??çµ?"
 msgid "Invalid server version"
 msgstr "ç?¡æ??ç??ä¼ºæ??å?¨ç??æ?¬"
 
+#: ../calendar/libedata-cal/e-data-cal.c:491
+#, c-format
+msgid "Cannot retrieve calendar address"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ä½?å??"
+
+#: ../calendar/libedata-cal/e-data-cal.c:509
+#, c-format
+msgid "Cannot retrieve calendar alarm e-mail address"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??é¬§é?´é?»å?é?µä»¶ä½?å??"
+
+#: ../calendar/libedata-cal/e-data-cal.c:527
+#, c-format
+msgid "Cannot retrieve calendar's ldap attribute"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?? ldap å±¬æ?§"
+
+# camel/camel-filter-driver.c:671
+#: ../calendar/libedata-cal/e-data-cal.c:545
+#, c-format
+msgid "Cannot retrieve calendar scheduling information"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??è¡?ç¨?è³?è¨?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:562
+#, c-format
+msgid "Cannot open calendar"
+msgstr "ä¸?è?½é??å??è¡?äº?æ??"
+
+#: ../calendar/libedata-cal/e-data-cal.c:579
+#, c-format
+msgid "Cannot refresh calendar"
+msgstr "ä¸?è?½é??æ?°æ?´ç??è¡?äº?æ??"
+
+#: ../calendar/libedata-cal/e-data-cal.c:596
+#, c-format
+msgid "Cannot remove calendar"
+msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??"
+
+# mail/mail-crypto.c:251
+#: ../calendar/libedata-cal/e-data-cal.c:615
+#, c-format
+msgid "Cannot create calendar object"
+msgstr "ä¸?è?½å»ºç«?è¡?äº?æ??ç?©ä»¶"
+
+#: ../calendar/libedata-cal/e-data-cal.c:637
+#, c-format
+msgid "Cannot modify calender object"
+msgstr "ä¸?è?½ä¿®æ?¹è¡?äº?æ??ç?©ä»¶"
+
+#: ../calendar/libedata-cal/e-data-cal.c:661
+#, c-format
+msgid "Cannot remove calendar object"
+msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??ç?©ä»¶"
+
+#: ../calendar/libedata-cal/e-data-cal.c:680
+#, c-format
+msgid "Cannot receive calendar objects"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶"
+
+#: ../calendar/libedata-cal/e-data-cal.c:697
+#, c-format
+msgid "Cannot discard calendar alarm"
+msgstr "ä¸?è?½å??æ¶?è¡?äº?æ??é¬§é?´"
+
+#: ../calendar/libedata-cal/e-data-cal.c:716
+#, c-format
+msgid "Cannot send calendar objects"
+msgstr "ä¸?è?½å?³é??è¡?äº?æ??ç?©ä»¶"
+
+#: ../calendar/libedata-cal/e-data-cal.c:751
+#, c-format
+msgid "Cannot retrieve default calendar object path"
+msgstr "ä¸?è?½å??å¾?é ?è¨ç??è¡?äº?æ??ç?©ä»¶è·¯å¾?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:769
+#, c-format
+msgid "Cannot retrieve calendar object path"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶è·¯å¾?"
+
+#: ../calendar/libedata-cal/e-data-cal.c:787
+#, c-format
+msgid "Cannot retrieve calendar object list"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶æ¸?å?®"
+
+# mail/mail-ops.c:1872
+#: ../calendar/libedata-cal/e-data-cal.c:825
+#, c-format
+msgid "Could not retrieve attachment list"
+msgstr "ä¸?è?½å??å¾?é??ä»¶æ¸?å?®"
+
+# camel/providers/local/camel-mbox-store.c:110
+#: ../calendar/libedata-cal/e-data-cal.c:847
+#, c-format
+msgid "Could not complete calendar query"
+msgstr "ä¸?è?½å®?æ??è¡?äº?æ??æ?¥è©¢"
+
+# mail/mail-ops.c:1872
+#: ../calendar/libedata-cal/e-data-cal.c:865
+#, c-format
+msgid "Could not retrieve calendar time zone"
+msgstr "ä¸?è?½å??å¾?å¤©æ°£è¡?äº?æ??æ??å??"
+
+# calendar/gui/e-itip-control.c:883
+#: ../calendar/libedata-cal/e-data-cal.c:883
+#, c-format
+msgid "Could not add calendar time zone"
+msgstr "ä¸?è?½å? å?¥è¡?äº?æ??æ??å??"
+
+#: ../calendar/libedata-cal/e-data-cal.c:900
+#, c-format
+msgid "Could not set default calendar time zone"
+msgstr "ä¸?è?½è¨å®?é ?è¨ç??è¡?äº?æ??æ??å??"
+
+#: ../calendar/libedata-cal/e-data-cal.c:921
+#, c-format
+msgid "Cannot retrieve calendar changes"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??è®?æ?´"
+
+#: ../calendar/libedata-cal/e-data-cal.c:971
+#, c-format
+msgid "Cannot retrieve calendar free/busy list"
+msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç©ºé??/å¿?ç¢?æ¸?å?®"
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#, c-format
+msgid "Invalid URI"
+msgstr "ç?¡æ??ç?? URI"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "æ²?æ??ã??%2$sã??ç??ã??%1$sã??ç??å¾?ç«¯å·¥å» "
+
+# camel/providers/local/camel-mbox-store.c:110
+#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#, c-format
+msgid "Could not instantiate backend"
+msgstr "ç?¡æ³?å¯¦é«?å??å¾?ç«¯ç¨?å¼?"
+
 # camel/camel-cipher-context.c:171
 #: ../camel/camel-cipher-context.c:102
 msgid "Signing is not supported by this cipher"
@@ -1504,17 +1611,17 @@ msgid "You may not export keys with this cipher"
 msgstr "æ?¨ä¸?è?½å?¯å?ºé??ç¨®å? å¯?æ?¹å¼?ç??é??é?°"
 
 # mail/mail-ops.c:1728
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-data-cache.c:135
 msgid "Unable to create cache path"
 msgstr "ç?¡æ³?å»ºæ§?å¿«å??è·¯å¾?"
 
 # camel/providers/imap/camel-imap-message-cache.c:150
-#: ../camel/camel-data-cache.c:402
+#: ../camel/camel-data-cache.c:401
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ç?¡æ³?ç§»é?¤å¿«å??é ?ç?®ï¼? %sï¼? %s"
 
-#: ../camel/camel-db.c:412
+#: ../camel/camel-db.c:411
 msgid "Insufficient memory"
 msgstr "è¨?æ?¶é«?ä¸?è¶³"
 
@@ -1563,10 +1670,10 @@ msgstr "æº?å??è³?æ??å¤¾ã??%sã??ä¾?é?¢ç·?ä½¿ç?¨"
 # camel/camel-disco-store.c:271
 #: ../camel/camel-disco-store.c:400
 #: ../camel/providers/groupwise/camel-groupwise-store.c:223
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:3014
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imap/camel-imap-store.c:1843
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imap/camel-imap-store.c:3068
 msgid "You must be working online to complete this operation"
 msgstr "æ?¨å¿?é ?æ?¼ç·?ä¸?å·¥ä½?æ??è?½å®?æ??æ¤æ??ä½?"
 
@@ -1737,53 +1844,54 @@ msgstr "(%s) æ??æ??é?£å??çµ?æ??"
 msgid "(%s) requires the folder set"
 msgstr "(%s) é??è¦?è³?æ??å¤¾è¨å®?"
 
-#: ../camel/camel-folder.c:683
+#: ../camel/camel-folder.c:669
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "ä¸?æ?¯æ?´ç??æ??ä½?ï¼?æ·»å? é?µä»¶ï¼? %s"
 
 # camel/camel-folder-search.c:338
-#: ../camel/camel-folder.c:1388
+#: ../camel/camel-folder.c:1374
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "ä¸?æ?¯æ?´ç??æ??ä½?ï¼?ä»¥è©?å?¥æ??å°?ï¼? %s"
 
 # camel/camel-folder-search.c:338
-#: ../camel/camel-folder.c:1429
+#: ../camel/camel-folder.c:1415
 #, c-format
 msgid "Unsupported operation: count by expression: for %s"
 msgstr "ä¸?æ?¯æ?´ç??æ??ä½?ï¼?ä»¥è©?å?¥è¨?æ?¸ï¼?ç?¨æ?¼ %s"
 
-#: ../camel/camel-folder.c:1468
+#: ../camel/camel-folder.c:1454
 #, c-format
 msgid "Unsupported operation: search by UIDs: for %s"
 msgstr "ä¸?æ?¯æ?´ç??æ??ä½?ï¼?ä»¥ UIDs æ??å°?ï¼? %s"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:1567
+#: ../camel/providers/local/camel-maildir-folder.c:387
 msgid "Moving messages"
 msgstr "æ£å?¨ç§»å??é?µä»¶"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:1567
 msgid "Copying messages"
 msgstr "æ£å?¨è¤?è£½é?µä»¶"
 
 # widgets/misc/e-messagebox.c:159
-#: ../camel/camel-folder.c:1922
+#: ../camel/camel-folder.c:1908
 msgid "Learning junk"
 msgstr "äº?è§£å??å?¾é?µä»¶"
 
-#: ../camel/camel-folder.c:1939
+#: ../camel/camel-folder.c:1926
 msgid "Learning non-junk"
 msgstr "äº?è§£é??å??å?¾é?µä»¶"
 
 # mail/mail-ops.c:1565
-#: ../camel/camel-folder.c:1958
+#: ../camel/camel-folder.c:1946
 msgid "Filtering new message(s)"
 msgstr "å??å?? %d å°?é?µä»¶"
 
-#: ../camel/camel-gpg-context.c:751
+#: ../camel/camel-gpg-context.c:760
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1794,15 +1902,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:766
+#: ../camel/camel-gpg-context.c:775
 msgid "Failed to parse gpg userid hint."
 msgstr "è§£æ?? gpg userid æ??ç¤ºæ??å¤±æ??ã??"
 
-#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:804
+#: ../camel/camel-gpg-context.c:799 ../camel/camel-gpg-context.c:813
 msgid "Failed to parse gpg passphrase request."
 msgstr "è§£æ?? gpg å¯?èª?è¦?æ±?æ??å¤±æ??ã??"
 
-#: ../camel/camel-gpg-context.c:824
+#: ../camel/camel-gpg-context.c:833
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1811,7 +1919,7 @@ msgstr ""
 "é??è¦? PIN æ??è?½ç?ºæ?¨ç??æ?ºæ?§å?¡è§£é??ï¼?\n"
 "ã??%sã??"
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:837
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1821,106 +1929,101 @@ msgstr ""
 "ã??%sã??"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:842
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG å?³å??å°?ã??%sã??æ?ªé ?æ??ç??è¦?æ±?"
 
 # mail/mail-send-recv.c:471
-#: ../camel/camel-gpg-context.c:858 ../camel/camel-gpg-context.c:1067
+#: ../camel/camel-gpg-context.c:867 ../camel/camel-gpg-context.c:1113
 #: ../camel/providers/nntp/camel-nntp-store.c:1313
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../camel/camel-gpg-context.c:872
+#: ../camel/camel-gpg-context.c:881
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "è§£é??ç§?å¯?é??é?°æ??å¤±æ??ï¼?è¼¸å?¥äº? 3 æ¬¡é?¯èª¤ç??å¯?èª? ã??"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/camel-gpg-context.c:880
+#: ../camel/camel-gpg-context.c:889
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "å¾? GnuPG å?³å??æ??å¤?ç??å??æ??ï¼? %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/camel-gpg-context.c:943
+#: ../camel/camel-gpg-context.c:988
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ä¸?è?½å? å¯?é?µä»¶ï¼?æ²?æ??æ??ä¾?æ??æ??ç??æ?¶ä»¶è??ã??"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
 #. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1205 ../camel/camel-gpg-context.c:1330
-#: ../camel/camel-gpg-context.c:1852 ../camel/camel-gpg-context.c:1897
+#: ../camel/camel-gpg-context.c:1262 ../camel/camel-gpg-context.c:1387
+#: ../camel/camel-gpg-context.c:1953 ../camel/camel-gpg-context.c:1998
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "å?·è¡? gpg å¤±æ??ï¼? %s"
 
 # mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1298 ../camel/camel-smime-context.c:602
+#: ../camel/camel-gpg-context.c:1355 ../camel/camel-smime-context.c:605
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "ç?¡æ³?ç?¢ç??ç°½ç« è³?æ??ï¼?%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-gpg-context.c:1345 ../camel/camel-gpg-context.c:1546
-#: ../camel/camel-gpg-context.c:1562 ../camel/camel-gpg-context.c:1642
-#: ../camel/camel-gpg-context.c:1657 ../camel/camel-gpg-context.c:1773
-#: ../camel/camel-gpg-context.c:1788 ../camel/camel-gpg-context.c:1868
-#: ../camel/camel-gpg-context.c:1913
+#: ../camel/camel-gpg-context.c:1402 ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1646 ../camel/camel-gpg-context.c:1728
+#: ../camel/camel-gpg-context.c:1743 ../camel/camel-gpg-context.c:1859
+#: ../camel/camel-gpg-context.c:1874 ../camel/camel-gpg-context.c:1969
+#: ../camel/camel-gpg-context.c:2014
 msgid "Failed to execute gpg."
 msgstr "å?·è¡? gpg å¤±æ??ã??"
 
-#: ../camel/camel-gpg-context.c:1364
-msgid "This is a digitally signed message part"
-msgstr "é??æ?¯æ??æ?¸ä½?ç°½ç« ç??é?µä»¶"
-
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1450 ../camel/camel-gpg-context.c:1456
-#: ../camel/camel-gpg-context.c:1462 ../camel/camel-gpg-context.c:1477
-#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
+#: ../camel/camel-gpg-context.c:1534 ../camel/camel-gpg-context.c:1540
+#: ../camel/camel-gpg-context.c:1546 ../camel/camel-gpg-context.c:1561
+#: ../camel/camel-smime-context.c:929 ../camel/camel-smime-context.c:940
+#: ../camel/camel-smime-context.c:947
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ä¸?è?½é©?è?æ¤é?µä»¶ç??ç°½ç« ï¼?é?¯èª¤ç??è¨?æ?¯æ ¼å¼?"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1516
+#: ../camel/camel-gpg-context.c:1600
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "ä¸?è?½é©?è?æ¤é?µä»¶ç??ç°½ç« ï¼?ç?¡æ³?å»ºæ§?æ?«å?æª?æ¡?ï¼?%s"
 
 # mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1625
+#: ../camel/camel-gpg-context.c:1711
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "ç?¡æ³?ç?¢ç??å? å¯?è³?æ??ï¼?%s"
 
-#: ../camel/camel-gpg-context.c:1675
+#: ../camel/camel-gpg-context.c:1761
 msgid "This is a digitally encrypted message part"
 msgstr "é??æ?¯æ?¸ä½?å??å? å¯?è¨?æ?¯é?¨ä»½"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1728 ../camel/camel-gpg-context.c:1736
-#: ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-gpg-context.c:1814 ../camel/camel-gpg-context.c:1822
+#: ../camel/camel-gpg-context.c:1841
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ä¸?è?½è§£å¯?æ¤é?µä»¶ï¼?é?¯èª¤ç??è¨?æ?¯æ ¼å¼?"
 
-#: ../camel/camel-gpg-context.c:1745
+#: ../camel/camel-gpg-context.c:1831
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "è§£å¯? MIME çµ?ä»¶æ??å¤±æ??ï¼?é??è¨?å??å®?é?¯èª¤"
 
-#: ../camel/camel-gpg-context.c:1810 ../camel/camel-smime-context.c:1186
+#: ../camel/camel-gpg-context.c:1909 ../camel/camel-smime-context.c:1205
 msgid "Encrypted content"
 msgstr "å? å¯?å?§å®¹"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: ../camel/camel-gpg-context.c:1829
+#: ../camel/camel-gpg-context.c:1930
 msgid "Unable to parse message content"
 msgstr "ç?¡æ³?å¾?ç·¨è¼¯å?¨å??å¾?é?µä»¶"
 
-#: ../camel/camel-gpg-context.c:1853 ../camel/camel-gpg-context.c:1898
-#: ../camel/camel-tcp-stream-openssl.c:627
+#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:1999
 #: ../camel/providers/imap4/camel-imap4-utils.c:614
 #: ../camel/providers/smtp/camel-smtp-transport.c:165
 #: ../camel/providers/smtp/camel-smtp-transport.c:220
@@ -2054,14 +2157,14 @@ msgstr "è§£æ??é?¯èª¤"
 # camel/camel-service.c:544
 # camel/camel-service.c:580
 #: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:806
-#: ../camel/providers/pop3/camel-pop3-store.c:446
-#: ../camel/providers/pop3/camel-pop3-store.c:546
+#: ../camel/camel-net-utils.c:805
+#: ../camel/providers/pop3/camel-pop3-store.c:476
+#: ../camel/providers/pop3/camel-pop3-store.c:576
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-net-utils.c:522
+#: ../camel/camel-net-utils.c:521
 msgid "cannot create thread"
 msgstr "ç?¡æ³?å»ºæ§?å?·è¡?ç·?"
 
@@ -2083,16 +2186,16 @@ msgid "Host lookup failed: %s: %s"
 msgstr "æ??å°?ä¸»æ©?å¤±æ??ï¼? %s ï¼?%s"
 
 # camel/camel-service.c:548
-#: ../camel/camel-net-utils.c:810
+#: ../camel/camel-net-utils.c:809
 msgid "Resolving address"
 msgstr "è§£æ??ä½?å??"
 
-#: ../camel/camel-net-utils.c:830
+#: ../camel/camel-net-utils.c:829
 msgid "Name lookup failed"
 msgstr "æ?¥è©¢å??ç¨±å¤±æ??"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/camel-net-utils.c:833
+#: ../camel/camel-net-utils.c:832
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "æ??å°?å??ç¨±å¤±æ??ï¼? %s"
@@ -2140,7 +2243,7 @@ msgstr "ç?¡æ³?è¼?å?¥ %sï¼?æ¨¡çµ?å?§æ²?æ??å??å§?ç¢¼ã??"
 
 # camel/camel-session.c:295
 # camel/camel-session.c:364
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "æ²?æ??é??è¨?å??å®?ã??%sã??ç??æ??ä¾?è??"
@@ -2249,100 +2352,79 @@ msgstr "ä¼ºæ??å?¨å??æ??å??å?«ä¸?å®?æ?´ç??æ??æ¬?è³?æ??"
 msgid "Server response does not match"
 msgstr "ä¼ºæ??å?¨å??æ??ä¸?ç¬¦"
 
-#: ../camel/camel-sasl-gssapi.c:63
+#: ../camel/camel-sasl-gssapi.c:72
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
 # camel/camel-sasl-kerberos4.c:42
-#: ../camel/camel-sasl-gssapi.c:65
+#: ../camel/camel-sasl-gssapi.c:74
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ Kerberos 5 é©?è?é?£ç·?è?³ä¼ºæ??å?¨ã??"
 
-#: ../camel/camel-sasl-gssapi.c:159
+#: ../camel/camel-sasl-gssapi.c:168
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr "æ??ä¾?ç??è?ä»¶ä¸?æ?¯æ?´æ??å®?ç??æ©?å?¶ï¼?æ??è??æ?¯å?·è¡?ç?¡æ³?è¾¨è?ã??"
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:173
 msgid "The provided target_name parameter was ill-formed."
 msgstr "æ??ä¾?ç?? target_name å??æ?¸æ ¼å¼?é?¯èª¤ã??"
 
-#: ../camel/camel-sasl-gssapi.c:167
+#: ../camel/camel-sasl-gssapi.c:176
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "æ??ä¾?ç?? target_name å??æ?¸å??å?«ç?¡æ??æ??ä¸?æ?¯æ?´ç??å??ç¨±é¡?å??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:171
+#: ../camel/camel-sasl-gssapi.c:180
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr ""
 "input_token å??å?«ä¸?å??ç??é??é??ï¼?é??é??  input_chan_bindingsï¼?é?£çµ?è?³é??äº?æ??å®?ç??å??æ?¸ã??"
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:185
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "input_token å??å?«ç?¡æ??ç??ç°½ç« ï¼?æ??è??ç?¡æ³?ç¢ºèª?ç??ç°½ç« ã??"
 
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../camel/camel-sasl-gssapi.c:189
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 msgstr "æ??ä¾?ç??è?ä»¶ä¸?é?©ç?¨æ?¼ç¶²è·¯ä½?ç½®ï¼?æ??è??è?ä»¶è?å?¥æ??æ¨?æ?ªå??ç?§ä»»ä½?æ??è?ã??"
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:194
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "æ??ä¾?ç??ç¶²è·¯ä½?ç½®è?å?¥æ??æ¨?æ?ªå??ç?§æ??æ??ç??ç¶²è·¯ä½?ç½®ã??"
 
-#: ../camel/camel-sasl-gssapi.c:188
+#: ../camel/camel-sasl-gssapi.c:197
 msgid "The consistency checks performed on the input_token failed."
 msgstr "å?¨ input_token å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:191
+#: ../camel/camel-sasl-gssapi.c:200
 msgid "The consistency checks performed on the credential failed."
 msgstr "å?¨è?ä»¶å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:203
 msgid "The referenced credentials have expired."
 msgstr "å??ç?§ç??è?ä»¶å·²ç¶?é??æ??ã??"
 
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
-#: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
-#: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
-#: ../camel/camel-sasl-kerberos4.c:230
-#: ../camel/providers/imap/camel-imap-store.c:1274
+#: ../camel/camel-sasl-gssapi.c:209 ../camel/camel-sasl-gssapi.c:316
+#: ../camel/camel-sasl-gssapi.c:358 ../camel/camel-sasl-gssapi.c:373
+#: ../camel/providers/imap/camel-imap-store.c:1272
 msgid "Bad authentication response from server."
 msgstr "ä¾?è?ªä¼ºæ??å?¨ç??ä¸?è?¯è¨±å?¯å??æ??ã??"
 
 # mail/mail-config.glade.h:1
-#: ../camel/camel-sasl-gssapi.c:309
+#: ../camel/camel-sasl-gssapi.c:383
 msgid "Unsupported security layer."
 msgstr "ä¸?æ?¯æ?´ç??é¡?å??"
 
-# camel/camel-sasl-kerberos4.c:40
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-# camel/camel-sasl-kerberos4.c:42
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ Kerberos 4 é©?è?é?£ç·?è?³ä¼ºæ??å?¨ã??"
-
-# camel/camel-sasl-kerberos4.c:161
-#: ../camel/camel-sasl-kerberos4.c:173
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"ç?¡æ³?å??å¾? Kerberos ticketï¼?\n"
-"%s"
-
 # camel/camel-sasl-login.c:32
 #: ../camel/camel-sasl-login.c:36
 msgid "Login"
@@ -2396,7 +2478,7 @@ msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP å??æ?¼ SMTP å??è¨±ä½¿ç?¨é?? POP ä¾?æº?"
 
 # camel/camel-search-private.c:111
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:147
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "æ£è¦?è¡¨ç¤ºå¼?ç·¨è¯å¤±æ??ï¼? %sï¼? %s"
@@ -2420,7 +2502,7 @@ msgid "URL '%s' needs a path component"
 msgstr "URLã??%sã??é??è¦? path å??ä»¶"
 
 # camel/camel-session.c:479
-#: ../camel/camel-session.c:307
+#: ../camel/camel-session.c:305
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2430,148 +2512,148 @@ msgstr ""
 "%s"
 
 # camel/providers/pop3/camel-pop3-store.c:361
-#: ../camel/camel-session.c:479
+#: ../camel/camel-session.c:477
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "è«?è¼¸å?¥ %2$s æ?¼ä¸»æ©? %3$s ç?? %1$s å¯?ç¢¼ã??"
 
-#: ../camel/camel-session.c:817
+#: ../camel/camel-session.c:815
 msgid "Camel session doesn't support forwarding of a message."
 msgstr "Camel ä½?æ¥é??æ®µä¸?æ?¯æ?´è½?é??è¨?æ?¯ã??"
 
 # camel/camel-smime-context.c:327
-#: ../camel/camel-smime-context.c:444 ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "æ?¾ä¸?å?° '%s' ç??æ??è?"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:453
 msgid "Cannot create CMS message"
 msgstr "ç?¡æ³?å»ºæ§? CMS è¨?æ?¯"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot create CMS signed data"
 msgstr "ç?¡æ³?å»ºæ§? CMS signedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot attach CMS signed data"
 msgstr "ç?¡æ³?é??å?  CMS signedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot attach CMS data"
 msgstr "ç?¡æ³?é??å?  CMS è³?æ??"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot create CMS Signer information"
 msgstr "ç?¡æ³?å»ºæ§? CMS SignerInfo"
 
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:483
 msgid "Cannot find certificate chain"
 msgstr "æ?¾ä¸?å?°æ??è?é??"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:489
 msgid "Cannot add CMS Signing time"
 msgstr "ç?¡æ³?æ?°å¢? CMS SigningTime"
 
 # composer/e-msg-composer.c:1092
-#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ç??å? å¯?æ??è?ä¸?å?å?¨"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:530
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "ç?¡æ³?æ?°å¢? SMIMEEncKeyPrefs å±¬æ?§"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:535
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "ç?¡æ³?æ?°å¢? MS SMIMEEncKeyPrefs å±¬æ?§"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:540
 msgid "Cannot add encryption certificate"
 msgstr "ç?¡æ³?æ?°å¢?å? å¯?æ??è?"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:546
 msgid "Cannot add CMS Signer information"
 msgstr "ç?¡æ³?æ?°å¢? CMS SignerInfo"
 
 # mail/mail-crypto.c:251
-#: ../camel/camel-smime-context.c:613 ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
 msgid "Cannot create encoder context"
 msgstr "ç?¡æ³?å»ºæ§?ç·¨ç¢¼å?¨ç¶²è·¯ä½?ç½®"
 
 # camel/camel-movemail.c:274
-#: ../camel/camel-smime-context.c:619
+#: ../camel/camel-smime-context.c:622
 msgid "Failed to add data to CMS encoder"
 msgstr "ç?¡æ³?æ?°å¢?è³?æ??è?³ CMS ç·¨ç¢¼å?¨"
 
-#: ../camel/camel-smime-context.c:624 ../camel/camel-smime-context.c:1082
+#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1101
 msgid "Failed to encode data"
 msgstr "ç?¡æ³?ç·¨ç¢¼è³?æ??"
 
 # calendar/gui/calendar-model.c:1064
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:700
 msgid "Unverified"
 msgstr "æ?ªæ??å®?"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:702
 msgid "Good signature"
 msgstr "è?¯å¥½ç??ç°½ç« "
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:704
 msgid "Bad signature"
 msgstr "é?¯èª¤ç??ç°½ç« "
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:706
 msgid "Content tampered with or altered in transit"
 msgstr "å?§å®¹å?¨å?³é??æ??è¢«ç«?æ?¹æ??è®?æ?´"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:708
 msgid "Signing certificate not found"
 msgstr "æ?¾ä¸?å?°ç°½ç½²æ??è?"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:710
 msgid "Signing certificate not trusted"
 msgstr "ç°½ç½²æ??è?ä¸?å??ä¿¡ä»»"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:712
 msgid "Signature algorithm unknown"
 msgstr "æ?ªç?¥ç??ç°½ç« æ¼?ç®?æ³?"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:714
 msgid "Signature algorithm unsupported"
 msgstr "ä¸?æ?¯æ?´é??ç¨®ç°½ç« æ¼?ç®?æ³?"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:716
 msgid "Malformed signature"
 msgstr "æ ¼å¼?ä¸?è?¯ç??ç°½ç« "
 
 # shell/e-storage.c:467
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:718
 msgid "Processing error"
 msgstr "è§£æ??é?¯èª¤"
 
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:772
 msgid "No signed data in signature"
 msgstr "ç°½ç« ä¸æ²?æ??è¢«ç°½ç½²ç??è³?æ??"
 
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:777
 msgid "Digests missing from enveloped data"
 msgstr "å??è£¹ç??è³?æ??ä¸é?ºæ¼?æ??è¦?"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
 msgid "Cannot calculate digests"
 msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
 
@@ -2582,95 +2664,95 @@ msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
 msgid "Cannot set message digests"
 msgstr "ç?¡æ³?è¨å®?é?µä»¶æ??è¦?"
 
 # mail/mail-crypto.c:59
-#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
 msgid "Certificate import failed"
 msgstr "æ??è?å?¯å?¥å¤±æ??"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:836
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "é??æ??è?è¨?æ?¯ï¼?ç?¡æ³?é©?è?æ??è?"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:839
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "é??æ??è?è¨?æ?¯ã??å?¯å?¥å??é©?è?ç??æ??è?"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:843
 msgid "Cannot find signature digests"
 msgstr "æ?¾ä¸?å?°ç°½ç« æ??è¦?"
 
 # mail/mail-config.glade.h:72
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:859
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ç°½ç½²è??ï¼? %s<%s>ï¼? %s\n"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1184
 msgid "Decoder failed"
 msgstr "è§£ç¢¼å?¨å¤±æ??"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1019
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "æ?¾ä¸?å?°ä¸?è?¬å¤§é??å? å¯?æ¼?ç®?æ³?"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1027
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "ç?¡æ³?é??ç½®æ??æ§½çµ¦å? å¯?å¤§é??é?°å??"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1038
 msgid "Cannot create CMS Message"
 msgstr "ç?¡æ³?å»ºæ§? CMS è¨?æ?¯"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1044
 msgid "Cannot create CMS Enveloped data"
 msgstr "ç?¡æ³?å»ºæ§? CMS EnvelopedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1050
 msgid "Cannot attach CMS Enveloped data"
 msgstr "ç?¡æ³?é??å?  CMS EnvelopedData"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot attach CMS data object"
 msgstr "ç?¡æ³?é??å?  CMS è³?æ??ç?©ä»¶"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1065
 msgid "Cannot create CMS Recipient information"
 msgstr "ç?¡æ³?å»ºæ§? CMS RecipientInfo"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1070
 msgid "Cannot add CMS Recipient information"
 msgstr "ç?¡æ³?æ?°å¢? CMS RecipientInfo"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1095
 msgid "Failed to add data to encoder"
 msgstr "ç?¡æ³?æ?°å¢?è³?æ??è?³ç·¨ç¢¼å?¨"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1191
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME è§£å¯?ï¼?æ?¾ä¸?å?°å? å¯?å?§å®¹"
 
 # camel/providers/smtp/camel-smtp-transport.c:172
-#: ../camel/camel-smime-context.c:1200
+#: ../camel/camel-smime-context.c:1219
 msgid "import keys: unimplemented"
 msgstr "å?¯å?¥é?°å??ï¼?æ?ªå?·è¡?"
 
-#: ../camel/camel-smime-context.c:1208
+#: ../camel/camel-smime-context.c:1227
 msgid "export keys: unimplemented"
 msgstr "å?¯å?ºé?°å??ï¼?æ?ªå?·è¡?"
 
@@ -2730,127 +2812,7 @@ msgstr "å??æ?¶ç?"
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
-#: ../camel/camel-tcp-stream-openssl.c:564
-msgid "Unable to get issuer's certificate"
-msgstr "ç?¡æ³?å??å¾?ç?¼ç?§è??ç??æ??è?ã??"
-
-#: ../camel/camel-tcp-stream-openssl.c:566
-msgid "Unable to get Certificate Revocation List"
-msgstr "ç?¡æ³?å??å¾?æ??è?æ??é?·æ¸?å?®"
-
-#: ../camel/camel-tcp-stream-openssl.c:568
-msgid "Unable to decrypt certificate signature"
-msgstr "ç?¡æ³?è§£å¯?æ??è?ç°½ç« "
-
-#: ../camel/camel-tcp-stream-openssl.c:570
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "ç?¡æ³?è§£å¯?æ??è?è¨»é?·ç°½ç« "
-
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to decode issuer's public key"
-msgstr "ç?¡æ³?è§£ç¢¼ç?¼ç?§è??ç??å?¬é??é??é?°"
-
-# mail/mail-crypto.c:59
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Certificate signature failure"
-msgstr "æ??è?ç°½ç« å¤±æ??"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Certificate Revocation List signature failure"
-msgstr "æ??è?å»¢æ¢æ¸?å??ç°½ç« å¤±æ??"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Certificate not yet valid"
-msgstr "æ??è?å°?æ?ªç??æ??"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Certificate has expired"
-msgstr "æ??è?å·²ç¶?å¤±æ??"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate Revocation List (CRL) not yet valid"
-msgstr "æ??è?å»¢æ¢æ¸?å?? (CRL) å°?æ?ªç??æ??"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List (CRL) has expired"
-msgstr "æ??è?å»¢æ¢æ¸?å?? (CRL) å·²é?¾æ??"
-
-#: ../camel/camel-tcp-stream-openssl.c:589
-msgid "Error in Certificate Revocation List (CRL)"
-msgstr "æ??è?å»¢æ¢æ¸?å?? (CRL) ç?¼ç??é?¯èª¤"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:394
-#: ../camel/camel-tcp-stream-openssl.c:591
-msgid "Out of memory"
-msgstr "è¨?æ?¶é«?ä¸?è¶³"
-
-#: ../camel/camel-tcp-stream-openssl.c:593
-msgid "Zero-depth self-signed certificate"
-msgstr "é?¶æ·±åº¦ è?ªæ??ç°½ç½²ç??æ??è?"
-
-#: ../camel/camel-tcp-stream-openssl.c:595
-msgid "Self-signed certificate in chain"
-msgstr "å?¨æ??è?é??ä¸ç??è?ªæ??ç°½ç½²æ??è?"
-
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Unable to get issuer's certificate locally"
-msgstr "ç?¡æ³?è?ªæ?¬å?°ç«¯å??å¾?ç?¼ç?§è??ç??æ??è?"
-
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Unable to verify leaf signature"
-msgstr "é©?è? leaf æ??è?å¤±æ??ã??"
-
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Certificate chain too long"
-msgstr "æ??è?é??å¤ªé?·"
-
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Certificate Revoked"
-msgstr "æ??è?å·²è¨»é?·"
-
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Invalid Certificate Authority (CA)"
-msgstr "ç?¡æ??ç??æ??è?æ©?æ§? (CA)"
-
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Path length exceeded"
-msgstr "è·¯å¾?é?·åº¦é??é?·"
-
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Invalid purpose"
-msgstr "ç?¡æ??ç??ç?®ç??"
-
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate untrusted"
-msgstr "æ??è?ä¸?è¢«ä¿¡ä»»"
-
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Certificate rejected"
-msgstr "æ??è?è¢«æ??çµ?"
-
-#: ../camel/camel-tcp-stream-openssl.c:616
-msgid "Subject/Issuer mismatch"
-msgstr "ä¸»æ?¨/ç?¼ç?§è??ä¸?ç¬¦"
-
-#: ../camel/camel-tcp-stream-openssl.c:618
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID ä¸?ç¬¦"
-
-#: ../camel/camel-tcp-stream-openssl.c:620
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/ç?¼ç?§è??åº?å??ä¸?ç¬¦"
-
-#: ../camel/camel-tcp-stream-openssl.c:622
-msgid "Key usage does not support certificate signing"
-msgstr "é??é?°ç??ç?¨é??ä¸¦ä¸?æ?¯æ?´æ??è?ç°½ç½²"
-
-#: ../camel/camel-tcp-stream-openssl.c:625
-msgid "Error in application verification"
-msgstr "æ??ç?¨ç¨?å¼?é©?è?æ??é?¯èª¤"
-
-#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:873
+#: ../camel/camel-tcp-stream-ssl.c:870
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2863,39 +2825,18 @@ msgstr ""
 "æ??ç´?æª?:              %s\n"
 "ç°½ç« :              %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:876
 msgid "GOOD"
 msgstr "è?¯å¥½"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:876
 msgid "BAD"
 msgstr "ä¸?è?¯"
 
 # camel/camel-tcp-stream-openssl.c:428
 # camel/camel-tcp-stream-ssl.c:364
-#: ../camel/camel-tcp-stream-openssl.c:700
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"ä¾?è?ª %s ç??ä¸?è?¯æ??è?ï¼?\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"æ?¨ç?¡è«?å¦?ä½?é?½è¦?æ?¥å??å??ï¼?"
-
-# camel/camel-tcp-stream-openssl.c:428
-# camel/camel-tcp-stream-ssl.c:364
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:883
+#: ../camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2910,7 +2851,7 @@ msgstr ""
 "\n"
 "æ?¨æ?³è¦?æ?¥å??å??ï¼?"
 
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:924
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2919,7 +2860,7 @@ msgstr ""
 "æ??è?å??é¡?ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:979
+#: ../camel/camel-tcp-stream-ssl.c:976
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2928,7 +2869,7 @@ msgstr ""
 "ä¸?æ£ç¢ºç??æ??è?ç¶²å??ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:997
+#: ../camel/camel-tcp-stream-ssl.c:994
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2937,7 +2878,7 @@ msgstr ""
 "æ??è?å·²é?¾æ??ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1014
+#: ../camel/camel-tcp-stream-ssl.c:1011
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2953,19 +2894,19 @@ msgid "Could not parse URL '%s'"
 msgstr "ç?¡æ³?è§£æ?? URLã??%sã??"
 
 # shell/e-shell-importer.c:384
-#: ../camel/camel-vee-folder.c:580
+#: ../camel/camel-vee-folder.c:577
 #, c-format
 msgid "Error storing '%s': %s"
 msgstr "å?²å?ã??%sã??ç?¼ç??é?¯èª¤ï¼?%s"
 
 # camel/camel-vee-folder.c:451
-#: ../camel/camel-vee-folder.c:657
+#: ../camel/camel-vee-folder.c:654
 #, c-format
 msgid "No such message %s in %s"
 msgstr "æ²?æ?? %s é??é¡?é?µä»¶å?¨ %s ä¸"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/camel-vee-folder.c:816 ../camel/camel-vee-folder.c:822
+#: ../camel/camel-vee-folder.c:813 ../camel/camel-vee-folder.c:819
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ä¸?è?½è¤?è£½æ??ç§»å??é?µä»¶å?°è??æ?¬è³?æ??å¤¾ä¸"
 
@@ -3004,7 +2945,7 @@ msgstr "ç?¡æ³?è¤?è£½è¨?æ?¯å?°ã??å??å?¾é?µä»¶ã??è³?æ??å¤¾"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3016,12 +2957,13 @@ msgstr ""
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:255
-#: ../camel/providers/local/camel-maildir-folder.c:281
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
+#: ../camel/providers/local/camel-maildir-folder.c:264
+#: ../camel/providers/local/camel-maildir-folder.c:293
+#: ../camel/providers/local/camel-maildir-folder.c:401
 #: ../camel/providers/local/camel-mbox-folder.c:363
 #: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:216
+#: ../camel/providers/local/camel-mh-folder.c:226
 msgid "No such message"
 msgstr "ç?¡æ¤é?µä»¶"
 
@@ -3029,11 +2971,11 @@ msgstr "ç?¡æ¤é?µä»¶"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
 #: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
+#: ../camel/providers/nntp/camel-nntp-folder.c:173
+#: ../camel/providers/nntp/camel-nntp-folder.c:248
+#: ../camel/providers/nntp/camel-nntp-folder.c:408
 #: ../camel/providers/pop3/camel-pop3-folder.c:268
 #: ../camel/providers/pop3/camel-pop3-folder.c:578
 #: ../camel/providers/pop3/camel-pop3-folder.c:639
@@ -3048,12 +2990,12 @@ msgstr "ä½¿ç?¨è??å·²å??æ¶?"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
 #: ../camel/providers/imap4/camel-imap4-folder.c:819
+#: ../camel/providers/nntp/camel-nntp-folder.c:164
 #: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:252
+#: ../camel/providers/nntp/camel-nntp-folder.c:175
+#: ../camel/providers/nntp/camel-nntp-folder.c:250
 #: ../camel/providers/pop3/camel-pop3-folder.c:388
 #: ../camel/providers/pop3/camel-pop3-folder.c:581
 #: ../camel/providers/pop3/camel-pop3-folder.c:642
@@ -3065,51 +3007,53 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼? %s"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2463
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2507
 #: ../camel/providers/imap4/camel-imap4-folder.c:837
 msgid "This message is not available in offline mode."
 msgstr "é??å°?é?µä»¶ç?¡æ³?å?¨é?¢ç·?æ¨¡å¼?ä¸?ä½¿ç?¨ã??"
 
 # camel/camel-movemail.c:306
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:194
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:201
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1966
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2017
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2010
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061
 msgid "Could not get message"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ã??"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
-#: ../camel/providers/imap/camel-imap-folder.c:296
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:983
+#: ../camel/providers/imap/camel-imap-folder.c:295
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "ç?¡æ³?è¼?å?¥ %s ç??æ??è¦?"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1056
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "æª¢æ?¥å?ªé?¤ç??é?µä»¶ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1331
 msgid "Trash Folder Full. Please Empty."
 msgstr "å??æ?¶ç?è³?æ??å¤¾å·²æ»¿ã??è«?å°?å®?æ¸?ç©ºã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1565
 #: ../camel/providers/groupwise/camel-groupwise-store.c:633
 #: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3421
-#: ../camel/providers/imap/camel-imap-folder.c:3497
+#: ../camel/providers/imap/camel-imap-folder.c:3429
+#: ../camel/providers/imap/camel-imap-folder.c:3505
+#: ../camel/providers/imapx/camel-imapx-server.c:2603
+#: ../camel/providers/imapx/camel-imapx-server.c:2687
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "æ£å??å¾? %s ä¸æ?°é?µä»¶ç??æ??è¦?è³?è¨?"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2317
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2361
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2404
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "ä¸?è?½å°?é?µä»¶å? å?¥è?³è³?æ??å¤¾ã??%sã??ï¼?%s"
@@ -3121,7 +3065,7 @@ msgstr "ä¸?è?½å°?é?µä»¶å? å?¥è?³è³?æ??å¤¾ã??%sã??ï¼?%s"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2392
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "ç?¡æ³?å»ºæ§?é?µä»¶ï¼? %s"
@@ -3218,7 +3162,7 @@ msgstr "ç?¨æ?¼å?å?? Novell Groupwise ä¼ºæ??å?¨"
 #: ../camel/providers/hula/camel-hula-provider.c:93
 #: ../camel/providers/imap/camel-imap-provider.c:100
 #: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
 #: ../camel/providers/nntp/camel-nntp-provider.c:74
 #: ../camel/providers/pop3/camel-pop3-provider.c:74
 msgid "Password"
@@ -3238,7 +3182,7 @@ msgstr "ç¶²å??ä¸ç??ä½¿ç?¨è??æ??ä¸»æ©?ç?¡æ³?ä½¿ç?¨"
 # camel/providers/imap/camel-imap-store.c:505
 # camel/providers/smtp/camel-smtp-transport.c:410
 #: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1358
+#: ../camel/providers/imap/camel-imap-store.c:1356
 msgid "You did not enter a password."
 msgstr "æ?¨æ²?æ??è¼¸å?¥å¯?ç¢¼ã??"
 
@@ -3249,8 +3193,9 @@ msgstr "æ??äº?å??è?½å?¯è?½ç?¡æ³?å?¨æ?¨ç?®å??ç??ä¼ºæ??å?¨ç??æ?¬ä¸?æ£å¸¸é??ä½?"
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
 #: ../camel/providers/groupwise/camel-groupwise-store.c:540
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/imap/camel-imap-store.c:1879
+#: ../camel/providers/imap/camel-imap-store.c:2077
+#: ../camel/providers/imapx/camel-imapx-store.c:245
 #, c-format
 msgid "No such folder %s"
 msgstr "æ²?æ??é??å??è³?æ??å¤¾ %s"
@@ -3261,8 +3206,8 @@ msgid "Cannot create GroupWise folders in offline mode."
 msgstr "å?¨é?¢ç·?æ¨¡å¼?ä¸ä¸?è?½å»ºæ§? GroupWise è³?æ??å¤¾ã??"
 
 #: ../camel/providers/groupwise/camel-groupwise-store.c:1280
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/imap/camel-imap-store.c:1954
+#: ../camel/providers/imap/camel-imap-store.c:2334
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "æ¯?è³?æ??å¤¾ä¸¦ä¸?å??è¨±å??å?«å?è³?æ??å¤¾"
 
@@ -3398,13 +3343,13 @@ msgstr "æ²?æ??è¼¸å?¥ä¸²æµ?"
 #: ../camel/providers/imap/camel-imap-command.c:229
 #: ../camel/providers/imap/camel-imap-command.c:278
 #: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3051
+#: ../camel/providers/imap/camel-imap-store.c:3105
 msgid "Operation cancelled"
 msgstr "æ??ä½?ç¨?åº?å·²å??æ¶?"
 
 # camel/camel-remote-store.c:476
 #: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3056
+#: ../camel/providers/imap/camel-imap-store.c:3110
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ä¼ºæ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼? %s"
@@ -3451,38 +3396,39 @@ msgid "Unexpected OK response from IMAP server: %s"
 msgstr "å¾? IMAP ä¼ºæ??å?¨å?³å??ä¸?ç?¶ç?? OK å??æ??ï¼? %s"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap/camel-imap-folder.c:91
+#: ../camel/providers/imap/camel-imap-folder.c:90
 msgid "Always check for new mail in this folder"
 msgstr "æ°¸é? æª¢æ?¥é??å??è³?æ??å¤¾ä¸æ?¯å?¦æ??æ?°é?µä»¶"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/imap/camel-imap-folder.c:277
+#: ../camel/providers/imap/camel-imap-folder.c:276
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ç?¡æ³?å»ºç«?ç?®é?? %sï¼?%s"
 
 # mail/mail-ops.c:1649
 #. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:919
+#: ../camel/providers/imap/camel-imap-folder.c:918
+#: ../camel/providers/imapx/camel-imapx-server.c:2633
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "æ??æ?? %s ä¸è®?æ?´é??ç??é?µä»¶"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1987
+#: ../camel/providers/imap/camel-imap-folder.c:1986
 #, c-format
 msgid "Unexpected response status '%s' after APPEND command"
 msgstr "å?¨ APPEND æ??ä»¤å¾?å?³å??æ?ªé ?æ??ç??å??æ??ç??æ??ã??%sã??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2002
+#: ../camel/providers/imap/camel-imap-folder.c:2001
 msgid "No response on continuation after APPEND command"
 msgstr "å?¨ APPEND æ??ä»¤å¾?æ²?æ??æ??çº?å??æ??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2047
+#: ../camel/providers/imap/camel-imap-folder.c:2046
 msgid "Unknown error occurred during APPEND command!"
 msgstr "å?¨ APPEND æ??ä»¤æ??é??ç?¼ç??æ?ªç?¥ç??é?¯èª¤ï¼?"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:2877
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "ç?¡æ³?å¾?å??å??é?µä»¶ï¼? %s"
@@ -3494,7 +3440,7 @@ msgstr "ç?¡æ³?å¾?å??å??é?µä»¶ï¼? %s"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:2912
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
@@ -3502,31 +3448,31 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
-#: ../camel/providers/imap/camel-imap-folder.c:2914
+#: ../camel/providers/imap/camel-imap-folder.c:2913
 msgid "No such message available."
 msgstr "æ²?æ??é??å??é?µä»¶ã??"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: ../camel/providers/imap/camel-imap-folder.c:2975
-#: ../camel/providers/imap/camel-imap-folder.c:3808
-#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/imap/camel-imap-folder.c:2974
+#: ../camel/providers/imap/camel-imap-folder.c:3819
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
 msgid "This message is not currently available"
 msgstr "é??å°?é?µä»¶ç?®å??ä»?æ?ªå?¯ç?¨"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3624
+#: ../camel/providers/imap/camel-imap-folder.c:3632
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ä¸?å®?æ?´ç??ä¼ºæ??å?¨å??æ??ï¼?æ?ªæ??ä¾?ä»»ä½?è³?è¨?çµ¦è¨?æ?¯ %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:3640
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ä¸?å®?æ?´ç??ä¼ºæ??å?¨å??æ??ï¼?æ?ªæ??ä¾? UID çµ¦è¨?æ?¯ %d"
 
 # camel/providers/imap/camel-imap-folder.c:1075
 # camel/providers/imap/camel-imap-folder.c:1314
-#: ../camel/providers/imap/camel-imap-folder.c:3846
+#: ../camel/providers/imap/camel-imap-folder.c:3857
 msgid "Could not find message body in FETCH response."
 msgstr "å?¨ FETCH ç??å??æ??å?§æ?¾ä¸?å?°é?µä»¶ç??å?§æ??ã??"
 
@@ -3594,19 +3540,19 @@ msgstr "ç?¨ä½?è®?å??å??å?²å?é?µä»¶æ?¼ IMAP ä¼ºæ??å?¨ã??"
 
 # camel/providers/imap/camel-imap-provider.c:82
 #: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ç°¡æ??ç??å¯?ç¢¼é?£ç·?è?³ IMAP ä¼ºæ??å?¨ã??"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
-#: ../camel/providers/imap/camel-imap-store.c:437
+#: ../camel/providers/imap/camel-imap-store.c:435
 #: ../camel/providers/imap4/camel-imap4-store.c:210
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP ä¼ºæ??å?¨ %s"
 
 # camel/camel-remote-store.c:195
-#: ../camel/providers/imap/camel-imap-store.c:439
+#: ../camel/providers/imap/camel-imap-store.c:437
 #: ../camel/providers/imap4/camel-imap4-store.c:212
 #, c-format
 msgid "IMAP service for %s on %s"
@@ -3614,59 +3560,64 @@ msgstr "%s ç?? IMAP æ??å??æ?¼ %s"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
+#: ../camel/providers/imap/camel-imap-store.c:566
+#: ../camel/providers/imap/camel-imap-store.c:581
 #: ../camel/providers/imap4/camel-imap4-store.c:247
 #: ../camel/providers/imap4/camel-imap4-store.c:262
 #: ../camel/providers/nntp/camel-nntp-store.c:182
 #: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:170
-#: ../camel/providers/pop3/camel-pop3-store.c:184
+#: ../camel/providers/pop3/camel-pop3-store.c:192
+#: ../camel/providers/pop3/camel-pop3-store.c:206
 #: ../camel/providers/smtp/camel-smtp-transport.c:259
 #: ../camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "ç?¡æ³?é?£æ?¥å?° %sï¼?%s"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
+#: ../camel/providers/imap/camel-imap-store.c:567
 #: ../camel/providers/imap4/camel-imap4-store.c:248
 #: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:171
+#: ../camel/providers/pop3/camel-pop3-store.c:193
 #: ../camel/providers/smtp/camel-smtp-transport.c:260
 msgid "SSL unavailable"
 msgstr "SSL ç?¡æ³?ä½¿ç?¨"
 
 # camel/camel-remote-store.c:252
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
+#: ../camel/providers/imap/camel-imap-store.c:578
+#: ../camel/providers/imap/camel-imap-store.c:860
+#: ../camel/providers/imapx/camel-imapx-server.c:1993
 msgid "Connection cancelled"
 msgstr "é?£ç·?å·²å??æ¶?"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
+#: ../camel/providers/imap/camel-imap-store.c:689
+#: ../camel/providers/imap/camel-imap-store.c:708
+#: ../camel/providers/imap/camel-imap-store.c:714
+#: ../camel/providers/imap/camel-imap-store.c:740
 #: ../camel/providers/imap4/camel-imap4-store.c:310
 #: ../camel/providers/imap4/camel-imap4-store.c:325
 #: ../camel/providers/imap4/camel-imap4-store.c:334
+#: ../camel/providers/imapx/camel-imapx-server.c:2033
+#: ../camel/providers/imapx/camel-imapx-server.c:2047
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "ä»¥å®?å?¨æ¨¡å¼?é?£ç·?å?° IMAP ä¼ºæ??å?¨ %s æ??å¤±æ??äº?ï¼? %s"
 
 # shell/e-storage.c:477
-#: ../camel/providers/imap/camel-imap-store.c:692
+#: ../camel/providers/imap/camel-imap-store.c:690
+#: ../camel/providers/imapx/camel-imapx-server.c:2034
 #: ../camel/providers/smtp/camel-smtp-transport.c:332
 msgid "STARTTLS not supported"
 msgstr "ä¸?æ?¯æ?´ STARTTLS"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:709
+#: ../camel/providers/imapx/camel-imapx-server.c:2048
 msgid "SSL negotiations failed"
 msgstr "SSL å??å??å¤±æ??"
 
-#: ../camel/providers/imap/camel-imap-store.c:717
+#: ../camel/providers/imap/camel-imap-store.c:715
 #: ../camel/providers/imap4/camel-imap4-store.c:335
 #: ../camel/providers/smtp/camel-smtp-transport.c:371
 msgid "SSL is not available in this build"
@@ -3674,43 +3625,44 @@ msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ SSL"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:863
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ç?¡æ³?ä»¥æ??ä»¤ã??%sã??é?£ç·?ï¼? %s"
 
 # mail/local-config.glade.h:8
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
+#: ../camel/providers/imap/camel-imap-store.c:1051
+#: ../camel/providers/imap/camel-imap-store.c:2430
 #: ../camel/providers/imap4/camel-imap4-store-summary.c:356
 #: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/local/camel-maildir-folder.c:80
+#: ../camel/providers/imapx/camel-imapx-store.c:409
+#: ../camel/providers/imapx/camel-imapx-store.c:640
+#: ../camel/providers/local/camel-maildir-folder.c:81
 #: ../camel/providers/local/camel-maildir-store.c:219
 #: ../camel/providers/local/camel-maildir-store.c:291
 #: ../camel/providers/local/camel-maildir-store.c:517
 #: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:463
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
+#: ../camel/providers/local/camel-spool-store.c:461
 msgid "Inbox"
 msgstr "æ?¶ä»¶å?£"
 
 # camel/providers/imap/camel-imap-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1305
+#: ../camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ä¼ºæ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?é¡?å?? %s"
 
 # camel/providers/imap/camel-imap-store.c:466
 # camel/providers/smtp/camel-smtp-transport.c:366
-#: ../camel/providers/imap/camel-imap-store.c:1315
+#: ../camel/providers/imap/camel-imap-store.c:1313
 #: ../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:531
-#: ../camel/providers/imap/camel-imap-store.c:1389
+#: ../camel/providers/imap/camel-imap-store.c:1387
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3721,8 +3673,8 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
+#: ../camel/providers/imap/camel-imap-store.c:1891
+#: ../camel/providers/imap/camel-imap-store.c:2272
 #: ../camel/providers/imap4/camel-imap4-store.c:954
 #, c-format
 msgid ""
@@ -3731,22 +3683,22 @@ msgstr "è³?æ??å¤¾å??ç¨±ã??%sã??ç?¡æ??ï¼?å? ç?ºå®?å??æ?¬å?å??ã??%cã??"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap/camel-imap-store.c:1978
+#: ../camel/providers/imap/camel-imap-store.c:2008
 #: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
+#: ../camel/providers/local/camel-mbox-store.c:202
 #: ../camel/providers/local/camel-mh-store.c:249
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?è³?æ??å¤¾å·²å?å?¨ã??"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/providers/imap/camel-imap-store.c:2253
+#: ../camel/providers/imap/camel-imap-store.c:2283
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ä¸?æ??ç??æ¯?è³?æ??å¤¾ï¼? %s"
 
 # camel/camel-remote-store.c:476
-#: ../camel/providers/imap/camel-imap-store.c:3053
+#: ../camel/providers/imap/camel-imap-store.c:3107
 msgid "Server unexpectedly disconnected"
 msgstr "ä¼ºæ??å?¨çª?ç?¶ä¸æ?·é?£ç·?"
 
@@ -3948,10 +3900,9 @@ msgstr "æ¤é?¸é ?æ??ä½¿ç?¨ç´?æ??å?å¯?ç¢¼ï¼?é?£ç·?å?° IMAPv4rev1 ä¼ºæ??å?¨ã??"
 
 # camel/camel-remote-store.c:252
 #: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/imapp/camel-imapp-store.c:249
 #: ../camel/providers/nntp/camel-nntp-store.c:194
 #: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/pop3/camel-pop3-store.c:203
 #: ../camel/providers/smtp/camel-smtp-transport.c:271
 msgid "Connection canceled"
 msgstr "é?£ç·?å·²å??æ¶?"
@@ -3967,7 +3918,7 @@ msgstr "ä»¥å®?å?¨æ¨¡å¼?é?£ç·?å?° IMAP ä¼ºæ??å?¨ %s æ??å¤±æ??äº?ï¼? ä¼ºæ??å?¨ä¸?
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
 #: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:275
 msgid "TLS negotiations failed"
 msgstr "TLS å??å??å¤±æ??"
 
@@ -4151,18 +4102,30 @@ msgstr "æ²?æ??è³?æ??"
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "IMAP ä¼ºæ??å?¨ %s æ??å¤?ä¸æ?·é?£ç·?ï¼?%s"
 
+# camel/providers/imap/camel-imap-folder.c:191
+#: ../camel/providers/imapx/camel-imapx-folder.c:84
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "ç?¡æ³?å»ºç«? %s ç??è³?æ??å¤¾æ??è¦?"
+
+# camel/providers/local/camel-mbox-store.c:110
+#: ../camel/providers/imapx/camel-imapx-folder.c:92
+#, c-format
+msgid "Could not create cache for %s"
+msgstr "ç?¡æ³?å»ºç«? %s ç??å¿«å??"
+
 # camel/providers/pop3/camel-pop3-provider.c:37
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 #: ../camel/providers/pop3/camel-pop3-provider.c:43
 msgid "Message storage"
 msgstr "é?µä»¶å?²å?ç©ºé??"
 
 # camel/providers/imap/camel-imap-provider.c:63
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "IMAP+"
 msgstr "IMAP"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:50
 msgid ""
 "Experimental IMAP 4(.1) client\n"
 "This is untested and unsupported code, you want to use plain imap instead.\n"
@@ -4176,13 +4139,20 @@ msgstr ""
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-server.c:1996
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼? %s"
 
+# camel/providers/pop3/camel-pop3-store.c:361
+#: ../camel/providers/imapx/camel-imapx-server.c:2076
+#: ../camel/providers/imapx/camel-imapx-store.c:147
+#, c-format
+msgid "%sPlease enter the IMAP password for %s %s"
+msgstr "%sè«?è¼¸å?¥ %s %s ç?? IMAP å¯?ç¢¼"
+
 # camel/providers/pop3/camel-pop3-store.c:322
-#: ../camel/providers/imapp/camel-imapp-store.c:348
+#: ../camel/providers/imapx/camel-imapx-store.c:130
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %s"
@@ -4278,62 +4248,62 @@ msgid "Standard Unix mbox spool directory"
 msgstr "æ¨?æº? Unix mbox æ??ç¨?å?¨ç?®é??"
 
 # camel/providers/local/camel-local-store.c:127
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:128
+#: ../camel/providers/local/camel-local-store.c:163
+#: ../camel/providers/local/camel-local-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:126
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "å?²å?æ ¹ç?®é?? %s ä¸?æ?¯çµ?å°?è·¯å¾?"
 
 # camel/providers/local/camel-local-store.c:134
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:170
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "å?²å?æ ¹ç?®é?? %s ä¸?æ?¯å??æ³?ç??ç?®é??"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../camel/providers/local/camel-local-store.c:179
+#: ../camel/providers/local/camel-local-store.c:187
+#: ../camel/providers/local/camel-local-store.c:285
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ï¼?%sï¼?%s"
 
 # camel/providers/local/camel-local-store.c:173
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:199
 msgid "Local stores do not have an inbox"
 msgstr "æ?¬å?°ç«¯ç??å?å?²æ²?æ??æ?¶ä»¶å?£"
 
 # camel/providers/local/camel-local-store.c:183
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:245
 #, c-format
 msgid "Local mail file %s"
 msgstr "æ?¬å?°ç«¯é?µä»¶æª?æ¡? %s"
 
 # camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:340
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ç?¡æ³?å°?è³?æ??å¤¾ %s é??æ?°å?½å??ç?º %sï¼? %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:408
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "ç?¡æ³?é??æ?°å?½å??ã??%sã??ï¼?%s "
 
 # camel/providers/local/camel-local-store.c:289
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-local-store.c:433
+#: ../camel/providers/local/camel-mbox-store.c:298
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ç´¢å¼?æª?æ¡?ã??%sã??ï¼? %s"
 
 # camel/providers/local/camel-local-store.c:279
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:456
+#: ../camel/providers/local/camel-mbox-store.c:322
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ä¸ç¹¼æª?æ¡?ã??%sã??ï¼?%s"
@@ -4345,14 +4315,14 @@ msgstr "ç?¡æ³?æ?°å¢?é?µä»¶å?°æ??è¦?è³?è¨?ï¼?ä¸?æ??ç??å??å? "
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/providers/local/camel-maildir-folder.c:229
+#: ../camel/providers/local/camel-maildir-folder.c:230
 msgid "Maildir append message canceled"
 msgstr "Maildir å¢?æ·»é?µä»¶å·²å??æ¶?"
 
 # camel/providers/local/camel-maildir-folder.c:150
 # camel/providers/local/camel-maildir-folder.c:158
 # camel/providers/local/camel-maildir-folder.c:169
-#: ../camel/providers/local/camel-maildir-folder.c:232
+#: ../camel/providers/local/camel-maildir-folder.c:233
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "ç?¡æ³?å°?é?µä»¶å?²å?å?° maildir è³?æ??å¤¾ï¼? %sï¼? %s"
@@ -4360,18 +4330,19 @@ msgstr "ç?¡æ³?å°?é?µä»¶å?²å?å?° maildir è³?æ??å¤¾ï¼? %sï¼? %s"
 # camel/providers/local/camel-mbox-folder.c:335
 # camel/providers/local/camel-mbox-folder.c:367
 # camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/local/camel-maildir-folder.c:254
-#: ../camel/providers/local/camel-maildir-folder.c:280
-#: ../camel/providers/local/camel-maildir-folder.c:294
-#: ../camel/providers/local/camel-maildir-folder.c:303
+#: ../camel/providers/local/camel-maildir-folder.c:263
+#: ../camel/providers/local/camel-maildir-folder.c:292
+#: ../camel/providers/local/camel-maildir-folder.c:306
+#: ../camel/providers/local/camel-maildir-folder.c:314
+#: ../camel/providers/local/camel-maildir-folder.c:400
 #: ../camel/providers/local/camel-mbox-folder.c:362
 #: ../camel/providers/local/camel-mbox-folder.c:413
 #: ../camel/providers/local/camel-mbox-folder.c:434
 #: ../camel/providers/local/camel-mbox-folder.c:465
 #: ../camel/providers/local/camel-mbox-folder.c:473
-#: ../camel/providers/local/camel-mh-folder.c:215
-#: ../camel/providers/local/camel-mh-folder.c:226
-#: ../camel/providers/local/camel-mh-folder.c:235
+#: ../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"
@@ -4382,16 +4353,21 @@ msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../camel/providers/local/camel-maildir-folder.c:304
+#: ../camel/providers/local/camel-maildir-folder.c:315
 msgid "Invalid message contents"
 msgstr "ç?¡æ??ç??é?µä»¶å?§æ??"
 
+# camel/providers/local/camel-mbox-summary.c:644
+#: ../camel/providers/local/camel-maildir-folder.c:419
+msgid "Cannot transfer message to destination folder"
+msgstr "ä¸?è?½å°?é?µä»¶å?³è¼¸å?°ç?®ç??ç«¯è³?æ??å¤¾"
+
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 #: ../camel/providers/local/camel-maildir-store.c:148
 #: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-mbox-store.c:174
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
@@ -4399,7 +4375,7 @@ msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 #: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
+#: ../camel/providers/local/camel-mbox-store.c:145
 #: ../camel/providers/local/camel-mh-store.c:217
 #, c-format
 msgid "Cannot get folder '%s': %s"
@@ -4409,7 +4385,7 @@ msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
 #: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
+#: ../camel/providers/local/camel-mbox-store.c:153
 #: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
@@ -4439,37 +4415,37 @@ msgstr "ä¸?æ?¯ä¸?å?? maildir ç?®é??"
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
 #: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:330
-#: ../camel/providers/local/camel-spool-store.c:344
+#: ../camel/providers/local/camel-spool-store.c:328
+#: ../camel/providers/local/camel-spool-store.c:342
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "ç?¡æ³?æ??æ??è³?æ??å¤¾ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-maildir-summary.c:405
 # camel/providers/local/camel-maildir-summary.c:526
-#: ../camel/providers/local/camel-maildir-summary.c:437
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-summary.c:432
+#: ../camel/providers/local/camel-maildir-summary.c:551
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "ä¸?è?½é??å?? maildir ç?®é??è·¯å¾?ï¼?%sï¼? %s"
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:544
 msgid "Checking folder consistency"
 msgstr "æª¢æ?¥è³?æ??å¤¾ç??ä¸?è?´æ?§"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/local/camel-maildir-summary.c:658
+#: ../camel/providers/local/camel-maildir-summary.c:637
 msgid "Checking for new messages"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: ../camel/providers/local/camel-maildir-summary.c:744
+#: ../camel/providers/local/camel-maildir-summary.c:724
 #: ../camel/providers/local/camel-mbox-summary.c:526
-#: ../camel/providers/local/camel-mbox-summary.c:708
-#: ../camel/providers/local/camel-mbox-summary.c:828
+#: ../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 "å?²å?è³?æ??å¤¾"
@@ -4508,28 +4484,28 @@ msgstr "è³?æ??å¤¾å¥½å??å·²ç¶?æ??æ¯?ä¸¦ä¸?ä¸?è?½å¾©å??ã??"
 
 # camel/providers/local/camel-mbox-folder.c:381
 #: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:236
+#: ../camel/providers/local/camel-mh-folder.c:245
 msgid "Message construction failed."
 msgstr "è¨?æ?¯çµ?æ§?å¤±æ??ã??"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:164
+#: ../camel/providers/local/camel-mbox-store.c:363
 msgid "Cannot create a folder by this name."
 msgstr "ç?¡æ³?å»ºæ§?ä»¥æ¤ç?ºå??ç??è³?æ??å¤¾"
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ã??%sã??ï¼?ä¸?æ?¯ä¸?è?¬æª?æ¡?ã??"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:226
+#: ../camel/providers/local/camel-mbox-store.c:237
+#: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -4540,54 +4516,54 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:245
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "ã??%sã??ä¸?æ?¯æ?®é??ç??æª?æ¡?ã??"
 
 # camel/providers/local/camel-mbox-store.c:153
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:252
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "è³?æ??å¤¾ã??%sã??å?§ä»?æ??æª?æ¡?ã??æ??ä»¥ä¸?å?ªé?¤ã??"
 
 # camel/providers/local/camel-local-store.c:279
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
+#: ../camel/providers/local/camel-mbox-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:286
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ç?¡æ³?å?ªé?¤è³?æ??å¤¾æ??è¦?æª?æ¡?ã??%sã??ï¼? %s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:376
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "ä¸?è?½å»ºç«?ç?®é??ã??%sã??ï¼? %sã??"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:390
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ï¼?%sï¼?%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:394
+#: ../camel/providers/local/camel-mbox-store.c:392
 msgid "Folder already exists"
 msgstr "è³?æ??å¤¾å·²å?å?¨"
 
 # shell/e-shell-folder-creation-dialog.c:156
-#: ../camel/providers/local/camel-mbox-store.c:485
+#: ../camel/providers/local/camel-mbox-store.c:483
 msgid "The new folder name is illegal."
 msgstr "æ??å®?ç??è³?æ??å¤¾å??ç¨±ä¸?å??æ³?ï¼? %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:496
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "ç?¡æ³?é??æ?°å?½å??ã??%sã??ï¼?ã??%sã??ï¼?%s"
 
 # camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:577
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "ç?¡æ³?å°? '%s' é??æ?°å?½å??æ?? %sï¼?%s"
@@ -4607,21 +4583,21 @@ msgstr "é? è¿? %ld (æ?¼è³?æ??å¤¾ %s)ç??ä½?ç½®ç?¼ç??å?´é??ç??é?µä»¶å??æ??é?¯èª¤"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mbox-summary.c:645
+#: ../camel/providers/local/camel-mbox-summary.c:659
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ä¸?è?½æª¢æ?¥è³?æ??å¤¾ï¼?%sï¼? %s"
 
 # camel/providers/local/camel-mbox-store.c:94
-#: ../camel/providers/local/camel-mbox-summary.c:713
-#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../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:524
-#: ../camel/providers/local/camel-mbox-summary.c:725
+#: ../camel/providers/local/camel-mbox-summary.c:739
 #: ../camel/providers/local/camel-spool-summary.c:168
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
@@ -4629,27 +4605,27 @@ msgstr "ä¸?è?½é??å??æ?«å? mailboxï¼?%s"
 
 # camel/providers/local/camel-mbox-summary.c:635
 # camel/providers/local/camel-mbox-summary.c:804
-#: ../camel/providers/local/camel-mbox-summary.c:738
-#: ../camel/providers/local/camel-mbox-summary.c:942
+#: ../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:644
-#: ../camel/providers/local/camel-mbox-summary.c:747
+#: ../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:655
-#: ../camel/providers/local/camel-mbox-summary.c:762
+#: ../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:655
-#: ../camel/providers/local/camel-mbox-summary.c:844
-#: ../camel/providers/local/camel-mbox-summary.c:1069
+#: ../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 "
@@ -4658,40 +4634,40 @@ msgstr "ç?¡æ³?å?²å?è³?æ??å¤¾ï¼?%s "
 # camel/providers/local/camel-mbox-summary.c:557
 # camel/providers/local/camel-mbox-summary.c:746
 # camel/providers/local/camel-mbox-summary.c:754
-#: ../camel/providers/local/camel-mbox-summary.c:883
-#: ../camel/providers/local/camel-mbox-summary.c:891
-#: ../camel/providers/local/camel-mbox-summary.c:1099
-#: ../camel/providers/local/camel-mbox-summary.c:1107
+#: ../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:879
-#: ../camel/providers/local/camel-mbox-summary.c:1032
+#: ../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:617
-#: ../camel/providers/local/camel-mbox-summary.c:1175
-#: ../camel/providers/local/camel-mbox-summary.c:1201
+#: ../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 "å¯«å?¥æ?«å?é?µç®±å¤±æ??ï¼?  %s"
 
 # camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1192
+#: ../camel/providers/local/camel-mbox-summary.c:1206
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "å¯«å?¥æ?«å?é?µç®±å¤±æ??ï¼? %sï¼? %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-mh-folder.c:180
 msgid "MH append message canceled"
 msgstr "MH å¢?æ·»é?µä»¶å·²å??æ¶?"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/local/camel-mh-folder.c:184
+#: ../camel/providers/local/camel-mh-folder.c:183
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° mh è³?æ??å¤¾ï¼? %sï¼? %s"
@@ -4716,13 +4692,13 @@ msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ã??%sã??ï¼?ä¸?æ?¯ç?®é??ã??"
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "ä¸?è?½é??å?? MH ç?®é??è·¯å¾?ï¼? %sï¼? %s"
 
-#: ../camel/providers/local/camel-spool-store.c:134
+#: ../camel/providers/local/camel-spool-store.c:132
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "æ??ç¨?å?¨ã??%sã??ä¸?è?½è¢«é??å??ï¼?%s"
 
 # camel/providers/local/camel-local-store.c:134
-#: ../camel/providers/local/camel-spool-store.c:146
+#: ../camel/providers/local/camel-spool-store.c:144
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "æ??ç¨?å?¨ã??%sã??ä¸?æ?¯ä¸?è?¬æª?æ¡?æ??ç?®é??ã??"
@@ -4730,14 +4706,14 @@ msgstr "æ??ç¨?å?¨ã??%sã??ä¸?æ?¯ä¸?è?¬æª?æ¡?æ??ç?®é??ã??"
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-spool-store.c:165
+#: ../camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "è³?æ??å¤¾ã??%s/%sã??ä¸?å?å?¨ã??"
 
 # camel/providers/local/camel-maildir-store.c:96
 # camel/providers/local/camel-mh-store.c:90
-#: ../camel/providers/local/camel-spool-store.c:175
+#: ../camel/providers/local/camel-spool-store.c:173
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4749,14 +4725,14 @@ msgstr ""
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-spool-store.c:179
+#: ../camel/providers/local/camel-spool-store.c:177
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "è³?æ??å¤¾ã??%sã??ä¸?å?å?¨ã??"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-spool-store.c:184
+#: ../camel/providers/local/camel-spool-store.c:182
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4767,31 +4743,31 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-spool-store.c:192
+#: ../camel/providers/local/camel-spool-store.c:190
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "ã??%sã??ä¸?æ?¯ mailbox æª?æ¡?ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:207
 msgid "Store does not support an INBOX"
 msgstr "å?²å?ä¸¦ä¸?æ?¯æ?´ INBOX"
 
 # camel/providers/local/camel-local-store.c:183
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:219
 #, c-format
 msgid "Spool mail file %s"
 msgstr "æ??ç¨?é?µä»¶æª?æ¡? %s"
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:219
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "æ??ç¨?è³?æ??å¤¾æ¨¹ç??çµ?æ§? %s"
 
-#: ../camel/providers/local/camel-spool-store.c:229
+#: ../camel/providers/local/camel-spool-store.c:227
 msgid "Spool folders cannot be renamed"
 msgstr "æ??ç¨?è³?æ??å¤¾ä¸?è?½é??æ?°å?½å??"
 
-#: ../camel/providers/local/camel-spool-store.c:237
+#: ../camel/providers/local/camel-spool-store.c:235
 msgid "Spool folders cannot be deleted"
 msgstr "æ??ç¨?è³?æ??å¤¾ä¸?è?½å?ªé?¤"
 
@@ -4821,9 +4797,9 @@ msgstr ""
 "ç?¡æ³?å??æ¥æ??ç¨?è³?æ??å¤¾ %sï¼? %s\n"
 "è³?æ??å¤¾å?¯è?½æ??æ¯?ï¼?è¤?è£½å?²å?æ?¼ã??%sã??"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:194
-#: ../camel/providers/nntp/camel-nntp-folder.c:226
+#: ../camel/providers/nntp/camel-nntp-folder.c:135
+#: ../camel/providers/nntp/camel-nntp-folder.c:192
+#: ../camel/providers/nntp/camel-nntp-folder.c:224
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "å?§é?¨é?¯èª¤ï¼?UID æ ¼å¼?ç?¡æ??ï¼?%s"
@@ -4832,20 +4808,20 @@ msgstr "å?§é?¨é?¯èª¤ï¼?UID æ ¼å¼?ç?¡æ??ï¼?%s"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/nntp/camel-nntp-folder.c:367
-#: ../camel/providers/nntp/camel-nntp-folder.c:370
+#: ../camel/providers/nntp/camel-nntp-folder.c:365
+#: ../camel/providers/nntp/camel-nntp-folder.c:368
+#: ../camel/providers/nntp/camel-nntp-folder.c:410
 #: ../camel/providers/nntp/camel-nntp-folder.c:412
-#: ../camel/providers/nntp/camel-nntp-folder.c:414
 #, c-format
 msgid "Posting failed: %s"
 msgstr "å¼µè²¼å¤±æ??ï¼?%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:432
+#: ../camel/providers/nntp/camel-nntp-folder.c:430
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "é?¢ç·?å·¥ä½?æ??ç?¡æ³?å¼µè²¼ NNTP è¨?æ?¯ï¼?"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/nntp/camel-nntp-folder.c:443
+#: ../camel/providers/nntp/camel-nntp-folder.c:441
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "æ?¨ç?¡æ³?å¾? NNTP è³?æ??å¤¾è¤?è£½è¨?æ?¯ï¼?"
 
@@ -5087,61 +5063,66 @@ msgstr ""
 "è?²ç¨±è?½å¤ æ?¯æ?´ï¼?ä½?å°?æ?¼æ??æ??ä½¿ç?¨è??ä¾?è¬?é?½æ?ªå¿?ä¸?å®?å?¯è¡?ã??"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:207
+#: ../camel/providers/pop3/camel-pop3-store.c:229
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "ç?¡æ³?å¾? POP ä¼ºæ??å?¨ %s è®?å??æ??æ??ç??å??å??èª?"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/pop3/camel-pop3-store.c:224
-#: ../camel/providers/pop3/camel-pop3-store.c:238
-#: ../camel/providers/pop3/camel-pop3-store.c:248
-#: ../camel/providers/pop3/camel-pop3-store.c:254
+#: ../camel/providers/pop3/camel-pop3-store.c:246
+#: ../camel/providers/pop3/camel-pop3-store.c:274
+#: ../camel/providers/pop3/camel-pop3-store.c:280
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "ç?¡æ³?ä»¥å®?å?¨æ¨¡å¼?é?£ç·?å?° POP ä¼ºæ??å?¨ %sï¼? %s"
 
 # shell/e-storage.c:477
-#: ../camel/providers/pop3/camel-pop3-store.c:225
+#: ../camel/providers/pop3/camel-pop3-store.c:247
 msgid "STLS not supported by server"
 msgstr "ä¼ºæ??å?¨ä¸?æ?¯æ?´ STLS"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:255
+# camel/providers/pop3/camel-pop3-store.c:379
+#: ../camel/providers/pop3/camel-pop3-store.c:262
+#, 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:281
 msgid "TLS is not available in this build"
 msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ TLS"
 
 # camel/providers/pop3/camel-pop3-store.c:322
-#: ../camel/providers/pop3/camel-pop3-store.c:361
+#: ../camel/providers/pop3/camel-pop3-store.c:387
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %s"
 
 # camel/providers/pop3/camel-pop3-store.c:409
-#: ../camel/providers/pop3/camel-pop3-store.c:402
-#: ../camel/providers/pop3/camel-pop3-store.c:535
+#: ../camel/providers/pop3/camel-pop3-store.c:428
+#: ../camel/providers/pop3/camel-pop3-store.c:565
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %sï¼?ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?æ©?å?¶ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:418
+#: ../camel/providers/pop3/camel-pop3-store.c:446
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "å?¨ POP ä¼ºæ??å?¨ %2$s ä»¥ SASL ã??%1$sã??ç?»å?¥å¤±æ??ï¼? %3$s"
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr "å?¨ POP ä¼ºæ??å?¨ %2$s ä»¥ SASL ã??%1$sã??ç?»å?¥å¤±æ??%3$s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:430
+#: ../camel/providers/pop3/camel-pop3-store.c:460
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "ä¸?è?½ç?»å?¥ POP ä¼ºæ??å?¨ %sï¼? SASL é??è¨?å??å®?é?¯èª¤"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:449
+#: ../camel/providers/pop3/camel-pop3-store.c:479
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "ç?¡æ³?é©?è? POP ä¼ºæ??å?¨ %sï¼?%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:508
+#: ../camel/providers/pop3/camel-pop3-store.c:538
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -5151,8 +5132,7 @@ msgstr ""
 "è?¯çµ¡æ?¨ç??ç³»çµ±ç®¡ç??è??ã??"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:549
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:579
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5162,17 +5142,27 @@ msgstr ""
 "å?³é??å¯?ç¢¼æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:556
+#: ../camel/providers/pop3/camel-pop3-store.c:588
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending username%s"
 msgstr ""
 "ç?¡æ³?é?£ç·? POP ä¼ºæ??å?¨ %sã??\n"
-"å?³é??ä½¿ç?¨è??å??ç¨±ç?¼ç??é?¯èª¤ï¼?%s"
+"å?³é??ä½¿ç?¨è??å??ç¨±ç?¼ç??é?¯èª¤%s"
+
+# camel/providers/pop3/camel-pop3-store.c:417
+#: ../camel/providers/pop3/camel-pop3-store.c:597
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password%s"
+msgstr ""
+"ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %sã??\n"
+"å?³é??å¯?ç¢¼æ??ç?¼ç??é?¯èª¤%s"
 
 # camel/providers/pop3/camel-pop3-store.c:484
-#: ../camel/providers/pop3/camel-pop3-store.c:669
+#: ../camel/providers/pop3/camel-pop3-store.c:703
 #, c-format
 msgid "No such folder '%s'."
 msgstr "æ²?æ??é??å??è³?æ??å¤¾ã??%sã??ã??"
@@ -5649,7 +5639,7 @@ msgstr "æ£å?¨ç?å¾?"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1900
+#: ../libedataserver/e-time-utils.c:1633 ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
@@ -5659,7 +5649,7 @@ msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1891
+#: ../libedataserver/e-time-utils.c:1638 ../libedataserver/e-time-utils.c:1889
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
@@ -5668,7 +5658,7 @@ msgstr "%Y/%m/%d (%a) %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1896
+#: ../libedataserver/e-time-utils.c:1643 ../libedataserver/e-time-utils.c:1894
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -5677,21 +5667,21 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1887
+#: ../libedataserver/e-time-utils.c:1648 ../libedataserver/e-time-utils.c:1885
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
 # e-util/e-time-utils.c:283
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1655
+#: ../libedataserver/e-time-utils.c:1653
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %m/%d/%Y %I %p"
 
 # e-util/e-time-utils.c:274
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1660
+#: ../libedataserver/e-time-utils.c:1658
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %m/%d/%Y %H"
 
@@ -5700,43 +5690,43 @@ msgstr "%a %m/%d/%Y %H"
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1763
-#: ../libedataserver/e-time-utils.c:1882
+#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1761
+#: ../libedataserver/e-time-utils.c:1880
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 # calendar/gui/calendar-model.c:797
 # e-util/e-time-utils.c:287
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1670
+#: ../libedataserver/e-time-utils.c:1668
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%m/%d/%Y %I:%M:%S %p"
 
 # calendar/gui/calendar-model.c:794
 # e-util/e-time-utils.c:278
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1674
+#: ../libedataserver/e-time-utils.c:1672
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%m/%d/%Y %H:%M:%S"
 
 # e-util/e-time-utils.c:283
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1679
+#: ../libedataserver/e-time-utils.c:1677
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%m/%d/%Y %I:%M %p"
 
 # e-util/e-time-utils.c:274
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1684
+#: ../libedataserver/e-time-utils.c:1682
 msgid "%m/%d/%Y %H:%M"
 msgstr "%m/%d/%Y %H:%M"
 
 # e-util/e-time-utils.c:283
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1687
 msgid "%m/%d/%Y %I %p"
 msgstr "%m/%d/%Y %I %p"
 
@@ -5747,7 +5737,7 @@ msgstr "%m/%d/%Y %I %p"
 # widgets/misc/e-dateedit.c:1465
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1692
 msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
@@ -5758,21 +5748,21 @@ msgstr "%m/%d/%Y %H"
 # widgets/misc/e-dateedit.c:1465
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1766
+#: ../libedataserver/e-time-utils.c:1695 ../libedataserver/e-time-utils.c:1764
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 # e-util/e-time-utils.c:323
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1824 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1822 ../libedataserver/e-time-utils.c:1942
 msgid "%I:%M:%S %p"
 msgstr "%p %I:%M:%S"
 
 # e-util/e-time-utils.c:315
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1828 ../libedataserver/e-time-utils.c:1936
+#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1934
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5784,7 +5774,7 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1833 ../libedataserver/e-time-utils.c:1941
+#: ../libedataserver/e-time-utils.c:1831 ../libedataserver/e-time-utils.c:1939
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
@@ -5795,7 +5785,7 @@ msgstr "%p %I:%M"
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1837 ../libedataserver/e-time-utils.c:1933
+#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1931
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -5804,7 +5794,7 @@ msgstr "%H:%M"
 # widgets/misc/e-dateedit.c:1318
 # widgets/misc/e-dateedit.c:1497
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1840
+#: ../libedataserver/e-time-utils.c:1838
 msgid "%H%M"
 msgstr "%H%M"
 
@@ -5813,7 +5803,7 @@ msgstr "%H%M"
 # widgets/misc/e-dateedit.c:1321
 # widgets/misc/e-dateedit.c:1500
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1844
+#: ../libedataserver/e-time-utils.c:1842
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -5825,59 +5815,63 @@ msgstr "æ£ä»¥å?¿å??æ?¹å¼?å?å?? LDAP ä¼ºæ??å?¨"
 msgid "Failed to authenticate.\n"
 msgstr "é©?è?æ??è?å¤±æ??ã??\n"
 
-#: ../libedataserverui/e-categories-dialog.c:327
+# calendar/gui/e-calendar-table.c:150
+#: ../libedataserverui/e-categories-dialog.c:143
+msgid "Category Icon"
+msgstr "å??é¡?å??ç¤º"
+
+#: ../libedataserverui/e-categories-dialog.c:149
+msgid "_No Image"
+msgstr "æ²?æ??å??ç??(_N)"
+
+#: ../libedataserverui/e-categories-dialog.c:370
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "å?¨çµ?æ??ä¸å·²ç¶?æ??å??ç?ºã??%sã??ç??å??é¡?ã??è«?ä½¿ç?¨å?¦å¤?ç??å??ç¨±"
 
-#: ../libedataserverui/e-categories-dialog.c:618
+#: ../libedataserverui/e-categories-dialog.c:678
 msgid "Icon"
 msgstr "å??ç¤º"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-categories-dialog.c:623
+#: ../libedataserverui/e-categories-dialog.c:683
 msgid "Category"
 msgstr "å??é¡?"
 
-# calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.glade.h:1
-msgid "Category Icon"
-msgstr "å??é¡?å??ç¤º"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: ../libedataserverui/e-categories-dialog.glade.h:2
+#: ../libedataserverui/e-categories-dialog.ui.h:1
 msgid "Category Properties"
 msgstr "å??é¡?å±¬æ?§"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.glade.h:3
+#: ../libedataserverui/e-categories-dialog.ui.h:2
 msgid "Category _Icon"
 msgstr "å??é¡?å??ç¤º(_I)"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.glade.h:4
+#: ../libedataserverui/e-categories-dialog.ui.h:3
 msgid "Category _Name"
 msgstr "å??é¡?å??ç¨±(_N)"
 
 # addressbook/contact-editor/e-contact-editor.c:603
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "å±¬æ?¼é??äº?å??é¡?ç??é ?ç?®(_C):"
+#: ../libedataserverui/e-categories-dialog.ui.h:4
+msgid "Item(s) _belong to these categories:"
+msgstr "å±¬æ?¼é??äº?å??é¡?ç??é ?ç?®(_B):"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.ui.h:5
 msgid "_Available Categories:"
 msgstr "å?¯ç?¨ç??å??é¡?(_A):"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.ui.h:6
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.glade.h:8
+#: ../libedataserverui/e-categories-dialog.ui.h:7
 msgid "categories"
 msgstr "å??é¡?"
 
@@ -5895,84 +5889,83 @@ msgstr "è?²å½©è³?è¨?"
 msgid "The color to render"
 msgstr "è¦?ç¹ªè£½ç??è?²å½©"
 
-#: ../libedataserverui/e-name-selector-dialog.c:276
+#: ../libedataserverui/e-name-selector-dialog.c:292
 msgid "Select Contacts from Address Book"
 msgstr "å¾?é??è¨?é??é?¸å??é?£çµ¡äºº"
 
-#: ../libedataserverui/e-name-selector-dialog.c:563
+#: ../libedataserverui/e-name-selector-dialog.c:587
 msgid "_Add"
 msgstr "å? å?¥(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:588
+#: ../libedataserverui/e-name-selector-dialog.c:612
 msgid "_Remove"
 msgstr "ç§»é?¤(_R)"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.c:765
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:789
+#: ../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>"
 
 # ui/evolution-addressbook.xml.h:17
-#: ../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 "é??è¨?é??"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
+#: ../libedataserverui/e-name-selector-dialog.ui.h:7
 msgid "Cate_gory:"
 msgstr "å??é¡?(_G):"
 
 # ui/evolution-addressbook.xml.h:17
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
+#: ../libedataserverui/e-name-selector-dialog.ui.h:8
 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:2455
+#: ../libedataserverui/e-name-selector-entry.c:2508
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "å±?é??è¡?å?§ %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2470
+#: ../libedataserverui/e-name-selector-entry.c:2523
 #, c-format
 msgid "Cop_y %s"
 msgstr "è¤?è£½(_Y) %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2480
+#: ../libedataserverui/e-name-selector-entry.c:2533
 #, c-format
 msgid "C_ut %s"
 msgstr "å?ªä¸?(_U) %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2497
+#: ../libedataserverui/e-name-selector-entry.c:2550
 #, c-format
 msgid "_Edit %s"
 msgstr "ç·¨è¼¯ %s(_E)"
@@ -6017,185 +6010,6 @@ msgstr "é?¸å??ç?®ç??å?°"
 msgid "_Destination"
 msgstr "ç?®ç??ç«¯(_D)"
 
-# camel/camel-smime-context.c:194
-#: ../servers/exchange/lib/e2k-autoconfig.c:1694
-#: ../servers/exchange/storage/exchange-account.c:955
-#, c-format
-msgid "Enter password for %s"
-msgstr "è¼¸å?¥ %s ç??å¯?ç¢¼ "
-
-#: ../servers/exchange/lib/e2k-autoconfig.c:1695
-#: ../servers/exchange/storage/exchange-account.c:960
-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:844
-msgid "Owner"
-msgstr "æ??æ??è??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:854
-msgid "Publishing Editor"
-msgstr "ç?¼ä½?ç·¨è¼¯è??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:862
-msgid "Editor"
-msgstr "ç·¨è¼¯è??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:869
-msgid "Publishing Author"
-msgstr "ç?¼ä½?ä½?è??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:875
-msgid "Author"
-msgstr "ä½?è??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:880
-msgid "Non-editing Author"
-msgstr "æ²?æ??ç·¨è¼¯ä¸ç??ä½?è??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:884
-msgid "Reviewer"
-msgstr "è®?è??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:886
-msgid "Contributor"
-msgstr "æ?£ä½?è??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:888
-msgid "None"
-msgstr "æ²?æ??"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:903
-msgid "Custom"
-msgstr "è?ªè¨?"
-
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "Generic error"
-msgstr "ä¸?è?¬é?¯èª¤"
-
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "A folder with the same name already exists"
-msgstr "å?·ç?¸å??å??ç¨±ç??è³?æ??å¤¾å·²å?å?¨"
-
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "The specified folder type is not valid"
-msgstr "æ??å®?ç??è³?æ??å¤¾é¡?å??ç?¡æ??"
-
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "I/O error"
-msgstr "I/O é?¯èª¤"
-
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "Not enough space to create the folder"
-msgstr "æ²?æ??è¶³å¤ ç??ç©ºé??å»ºæ§?è³?æ??å¤¾"
-
-# camel/providers/imap/camel-imap-provider.c:43
-# mail/mail-config.glade.h:13
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The folder is not empty"
-msgstr "è³?æ??å¤¾ä¸?æ?¯ç©ºç??"
-
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "The specified folder was not found"
-msgstr "æ?¾ä¸?å?°æ??å®?ç??è³?æ??å¤¾"
-
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Function not implemented in this storage"
-msgstr "å?¨é??å??å?²å?è£?ç½®ä¸?æ²?æ??å¯¦ä½?æ¤å??è?½"
-
-# shell/e-storage.c:477
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "Operation not supported"
-msgstr "ä¸?æ?¯æ?´ç??æ??ä½?"
-
-# camel/camel-cipher-context.c:251
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified type is not supported in this storage"
-msgstr "æ¤å?²å?è£?ç½®ä¸?æ?¯æ?´æ??å®?ç??é??å??é¡?å??"
-
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "The specified folder cannot be modified or removed"
-msgstr "æ??å®?ç??è³?æ??å¤¾ç?¡æ³?è¢«ç·¨è¼¯æ??ç§»é?¤"
-
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "ç?¡æ³?å°?è³?æ??å¤¾ç½®æ?¼å?¶å?è³?æ??å¤¾ä¹?ä¸?"
-
-# camel/providers/local/camel-mbox-folder.c:152
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "Cannot create a folder with that name"
-msgstr "ç?¡æ³?å»ºæ§?ä»¥æ¤ç?ºå??ç??è³?æ??å¤¾"
-
-# camel/providers/imap/camel-imap-folder.c:1047
-# camel/providers/imap/camel-imap-folder.c:1281
-#: ../servers/exchange/storage/e-storage.c:585
-msgid "This operation cannot be performed in off-line mode"
-msgstr "é??å??æ??ä½?ç?¡æ³?å?¨é?¢ç·?æ¨¡å¼?ä¸?é?²è¡?"
-
-# camel/providers/imap/camel-imap-provider.c:48
-# shell/e-shell-view.c:552
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:640
-#, c-format
-msgid "%s's Folders"
-msgstr "%s ç??è³?æ??å¤¾"
-
-#: ../servers/exchange/storage/exchange-account.c:1260
-msgid "Personal Folders"
-msgstr "å??äººè³?æ??å¤¾"
-
-#: ../servers/exchange/storage/exchange-account.c:1275
-msgid "Favorite Public Folders"
-msgstr "å??å¥½ç??å?¬é??è³?æ??å¤¾"
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1292
-msgid "All Public Folders"
-msgstr "æ??æ??ç??å?¬é??è³?æ??å¤¾"
-
-# addressbook/backend/ebook/e-card.c:3346
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1306
-msgid "Global Address List"
-msgstr "å?¨å??å?°å??æ¸?å?®"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-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 "æ?¥èª?"
-
-# addressbook/gui/widgets/e-addressbook-view.c:736
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "å??è¨»"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "å¯?ä»¶å?£"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "å?³é??é ?ç?®"
-
-# camel/camel-store.c:378
-# mail/mail-ops.c:1007
-# mail/mail-ops.c:1014
-# mail/mail-ops.c:1032
-# mail/mail-ops.c:1033
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "å·¥ä½?"
-
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
 #: ../servers/groupwise/e-gw-connection.c:225
@@ -6218,20 +6032,11 @@ msgstr "ç?¡æ??ç??ä¼ºæ??å?¨å??æ??"
 msgid "Bad parameter"
 msgstr "é?¯èª¤ç??å??æ?¸"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Evolution é??è¨?é??æª?æ¡?å¾?ç«¯"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Evolution è¡?äº?æ??æª?æ¡?å?? webcal å¾?ç«¯"
+#~ msgid "\"%s\" on book before \"%s\""
+#~ msgstr "å?¨é??è¨?é??ä¸ã??%sã??å?¨ã??%sã??ä¹?å??"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "Evolution è³?æ??ä¼ºæ??å?¨ä»?é?¢æª¢æ?¥æ??å??"
+#~ msgid "book busy"
+#~ msgstr "é??è¨?é??å¿?ç¢?ä¸"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Evolution è³?æ??ä¼ºæ??å?¨ç?»å?¥æ??å??"
+#~ msgid "CORBA exception making \"%s\" call"
+#~ msgstr "CORBA ä¾?å¤?é? æ??ã??%sã??å?¼å?«"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]