[evolution-data-server] Update Simplified Chinese translation.

From: Aron Xu <aronxu src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Update Simplified Chinese translation.
Date: Fri, 18 Mar 2011 10:51:20 +0000 (UTC)
commit 51eb27a21f046c2a56e57966abb999e59ab80c29
Author: Lele Long <schemacs gmail com>
Date:   Fri Mar 18 10:51:11 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po |  422 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 208 insertions(+), 214 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 53e4fb2..78cc4cb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,9 +1,8 @@
 # Simplified Chinese translation to evolution-data-server.
 # Evolution ç??ç®?ä½?ä¸æ??ç¿»è¯?
 # Copyright (C) 2003 Ximian Inc.
-# Copyright (C) 2009 Free Software Foundation.
+# Copyright (C) 2009, 2010, 2011 Free Software Foundation.
 # This file is distributed under the same license as the evolution package.
-#
 # Wang Li <charles linux net cn>, 2002, 2003.
 # Funda Wang <fundawang linux net cn>, 2003, 2005.
 # Neo Willis <willis linux net>, 2003.
@@ -13,15 +12,16 @@
 # lainme <lainme993 gmail com>, 2010.
 # Tao Wang <dancefire gmail com>, 2010.
 # Dean Lee <xslidian gmail com>, 2010.
+# Lele Long <schemacs gmail com>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution-data-server&component=Misc.\n"
-"POT-Creation-Date: 2011-03-03 03:57+0000\n"
-"PO-Revision-Date: 2011-03-04 12:28+0000\n"
-"Last-Translator: æ??ç?? <lw124124 gmail com>\n"
+"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
+"POT-Creation-Date: 2011-03-14 10:22+0000\n"
+"PO-Revision-Date: 2011-03-18 18:49+0800\n"
+"Last-Translator: Lele Long <schemacs 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"
@@ -50,24 +50,16 @@ msgid "Querying for updated contactsâ?¦"
 msgstr "æ?¥è¯¢æ?´æ?°ç??è??ç³»äºº..."
 
 #: ../addressbook/backends/google/e-book-backend-google.c:624
-#, fuzzy
-#| msgctxt "CategoryName"
-#| msgid "Personal"
 msgid "Personal"
 msgstr "ä¸ªäºº"
 
 #: ../addressbook/backends/google/e-book-backend-google.c:626
-#, fuzzy
-#| msgctxt "CategoryName"
-#| msgid "Favorites"
 msgid "Friends"
-msgstr "æ??ç?±"
+msgstr "æ??å??"
 
 #: ../addressbook/backends/google/e-book-backend-google.c:628
-#, fuzzy
-#| msgid "Family Name"
 msgid "Family"
-msgstr "å§?"
+msgstr "å®¶äºº"
 
 #: ../addressbook/backends/google/e-book-backend-google.c:630
 msgid "Coworkers"
@@ -91,16 +83,12 @@ msgid "Modifying contactâ?¦"
 msgstr "ä¿®æ?¹è??ç³»äºº..."
 
 #: ../addressbook/backends/google/e-book-backend-google.c:1199
-#, fuzzy
-#| msgid "Loading..."
 msgid "Loadingâ?¦"
 msgstr "æ£å?¨è½½å?¥..."
 
 #: ../addressbook/backends/google/e-book-backend-google.c:1346
-#, fuzzy
-#| msgid "Authentication Required"
 msgid "Authenticating with the serverâ?¦"
-msgstr "é??è¦?è®¤è¯?"
+msgstr "æ£å?¨ä¸?æ??å?¡å?¨è¿?è¡?è®¤è¯?..."
 
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
@@ -162,7 +150,7 @@ msgstr "æ?§è¡?æ??ç´¢é??è¯¯"
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
 #: ../calendar/backends/http/e-cal-backend-http.c:435
-#: ../calendar/libecal/e-cal.c:4176
+#: ../calendar/libecal/e-cal.c:4177
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:160
 #: ../camel/providers/imap/camel-imap-command.c:481
 #: ../camel/providers/imap/camel-imap-store.c:425
@@ -177,12 +165,12 @@ msgstr "æ?ªç?¥ç??é??è¯¯"
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "å??å»ºèµ?æº?â??%sâ??å¤±è´¥ï¼?HTTP ç?¶æ??ç ?ä¸º: %d(%s)"
 
-#: ../addressbook/libebook/e-book.c:3159
+#: ../addressbook/libebook/e-book.c:3160
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%sï¼?GConf ä¸æ²¡æ??å?å?¨ UIDâ??%sâ??ç??æº?ã??"
 
-#: ../addressbook/libebook/e-book.c:3515
+#: ../addressbook/libebook/e-book.c:3516
 #: ../addressbook/libedata-book/e-data-book.c:183
 msgid "Address book does not exist"
 msgstr "å?°å??ç°¿ä¸?å?å?¨"
@@ -373,7 +361,7 @@ msgstr "ç½?ç»?æ?¥è®° URL"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:756
+#: ../libedataserverui/e-categories-dialog.c:757
 msgid "Categories"
 msgstr "ç±»å?«"
 
@@ -721,15 +709,16 @@ msgstr "SIP å?°å??"
 msgid "Unnamed List"
 msgstr "æ?ªå?½å??ç??å??è¡¨"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:302
+#: ../addressbook/libedata-book/e-data-book-factory.c:301
+#: ../addressbook/libedata-book/e-data-book-factory.c:334
+#: ../calendar/libedata-cal/e-data-cal-factory.c:362
 #, c-format
 msgid "Empty URI"
 msgstr "ç©ºç?? URI"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:321
-#: ../addressbook/libedata-book/e-data-book-factory.c:359
+#: ../addressbook/libedata-book/e-data-book-factory.c:320
+#: ../addressbook/libedata-book/e-data-book-factory.c:370
 #: ../calendar/libedata-cal/e-data-cal-factory.c:350
-#: ../calendar/libedata-cal/e-data-cal-factory.c:362
 #, c-format
 msgid "Invalid source"
 msgstr "æ? æ??ç??æº?"
@@ -745,7 +734,7 @@ msgid "Repository offline"
 msgstr "ä»?åº?ç¦»çº¿"
 
 #: ../addressbook/libedata-book/e-data-book.c:175
-#: ../calendar/libecal/e-cal.c:4158 ../calendar/libedata-cal/e-data-cal.c:110
+#: ../calendar/libecal/e-cal.c:4159 ../calendar/libedata-cal/e-data-cal.c:110
 msgid "Permission denied"
 msgstr "æ²¡æ??æ??é??"
 
@@ -828,13 +817,13 @@ msgid "No space"
 msgstr "æ²¡æ??ç©ºé?´"
 
 #: ../addressbook/libedata-book/e-data-book.c:194
-#: ../calendar/libecal/e-cal.c:4142 ../calendar/libedata-cal/e-data-cal.c:131
+#: ../calendar/libecal/e-cal.c:4143 ../calendar/libedata-cal/e-data-cal.c:131
 msgid "Invalid argument"
 msgstr "æ? æ??å??æ?°"
 
 #. Translators: The string for NOT_SUPPORTED error
 #: ../addressbook/libedata-book/e-data-book.c:196
-#: ../calendar/libecal/e-cal.c:4181 ../calendar/libedata-cal/e-data-cal.c:133
+#: ../calendar/libecal/e-cal.c:4182 ../calendar/libedata-cal/e-data-cal.c:133
 msgid "Not supported"
 msgstr "ä¸?æ?¯æ??"
 
@@ -1230,7 +1219,7 @@ msgstr "ä½?"
 msgid "Undefined"
 msgstr "æ?ªå®?ä¹?"
 
-#: ../calendar/libecal/e-cal.c:1235 ../libedataserverui/e-book-auth-util.c:206
+#: ../calendar/libecal/e-cal.c:1236 ../libedataserverui/e-book-auth-util.c:206
 #: ../libedataserverui/e-book-auth-util.c:440
 #, c-format
 msgid "Enter password for %s (user %s)"
@@ -1240,62 +1229,62 @@ msgstr "ä¸º %s è¾?å?¥å¯?ç ? (ç?¨æ?· %s)"
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1249
+#: ../calendar/libecal/e-cal.c:1250
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "è¾?å?¥ %s ç??å¯?ç ?ï¼?ä»¥ä¾¿ä¸ºç?¨æ?· %s å?¯ç?¨ä»£ç??æ??å?¡å?¨"
 
-#: ../calendar/libecal/e-cal.c:4144
+#: ../calendar/libecal/e-cal.c:4145
 msgid "Backend is busy"
 msgstr "å??å?°ç¹?å¿?"
 
-#: ../calendar/libecal/e-cal.c:4146
+#: ../calendar/libecal/e-cal.c:4147
 msgid "Repository is offline"
 msgstr "ä»?åº?ç¦»çº¿"
 
-#: ../calendar/libecal/e-cal.c:4148
+#: ../calendar/libecal/e-cal.c:4149
 msgid "No such calendar"
 msgstr "æ²¡æ??è¿?æ ·ç??æ?¥å??"
 
-#: ../calendar/libecal/e-cal.c:4150 ../calendar/libedata-cal/e-data-cal.c:112
+#: ../calendar/libecal/e-cal.c:4151 ../calendar/libedata-cal/e-data-cal.c:112
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "æ?¾ä¸?å?°å¯¹è±¡"
 
-#: ../calendar/libecal/e-cal.c:4152 ../calendar/libedata-cal/e-data-cal.c:113
+#: ../calendar/libecal/e-cal.c:4153 ../calendar/libedata-cal/e-data-cal.c:113
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "æ? æ??å¯¹è±¡"
 
-#: ../calendar/libecal/e-cal.c:4154
+#: ../calendar/libecal/e-cal.c:4155
 msgid "URI not loaded"
 msgstr "URI æ?ªè½½å?¥"
 
-#: ../calendar/libecal/e-cal.c:4156
+#: ../calendar/libecal/e-cal.c:4157
 msgid "URI already loaded"
 msgstr "URI å·²ç»?è½½å?¥"
 
-#: ../calendar/libecal/e-cal.c:4160 ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4161 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "æ?ªç?¥ç?¨æ?·"
 
-#: ../calendar/libecal/e-cal.c:4162 ../calendar/libedata-cal/e-data-cal.c:114
+#: ../calendar/libecal/e-cal.c:4163 ../calendar/libedata-cal/e-data-cal.c:114
 msgid "Object ID already exists"
 msgstr "å¯¹è±¡ ID å·²ç»?å?å?¨"
 
-#: ../calendar/libecal/e-cal.c:4164
+#: ../calendar/libecal/e-cal.c:4165
 msgid "Protocol not supported"
 msgstr "ä¸?æ?¯æ??ç??å??è®®"
 
-#: ../calendar/libecal/e-cal.c:4166
+#: ../calendar/libecal/e-cal.c:4167
 msgid "Operation has been canceled"
 msgstr "æ??ä½?å·²å??æ¶?"
 
-#: ../calendar/libecal/e-cal.c:4168
+#: ../calendar/libecal/e-cal.c:4169
 msgid "Could not cancel operation"
 msgstr "æ? æ³?å??æ¶?æ??ä½?"
 
-#: ../calendar/libecal/e-cal.c:4170
+#: ../calendar/libecal/e-cal.c:4171
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:1306
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:1324
 #: ../camel/providers/groupwise/camel-groupwise-store.c:628
@@ -1306,16 +1295,16 @@ msgstr "æ? æ³?å??æ¶?æ??ä½?"
 msgid "Authentication failed"
 msgstr "è®¤è¯?å¤±è´¥"
 
-#: ../calendar/libecal/e-cal.c:4172
+#: ../calendar/libecal/e-cal.c:4173
 #: ../camel/providers/smtp/camel-smtp-transport.c:775
 msgid "Authentication required"
 msgstr "å¿?é¡»è®¤è¯?"
 
-#: ../calendar/libecal/e-cal.c:4174
+#: ../calendar/libecal/e-cal.c:4175
 msgid "A D-Bus exception has occurred"
 msgstr "å??ç??äº?ä¸?ä¸ª D-Bus å¼?å¸¸"
 
-#: ../calendar/libecal/e-cal.c:4178
+#: ../calendar/libecal/e-cal.c:4179
 msgid "No error"
 msgstr "æ? é??è¯¯"
 
@@ -1566,17 +1555,17 @@ msgstr "æ? æ³?è?·å??æ?¥å??æ?´æ?¹ï¼?%s"
 msgid "Cannot retrieve calendar free/busy list: %s"
 msgstr "æ? æ³?è?·å??æ?¥å??ç©ºé?²ã??ç¹?å¿?å??è¡¨ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:372
+#: ../calendar/libedata-cal/e-data-cal-factory.c:375
 #, c-format
 msgid "Invalid URI"
 msgstr "æ? æ??ç?? URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#: ../calendar/libedata-cal/e-data-cal-factory.c:393
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "å¯¹â??%2$sâ??ç??â??%1$sâ??æ²¡æ??å??ç«¯å·¥å??"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:440
+#: ../calendar/libedata-cal/e-data-cal-factory.c:443
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "æ? æ³?å®?ä¾?å??å??ç«¯"
@@ -1611,24 +1600,24 @@ msgstr "æ?¨ä¸?è?½ç?¨æ¤å¯?ç ?å¯¼å?¥å¯?é?¥"
 msgid "You may not export keys with this cipher"
 msgstr "æ?¨ä¸?è?½ç?¨æ¤å¯?ç ?å¯¼å?ºå¯?é?¥"
 
-#: ../camel/camel-cipher-context.c:811
+#: ../camel/camel-cipher-context.c:812
 msgid "Signing message"
 msgstr "ç¾å??æ¶?æ?¯"
 
-#: ../camel/camel-cipher-context.c:1052
+#: ../camel/camel-cipher-context.c:1053
 msgid "Encrypting message"
 msgstr "å? å¯?æ¶?æ?¯"
 
-#: ../camel/camel-cipher-context.c:1179
+#: ../camel/camel-cipher-context.c:1180
 msgid "Decrypting message"
 msgstr "è§£å¯?æ¶?æ?¯"
 
-#: ../camel/camel-data-cache.c:177
+#: ../camel/camel-data-cache.c:178
 #, c-format
 msgid "Unable to create cache path"
 msgstr "æ? æ³?å??å»ºç¼?å?è·¯å¾?"
 
-#: ../camel/camel-data-cache.c:495
+#: ../camel/camel-data-cache.c:496
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "æ? æ³?å? é?¤ç¼?å?æ?¡ç?®ï¼?%sï¼?%s"
@@ -1696,77 +1685,77 @@ msgstr "å°?æ??ä»¶å¤¹å??å®¹å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?"
 #: ../camel/providers/imapx/camel-imapx-folder.c:465
 #: ../camel/providers/imapx/camel-imapx-folder.c:505
 #: ../camel/providers/imapx/camel-imapx-folder.c:541
-#: ../camel/providers/imapx/camel-imapx-store.c:277
-#: ../camel/providers/imapx/camel-imapx-store.c:1299
-#: ../camel/providers/imapx/camel-imapx-store.c:1387
-#: ../camel/providers/imapx/camel-imapx-store.c:1422
+#: ../camel/providers/imapx/camel-imapx-store.c:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1298
+#: ../camel/providers/imapx/camel-imapx-store.c:1386
+#: ../camel/providers/imapx/camel-imapx-store.c:1421
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "æ?¨å¿?é¡»å?¨çº¿å·¥ä½?ä»¥ä¾¿å®?æ??è¯¥æ??ä½?"
 
-#: ../camel/camel-file-utils.c:719
+#: ../camel/camel-file-utils.c:722
 #, c-format
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
-#: ../camel/camel-filter-driver.c:815 ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:817 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "å??å»ºå?è¿?ç¨?â??%sâ??å¤±è´¥ï¼?%s"
 
-#: ../camel/camel-filter-driver.c:862
+#: ../camel/camel-filter-driver.c:864
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "æ?¶å?° %s å??æ?¥ç??æ? æ??æ¶?æ?¯æµ?ï¼?%s"
 
-#: ../camel/camel-filter-driver.c:1049 ../camel/camel-filter-driver.c:1058
+#: ../camel/camel-filter-driver.c:1051 ../camel/camel-filter-driver.c:1060
 msgid "Syncing folders"
 msgstr "å??æ¥æ??ä»¶å¤¹"
 
-#: ../camel/camel-filter-driver.c:1146 ../camel/camel-filter-driver.c:1596
+#: ../camel/camel-filter-driver.c:1148 ../camel/camel-filter-driver.c:1598
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "è§£æ??è¿?æ»¤è§?å??å?ºé??ï¼?%sï¼?%s"
 
-#: ../camel/camel-filter-driver.c:1157 ../camel/camel-filter-driver.c:1607
+#: ../camel/camel-filter-driver.c:1159 ../camel/camel-filter-driver.c:1609
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "æ?§è¡?è¿?æ»¤è§?å??é??è¯¯ï¼?%sï¼?%s"
 
-#: ../camel/camel-filter-driver.c:1254
+#: ../camel/camel-filter-driver.c:1256
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "æ? æ³?æ??å¼?è?±æ?ºæ??ä»¶å¤¹"
 
-#: ../camel/camel-filter-driver.c:1265
+#: ../camel/camel-filter-driver.c:1267
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "æ? æ³?å¤?ç??è?±æ?ºæ??ä»¶å¤¹"
 
-#: ../camel/camel-filter-driver.c:1283
+#: ../camel/camel-filter-driver.c:1285
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "è?·å??ç¬¬%då°?ä¿¡(%d%%)"
 
-#: ../camel/camel-filter-driver.c:1290 ../camel/camel-filter-driver.c:1312
+#: ../camel/camel-filter-driver.c:1292 ../camel/camel-filter-driver.c:1314
 #, c-format
 msgid "Failed on message %d"
 msgstr "å?¨ç¬¬%då°?ä¿¡å¤±è´¥"
 
-#: ../camel/camel-filter-driver.c:1327 ../camel/camel-filter-driver.c:1432
+#: ../camel/camel-filter-driver.c:1329 ../camel/camel-filter-driver.c:1434
 msgid "Syncing folder"
 msgstr "å??æ¥æ??ä»¶å¤¹"
 
-#: ../camel/camel-filter-driver.c:1332 ../camel/camel-filter-driver.c:1438
+#: ../camel/camel-filter-driver.c:1334 ../camel/camel-filter-driver.c:1440
 msgid "Complete"
 msgstr "å®?æ??"
 
-#: ../camel/camel-filter-driver.c:1396
+#: ../camel/camel-filter-driver.c:1398
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "è?·å??ç¬¬%då°?ä¿¡ï¼?å?±%då°?"
 
-#: ../camel/camel-filter-driver.c:1414
+#: ../camel/camel-filter-driver.c:1416
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "å?¨ç¬¬%då°?ä¿¡å¤±è´¥ï¼?å?±%då°?"
@@ -1788,8 +1777,8 @@ msgstr "(user-tag)å??æ?°æ? æ??"
 msgid "Error executing filter search: %s: %s"
 msgstr "æ?§è¡?è¿?æ»¤è§?å??æ??ç´¢é??è¯¯ï¼?%sï¼?%s"
 
-#: ../camel/camel-folder-search.c:341 ../camel/camel-folder-search.c:452
-#: ../camel/camel-folder-search.c:623
+#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:624
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1798,8 +1787,8 @@ msgstr ""
 "æ? æ³?è§£æ??æ??ç´¢è¡¨è¾¾å¼?ï¼?%sï¼?\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:353 ../camel/camel-folder-search.c:464
-#: ../camel/camel-folder-search.c:635
+#: ../camel/camel-folder-search.c:354 ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:636
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1808,27 +1797,27 @@ msgstr ""
 "æ?§è¡?æ??ç´¢è¡¨è¾¾å¼?é??è¯¯ï¼?%sï¼?\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:839 ../camel/camel-folder-search.c:881
+#: ../camel/camel-folder-search.c:840 ../camel/camel-folder-search.c:882
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) é??è¦?ä¸?ä¸ªå¸?å°?ç»?æ??"
 
-#: ../camel/camel-folder-search.c:934
+#: ../camel/camel-folder-search.c:935
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ä¸?å??è®¸å?¨ %s ä¸ä½¿ç?¨"
 
-#: ../camel/camel-folder-search.c:940 ../camel/camel-folder-search.c:947
+#: ../camel/camel-folder-search.c:941 ../camel/camel-folder-search.c:948
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) é??è¦?ä¸?ä¸ªå?¹é??ç±»å??å?ç¬¦ä¸²"
 
-#: ../camel/camel-folder-search.c:974
+#: ../camel/camel-folder-search.c:975
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) é??è¦?ä¸?ä¸ªæ?°ç»?ç»?æ??"
 
-#: ../camel/camel-folder-search.c:983
+#: ../camel/camel-folder-search.c:984
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) é??è¦?æ??ä»¶å¤¹é??"
@@ -1860,7 +1849,7 @@ msgstr "ç§»å?¨æ¶?æ?¯"
 msgid "Copying messages"
 msgstr "å¤?å?¶æ¶?æ?¯"
 
-#: ../camel/camel-folder.c:3246
+#: ../camel/camel-folder.c:3247
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "æ£å?¨è?·å?? POP æ¶?æ?¯â??%sâ??"
@@ -1923,10 +1912,10 @@ msgstr "GnuPG å¯¹â??%sâ??ç??æ??å¤?å??åº?"
 
 #: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
 #: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:4894
-#: ../camel/providers/imapx/camel-imapx-server.c:4911
-#: ../camel/providers/imapx/camel-imapx-store.c:199
-#: ../camel/providers/nntp/camel-nntp-summary.c:398
+#: ../camel/providers/imapx/camel-imapx-server.c:4892
+#: ../camel/providers/imapx/camel-imapx-server.c:4909
+#: ../camel/providers/imapx/camel-imapx-store.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:405
 #: ../camel/providers/pop3/camel-pop3-folder.c:366
 #: ../camel/providers/pop3/camel-pop3-folder.c:431
 #: ../camel/providers/pop3/camel-pop3-folder.c:506
@@ -2090,17 +2079,17 @@ msgstr "å??å?¥é?®ä»¶ä¸´æ?¶æ??ä»¶é??è¯¯ï¼?%s"
 msgid "Error copying mail temp file: %s"
 msgstr "å¤?å?¶é?®ä»¶ä¸´æ?¶æ??ä»¶é??è¯¯ï¼?%s"
 
-#: ../camel/camel-multipart-signed.c:329
+#: ../camel/camel-multipart-signed.c:327
 #, c-format
 msgid "No content available"
 msgstr "æ²¡æ??å?¯ç?¨ç??å??å®¹"
 
-#: ../camel/camel-multipart-signed.c:337
+#: ../camel/camel-multipart-signed.c:335
 #, c-format
 msgid "No signature available"
 msgstr "æ²¡æ??å?¯ç?¨ç??ç¾å??"
 
-#: ../camel/camel-multipart-signed.c:665
+#: ../camel/camel-multipart-signed.c:663
 #, c-format
 msgid "parse error"
 msgstr "è§£æ??é??è¯¯"
@@ -2260,73 +2249,73 @@ msgstr "æ??å?¡å?¨åº?è¾¾å?«æ??ä¸?å®?æ?´ç??è®¤è¯?æ?°æ?®"
 msgid "Server response does not match"
 msgstr "æ??å?¡å?¨åº?ç?ä¸?å?¹é??"
 
-#: ../camel/camel-sasl-gssapi.c:81
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:83
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "è¯¥é??é¡¹å°?ç?¨ Kerberos 5 è®¤è¯?è¿?æ?¥å?°æ??å?¡å?¨ã??"
 
-#: ../camel/camel-sasl-gssapi.c:124
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr "æ??æ??ä¾?ç??è¯?ä¹¦ä¸?æ?¯æ??æ??å®?ç??æ?ºå?¶ï¼?æ??è??æ? æ³?è¢«å®?ç?°æ??è¯?å?«ã??"
 
-#: ../camel/camel-sasl-gssapi.c:129
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr "æ??ä¾?ç?? target_name å??æ?°æ ¼å¼?ä¸?å¯¹ã??"
 
-#: ../camel/camel-sasl-gssapi.c:132
+#: ../camel/camel-sasl-gssapi.c:137
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "æ??ä¾?ç?? target_name å??æ?°å??å?«æ? æ??æ??ä¸?æ?¯æ??ç??å??ç§°ç±»å??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:136
+#: ../camel/camel-sasl-gssapi.c:141
 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:141
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "input_token å??å?«æ? æ??ç??ç¾å??ï¼?æ??è??æ? æ³?éª?è¯?ç¾å??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:145
+#: ../camel/camel-sasl-gssapi.c:150
 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:150
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "æ??ä¾?ç??ä¸?ä¸?æ??å?¥æ??æ??å¼?ç?¨ç??ä¸?ä¸?æ??æ? æ??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:153
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
 msgstr "å¯¹ input_token æ?§è¡?å®?æ?´æ?§æ£?æ?¥å¤±è´¥ã??"
 
-#: ../camel/camel-sasl-gssapi.c:156
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
 msgstr "å¯¹è¯?ä¹¦æ?§è¡?å®?æ?´æ?§æ£?æ?¥å¤±è´¥ã??"
 
-#: ../camel/camel-sasl-gssapi.c:159
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The referenced credentials have expired."
 msgstr "å¼?ç?¨ç??è¯?ä¹¦å·²è¿?æ??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:165 ../camel/camel-sasl-gssapi.c:305
-#: ../camel/camel-sasl-gssapi.c:349 ../camel/camel-sasl-gssapi.c:366
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:310
+#: ../camel/camel-sasl-gssapi.c:354 ../camel/camel-sasl-gssapi.c:371
 #: ../camel/providers/smtp/camel-smtp-transport.c:1256
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "æ?¥è?ªæ??å?¡å?¨ç??æ? æ??è®¤è¯?åº?ç?ã??"
 
-#: ../camel/camel-sasl-gssapi.c:378
+#: ../camel/camel-sasl-gssapi.c:383
 #, c-format
 msgid "Unsupported security layer."
 msgstr "ä¸?æ?¯æ??ç??å®?å?¨å±?ã??"
@@ -2409,7 +2398,7 @@ msgstr ""
 "æ? æ³?å??å»ºç?®å½? %sï¼?\n"
 "%s"
 
-#: ../camel/camel-session.c:752
+#: ../camel/camel-session.c:753
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "è¯·è¾?å?¥ %2$s %3$s ç?? %1$s å¯?ç ?"
@@ -2604,35 +2593,35 @@ msgstr "å°?æ?°æ?®æ·»å? å?°ç¼?ç ?å?¨å¤±è´¥"
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME è§£å¯?ï¼?æ²¡æ??æ?¾å?°å? å¯?å??å®¹"
 
-#: ../camel/camel-store.c:2180
+#: ../camel/camel-store.c:2181
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "æ? æ³?å??å»ºæ??ä»¶å¤¹â??%sâ??æ??ä»¶å¤¹å·²å?å?¨"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2371 ../camel/camel-store.c:2381
+#: ../camel/camel-store.c:2372 ../camel/camel-store.c:2382
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "å??æ?¶ç«?"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2374 ../camel/camel-store.c:2385
+#: ../camel/camel-store.c:2375 ../camel/camel-store.c:2386
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "å??å?¾"
 
-#: ../camel/camel-store.c:2828
+#: ../camel/camel-store.c:2829
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "æ? æ³?å??å»ºæ??ä»¶å¤¹ï¼?%sï¼?æ??ä»¶å¤¹å·²å?å?¨"
 
-#: ../camel/camel-store.c:2955 ../camel/camel-vee-store.c:367
+#: ../camel/camel-store.c:2956 ../camel/camel-vee-store.c:367
 #: ../camel/providers/local/camel-maildir-store.c:272
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "æ? æ³?å? é?¤æ??ä»¶å¤¹ï¼?%sï¼?æ? æ??æ??ä½?"
 
-#: ../camel/camel-store.c:3096 ../camel/camel-vee-store.c:417
+#: ../camel/camel-store.c:3097 ../camel/camel-vee-store.c:417
 #: ../camel/providers/local/camel-maildir-store.c:668
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -2794,17 +2783,17 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "æ? æ³?è§£æ?? URLâ??%sâ??"
 
-#: ../camel/camel-vee-folder.c:1236 ../camel/camel-vee-folder.c:1399
+#: ../camel/camel-vee-folder.c:1235 ../camel/camel-vee-folder.c:1398
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "æ? æ³?å°?æ¶?æ?¯ç§»å?¨æ??å¤?å?¶å?°è??æ??æ??ä»¶å¤¹ä¸"
 
-#: ../camel/camel-vee-folder.c:1272
+#: ../camel/camel-vee-folder.c:1271
 #, c-format
 msgid "No such message %s in %s"
 msgstr "å?¨ %2$s ä¸æ²¡æ??æ¶?æ?¯ %1$s"
 
-#: ../camel/camel-vee-folder.c:1340
+#: ../camel/camel-vee-folder.c:1339
 #, c-format
 msgid "Error storing '%s': "
 msgstr "å?å?¨â??%sâ??å?ºé??ï¼?"
@@ -2833,7 +2822,7 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "æ? æ³?å°?æ¶?æ?¯å¤?å?¶å?°å??å?¾é?®ä»¶æ??ä»¶å¤¹"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:954
-#: ../camel/providers/imap/camel-imap-folder.c:391
+#: ../camel/providers/imap/camel-imap-folder.c:392
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "æ? æ³?ä¸º %s è½½å?¥æ¦?è¦?"
@@ -2846,8 +2835,8 @@ msgstr "æ£?æ?¥å·²å? é?¤ç??æ?°å»º %s"
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:1517
 #: ../camel/providers/groupwise/camel-groupwise-store.c:665
 #: ../camel/providers/groupwise/camel-groupwise-store.c:796
-#: ../camel/providers/imap/camel-imap-folder.c:3961
-#: ../camel/providers/imap/camel-imap-folder.c:4043
+#: ../camel/providers/imap/camel-imap-folder.c:3962
+#: ../camel/providers/imap/camel-imap-folder.c:4044
 #: ../camel/providers/imapx/camel-imapx-server.c:3871
 #: ../camel/providers/imapx/camel-imapx-server.c:4002
 #, c-format
@@ -2892,8 +2881,8 @@ msgid "No such message"
 msgstr "æ²¡æ??è¯¥æ¶?æ?¯"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:2659
-#: ../camel/providers/nntp/camel-nntp-folder.c:247
-#: ../camel/providers/nntp/camel-nntp-folder.c:414
+#: ../camel/providers/nntp/camel-nntp-folder.c:246
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
 #: ../camel/providers/pop3/camel-pop3-folder.c:457
 #, c-format
 msgid "Cannot get message %s: "
@@ -3007,7 +2996,7 @@ msgstr "æ??äº?ç?¹æ?§å?¯è?½æ? æ³?ä¸?æ?¨ç?®å??ç??æ??å?¡å?¨ç??æ?¬å?±å??å·¥ä½?"
 #: ../camel/providers/groupwise/camel-groupwise-store.c:556
 #: ../camel/providers/imap/camel-imap-store.c:1808
 #: ../camel/providers/imap/camel-imap-store.c:2005
-#: ../camel/providers/imapx/camel-imapx-store.c:342
+#: ../camel/providers/imapx/camel-imapx-store.c:341
 #, c-format
 msgid "No such folder %s"
 msgstr "æ²¡æ??æ??ä»¶å¤¹ %s"
@@ -3025,7 +3014,7 @@ msgstr "æ? æ³?å??å»ºç?¹æ®?ç³»ç»?æ??ä»¶å¤¹"
 #: ../camel/providers/groupwise/camel-groupwise-store.c:1236
 #: ../camel/providers/imap/camel-imap-store.c:1886
 #: ../camel/providers/imap/camel-imap-store.c:2323
-#: ../camel/providers/imapx/camel-imapx-store.c:1341
+#: ../camel/providers/imapx/camel-imapx-store.c:1340
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "ç?¶æ??ä»¶å¤¹ä¸?å??è®¸å?«æ??å?æ??ä»¶å¤¹"
@@ -3138,50 +3127,50 @@ msgstr "æ?¥è?ª IMAP æ??å?¡å?¨æ??å¤?ç?? OK åº?ç?ï¼?%s"
 msgid "Always check for new mail in this folder"
 msgstr "æ?»æ?¯æ£?æ?¥æ¤æ??ä»¶å¤¹ä¸ç??æ?°é?®ä»¶(_B)"
 
-#: ../camel/providers/imap/camel-imap-folder.c:368
+#: ../camel/providers/imap/camel-imap-folder.c:369
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "æ? æ³?å??å»ºç?®å½? %sï¼?%s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:991
+#: ../camel/providers/imap/camel-imap-folder.c:992
 #: ../camel/providers/imapx/camel-imapx-server.c:3915
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "æ?«æ?? %s ä¸æ?´æ?¹äº?ç??æ¶?æ?¯"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3368
+#: ../camel/providers/imap/camel-imap-folder.c:3369
 msgid "Unable to retrieve message: "
 msgstr "æ? æ³?è?·å??æ¶?æ?¯ï¼?"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3403
-#: ../camel/providers/imapx/camel-imapx-server.c:5195
+#: ../camel/providers/imap/camel-imap-folder.c:3404
+#: ../camel/providers/imapx/camel-imapx-server.c:5193
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "æ? æ³?è?·å??æ¶?æ?¯ ID %sï¼?%s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3404
-#: ../camel/providers/imapx/camel-imapx-server.c:5196
+#: ../camel/providers/imap/camel-imap-folder.c:3405
+#: ../camel/providers/imapx/camel-imapx-server.c:5194
 msgid "No such message available."
 msgstr "æ²¡æ??è¯¥æ¶?æ?¯ã??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3479
-#: ../camel/providers/imap/camel-imap-folder.c:4374
-#: ../camel/providers/nntp/camel-nntp-folder.c:403
+#: ../camel/providers/imap/camel-imap-folder.c:3480
+#: ../camel/providers/imap/camel-imap-folder.c:4375
+#: ../camel/providers/nntp/camel-nntp-folder.c:402
 #, c-format
 msgid "This message is not currently available"
 msgstr "è¯¥æ¶?æ?¯ç?®å??ä¸?å?¯ç?¨"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4175
+#: ../camel/providers/imap/camel-imap-folder.c:4176
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ä¸?å®?æ?´ç??æ??å?¡å?¨å??åº?ï¼?æ²¡æ??ä¸ºç¬¬ %d å°?ä¿¡æ??ä¾?ä¿¡æ?¯"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4185
+#: ../camel/providers/imap/camel-imap-folder.c:4186
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ä¸?å®?æ?´ç??æ??å?¡å?¨å??åº?ï¼?æ²¡æ??ä¸ºç¬¬ %d å°?ä¿¡æ??ä¾? UID"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4414
+#: ../camel/providers/imap/camel-imap-folder.c:4415
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "æ? æ³?å?¨ FETCH åº?ç?ä¸æ?¾å?°ä¿¡ä½?ã??"
@@ -3275,7 +3264,7 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "è¯¥é??é¡¹å°?ä½¿ç?¨çº¯æ??æ?¬å¯?ç ?è¿?æ?¥å?° IMAP æ??å?¡å?¨ã??"
 
 #: ../camel/providers/imap/camel-imap-store.c:243
-#: ../camel/providers/nntp/camel-nntp-store.c:309
+#: ../camel/providers/nntp/camel-nntp-store.c:342
 #: ../camel/providers/pop3/camel-pop3-store.c:135
 #: ../camel/providers/smtp/camel-smtp-transport.c:151
 #, c-format
@@ -3283,14 +3272,14 @@ msgid "Could not connect to %s: %s"
 msgstr "æ? æ³?è¿?æ?¥å?° %sï¼?%s"
 
 #: ../camel/providers/imap/camel-imap-store.c:244
-#: ../camel/providers/nntp/camel-nntp-store.c:310
+#: ../camel/providers/nntp/camel-nntp-store.c:343
 #: ../camel/providers/pop3/camel-pop3-store.c:136
 #: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "SSL unavailable"
 msgstr "SSL ä¸?å?¯ç?¨"
 
 #: ../camel/providers/imap/camel-imap-store.c:264
-#: ../camel/providers/nntp/camel-nntp-store.c:329
+#: ../camel/providers/nntp/camel-nntp-store.c:362
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "æ? æ³?è¿?æ?¥å?° %sï¼?"
@@ -3359,13 +3348,13 @@ msgstr ""
 "\n"
 
 #: ../camel/providers/imap/camel-imap-store.c:997
-#: ../camel/providers/imapx/camel-imapx-store.c:183
+#: ../camel/providers/imapx/camel-imapx-store.c:182
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP æ??å?¡å?¨ %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:1001
-#: ../camel/providers/imapx/camel-imapx-store.c:185
+#: ../camel/providers/imapx/camel-imapx-store.c:184
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%2$s ä¸º %1$s æ??ä¾?ç?? IMAP æ??å?¡"
@@ -3373,8 +3362,8 @@ msgstr "%2$s ä¸º %1$s æ??ä¾?ç?? IMAP æ??å?¡"
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
 #: ../camel/providers/imap/camel-imap-store.c:1367
 #: ../camel/providers/imap/camel-imap-store.c:2416
-#: ../camel/providers/imapx/camel-imapx-store.c:372
-#: ../camel/providers/imapx/camel-imapx-store.c:794
+#: ../camel/providers/imapx/camel-imapx-store.c:371
+#: ../camel/providers/imapx/camel-imapx-store.c:793
 #: ../camel/providers/local/camel-maildir-folder.c:409
 #: ../camel/providers/local/camel-maildir-store.c:273
 #: ../camel/providers/local/camel-maildir-store.c:615
@@ -3386,7 +3375,7 @@ msgstr "æ?¶ä»¶ç®±"
 
 #: ../camel/providers/imap/camel-imap-store.c:1822
 #: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imapx/camel-imapx-store.c:1320
+#: ../camel/providers/imapx/camel-imapx-store.c:1319
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -3401,7 +3390,7 @@ msgid "Cannot create folder '%s': folder exists."
 msgstr "æ? æ³?å??å»ºæ??ä»¶å¤¹â??%sâ??ï¼?æ??ä»¶å¤¹å·²å?å?¨ã??"
 
 #: ../camel/providers/imap/camel-imap-store.c:2272
-#: ../camel/providers/imapx/camel-imapx-store.c:1331
+#: ../camel/providers/imapx/camel-imapx-store.c:1330
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "æ?ªç?¥ç??ç?¶æ??ä»¶å¤¹ï¼?%s"
@@ -3467,13 +3456,13 @@ msgstr "æ? æ³?è¿?æ?¥å?° %s(ç«¯å?£ %s)ï¼?"
 msgid "Closing tmp stream failed: "
 msgstr "å?³é?ä¸´æ?¶æµ?å¤±è´¥ï¼?"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5345
-#: ../camel/providers/imapx/camel-imapx-server.c:5360
+#: ../camel/providers/imapx/camel-imapx-server.c:5343
+#: ../camel/providers/imapx/camel-imapx-server.c:5358
 msgid "Cannot create spool file: "
 msgstr "æ? æ³?å??å»ºè?±æ?ºæ??ä»¶ï¼?"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1136
-#: ../camel/providers/nntp/camel-nntp-store.c:1606
+#: ../camel/providers/imapx/camel-imapx-store.c:1135
+#: ../camel/providers/nntp/camel-nntp-store.c:1666
 #, c-format
 msgid "No such folder: %s"
 msgstr "æ²¡æ??æ??ä»¶å¤¹ï¼?%s"
@@ -3508,7 +3497,7 @@ msgstr "%s (%s)"
 msgid "Index message body data"
 msgstr "ç´¢å¼?ä¿¡ä½?æ?°æ?®"
 
-#: ../camel/providers/local/camel-local-folder.c:679
+#: ../camel/providers/local/camel-local-folder.c:700
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3715,21 +3704,21 @@ msgstr "æ? æ³?æ?«æ??æ??ä»¶å¤¹â??%sâ??ï¼?%s"
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
 msgstr "æ? æ³?é??å?½å??æ??ä»¶å¤¹ï¼?%sï¼?æ??ä»¶å¤¹å??ç§°ä¸?è?½å??å?«ç?¹"
 
-#: ../camel/providers/local/camel-maildir-summary.c:430
-#: ../camel/providers/local/camel-maildir-summary.c:560
+#: ../camel/providers/local/camel-maildir-summary.c:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "æ? æ³?æ??å¼?é?®ä»¶ç?®å½?è·¯å¾?ï¼?%sï¼?%s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
 msgstr "æ£?æ?¥æ??ä»¶å¤¹ä¸?è?´æ?§"
 
-#: ../camel/providers/local/camel-maildir-summary.c:644
+#: ../camel/providers/local/camel-maildir-summary.c:650
 msgid "Checking for new messages"
 msgstr "æ£?æ?¥æ?°æ¶?æ?¯"
 
-#: ../camel/providers/local/camel-maildir-summary.c:737
+#: ../camel/providers/local/camel-maildir-summary.c:743
 #: ../camel/providers/local/camel-mbox-summary.c:468
 #: ../camel/providers/local/camel-mbox-summary.c:690
 #: ../camel/providers/local/camel-mbox-summary.c:826
@@ -3920,7 +3909,7 @@ msgstr "æ? æ³?å??å»ºæ??ä»¶å¤¹â??%sâ??ï¼?%s"
 msgid "Cannot get folder '%s': not a directory."
 msgstr "æ? æ³?è?·å??æ??ä»¶å¤¹â??%sâ??ï¼?ä¸?æ?¯ç?®å½?ã??"
 
-#: ../camel/providers/local/camel-mh-summary.c:226
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "æ? æ³?æ??å¼? MH ç?®å½?ï¼?%sï¼?%s"
@@ -4016,15 +4005,15 @@ msgstr ""
 "æ? æ³?å??æ¥è?±æ?ºæ??ä»¶å¤¹ %s: %s\n"
 "æ??ä»¶å¤¹å?¯è?½å·²æ??å??ï¼?å?¯æ?¬å·²å?æ?¾å?¨ '%s'"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:196
-#: ../camel/providers/nntp/camel-nntp-folder.c:275
-#: ../camel/providers/nntp/camel-nntp-folder.c:389
+#: ../camel/providers/nntp/camel-nntp-folder.c:195
+#: ../camel/providers/nntp/camel-nntp-folder.c:274
+#: ../camel/providers/nntp/camel-nntp-folder.c:388
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "å??é?¨é??è¯¯ï¼?UID ç??æ ¼å¼?æ? æ??ï¼?%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:237
-#: ../camel/providers/nntp/camel-nntp-folder.c:241
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/nntp/camel-nntp-folder.c:240
 #: ../camel/providers/pop3/camel-pop3-folder.c:371
 #: ../camel/providers/pop3/camel-pop3-folder.c:436
 #: ../camel/providers/pop3/camel-pop3-folder.c:448
@@ -4033,23 +4022,23 @@ msgstr "å??é?¨é??è¯¯ï¼?UID ç??æ ¼å¼?æ? æ??ï¼?%s"
 msgid "Cannot get message %s: %s"
 msgstr "æ? æ³?è?·å??æ¶?æ?¯ %sï¼?%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:473
-#: ../camel/providers/nntp/camel-nntp-folder.c:479
-#: ../camel/providers/nntp/camel-nntp-folder.c:526
+#: ../camel/providers/nntp/camel-nntp-folder.c:472
+#: ../camel/providers/nntp/camel-nntp-folder.c:478
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 #, c-format
 msgid "Posting failed: %s"
 msgstr "å??è¡¨å¤±è´¥ï¼?%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:521
+#: ../camel/providers/nntp/camel-nntp-folder.c:520
 msgid "Posting failed: "
 msgstr "å??è¡¨å¤±è´¥ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:550
+#: ../camel/providers/nntp/camel-nntp-folder.c:549
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "æ?¨ç¦»çº¿æ?¶æ? æ³?æ??é?? NNTP æ¶?æ?¯ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:570
+#: ../camel/providers/nntp/camel-nntp-folder.c:569
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "æ?¨æ? æ³?ä»? NNTP æ??ä»¶å¤¹å¤?å?¶æ¶?æ?¯ï¼?"
@@ -4087,22 +4076,22 @@ msgstr "è¯·æ±?äº?èº«ä»½éª?è¯?ï¼?ä½?æ?ªæ??ä¾?ç?¨æ?·å??"
 msgid "Cannot authenticate to server: %s"
 msgstr "æ? æ³?è®¤è¯?å?°æ??å?¡å?¨ï¼?%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:342
+#: ../camel/providers/nntp/camel-nntp-store.c:375
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "æ? æ³?é??è¯»æ?¥è?ª %s ç??æ¬¢è¿?ä¿¡æ?¯ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:355
+#: ../camel/providers/nntp/camel-nntp-store.c:388
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP æ??å?¡å?¨ %s è¿?å??é??è¯¯ç ? %dï¼?%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:523
+#: ../camel/providers/nntp/camel-nntp-store.c:582
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET æ?°é?» %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1041
+#: ../camel/providers/nntp/camel-nntp-store.c:1100
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4113,7 +4102,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1156
+#: ../camel/providers/nntp/camel-nntp-store.c:1215
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4124,7 +4113,7 @@ msgstr ""
 "\n"
 "æ²¡æ??è¿?æ ·ç??æ?°é?»ç»?ã??é??ä¸é¡¹ç?®å?¯è?½æ?¯ç?¶æ??ä»¶å¤¹ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1198
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4135,47 +4124,47 @@ msgstr ""
 "\n"
 "æ?°é?»ç»?ä¸?å?å?¨ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1231
+#: ../camel/providers/nntp/camel-nntp-store.c:1290
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸å??å»ºæ??ä»¶å¤¹ï¼?åº?è¯¥è®¢é??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1247
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸é??å?½å??æ??ä»¶å¤¹ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1264
+#: ../camel/providers/nntp/camel-nntp-store.c:1323
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸å? é?¤æ??ä»¶å¤¹ï¼?åº?è¯¥é??è®¢ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1475
+#: ../camel/providers/nntp/camel-nntp-store.c:1535
 msgid "NNTP Command failed: "
 msgstr "NNTP å?½ä»¤å¤±è´¥ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1549
+#: ../camel/providers/nntp/camel-nntp-store.c:1609
 #, c-format
 msgid "Not connected."
 msgstr "æ?ªè¿?æ?¥ã??"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:230
-#: ../camel/providers/nntp/camel-nntp-summary.c:341
+#: ../camel/providers/nntp/camel-nntp-summary.c:232
+#: ../camel/providers/nntp/camel-nntp-summary.c:348
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%sï¼?æ£å?¨æ?«æ??æ?°æ¶?æ?¯"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:242
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "æ?¥è?ª xover ç??æ??å¤?æ??å?¡å?¨åº?ç?ï¼?%s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:358
+#: ../camel/providers/nntp/camel-nntp-summary.c:365
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "æ?¥è?ª head ç??æ??å¤?æ??å?¡å?¨åº?ç?ï¼?%s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:403
+#: ../camel/providers/nntp/camel-nntp-summary.c:410
 #, c-format
 msgid "Operation failed: %s"
 msgstr "æ??ä½?å¤±è´¥ï¼?%s"
@@ -4784,7 +4773,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:1902
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1931
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y-%m-%d %A%p%I:%M:%S"
 
@@ -4792,7 +4781,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:1893
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1922
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y-%m-%d %A %H:%M:%S"
 
@@ -4800,7 +4789,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:1898
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1927
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y-%m-%d %A%p%I:%M"
 
@@ -4808,7 +4797,7 @@ msgstr "%Y-%m-%d %A%p%I:%M"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1918
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%Y-%m-%d %A %H:%M"
 
@@ -4826,8 +4815,8 @@ msgstr "%Y-%m-%d %A %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1765
-#: ../libedataserver/e-time-utils.c:1884
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1783
+#: ../libedataserver/e-time-utils.c:1913
 msgid "%a %m/%d/%Y"
 msgstr "%Y-%m-%d %A"
 
@@ -4867,19 +4856,19 @@ msgstr "%Y-%m-%d %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1768
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1786
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1946
+#: ../libedataserver/e-time-utils.c:1855 ../libedataserver/e-time-utils.c:1975
 msgid "%I:%M:%S %p"
 msgstr "%p%I:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1830 ../libedataserver/e-time-utils.c:1938
+#: ../libedataserver/e-time-utils.c:1859 ../libedataserver/e-time-utils.c:1967
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4887,24 +4876,24 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
+#: ../libedataserver/e-time-utils.c:1864 ../libedataserver/e-time-utils.c:1972
 msgid "%I:%M %p"
 msgstr "%p%I:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1839 ../libedataserver/e-time-utils.c:1935
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1964
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1842
+#: ../libedataserver/e-time-utils.c:1871
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1846
+#: ../libedataserver/e-time-utils.c:1875
 msgid "%I %p"
 msgstr "%p%I"
 
@@ -4957,11 +4946,11 @@ msgstr "å?¯ç?¨ç±»å?«(_A)ï¼?"
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
-#: ../libedataserverui/e-categories-dialog.c:767
+#: ../libedataserverui/e-categories-dialog.c:768
 msgid "Icon"
 msgstr "å?¾æ ?"
 
-#: ../libedataserverui/e-categories-dialog.c:772
+#: ../libedataserverui/e-categories-dialog.c:773
 msgid "Category"
 msgstr "ç±»å?«"
 
@@ -4970,56 +4959,56 @@ msgstr "ç±»å?«"
 msgid "Create category \"%s\""
 msgstr "å??å»ºå??ç±»â??%sâ??"
 
-#: ../libedataserverui/e-name-selector-dialog.c:170
+#: ../libedataserverui/e-name-selector-dialog.c:176
 msgid "Show Contacts"
 msgstr "æ?¾ç¤ºè??ç³»äºº"
 
-#: ../libedataserverui/e-name-selector-dialog.c:192
+#: ../libedataserverui/e-name-selector-dialog.c:198
 msgid "Address B_ook:"
 msgstr "å?°å??ç°¿(_O)ï¼?"
 
-#: ../libedataserverui/e-name-selector-dialog.c:200
+#: ../libedataserverui/e-name-selector-dialog.c:206
 msgid "Cate_gory:"
 msgstr "ç±»å?«(_G)ï¼?"
 
-#: ../libedataserverui/e-name-selector-dialog.c:218
+#: ../libedataserverui/e-name-selector-dialog.c:224
 msgid "_Search:"
 msgstr "æ??ç´¢(_S)ï¼?"
 
-#: ../libedataserverui/e-name-selector-dialog.c:236
-#: ../libedataserverui/e-name-selector-dialog.c:971
+#: ../libedataserverui/e-name-selector-dialog.c:242
+#: ../libedataserverui/e-name-selector-dialog.c:977
 msgid "Any Category"
 msgstr "ä»»ä½?ç±»å?«"
 
-#: ../libedataserverui/e-name-selector-dialog.c:238
+#: ../libedataserverui/e-name-selector-dialog.c:244
 msgid "Co_ntacts"
 msgstr "è??ç³»äºº(_N)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:283
+#: ../libedataserverui/e-name-selector-dialog.c:289
 msgid "Search"
 msgstr "æ??ç´¢"
 
-#: ../libedataserverui/e-name-selector-dialog.c:286
+#: ../libedataserverui/e-name-selector-dialog.c:292
 msgid "Address Book"
 msgstr "å?°å??ç°¿"
 
-#: ../libedataserverui/e-name-selector-dialog.c:289
+#: ../libedataserverui/e-name-selector-dialog.c:295
 msgid "Contacts"
 msgstr "è??ç³»äºº"
 
-#: ../libedataserverui/e-name-selector-dialog.c:406
+#: ../libedataserverui/e-name-selector-dialog.c:412
 msgid "Select Contacts from Address Book"
 msgstr "ä»?å?°å??ç°¿ä¸é??æ?©è??ç³»äºº"
 
-#: ../libedataserverui/e-name-selector-dialog.c:741
+#: ../libedataserverui/e-name-selector-dialog.c:747
 msgid "_Add"
 msgstr "æ·»å? (_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:745
+#: ../libedataserverui/e-name-selector-dialog.c:751
 msgid "_Remove"
 msgstr "å? é?¤(_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:885
+#: ../libedataserverui/e-name-selector-dialog.c:891
 #, c-format
 msgid "Error loading address book: %s"
 msgstr "è½½å?¥å?°å??ç°¿æ?¶å?ºé??ï¼?%s"
@@ -5059,22 +5048,27 @@ msgid "Keyring key is unusable: no user or host name"
 msgstr "å¯?é?¥ç?¯ä¸?å?¯ç?¨ï¼?æ²¡æ??ç?¨æ?·æ??ä¸»æ?ºå??"
 
 #: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
 msgstr "æ?¨æ??å¼?äº? Caps Lockã??"
 
 #: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "è®°ä½?æ¤å¯?ç ?å?¥(_R)"
 
 #: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:736
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "æ?¬æ¬¡ä¼?è¯?è®°ä½?æ¤å¯?ç ?å?¥(_R)"
 
 #: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "è®°ä½?æ¤å¯?ç ?(_R)"
 
 #: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr "æ?¬æ¬¡ä¼?è¯?è®°ä½?æ¤å¯?ç ?(_R)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]