[evolution-data-server/gnome-2-30] Update Simplified Chinese translation.

From: Aron Xu <aronxu src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server/gnome-2-30] Update Simplified Chinese translation.
Date: Mon, 25 Oct 2010 08:08:33 +0000 (UTC)
commit cd0a70dcb6bcd61fc3416ab674c638ba950445d8
Author: Aron Xu <aronxu gnome org>
Date:   Mon Oct 25 08:07:52 2010 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po |  339 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 170 insertions(+), 169 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c37b3c5..94d6f3b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,7 +1,7 @@
 # Simplified Chinese translation to evolution-data-server.
 # Evolution ç??ç®?ä½?ä¸æ??ç¿»è¯?
 # Copyright (C) 2003 Ximian Inc.
-# Copyright (C) 2009 Free Software Foundation.
+# Copyright (C) 2009, 2010 Free Software Foundation.
 # This file is distributed under the same license as the evolution package.
 #
 # Wang Li <charles linux net cn>, 2002, 2003.
@@ -9,7 +9,7 @@
 # Neo Willis <willis linux net>, 2003.
 # Partly comes from Sun_l10n group, 2003.
 # Yang Zhang <zyangmath gmail com>, 2008.
-# Aron Xu <happyaron xu gmail com>, 2009.
+# Aron Xu <happyaron xu gmail com>, 2009, 2010.
 # Yinghua Wang <wantinghard gmail com>, 2010
 #
 msgid ""
@@ -17,9 +17,9 @@ msgstr ""
 "Project-Id-Version: evolution-data-server master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution-data-server&component=Misc.\n"
-"POT-Creation-Date: 2010-09-01 00:36+0000\n"
-"PO-Revision-Date: 2010-08-10 10:04+0800\n"
-"Last-Translator: Yinghua Wang <wantinghard gmail com>\n"
+"POT-Creation-Date: 2010-10-19 03:58+0000\n"
+"PO-Revision-Date: 2010-10-25 16:06+0800\n"
+"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -625,15 +625,15 @@ msgstr "SIP å?°å??"
 msgid "Unnamed List"
 msgstr "æ?ªå?½å??ç??å??è¡¨"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#: ../addressbook/libedata-book/e-data-book-factory.c:301
 #, c-format
 msgid "Empty URI"
 msgstr "ç©º URI"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:305
-#: ../addressbook/libedata-book/e-data-book-factory.c:332
-#: ../calendar/libedata-cal/e-data-cal-factory.c:324
-#: ../calendar/libedata-cal/e-data-cal-factory.c:333
+#: ../addressbook/libedata-book/e-data-book-factory.c:316
+#: ../addressbook/libedata-book/e-data-book-factory.c:343
+#: ../calendar/libedata-cal/e-data-cal-factory.c:335
+#: ../calendar/libedata-cal/e-data-cal-factory.c:344
 #, c-format
 msgid "Invalid source"
 msgstr "æ? æ??æ?¥æº?ã??"
@@ -1060,7 +1060,7 @@ msgstr "å??ç??äº? CORBA å¼?å¸¸"
 
 #: ../calendar/libecal/e-cal.c:4032
 #: ../calendar/libedata-cal/e-cal-backend-util.c:148
-#: ../camel/camel-net-utils.c:523
+#: ../camel/camel-net-utils.c:527
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:214
 #: ../camel/providers/imap/camel-imap-command.c:432
 #: ../camel/providers/imap/camel-imap-store.c:741
@@ -1329,17 +1329,17 @@ msgstr "æ? æ³?è?·å??æ?¥å??æ?´æ?¹"
 msgid "Cannot retrieve calendar free/busy list"
 msgstr "æ? æ³?è?·å??æ?¥å??ç©ºé?²/ç¹?å¿?å??è¡¨"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:340
+#: ../calendar/libedata-cal/e-data-cal-factory.c:351
 #, c-format
 msgid "Invalid URI"
 msgstr "æ? æ??ç?? URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:351
+#: ../calendar/libedata-cal/e-data-cal-factory.c:362
 #, fuzzy, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "æ? å¯¹åº? '%2$s' ç?? '%1$s' ç??å??ç«¯å·¥å??"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:391
+#: ../calendar/libedata-cal/e-data-cal-factory.c:402
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "æ? æ³?å®?ä¾?å??å??ç«¯"
@@ -1350,7 +1350,7 @@ msgstr "è¯¥å¯?ç ?ä¸?æ?¯æ??ç¾å??"
 
 #: ../camel/camel-cipher-context.c:128
 msgid "Signing message"
-msgstr "ç¾å??ä¿¡ä»¶"
+msgstr "ç¾å??æ¶?æ?¯"
 
 #: ../camel/camel-cipher-context.c:145
 msgid "Verifying is not supported by this cipher"
@@ -1358,7 +1358,7 @@ msgstr "è¯¥å¯?ç ?ä¸?æ?¯æ??éª?è¯?"
 
 #: ../camel/camel-cipher-context.c:171
 msgid "Verifying message"
-msgstr "æ ¡éª?ä¿¡ä»¶"
+msgstr "æ ¡éª?æ¶?æ?¯"
 
 #: ../camel/camel-cipher-context.c:189
 msgid "Encryption is not supported by this cipher"
@@ -1366,7 +1366,7 @@ msgstr "è¯¥å¯?ç ?ä¸?æ?¯æ??å? å¯?"
 
 #: ../camel/camel-cipher-context.c:215
 msgid "Encrypting message"
-msgstr "å? å¯?ä¿¡ä»¶"
+msgstr "å? å¯?æ¶?æ?¯"
 
 #: ../camel/camel-cipher-context.c:232
 msgid "Decryption is not supported by this cipher"
@@ -1374,7 +1374,7 @@ msgstr "è¯¥å¯?ç ?ä¸?æ?¯æ??è§£å¯?"
 
 #: ../camel/camel-cipher-context.c:254
 msgid "Decrypting message"
-msgstr "è§£å¯?ä¿¡ä»¶"
+msgstr "è§£å¯?æ¶?æ?¯"
 
 #: ../camel/camel-cipher-context.c:271
 msgid "You may not import keys with this cipher"
@@ -1430,7 +1430,7 @@ msgstr "å°?æ??ä»¶å¤¹å??å®¹å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?"
 
 #: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:106
 msgid "Downloading new messages for offline mode"
-msgstr "ä¸?è½½æ?°ä¿¡ä»¶ä»¥è¿?è¡?è?±æ?ºæ??ä½?"
+msgstr "ä¸?è½½æ?°æ¶?æ?¯ä»¥è¿?è¡?è?±æ?ºæ??ä½?"
 
 #: ../camel/camel-disco-folder.c:466
 #, c-format
@@ -1443,10 +1443,10 @@ msgstr "å??å¤?è?±æ?ºæ??ä»¶å¤¹â??%sâ??"
 #: ../camel/providers/imap/camel-imap-store.c:1843
 #: ../camel/providers/imap/camel-imap-store.c:2280
 #: ../camel/providers/imap/camel-imap-store.c:3089
-#: ../camel/providers/imapx/camel-imapx-store.c:170
-#: ../camel/providers/imapx/camel-imapx-store.c:676
-#: ../camel/providers/imapx/camel-imapx-store.c:732
-#: ../camel/providers/imapx/camel-imapx-store.c:784
+#: ../camel/providers/imapx/camel-imapx-store.c:169
+#: ../camel/providers/imapx/camel-imapx-store.c:680
+#: ../camel/providers/imapx/camel-imapx-store.c:736
+#: ../camel/providers/imapx/camel-imapx-store.c:788
 msgid "You must be working online to complete this operation"
 msgstr "æ?¨å¿?é¡»å?¨çº¿å·¥ä½?ä»¥ä¾¿å®?æ??è¯¥æ??ä½?"
 
@@ -1462,7 +1462,7 @@ msgstr "å??å»ºå?è¿?ç¨?â??%sâ??å¤±è´¥ï¼?%s"
 #: ../camel/camel-filter-driver.c:836
 #, c-format
 msgid "Invalid message stream received from %s: %s"
-msgstr "æ?¶å?° %s å??æ?¥ç??æ? æ??ä¿¡ä»¶æµ?ï¼?%s"
+msgstr "æ?¶å?° %s å??æ?¥ç??æ? æ??æ¶?æ?¯æµ?ï¼?%s"
 
 #: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
 msgid "Syncing folders"
@@ -1493,7 +1493,7 @@ msgstr "è?·å??ç¬¬%då°?ä¿¡(%d%%)"
 
 #: ../camel/camel-filter-driver.c:1245
 msgid "Cannot open message"
-msgstr "æ? æ³?æ??å¼?ä¿¡ä»¶"
+msgstr "æ? æ³?æ??å¼?æ¶?æ?¯"
 
 #: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
 #, c-format
@@ -1520,7 +1520,7 @@ msgstr "å?¨ç¬¬%då°?ä¿¡å¤±è´¥ï¼?å?±%då°?"
 
 #: ../camel/camel-filter-search.c:137
 msgid "Failed to retrieve message"
-msgstr "è?·å??ä¿¡ä»¶å¤±è´¥"
+msgstr "è?·å??æ¶?æ?¯å¤±è´¥"
 
 #: ../camel/camel-filter-search.c:399
 msgid "Invalid arguments to (system-flag)"
@@ -1584,7 +1584,7 @@ msgstr "(%s) é??è¦?æ??ä»¶å¤¹é??"
 #: ../camel/camel-folder.c:690
 #, c-format
 msgid "Unsupported operation: append message: for %s"
-msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?é??å? ä¿¡ä»¶ï¼?ä¸º %s"
+msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?é??å? æ¶?æ?¯ï¼?ä¸º %s"
 
 #: ../camel/camel-folder.c:1401
 #, c-format
@@ -1604,11 +1604,11 @@ msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?æ?? UID æ??ç´¢ï¼?æ??ç´¢ %s"
 #: ../camel/camel-folder.c:1596
 #: ../camel/providers/local/camel-maildir-folder.c:387
 msgid "Moving messages"
-msgstr "ç§»å?¨ä¿¡ä»¶"
+msgstr "ç§»å?¨æ¶?æ?¯"
 
 #: ../camel/camel-folder.c:1596
 msgid "Copying messages"
-msgstr "å¤?å?¶ä¿¡ä»¶"
+msgstr "å¤?å?¶æ¶?æ?¯"
 
 #: ../camel/camel-folder.c:1945
 msgid "Learning junk"
@@ -1620,7 +1620,7 @@ msgstr "å¦ä¹ é??å??å?¾é?®ä»¶"
 
 #: ../camel/camel-folder.c:1983
 msgid "Filtering new message(s)"
-msgstr "è¿?æ»¤æ?°ä¿¡ä»¶"
+msgstr "è¿?æ»¤æ?°æ¶?æ?¯"
 
 #: ../camel/camel-gpg-context.c:760
 #, c-format
@@ -1707,12 +1707,12 @@ msgstr "æ?§è¡? gpg å¤±è´¥ã??"
 #: ../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 "æ? æ³?æ ¡éª?ä¿¡ä»¶ç¾å??ï¼?ä¿¡ä»¶æ ¼å¼?ä¸?å¯¹"
+msgstr "æ? æ³?æ ¡éª?æ¶?æ?¯ç¾å??ï¼?æ¶?æ?¯æ ¼å¼?ä¸?å¯¹"
 
 #: ../camel/camel-gpg-context.c:1600
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "æ? æ³?æ ¡éª?ä¿¡ä»¶ç¾å??ï¼?æ? æ³?å??å»ºä¸´æ?¶æ??ä»¶ï¼?%s"
+msgstr "æ? æ³?æ ¡éª?æ¶?æ?¯ç¾å??ï¼?æ? æ³?å??å»ºä¸´æ?¶æ??ä»¶ï¼?%s"
 
 #: ../camel/camel-gpg-context.c:1713
 #, c-format
@@ -1721,12 +1721,12 @@ msgstr "æ? æ³?ç??æ??å? å¯?æ?°æ?®ï¼?%s"
 
 #: ../camel/camel-gpg-context.c:1765
 msgid "This is a digitally encrypted message part"
-msgstr "è¿?æ?¯ä¿¡ä»¶ç??æ?°å?å? å¯?é?¨å??"
+msgstr "è¿?æ?¯æ¶?æ?¯ç??æ?°å?å? å¯?é?¨å??"
 
 #: ../camel/camel-gpg-context.c:1818 ../camel/camel-gpg-context.c:1826
 #: ../camel/camel-gpg-context.c:1845
 msgid "Cannot decrypt message: Incorrect message format"
-msgstr "æ? æ³?è§£å¯?ä¿¡ä»¶ï¼?ä¿¡ä»¶æ ¼å¼?ä¸?å¯¹"
+msgstr "æ? æ³?è§£å¯?æ¶?æ?¯ï¼?æ¶?æ?¯æ ¼å¼?ä¸?å¯¹"
 
 #: ../camel/camel-gpg-context.c:1835
 msgid "Failed to decrypt MIME part: protocol error"
@@ -1738,7 +1738,7 @@ msgstr "å? å¯?å??å®¹"
 
 #: ../camel/camel-gpg-context.c:1936
 msgid "Unable to parse message content"
-msgstr "æ? æ³?å??æ??ä¿¡ä»¶å??å®¹"
+msgstr "æ? æ³?å??æ??æ¶?æ?¯å??å®¹"
 
 #: ../camel/camel-gpg-context.c:1960 ../camel/camel-gpg-context.c:2007
 #: ../camel/providers/imap4/camel-imap4-utils.c:614
@@ -1845,40 +1845,40 @@ msgstr "å¤?å?¶é?®ä»¶ä¸´æ?¶æ??ä»¶é??è¯¯ï¼?%s"
 msgid "parse error"
 msgstr "è§£æ??é??è¯¯"
 
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:678
-#: ../camel/camel-net-utils.c:817
+#: ../camel/camel-net-utils.c:507 ../camel/camel-net-utils.c:682
+#: ../camel/camel-net-utils.c:821
 #: ../camel/providers/pop3/camel-pop3-store.c:478
 #: ../camel/providers/pop3/camel-pop3-store.c:578
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
-#: ../camel/camel-net-utils.c:523
+#: ../camel/camel-net-utils.c:527
 msgid "cannot create thread"
 msgstr "æ? æ³?å??å»ºçº¿ç´¢"
 
-#: ../camel/camel-net-utils.c:682
+#: ../camel/camel-net-utils.c:686
 #, c-format
 msgid "Resolving: %s"
 msgstr "è§£æ??ï¼?%s"
 
-#: ../camel/camel-net-utils.c:704
+#: ../camel/camel-net-utils.c:708
 msgid "Host lookup failed"
 msgstr "ä¸»æ?ºæ?¥é??å¤±è´¥"
 
-#: ../camel/camel-net-utils.c:706
+#: ../camel/camel-net-utils.c:710
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "ä¸»æ?ºæ?¥é??å¤±è´¥ï¼?%sï¼?%s"
 
-#: ../camel/camel-net-utils.c:821
+#: ../camel/camel-net-utils.c:825
 msgid "Resolving address"
 msgstr "è§£æ??å?°å??"
 
-#: ../camel/camel-net-utils.c:841
+#: ../camel/camel-net-utils.c:845
 msgid "Name lookup failed"
 msgstr "å??ç§°æ?¥é??å¤±è´¥"
 
-#: ../camel/camel-net-utils.c:844
+#: ../camel/camel-net-utils.c:848
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "å??ç§°æ?¥é??å¤±è´¥ï¼?%s"
@@ -1886,7 +1886,7 @@ msgstr "å??ç§°æ?¥é??å¤±è´¥ï¼?%s"
 #: ../camel/camel-offline-folder.c:247
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
-msgstr "æ£å?¨å°?æ??ä»¶å¤¹â??%sâ??ä¸ç??ä¿¡ä»¶å??æ¥å?°ç£?ç??"
+msgstr "æ£å?¨å°?æ??ä»¶å¤¹â??%sâ??ä¸ç??æ¶?æ?¯å??æ¥å?°ç£?ç??"
 
 #: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
 #, c-format
@@ -2155,7 +2155,7 @@ msgstr "è¯·è¾?å?¥ %2$s %3$s ç?? %1$s å¯?ç ?"
 
 #: ../camel/camel-session.c:832
 msgid "Camel session doesn't support forwarding of a message."
-msgstr "Camel ä¼?è¯?ä¸?æ?¯æ??ä¿¡ä»¶è½¬å??ã??"
+msgstr "Camel ä¼?è¯?ä¸?æ?¯æ??æ¶?æ?¯è½¬å??ã??"
 
 #: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
 #, c-format
@@ -2164,7 +2164,7 @@ msgstr "æ? æ³?æ?¾å?°â??%sâ??ç??è¯?ä¹¦"
 
 #: ../camel/camel-smime-context.c:453
 msgid "Cannot create CMS message"
-msgstr "æ? æ³?å??å»º CMS ä¿¡ä»¶"
+msgstr "æ? æ³?å??å»º CMS æ¶?æ?¯"
 
 #: ../camel/camel-smime-context.c:458
 msgid "Cannot create CMS signed data"
@@ -2277,7 +2277,7 @@ msgstr "æ? æ³?è®¡ç®?æ??è¦?"
 
 #: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
 msgid "Cannot set message digests"
-msgstr "æ? æ³?è®¾ç½®ä¿¡ä»¶æ??è¦?"
+msgstr "æ? æ³?è®¾ç½®æ¶?æ?¯æ??è¦?"
 
 #: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
 msgid "Certificate import failed"
@@ -2286,12 +2286,12 @@ msgstr "è¯?ä¹¦å¯¼å?¥å¤±è´¥"
 #: ../camel/camel-smime-context.c:836
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr "å?ªæ??è¯?ä¹¦ç??ä¿¡ä»¶ï¼?æ? æ³?æ ¡éª?è¯?ä¹¦"
+msgstr "å?ªæ??è¯?ä¹¦ç??æ¶?æ?¯ï¼?æ? æ³?æ ¡éª?è¯?ä¹¦"
 
 #: ../camel/camel-smime-context.c:839
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr "å?ªæ??è¯?ä¹¦ç??ä¿¡ä»¶ï¼?è¯?ä¹¦å·²å¯¼å?¥å¹¶æ ¡éª?"
+msgstr "å?ªæ??è¯?ä¹¦ç??æ¶?æ?¯ï¼?è¯?ä¹¦å·²å¯¼å?¥å¹¶æ ¡éª?"
 
 #: ../camel/camel-smime-context.c:843
 msgid "Cannot find signature digests"
@@ -2316,7 +2316,7 @@ msgstr "æ? æ³?ä¸ºå? å¯?æ?¹é??å¯?é?¥å??é??å¯?é?¥æ§½"
 
 #: ../camel/camel-smime-context.c:1038
 msgid "Cannot create CMS Message"
-msgstr "æ? æ³?å??å»º CMS ä¿¡ä»¶"
+msgstr "æ? æ³?å??å»º CMS æ¶?æ?¯"
 
 #: ../camel/camel-smime-context.c:1044
 msgid "Cannot create CMS Enveloped data"
@@ -2482,11 +2482,11 @@ msgstr "å?å?¨â??%sâ??å?ºé??ï¼?"
 #: ../camel/camel-vee-folder.c:654
 #, c-format
 msgid "No such message %s in %s"
-msgstr "å?¨ %2$s ä¸æ²¡æ??ä¿¡ä»¶ %1$s"
+msgstr "å?¨ %2$s ä¸æ²¡æ??æ¶?æ?¯ %1$s"
 
 #: ../camel/camel-vee-folder.c:813 ../camel/camel-vee-folder.c:819
 msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "æ? æ³?å°?ä¿¡ä»¶ç§»å?¨æ??å¤?å?¶å?°è??æ??æ??ä»¶å¤¹ä¸"
+msgstr "æ? æ³?å°?æ¶?æ?¯ç§»å?¨æ??å¤?å?¶å?°è??æ??æ??ä»¶å¤¹ä¸"
 
 #: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
 #: ../camel/camel-vee-store.c:353
@@ -2505,11 +2505,11 @@ msgstr "æ? æ³?é??å?½å??æ??ä»¶å¤¹ï¼?%sï¼?æ²¡æ??è¯¥æ??ä»¶å¤¹"
 
 #: ../camel/camel-vtrash-folder.c:55
 msgid "Cannot copy messages to the Trash folder"
-msgstr "æ? æ³?å°?ä¿¡ä»¶å¤?å?¶å?°å??æ?¶ç«?æ??ä»¶å¤¹"
+msgstr "æ? æ³?å°?æ¶?æ?¯å¤?å?¶å?°å??æ?¶ç«?æ??ä»¶å¤¹"
 
 #: ../camel/camel-vtrash-folder.c:57
 msgid "Cannot copy messages to the Junk folder"
-msgstr "æ? æ³?å°?ä¿¡ä»¶å¤?å?¶å?°å??å?¾é?®ä»¶æ??ä»¶å¤¹"
+msgstr "æ? æ³?å°?æ¶?æ?¯å¤?å?¶å?°å??å?¾é?®ä»¶æ??ä»¶å¤¹"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:137
 #, c-format
@@ -2517,7 +2517,7 @@ msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
-"æ? æ³?è?·å??ä¿¡ä»¶ï¼?%s\n"
+"æ? æ³?è?·å??æ¶?æ?¯ï¼?%s\n"
 "  %s"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:137
@@ -2528,7 +2528,7 @@ msgstr ""
 #: ../camel/providers/local/camel-mbox-folder.c:414
 #: ../camel/providers/local/camel-mh-folder.c:226
 msgid "No such message"
-msgstr "æ²¡æ??è¯¥ä¿¡ä»¶"
+msgstr "æ²¡æ??è¯¥æ¶?æ?¯"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:149
 #: ../camel/providers/imap4/camel-imap4-folder.c:814
@@ -2555,21 +2555,21 @@ msgstr "ç?¨æ?·å·²å??æ¶?"
 #: ../camel/providers/pop3/camel-pop3-folder.c:669
 #, c-format
 msgid "Cannot get message %s: %s"
-msgstr "æ? æ³?è?·å??ä¿¡ä»¶ %sï¼?%s"
+msgstr "æ? æ³?è?·å??æ¶?æ?¯ %sï¼?%s"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:173
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:181
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:2501
 #: ../camel/providers/imap4/camel-imap4-folder.c:837
 msgid "This message is not available in offline mode."
-msgstr "è¯¥ä¿¡ä»¶æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸ä½¿ç?¨ã??"
+msgstr "è¯¥æ¶?æ?¯æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸ä½¿ç?¨ã??"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:195
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:202
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:2004
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:2055
 msgid "Could not get message"
-msgstr "æ? æ³?è?·å¾?ä¿¡ä»¶"
+msgstr "æ? æ³?è?·å¾?æ¶?æ?¯"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:982
 #: ../camel/providers/imap/camel-imap-folder.c:295
@@ -2591,22 +2591,22 @@ msgstr "å??æ?¶ç«?æ??ä»¶å¤¹å·²æ»¡ã??è¯·æ¸?ç©ºã??"
 #: ../camel/providers/groupwise/camel-groupwise-store.c:756
 #: ../camel/providers/imap/camel-imap-folder.c:3429
 #: ../camel/providers/imap/camel-imap-folder.c:3505
-#: ../camel/providers/imapx/camel-imapx-server.c:3631
-#: ../camel/providers/imapx/camel-imapx-server.c:3750
+#: ../camel/providers/imapx/camel-imapx-server.c:3663
+#: ../camel/providers/imapx/camel-imapx-server.c:3782
 #, c-format
 msgid "Fetching summary information for new messages in %s"
-msgstr "ä»? %s ä¸ç??æ?°ä¿¡ä»¶ä¸è?·å??æ¦?è¦?ä¿¡æ?¯"
+msgstr "ä»? %s ä¸ç??æ?°æ¶?æ?¯ä¸è?·å??æ¦?è¦?ä¿¡æ?¯"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:2355
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:2398
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
-msgstr "æ? æ³?å°?ä¿¡ä»¶è¿½å? å?°æ??ä»¶å¤¹â??%sâ??ï¼?%s"
+msgstr "æ? æ³?å°?æ¶?æ?¯è¿½å? å?°æ??ä»¶å¤¹â??%sâ??ï¼?%s"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:2386
 #, c-format
 msgid "Cannot create message: %s"
-msgstr "æ? æ³?å??å»ºä¿¡ä»¶ï¼?%s"
+msgstr "æ? æ³?å??å»ºæ¶?æ?¯ï¼?%s"
 
 #: ../camel/providers/groupwise/camel-groupwise-journal.c:281
 #, c-format
@@ -2616,13 +2616,13 @@ msgstr "æ? æ³?è?·å¾?æ??ä»¶å¤¹å®¹å?¨ %s"
 #: ../camel/providers/groupwise/camel-groupwise-journal.c:343
 #: ../camel/providers/imap4/camel-imap4-journal.c:311
 msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?è¿½å? ä¿¡ä»¶ï¼?ç¼?å?ä¸?å?¯ç?¨"
+msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?è¿½å? æ¶?æ?¯ï¼?ç¼?å?ä¸?å?¯ç?¨"
 
 #: ../camel/providers/groupwise/camel-groupwise-journal.c:359
 #: ../camel/providers/imap4/camel-imap4-journal.c:327
 #, c-format
 msgid "Cannot append message in offline mode: %s"
-msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?è¿½å? ä¿¡ä»¶ï¼?%s"
+msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?è¿½å? æ¶?æ?¯ï¼?%s"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:54
 #: ../camel/providers/imap4/camel-imap4-provider.c:38
@@ -2633,14 +2633,14 @@ msgstr "æ£?æ?¥æ?°é?®ä»¶"
 #: ../camel/providers/hula/camel-hula-provider.c:50
 #: ../camel/providers/imap/camel-imap-provider.c:46
 #: ../camel/providers/imap4/camel-imap4-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:52
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
 msgid "C_heck for new messages in all folders"
-msgstr "å?¨æ??æ??æ??ä»¶å¤¹ä¸æ£?æ?¥æ?°ä¿¡ä»¶(_H)"
+msgstr "å?¨æ??æ??æ??ä»¶å¤¹ä¸æ£?æ?¥æ?°æ¶?æ?¯(_H)"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:59
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imap4/camel-imap4-provider.c:51
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../camel/providers/imapx/camel-imapx-provider.c:79
 #: ../camel/providers/local/camel-local-provider.c:46
 #: ../camel/providers/local/camel-local-provider.c:86
 #: ../camel/providers/local/camel-local-provider.c:106
@@ -2649,15 +2649,15 @@ msgstr "é??é¡¹"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "åº?ç?¨è¿?æ»¤è§?å??å?°æ¤æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡ä»¶(_A)"
+msgstr "åº?ç?¨è¿?æ»¤è§?å??å?°æ¤æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°æ¶?æ?¯(_A)"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:63
 msgid "Check new messages for J_unk contents"
-msgstr "æ£?æ?¥æ?°ä¿¡ä»¶ç??å??å?¾å??å®¹(_U)"
+msgstr "æ£?æ?¥æ?°æ¶?æ?¯ç??å??å?¾å??å®¹(_U)"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:65
 #: ../camel/providers/imap/camel-imap-provider.c:74
-#: ../camel/providers/imapx/camel-imapx-provider.c:86
+#: ../camel/providers/imapx/camel-imapx-provider.c:85
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "ä»?å?¨æ?¶ä»¶ç®±ä¸æ£?æ?¥å??å?¾é?®ä»¶(_B)"
 
@@ -2685,7 +2685,7 @@ msgstr "è®¿é?® Novell GroupWise æ??å?¡å?¨"
 #: ../camel/providers/hula/camel-hula-provider.c:93
 #: ../camel/providers/imap/camel-imap-provider.c:100
 #: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapx/camel-imapx-provider.c:112
+#: ../camel/providers/imapx/camel-imapx-provider.c:111
 #: ../camel/providers/nntp/camel-nntp-provider.c:74
 #: ../camel/providers/pop3/camel-pop3-provider.c:74
 msgid "Password"
@@ -2702,7 +2702,7 @@ msgstr "URL ä¸ç??ä¸»æ?ºæ??ç?¨æ?·ä¸?å?¯ç?¨"
 
 #: ../camel/providers/groupwise/camel-groupwise-store.c:197
 #: ../camel/providers/imap/camel-imap-store.c:1356
-#: ../camel/providers/imapx/camel-imapx-server.c:2901
+#: ../camel/providers/imapx/camel-imapx-server.c:2933
 msgid "You did not enter a password."
 msgstr "æ?¨æ²¡æ??è¾?å?¥å¯?ç ?ã??"
 
@@ -2713,7 +2713,7 @@ msgstr "æ??äº?ç?¹æ?§å?¯è?½æ? æ³?ä¸?æ?¨ç?®å??ç??æ??å?¡å?¨ç??æ?¬å?±å??å·¥ä½?"
 #: ../camel/providers/groupwise/camel-groupwise-store.c:533
 #: ../camel/providers/imap/camel-imap-store.c:1879
 #: ../camel/providers/imap/camel-imap-store.c:2077
-#: ../camel/providers/imapx/camel-imapx-store.c:376
+#: ../camel/providers/imapx/camel-imapx-store.c:380
 #, c-format
 msgid "No such folder %s"
 msgstr "æ²¡æ??æ??ä»¶å¤¹ %s"
@@ -2725,7 +2725,7 @@ msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?å??å»º GroupWise æ??ä»¶å¤¹ã??"
 #: ../camel/providers/groupwise/camel-groupwise-store.c:1215
 #: ../camel/providers/imap/camel-imap-store.c:1954
 #: ../camel/providers/imap/camel-imap-store.c:2355
-#: ../camel/providers/imapx/camel-imapx-store.c:820
+#: ../camel/providers/imapx/camel-imapx-store.c:824
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "ç?¶æ??ä»¶å¤¹ä¸?å??è®¸å?«æ??å?æ??ä»¶å¤¹"
 
@@ -2753,7 +2753,7 @@ msgstr "é??è¿? %s å??é?? GroupWise é?®ä»¶"
 
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:164
 msgid "Sending Message"
-msgstr "å??é??ä¿¡ä»¶"
+msgstr "å??é??æ¶?æ?¯"
 
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:212
 msgid ""
@@ -2768,36 +2768,36 @@ msgstr ""
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:207
 #, c-format
 msgid "Could not send message: %s"
-msgstr "æ? æ³?å??é??ä¿¡ä»¶ï¼?%s"
+msgstr "æ? æ³?å??é??æ¶?æ?¯ï¼?%s"
 
 #: ../camel/providers/hula/camel-hula-provider.c:48
 #: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:43
 msgid "Checking for New Mail"
 msgstr "æ£?æ?¥æ?°é?®ä»¶"
 
 #: ../camel/providers/hula/camel-hula-provider.c:53
 #: ../camel/providers/imap/camel-imap-provider.c:52
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:57
 msgid "Connection to Server"
 msgstr "è¿?æ?¥æ??å?¡å?¨"
 
 #: ../camel/providers/hula/camel-hula-provider.c:55
 #: ../camel/providers/imap/camel-imap-provider.c:54
-#: ../camel/providers/imapx/camel-imapx-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
 msgid "_Use custom command to connect to server"
 msgstr "ä½¿ç?¨è?ªå®?ä¹?å?½ä»¤è¿?æ?¥å?°æ??å?¡å?¨(_U)"
 
 #: ../camel/providers/hula/camel-hula-provider.c:57
 #: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
 msgid "Command:"
 msgstr "å?½ä»¤ï¼?"
 
 #: ../camel/providers/hula/camel-hula-provider.c:60
 #: ../camel/providers/imap/camel-imap-provider.c:60
 #: ../camel/providers/imap4/camel-imap4-provider.c:43
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid "Folders"
 msgstr "æ??ä»¶å¤¹"
@@ -2805,14 +2805,14 @@ msgstr "æ??ä»¶å¤¹"
 #: ../camel/providers/hula/camel-hula-provider.c:62
 #: ../camel/providers/imap/camel-imap-provider.c:62
 #: ../camel/providers/imap4/camel-imap4-provider.c:45
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:71
 msgid "_Show only subscribed folders"
 msgstr "å?ªæ?¾ç¤ºè®¢é??äº?ç??æ??ä»¶å¤¹(_S)"
 
 #: ../camel/providers/hula/camel-hula-provider.c:64
 #: ../camel/providers/imap/camel-imap-provider.c:64
 #: ../camel/providers/imap4/camel-imap4-provider.c:47
-#: ../camel/providers/imapx/camel-imapx-provider.c:75
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 msgid "O_verride server-supplied folder namespace"
 msgstr "è¦?ç??æ??å?¡å?¨æ??ä¾?ç??æ??ä»¶å¤¹å?½å??ç©ºé?´(_V)"
 
@@ -2846,6 +2846,7 @@ msgstr "æ²¡æ??è¾?å?¥æµ?"
 #: ../camel/providers/imap/camel-imap-command.c:278
 #: ../camel/providers/imap/camel-imap-command.c:492
 #: ../camel/providers/imap/camel-imap-store.c:3126
+#: ../camel/providers/imapx/camel-imapx-store.c:216
 msgid "Operation cancelled"
 msgstr "æ??ä½?å·²å??æ¶?"
 
@@ -2901,10 +2902,10 @@ msgstr "æ? æ³?å??å»ºç?®å½? %sï¼?%s"
 
 #. Check UIDs and flags of all messages we already know of.
 #: ../camel/providers/imap/camel-imap-folder.c:918
-#: ../camel/providers/imapx/camel-imapx-server.c:3668
+#: ../camel/providers/imapx/camel-imapx-server.c:3700
 #, c-format
 msgid "Scanning for changed messages in %s"
-msgstr "æ?«æ?? %s ä¸æ?´æ?¹äº?ç??ä¿¡ä»¶"
+msgstr "æ?«æ?? %s ä¸æ?´æ?¹äº?ç??æ¶?æ?¯"
 
 #: ../camel/providers/imap/camel-imap-folder.c:1986
 #, c-format
@@ -2922,24 +2923,24 @@ msgstr "å?¨ APPEND å?½ä»¤æ?¶å??ç??äº?é??è¯¯ï¼?"
 #: ../camel/providers/imap/camel-imap-folder.c:2877
 #, c-format
 msgid "Unable to retrieve message: %s"
-msgstr "æ? æ³?è?·å??ä¿¡ä»¶ï¼?%s"
+msgstr "æ? æ³?è?·å??æ¶?æ?¯ï¼?%s"
 
 #: ../camel/providers/imap/camel-imap-folder.c:2912
-#: ../camel/providers/imapx/camel-imapx-server.c:4782
+#: ../camel/providers/imapx/camel-imapx-server.c:4815
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
-msgstr "æ? æ³?è?·å??ä¿¡ä»¶ ID %sï¼?%s"
+msgstr "æ? æ³?è?·å??æ¶?æ?¯ ID %sï¼?%s"
 
 #: ../camel/providers/imap/camel-imap-folder.c:2913
-#: ../camel/providers/imapx/camel-imapx-server.c:4783
+#: ../camel/providers/imapx/camel-imapx-server.c:4816
 msgid "No such message available."
-msgstr "æ²¡æ??è¯¥ä¿¡ä»¶ã??"
+msgstr "æ²¡æ??è¯¥æ¶?æ?¯ã??"
 
 #: ../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 "è¯¥ä¿¡ä»¶ç?®å??ä¸?å?¯ç?¨"
+msgstr "è¯¥æ¶?æ?¯ç?®å??ä¸?å?¯ç?¨"
 
 #: ../camel/providers/imap/camel-imap-folder.c:3632
 #, c-format
@@ -2967,7 +2968,7 @@ msgstr "æ? æ³?æ??å¼?ç¼?å?ç?®å½?ï¼?%s"
 #: ../camel/providers/imap/camel-imap-message-cache.c:450
 #, c-format
 msgid "Failed to cache message %s: %s"
-msgstr "ç¼?å?ä¿¡ä»¶ %s å¤±è´¥ï¼?%s"
+msgstr "ç¼?å?æ¶?æ?¯ %s å¤±è´¥ï¼?%s"
 
 #: ../camel/providers/imap/camel-imap-message-cache.c:530
 #, c-format
@@ -2975,30 +2976,30 @@ msgid "Failed to cache %s: %s"
 msgstr "ç¼?å? %s å¤±è´¥ï¼?%s"
 
 #: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
 msgid "Ch_eck for new messages in subscribed folders"
-msgstr "å?¨è®¢é??ç??æ??ä»¶å¤¹ä¸æ£?æ?¥æ?°ä¿¡ä»¶(_E)"
+msgstr "å?¨è®¢é??ç??æ??ä»¶å¤¹ä¸æ£?æ?¥æ?°æ¶?æ?¯(_E)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:66
 #: ../camel/providers/imap4/camel-imap4-provider.c:49
-#: ../camel/providers/imapx/camel-imapx-provider.c:77
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Namespace:"
 msgstr "å?½å??ç©ºé?´ï¼?"
 
 #: ../camel/providers/imap/camel-imap-provider.c:70
 #: ../camel/providers/imap4/camel-imap4-provider.c:53
-#: ../camel/providers/imapx/camel-imapx-provider.c:82
+#: ../camel/providers/imapx/camel-imapx-provider.c:81
 msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "åº?ç?¨è¿?æ»¤è§?å??å?°æ?¬æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡ä»¶(_A)"
+msgstr "åº?ç?¨è¿?æ»¤è§?å??å?°æ?¬æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°æ¶?æ?¯(_A)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:84
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
 msgid "Check new messages for Jun_k contents"
-msgstr "æ£?æ?¥æ?°ä¿¡ä»¶ç??å??å?¾å??å®¹(_K)"
+msgstr "æ£?æ?¥æ?°æ¶?æ?¯ç??å??å?¾å??å®¹(_K)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:76
 #: ../camel/providers/imap4/camel-imap4-provider.c:59
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "è?ªå?¨å°?è¿?ç¨?é?®ä»¶å??æ¥å?°æ?¬å?°(_Z)"
 
@@ -3007,25 +3008,25 @@ msgid "IMAP"
 msgstr "IMAP"
 
 #: ../camel/providers/imap/camel-imap-provider.c:85
-#: ../camel/providers/imapx/camel-imapx-provider.c:98
+#: ../camel/providers/imapx/camel-imapx-provider.c:97
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP æ??å?¡å?¨ä¸?ç??é?®ä»¶ç??è¯»å??ã??"
 
 #: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapx/camel-imapx-provider.c:114
+#: ../camel/providers/imapx/camel-imapx-provider.c:113
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "è¯¥é??é¡¹å°?ä½¿ç?¨çº¯æ??æ?¬å¯?ç ?è¿?æ?¥å?° IMAP æ??å?¡å?¨ã??"
 
 #: ../camel/providers/imap/camel-imap-store.c:435
 #: ../camel/providers/imap4/camel-imap4-store.c:210
-#: ../camel/providers/imapx/camel-imapx-store.c:204
+#: ../camel/providers/imapx/camel-imapx-store.c:203
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP æ??å?¡å?¨ %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:437
 #: ../camel/providers/imap4/camel-imap4-store.c:212
-#: ../camel/providers/imapx/camel-imapx-store.c:206
+#: ../camel/providers/imapx/camel-imapx-store.c:205
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%2$s ä¸º %1$s æ??ä¾?ç?? IMAP æ??å?¡"
@@ -3054,8 +3055,8 @@ msgstr "SSL ä¸?å?¯ç?¨"
 
 #: ../camel/providers/imap/camel-imap-store.c:578
 #: ../camel/providers/imap/camel-imap-store.c:860
-#: ../camel/providers/imapx/camel-imapx-server.c:2595
-#: ../camel/providers/imapx/camel-imapx-server.c:2693
+#: ../camel/providers/imapx/camel-imapx-server.c:2627
+#: ../camel/providers/imapx/camel-imapx-server.c:2725
 msgid "Connection cancelled"
 msgstr "è¿?æ?¥å·²å??æ¶?"
 
@@ -3066,20 +3067,20 @@ msgstr "è¿?æ?¥å·²å??æ¶?"
 #: ../camel/providers/imap4/camel-imap4-store.c:310
 #: ../camel/providers/imap4/camel-imap4-store.c:325
 #: ../camel/providers/imap4/camel-imap4-store.c:334
-#: ../camel/providers/imapx/camel-imapx-server.c:2764
-#: ../camel/providers/imapx/camel-imapx-server.c:2795
+#: ../camel/providers/imapx/camel-imapx-server.c:2796
+#: ../camel/providers/imapx/camel-imapx-server.c:2827
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "ä»¥å®?å?¨æ¨¡å¼?è¿?æ?¥å?° IMAP æ??å?¡å?¨ %s å¤±è´¥ï¼?%s"
 
 #: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imapx/camel-imapx-server.c:2765
+#: ../camel/providers/imapx/camel-imapx-server.c:2797
 #: ../camel/providers/smtp/camel-smtp-transport.c:332
 msgid "STARTTLS not supported"
 msgstr "ä¸?æ?¯æ?? STARTTLS"
 
 #: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:2796
+#: ../camel/providers/imapx/camel-imapx-server.c:2828
 msgid "SSL negotiations failed"
 msgstr "SSL å??å??å¤±è´¥"
 
@@ -3090,7 +3091,7 @@ msgid "SSL is not available in this build"
 msgstr "æ?¬æ¬¡ç¼?è¯?ä¸æ?ªå??å?« SSL"
 
 #: ../camel/providers/imap/camel-imap-store.c:863
-#: ../camel/providers/imapx/camel-imapx-server.c:2598
+#: ../camel/providers/imapx/camel-imapx-server.c:2630
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "æ? æ³?ä½¿ç?¨å?½ä»¤â??%sâ??è¿?æ?¥ï¼?%s"
@@ -3100,8 +3101,8 @@ msgstr "æ? æ³?ä½¿ç?¨å?½ä»¤â??%sâ??è¿?æ?¥ï¼?%s"
 #: ../camel/providers/imap/camel-imap-store.c:2451
 #: ../camel/providers/imap4/camel-imap4-store-summary.c:356
 #: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/imapx/camel-imapx-store.c:428
-#: ../camel/providers/imapx/camel-imapx-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:432
+#: ../camel/providers/imapx/camel-imapx-store.c:1005
 #: ../camel/providers/local/camel-maildir-folder.c:81
 #: ../camel/providers/local/camel-maildir-store.c:219
 #: ../camel/providers/local/camel-maildir-store.c:291
@@ -3112,20 +3113,20 @@ msgid "Inbox"
 msgstr "æ?¶ä»¶ç®±"
 
 #: ../camel/providers/imap/camel-imap-store.c:1303
-#: ../camel/providers/imapx/camel-imapx-server.c:2860
+#: ../camel/providers/imapx/camel-imapx-server.c:2892
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP æ??å?¡å?¨ %s ä¸?æ?¯æ??è¦?æ±?ç??éª?è¯?ç±»å?? %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:1313
-#: ../camel/providers/imapx/camel-imapx-server.c:2871
+#: ../camel/providers/imapx/camel-imapx-server.c:2903
 #: ../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:1387
-#: ../camel/providers/imapx/camel-imapx-server.c:2940
+#: ../camel/providers/imapx/camel-imapx-server.c:2972
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3139,7 +3140,7 @@ msgstr ""
 #: ../camel/providers/imap/camel-imap-store.c:1891
 #: ../camel/providers/imap/camel-imap-store.c:2293
 #: ../camel/providers/imap4/camel-imap4-store.c:954
-#: ../camel/providers/imapx/camel-imapx-store.c:803
+#: ../camel/providers/imapx/camel-imapx-store.c:807
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -3154,7 +3155,7 @@ msgid "Cannot create folder '%s': folder exists."
 msgstr "æ? æ³?å??å»ºæ??ä»¶å¤¹â??%sâ??ï¼?æ??ä»¶å¤¹å·²å?å?¨ã??"
 
 #: ../camel/providers/imap/camel-imap-store.c:2304
-#: ../camel/providers/imapx/camel-imapx-store.c:812
+#: ../camel/providers/imapx/camel-imapx-store.c:816
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "æ?ªç?¥ç??ç?¶æ??ä»¶å¤¹ï¼?%s"
@@ -3214,11 +3215,11 @@ msgstr "å?¯ç?¨æ??äº?è¿?æ»¤å?¨å??è??æ??æ??ä»¶å¤¹è§?å??æ??é??ç??æ?©å±?é?®ä»¶å??è¡¨
 
 #: ../camel/providers/imap4/camel-imap4-folder.c:88
 msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "å°?è?¥å¹²ç§?æ?ªé??è¯»ç??ç¼?å?ä¿¡ä»¶è®¾ç½®ä¸ºè¿?æ??"
+msgstr "å°?è?¥å¹²ç§?æ?ªé??è¯»ç??ç¼?å?æ¶?æ?¯è®¾ç½®ä¸ºè¿?æ??"
 
 #: ../camel/providers/imap4/camel-imap4-folder.c:89
 msgid "Expire cached messages older than X seconds"
-msgstr "å?¨è?¥å¹²ç§?å??å°?ä¿¡ä»¶è®¾ç½®ä¸ºè¿?æ??"
+msgstr "å?¨è?¥å¹²ç§?å??å°?æ¶?æ?¯è®¾ç½®ä¸ºè¿?æ??"
 
 #: ../camel/providers/imap4/camel-imap4-folder.c:427
 #, c-format
@@ -3248,51 +3249,51 @@ msgstr "æ? æ³?é??æ¯?æ??ä»¶å¤¹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
 #: ../camel/providers/imap4/camel-imap4-folder.c:891
 #, c-format
 msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "æ? æ³?ä»?æ??ä»¶å¤¹â??%2$sâ??è?·å??ä¿¡ä»¶ %1$sï¼?æ²¡æ??è¿?æ ·ç??ä¿¡ä»¶"
+msgstr "æ? æ³?ä»?æ??ä»¶å¤¹â??%2$sâ??è?·å??æ¶?æ?¯ %1$sï¼?æ²¡æ??è¿?æ ·ç??æ¶?æ?¯"
 
 #: ../camel/providers/imap4/camel-imap4-folder.c:896
 #, c-format
 msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "æ? æ³?ä»?æ??ä»¶å¤¹â??%2$sâ??è?·å??ä¿¡ä»¶ %1$sï¼?å?½ä»¤æ? æ??"
+msgstr "æ? æ³?ä»?æ??ä»¶å¤¹â??%2$sâ??è?·å??æ¶?æ?¯ %1$sï¼?å?½ä»¤æ? æ??"
 
 #: ../camel/providers/imap4/camel-imap4-folder.c:940
 #, c-format
 msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "æ? æ³?å°?ä¿¡ä»¶è¿½å? å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ??ä»¶å¤¹ä¸ºå?ªè¯»"
+msgstr "æ? æ³?å°?æ¶?æ?¯è¿½å? å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ??ä»¶å¤¹ä¸ºå?ªè¯»"
 
 #: ../camel/providers/imap4/camel-imap4-folder.c:1033
 #, c-format
 msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "æ? æ³?å°?ä¿¡ä»¶è¿½å? å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ?ªç?¥é??è¯¯"
+msgstr "æ? æ³?å°?æ¶?æ?¯è¿½å? å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ?ªç?¥é??è¯¯"
 
 #: ../camel/providers/imap4/camel-imap4-folder.c:1063
 #, c-format
 msgid "Cannot append message to folder '%s': Bad command"
-msgstr "æ? æ³?å°?ä¿¡ä»¶è¿½å? å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+msgstr "æ? æ³?å°?æ¶?æ?¯è¿½å? å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
 
 #: ../camel/providers/imap4/camel-imap4-folder.c:1182
 #, c-format
 msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "æ? æ³?å°?ä¿¡ä»¶ä»?æ??ä»¶å¤¹â??%sâ??ç§»å?¨å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ?ªç?¥é??è¯¯"
+msgstr "æ? æ³?å°?æ¶?æ?¯ä»?æ??ä»¶å¤¹â??%sâ??ç§»å?¨å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ?ªç?¥é??è¯¯"
 
 #: ../camel/providers/imap4/camel-imap4-folder.c:1186
 #, c-format
 msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "æ? æ³?å°?ä¿¡ä»¶ä»?æ??ä»¶å¤¹â??%sâ??å¤?å?¶å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ?ªç?¥é??è¯¯"
+msgstr "æ? æ³?å°?æ¶?æ?¯ä»?æ??ä»¶å¤¹â??%sâ??å¤?å?¶å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ?ªç?¥é??è¯¯"
 
 #: ../camel/providers/imap4/camel-imap4-folder.c:1194
 #, c-format
 msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "æ? æ³?å°?ä¿¡ä»¶ä»?æ??ä»¶å¤¹â??%sâ??ç§»å?¨å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+msgstr "æ? æ³?å°?æ¶?æ?¯ä»?æ??ä»¶å¤¹â??%sâ??ç§»å?¨å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
 
 #: ../camel/providers/imap4/camel-imap4-folder.c:1198
 #, c-format
 msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "æ? æ³?å°?ä¿¡ä»¶ä»?æ??ä»¶å¤¹â??%sâ??å¤?å?¶å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+msgstr "æ? æ³?å°?æ¶?æ?¯ä»?æ??ä»¶å¤¹â??%sâ??å¤?å?¶å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
 
 #: ../camel/providers/imap4/camel-imap4-provider.c:55
 msgid "Check new messages for _Junk contents"
-msgstr "æ£?æ?¥æ?°ä¿¡ä»¶ç??å??å?¾å??å®¹(_J)"
+msgstr "æ£?æ?¥æ?°æ¶?æ?¯ç??å??å?¾å??å®¹(_J)"
 
 #: ../camel/providers/imap4/camel-imap4-provider.c:57
 msgid "Only check for Junk messa_ges in the INBOX folder"
@@ -3447,7 +3448,7 @@ msgstr "æ? æ³?é??è®¢æ??ä»¶å¤¹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
 
 #: ../camel/providers/imap4/camel-imap4-summary.c:1590
 msgid "Scanning for changed messages"
-msgstr "æ?«æ??æ?´æ?¹äº?ç??ä¿¡ä»¶"
+msgstr "æ?«æ??æ?´æ?¹äº?ç??æ¶?æ?¯"
 
 #: ../camel/providers/imap4/camel-imap4-summary.c:1611
 #, c-format
@@ -3456,7 +3457,7 @@ msgstr "IMAP æ??å?¡å?¨ %s ç??ç?¶æ??ä¸?ä¸?è?´ã??"
 
 #: ../camel/providers/imap4/camel-imap4-summary.c:1638
 msgid "Fetching envelopes of new messages"
-msgstr "è?·å??æ?°æ?°ä¿¡ä»¶ç??ä¿¡å°?"
+msgstr "è?·å??æ?°æ?°æ¶?æ?¯ç??ä¿¡å°?"
 
 #: ../camel/providers/imap4/camel-imap4-utils.c:429
 #, c-format
@@ -3472,29 +3473,29 @@ msgstr "æ? æ?°æ?®"
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "IMAP4 æ??å?¡å?¨ %s æ??å¤?æ?å¼?è¿?æ?¥ï¼?%s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:87
+#: ../camel/providers/imapx/camel-imapx-folder.c:86
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "æ? æ³?ä¸º %s å??å»ºæ??ä»¶å¤¹æ¦?è¦?"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:95
+#: ../camel/providers/imapx/camel-imapx-folder.c:94
 #, c-format
 msgid "Could not create cache for %s"
 msgstr "æ? æ³?ä¸º %s å??å»ºç¼?å?æ??ä»¶"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
 msgid "Use I_dle if the server supports it"
 msgstr "è?¥æ??å?¡å?¨æ?¯æ??ï¼?ä½¿ç?¨ I_dle"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:65
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
 msgid "Numbe_r of cached connections to use"
 msgstr "è¦?ä½¿ç?¨ç??ç¼?å?è¿?æ?¥æ?°(_R)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
+#: ../camel/providers/imapx/camel-imapx-provider.c:95
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2696
+#: ../camel/providers/imapx/camel-imapx-server.c:2728
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr "æ? æ³?è¿?æ?¥å?° %s(ç«¯å?£ %s)ï¼?%s"
@@ -3549,7 +3550,7 @@ msgstr ""
 #: ../camel/providers/local/camel-local-provider.c:88
 #: ../camel/providers/local/camel-local-provider.c:107
 msgid "_Apply filters to new messages in INBOX"
-msgstr "å¯¹ INBOX ä¸ç??æ?°ä¿¡ä»¶åº?ç?¨è¿?æ»¤è§?å??(_A)"
+msgstr "å¯¹ INBOX ä¸ç??æ?°æ¶?æ?¯åº?ç?¨è¿?æ»¤è§?å??(_A)"
 
 #: ../camel/providers/local/camel-local-provider.c:95
 msgid "Maildir-format mail directories"
@@ -3633,7 +3634,7 @@ msgstr "æ? æ³?å? é?¤æ??ä»¶å¤¹å??æ??ä»¶â??%sâ??ï¼?%s"
 
 #: ../camel/providers/local/camel-local-summary.c:515
 msgid "Unable to add message to summary: unknown reason"
-msgstr "æ? æ³?å°?ä¿¡ä»¶æ·»å? å?°æ¦?è¦?ä¸ï¼?æ?ªç?¥ç??å??å? "
+msgstr "æ? æ³?å°?æ¶?æ?¯æ·»å? å?°æ¦?è¦?ä¸ï¼?æ?ªç?¥ç??å??å? "
 
 #: ../camel/providers/local/camel-maildir-folder.c:230
 msgid "Maildir append message canceled"
@@ -3642,7 +3643,7 @@ msgstr "é?®ä»¶ç?®å½?é??å? æ¶?æ?¯å·²å??æ¶?"
 #: ../camel/providers/local/camel-maildir-folder.c:233
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "æ? æ³?å°?ä¿¡ä»¶é??å? å?°é?®ä»¶ç?®å½?æ??ä»¶å¤¹ï¼?%sï¼?%s"
+msgstr "æ? æ³?å°?æ¶?æ?¯é??å? å?°é?®ä»¶ç?®å½?æ??ä»¶å¤¹ï¼?%sï¼?%s"
 
 #: ../camel/providers/local/camel-maildir-folder.c:263
 #: ../camel/providers/local/camel-maildir-folder.c:292
@@ -3662,16 +3663,16 @@ msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
-"æ? æ³?ä»?æ??ä»¶å¤¹ %2$s è?·å??ä¿¡ä»¶ï¼?%1$s\n"
+"æ? æ³?ä»?æ??ä»¶å¤¹ %2$s è?·å??æ¶?æ?¯ï¼?%1$s\n"
 "  %3$s"
 
 #: ../camel/providers/local/camel-maildir-folder.c:315
 msgid "Invalid message contents"
-msgstr "æ? æ??ç??ä¿¡ä»¶å??å®¹"
+msgstr "æ? æ??ç??æ¶?æ?¯å??å®¹"
 
 #: ../camel/providers/local/camel-maildir-folder.c:418
 msgid "Cannot transfer message to destination folder"
-msgstr "æ? æ³?å°?ä¿¡ä»¶è½¬ç§»å?°ç?®æ ?æ??ä»¶å¤¹"
+msgstr "æ? æ³?å°?æ¶?æ?¯è½¬ç§»å?°ç?®æ ?æ??ä»¶å¤¹"
 
 #: ../camel/providers/local/camel-maildir-store.c:148
 #: ../camel/providers/local/camel-maildir-store.c:173
@@ -3730,7 +3731,7 @@ msgstr "æ£?æ?¥æ??ä»¶å¤¹ä¸?è?´æ?§"
 
 #: ../camel/providers/local/camel-maildir-summary.c:637
 msgid "Checking for new messages"
-msgstr "æ£?æ?¥æ?°ä¿¡ä»¶"
+msgstr "æ£?æ?¥æ?°æ¶?æ?¯"
 
 #: ../camel/providers/local/camel-maildir-summary.c:724
 #: ../camel/providers/local/camel-mbox-summary.c:529
@@ -3758,7 +3759,7 @@ msgstr "é?®ä»¶è¿½å? å·²å??æ¶?"
 #: ../camel/providers/local/camel-mbox-folder.c:300
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
-msgstr "æ? æ³?å°?ä¿¡ä»¶é??å? å?°é?®ä»¶ç®±æ??ä»¶ï¼?%sï¼?%s"
+msgstr "æ? æ³?å°?æ¶?æ?¯é??å? å?°é?®ä»¶ç®±æ??ä»¶ï¼?%sï¼?%s"
 
 #: ../camel/providers/local/camel-mbox-folder.c:466
 msgid "The folder appears to be irrecoverably corrupted."
@@ -3767,7 +3768,7 @@ msgstr "æ??ä»¶å¤¹å¥½å??å·²ç»?è¢«ä¸?å?¯æ?¢å¤?å?°ç ´å??äº?ã??"
 #: ../camel/providers/local/camel-mbox-folder.c:474
 #: ../camel/providers/local/camel-mh-folder.c:245
 msgid "Message construction failed."
-msgstr "ä¿¡ä»¶æ??å»ºå¤±è´¥ã??"
+msgstr "æ¶?æ?¯æ??å»ºå¤±è´¥ã??"
 
 #: ../camel/providers/local/camel-mbox-store.c:164
 #: ../camel/providers/local/camel-mbox-store.c:363
@@ -3910,12 +3911,12 @@ msgstr "å??å?¥ä¸´æ?¶ mailbox å¤±è´¥ï¼?%sï¼?%s"
 
 #: ../camel/providers/local/camel-mh-folder.c:180
 msgid "MH append message canceled"
-msgstr "MH è¿½å? ä¿¡ä»¶å·²å??æ¶?"
+msgstr "MH è¿½å? æ¶?æ?¯å·²å??æ¶?"
 
 #: ../camel/providers/local/camel-mh-folder.c:183
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
-msgstr "æ? æ³?å°?ä¿¡ä»¶é??å? å?° mh æ??ä»¶å¤¹ï¼?%sï¼?%s"
+msgstr "æ? æ³?å°?æ¶?æ?¯é??å? å?° mh æ??ä»¶å¤¹ï¼?%sï¼?%s"
 
 #: ../camel/providers/local/camel-mh-store.c:232
 #, c-format
@@ -4037,11 +4038,11 @@ msgstr "å??è¡¨å¤±è´¥ï¼?%s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:430
 msgid "You cannot post NNTP messages while working offline!"
-msgstr "æ?¨ç¦»çº¿æ?¶æ? æ³?æ??é?? NNTP ä¿¡ä»¶ï¼?"
+msgstr "æ?¨ç¦»çº¿æ?¶æ? æ³?æ??é?? NNTP æ¶?æ?¯ï¼?"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:441
 msgid "You cannot copy messages from a NNTP folder!"
-msgstr "æ?¨æ? æ³?ä»? NNTP æ??ä»¶å¤¹å¤?å?¶ä¿¡ä»¶ï¼?"
+msgstr "æ?¨æ? æ³?ä»? NNTP æ??ä»¶å¤¹å¤?å?¶æ¶?æ?¯ï¼?"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid ""
@@ -4151,7 +4152,7 @@ msgstr "æ²¡æ??æ??ä»¶å¤¹ï¼?%s"
 #: ../camel/providers/nntp/camel-nntp-summary.c:373
 #, c-format
 msgid "%s: Scanning new messages"
-msgstr "%sï¼?æ£å?¨æ?«æ??æ?°ä¿¡ä»¶"
+msgstr "%sï¼?æ£å?¨æ?«æ??æ?°æ¶?æ?¯"
 
 #: ../camel/providers/nntp/camel-nntp-summary.c:282
 #, c-format
@@ -4183,24 +4184,24 @@ msgstr "æ? æ³?è?·å?? POP æ¦?è¦?ï¼?%s"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:314
 msgid "Expunging old messages"
-msgstr "é??æ¯?æ?§ä¿¡ä»¶"
+msgstr "é??æ¯?æ?§æ¶?æ?¯"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:322
 msgid "Expunging deleted messages"
-msgstr "å½»åº?é??æ¯?å·²å? é?¤ç??ä¿¡ä»¶"
+msgstr "å½»åº?é??æ¯?å·²å? é?¤ç??æ¶?æ?¯"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:539
 #: ../camel/providers/pop3/camel-pop3-folder.c:561
 #, c-format
 msgid "No message with UID %s"
-msgstr "æ²¡æ?? UID ä¸º %s ç??ä¿¡ä»¶"
+msgstr "æ²¡æ?? UID ä¸º %s ç??æ¶?æ?¯"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
 #: ../camel/providers/pop3/camel-pop3-folder.c:568
 #, c-format
 msgid "Retrieving POP message %d"
-msgstr "æ£å?¨è?·å?? POP ä¿¡ä»¶ %d"
+msgstr "æ£å?¨è?·å?? POP æ¶?æ?¯ %d"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:658
 msgid "Unknown reason"
@@ -4208,11 +4209,11 @@ msgstr "æ?ªç?¥å??å? "
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:43
 msgid "Message storage"
-msgstr "ä¿¡ä»¶å?å?¨"
+msgstr "æ¶?æ?¯å?å?¨"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "_Leave messages on server"
-msgstr "å?¨æ??å?¡å?¨ä¸?ä¿?ç??ä¿¡ä»¶(_L)"
+msgstr "å?¨æ??å?¡å?¨ä¸?ä¿?ç??æ¶?æ?¯(_L)"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:47
 #, c-format
@@ -4423,7 +4424,7 @@ msgstr "ç³»ç»?ç?¶æ??ï¼?æ??ç³»ç»?æ±?å?©å°±ç»ª"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Help message"
-msgstr "å¸®å?©ä¿¡ä»¶"
+msgstr "å¸®å?©æ¶?æ?¯"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service ready"
@@ -4545,23 +4546,23 @@ msgstr "é??è¿? %s å??é?? SMTP é?®ä»¶"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Cannot send message: service not connected."
-msgstr "æ? æ³?å??é??ä¿¡ä»¶ï¼?æ??å?¡æ?ªè¿?æ?¥ã??"
+msgstr "æ? æ³?å??é??æ¶?æ?¯ï¼?æ??å?¡æ?ªè¿?æ?¥ã??"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:726
 msgid "Cannot send message: sender address not valid."
-msgstr "æ? æ³?å??é??ä¿¡ä»¶ï¼?å??ä»¶äººå?°å??ä¸?å??æ³?ã??"
+msgstr "æ? æ³?å??é??æ¶?æ?¯ï¼?å??ä»¶äººå?°å??ä¸?å??æ³?ã??"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:730
 msgid "Sending message"
-msgstr "å??é??ä¿¡ä»¶"
+msgstr "å??é??æ¶?æ?¯"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:745
 msgid "Cannot send message: no recipients defined."
-msgstr "æ? æ³?å??é??ä¿¡ä»¶ï¼?æ²¡æ??å®?ä¹?æ?¶ä»¶äººã??"
+msgstr "æ? æ³?å??é??æ¶?æ?¯ï¼?æ²¡æ??å®?ä¹?æ?¶ä»¶äººã??"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:756
 msgid "Cannot send message: one or more invalid recipients"
-msgstr "æ? æ³?å??é??ä¿¡ä»¶ï¼?ä¸?ä¸ªæ??å¤?ä¸ªé??æ³?æ?¶ä»¶äºº"
+msgstr "æ? æ³?å??é??æ¶?æ?¯ï¼?ä¸?ä¸ªæ??å¤?ä¸ªé??æ³?æ?¶ä»¶äºº"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:985
 msgid "SMTP Greeting"
@@ -5068,7 +5069,7 @@ msgstr "æ? æ??å??æ?°"
 #~ msgstr "%sï¼?gconf ä¸æ²¡æ??å?å?¨è?ªèº«è??ç³»äººç?? UID"
 
 #~ msgid "This is a digitally signed message part"
-#~ msgstr "è¿?æ?¯ä¿¡ä»¶ç??æ?°å?ç¾å??é?¨å??"
+#~ msgstr "è¿?æ?¯æ¶?æ?¯ç??æ?°å?ç¾å??é?¨å??"
 
 #~ msgid "Kerberos 4"
 #~ msgstr "Kerberos 4"
@@ -5282,7 +5283,7 @@ msgstr "æ? æ??å??æ?°"
 #~ msgstr "æ? æ³?ä»¥æ¤å??ç§°å??å»ºæ??ä»¶å¤¹"
 
 #~ msgid "This operation cannot be performed in off-line mode"
-#~ msgstr "è¯¥ä¿¡ä»¶æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸ä½¿ç?¨"
+#~ msgstr "è¯¥æ¶?æ?¯æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸ä½¿ç?¨"
 
 #~ msgid "%s's Folders"
 #~ msgstr "%s ç??æ??ä»¶å¤¹"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]