[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, 4 Mar 2011 12:29:40 +0000 (UTC)
commit c62604e413409b821a5943008f149030971af604
Author: Wei Li <lw124124 gmail com>
Date: Fri Mar 4 12:29:26 2011 +0000
Update simplified Chinese translation.
po/zh_CN.po | 1077 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 569 insertions(+), 508 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6014098..53e4fb2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -19,9 +19,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-12-21 13:49+0000\n"
-"PO-Revision-Date: 2011-01-23 17:03+0800\n"
-"Last-Translator: YunQiang Su <wzssyqa gmail com>\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"
"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -44,6 +44,64 @@ msgstr "æ£å?¨è½½å?¥..."
msgid "Searching..."
msgstr "æ£å?¨æ??ç´¢..."
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:589
+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 "æ??ç?±"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:628
+#, fuzzy
+#| msgid "Family Name"
+msgid "Family"
+msgstr "�"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:630
+msgid "Coworkers"
+msgstr "å??äº?"
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:707
+msgid "Querying for updated groupsâ?¦"
+msgstr "æ?¥è¯¢æ?´æ?°ç??ç»?..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:891
+msgid "Creating new contactâ?¦"
+msgstr "å??建æ?°ç??è??系人..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:984
+msgid "Deleting contactâ?¦"
+msgstr "å? é?¤è??系人..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1092
+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 "é??è¦?认è¯?"
+
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
#, c-format
@@ -51,8 +109,8 @@ msgid "Downloading contacts (%d)... "
msgstr "æ£å?¨ä¸?è½½è??系人(%d)..."
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3030
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3077
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3075
#, c-format
msgid "Updating contacts cache (%d)... "
msgstr "æ£å?¨æ?´æ?°è??系人ç¼?å?(%d)..."
@@ -104,7 +162,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:4180
+#: ../calendar/libecal/e-cal.c:4176
#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
#: ../camel/providers/imap/camel-imap-command.c:481
#: ../camel/providers/imap/camel-imap-store.c:425
@@ -119,12 +177,12 @@ msgstr "æ?ªç?¥ç??é??误"
msgid "Create resource '%s' failed with HTTP status: %d (%s)"
msgstr "å??建èµ?æº?â??%sâ??失败ï¼?HTTP ç?¶æ??ç ?为: %d(%s)"
-#: ../addressbook/libebook/e-book.c:3066
+#: ../addressbook/libebook/e-book.c:3159
#, c-format
msgid "%s: there was no source for UID '%s' stored in GConf."
msgstr "%sï¼?GConf ä¸æ²¡æ??å?å?¨ UIDâ??%sâ??ç??æº?ã??"
-#: ../addressbook/libebook/e-book.c:3422
+#: ../addressbook/libebook/e-book.c:3515
#: ../addressbook/libedata-book/e-data-book.c:183
msgid "Address book does not exist"
msgstr "å?°å??ç°¿ä¸?å?å?¨"
@@ -315,7 +373,7 @@ msgstr "���记 URL"
#. Contact categories
#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:759
+#: ../libedataserverui/e-categories-dialog.c:756
msgid "Categories"
msgstr "类�"
@@ -663,31 +721,31 @@ msgstr "SIP å?°å??"
msgid "Unnamed List"
msgstr "æ?ªå?½å??ç??å??表"
-#: ../addressbook/libedata-book/e-data-book-factory.c:298
+#: ../addressbook/libedata-book/e-data-book-factory.c:302
#, c-format
msgid "Empty URI"
msgstr "空ç?? URI"
-#: ../addressbook/libedata-book/e-data-book-factory.c:317
-#: ../addressbook/libedata-book/e-data-book-factory.c:355
-#: ../calendar/libedata-cal/e-data-cal-factory.c:346
-#: ../calendar/libedata-cal/e-data-cal-factory.c:358
+#: ../addressbook/libedata-book/e-data-book-factory.c:321
+#: ../addressbook/libedata-book/e-data-book-factory.c:359
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#: ../calendar/libedata-cal/e-data-cal-factory.c:362
#, c-format
msgid "Invalid source"
msgstr "æ? æ??ç??æº?"
#: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libedata-cal/e-data-cal.c:110
+#: ../calendar/libedata-cal/e-data-cal.c:108
msgid "Success"
msgstr "æ??å??"
#: ../addressbook/libedata-book/e-data-book.c:174
-#: ../calendar/libedata-cal/e-data-cal.c:111
+#: ../calendar/libedata-cal/e-data-cal.c:109
msgid "Repository offline"
msgstr "��离线"
#: ../addressbook/libedata-book/e-data-book.c:175
-#: ../calendar/libecal/e-cal.c:4162 ../calendar/libedata-cal/e-data-cal.c:112
+#: ../calendar/libecal/e-cal.c:4158 ../calendar/libedata-cal/e-data-cal.c:110
msgid "Permission denied"
msgstr "没æ??æ??é??"
@@ -700,27 +758,27 @@ msgid "Contact ID already exists"
msgstr "è??系人 ID å·²ç»?å?å?¨"
#: ../addressbook/libedata-book/e-data-book.c:178
-#: ../calendar/libedata-cal/e-data-cal.c:117
+#: ../calendar/libedata-cal/e-data-cal.c:115
msgid "Authentication Failed"
msgstr "认�失败"
#: ../addressbook/libedata-book/e-data-book.c:179
-#: ../calendar/libedata-cal/e-data-cal.c:118
+#: ../calendar/libedata-cal/e-data-cal.c:116
msgid "Authentication Required"
msgstr "é??è¦?认è¯?"
#: ../addressbook/libedata-book/e-data-book.c:180
-#: ../calendar/libedata-cal/e-data-cal.c:119
+#: ../calendar/libedata-cal/e-data-cal.c:117
msgid "Unsupported field"
msgstr "ä¸?æ?¯æ??ç??å??"
#: ../addressbook/libedata-book/e-data-book.c:181
-#: ../calendar/libedata-cal/e-data-cal.c:121
+#: ../calendar/libedata-cal/e-data-cal.c:119
msgid "Unsupported authentication method"
msgstr "ä¸?æ?¯æ??ç??身份éª?è¯?æ?¹å¼?"
#: ../addressbook/libedata-book/e-data-book.c:182
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#: ../calendar/libedata-cal/e-data-cal.c:120
msgid "TLS not available"
msgstr "TLS ���"
@@ -729,39 +787,39 @@ msgid "Book removed"
msgstr "å?°å??ç°¿å·²å? é?¤"
#: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:125
+#: ../calendar/libedata-cal/e-data-cal.c:123
msgid "Not available in offline mode"
msgstr "å?¨è?±æ?ºæ¨¡å¼?ä¸æ? æ³?使ç?¨"
#: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:126
+#: ../calendar/libedata-cal/e-data-cal.c:124
msgid "Search size limit exceeded"
msgstr "è¶?è¿?æ??索大å°?é??å?¶"
#: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libedata-cal/e-data-cal.c:127
+#: ../calendar/libedata-cal/e-data-cal.c:125
msgid "Search time limit exceeded"
msgstr "è¶?è¿?æ??ç´¢æ?¶é?´é??å?¶"
#: ../addressbook/libedata-book/e-data-book.c:188
-#: ../calendar/libedata-cal/e-data-cal.c:128
+#: ../calendar/libedata-cal/e-data-cal.c:126
msgid "Invalid query"
msgstr "æ? æ??ç??æ?¥è¯¢"
#: ../addressbook/libedata-book/e-data-book.c:189
-#: ../calendar/libedata-cal/e-data-cal.c:129
+#: ../calendar/libedata-cal/e-data-cal.c:127
msgid "Query refused"
msgstr "æ?¥è¯¢è¢«æ??ç»?"
#: ../addressbook/libedata-book/e-data-book.c:190
-#: ../calendar/libedata-cal/e-data-cal.c:130
+#: ../calendar/libedata-cal/e-data-cal.c:128
msgid "Could not cancel"
msgstr "æ? æ³?å??æ¶?"
#. { E_DATA_BOOK_STATUS_OTHER_ERROR, N_("Other error") },
#. { OtherError, N_("Other error") },
#: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libedata-cal/e-data-cal.c:132
+#: ../calendar/libedata-cal/e-data-cal.c:130
msgid "Invalid server version"
msgstr "æ? æ??ç??æ??å?¡å?¨ç??æ?¬"
@@ -770,18 +828,18 @@ msgid "No space"
msgstr "没æ??空é?´"
#: ../addressbook/libedata-book/e-data-book.c:194
-#: ../calendar/libecal/e-cal.c:4146 ../calendar/libedata-cal/e-data-cal.c:133
+#: ../calendar/libecal/e-cal.c:4142 ../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:4185 ../calendar/libedata-cal/e-data-cal.c:135
+#: ../calendar/libecal/e-cal.c:4181 ../calendar/libedata-cal/e-data-cal.c:133
msgid "Not supported"
msgstr "ä¸?æ?¯æ??"
#: ../addressbook/libedata-book/e-data-book.c:204
-#: ../calendar/libedata-cal/e-data-cal.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:141
msgid "Other error"
msgstr "å?¶ä»?é??误"
@@ -889,15 +947,17 @@ msgstr "æ??å?¡å?¨ä¸?å?¯ç?¨ (%s)"
msgid "Unexpected HTTP status code %d returned (%s)"
msgstr "è¿?å??äº?æ??å¤?ç?? HTTP ç?¶æ??代ç ? %d(%s)"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2090
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2495
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2096
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2496
#, c-format
msgid ""
"Server is unreachable, calendar is opened in read-only mode.\n"
"Error message: %s"
-msgstr "æ??å?¡å?¨ä¸?å?¯ç?¨ï¼?æ?¥å??å°?以å?ªè¯»æ¨¡å¼?æ??å¼?ã??\né??误æ¶?æ?¯ï¼?%s"
+msgstr ""
+"æ??å?¡å?¨ä¸?å?¯ç?¨ï¼?æ?¥å??å°?以å?ªè¯»æ¨¡å¼?æ??å¼?ã??\n"
+"é??误æ¶?æ?¯ï¼?%s"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4266
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
msgid "Calendar doesn't support Free/Busy"
msgstr "æ?¥å??ä¸?æ?¯æ??空é?²/ç¹?å¿?"
@@ -925,47 +985,47 @@ msgid "Cannot save calendar data"
msgstr "æ? æ³?ä¿?å?æ?¥å??æ?°æ?®"
#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2107
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2101
msgid "Reply Requested: by "
msgstr "请æ±?å??å¤?ï¼?ç?±"
#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2112
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2106
msgid "Reply Requested: When convenient"
msgstr "请æ±?å??å¤?ï¼?æ?¹ä¾¿æ?¶"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:330
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
msgid "Loading Appointment items"
msgstr "æ£å?¨è½½å?¥çº¦ä¼?项"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:332
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
msgid "Loading Task items"
msgstr "æ£å?¨è½½å?¥ä»»å?¡é¡¹"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:334
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
msgid "Loading Note items"
msgstr "æ£å?¨è½½å?¥ç¬?记项"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:336
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
msgid "Loading items"
msgstr "æ£å?¨è½½å?¥é¡¹"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:963
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
msgid "Calendar"
msgstr "æ?¥å??"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1026
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
msgid "Invalid server URI"
msgstr "æ? æ??ç??æ??å?¡å?¨ URI"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1387
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
#: ../calendar/backends/http/e-cal-backend-http.c:783
#: ../calendar/backends/weather/e-cal-backend-weather.c:520
msgid "Could not create cache file"
msgstr "æ? æ³?å??建ç¼?å?æ??件"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1139
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
msgid "Could not create thread for populating cache"
msgstr "æ? æ³?å??建å¢?æ®?ç¼?å?å??建线索"
@@ -1025,131 +1085,131 @@ msgstr "天�����"
msgid "Forecast"
msgstr "天���"
-#: ../calendar/libecal/e-cal-component.c:1306
+#: ../calendar/libecal/e-cal-component.c:1299
msgid "Untitled appointment"
msgstr "æ? æ ?é¢?约ä¼?"
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:3986
msgid "1st"
msgstr "1æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:3987
msgid "2nd"
msgstr "2æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3988
msgid "3rd"
msgstr "3æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3989
msgid "4th"
msgstr "4æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3990
msgid "5th"
msgstr "5æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3991
msgid "6th"
msgstr "6æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3992
msgid "7th"
msgstr "7æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3993
msgid "8th"
msgstr "8æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3994
msgid "9th"
msgstr "9æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3995
msgid "10th"
msgstr "10æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3996
msgid "11th"
msgstr "11æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3997
msgid "12th"
msgstr "12æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3998
msgid "13th"
msgstr "13æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3999
msgid "14th"
msgstr "14æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:4000
msgid "15th"
msgstr "15æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4001
msgid "16th"
msgstr "16æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4002
msgid "17th"
msgstr "17æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4003
msgid "18th"
msgstr "18å?«æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4004
msgid "19th"
msgstr "19æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4005
msgid "20th"
msgstr "20æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4006
msgid "21st"
msgstr "21æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4007
msgid "22nd"
msgstr "22æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4008
msgid "23rd"
msgstr "23æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4009
msgid "24th"
msgstr "24æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4010
msgid "25th"
msgstr "25æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4011
msgid "26th"
msgstr "26æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4012
msgid "27th"
msgstr "27æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4013
msgid "28th"
msgstr "28æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4014
msgid "29th"
msgstr "29æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4015
msgid "30th"
msgstr "30æ?¥"
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4016
msgid "31st"
msgstr "31æ?¥"
@@ -1170,8 +1230,8 @@ msgstr "ä½?"
msgid "Undefined"
msgstr "���"
-#: ../calendar/libecal/e-cal.c:1236 ../libedataserverui/e-book-auth-util.c:206
-#: ../libedataserverui/e-book-auth-util.c:435
+#: ../calendar/libecal/e-cal.c:1235 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:440
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "为 %s è¾?å?¥å¯?ç ? (ç?¨æ?· %s)"
@@ -1180,82 +1240,82 @@ msgstr "为 %s è¾?å?¥å¯?ç ? (ç?¨æ?· %s)"
#. This password prompt will be prompted rarely. Since the key that is passed to
#. the auth_func corresponds to the parent user.
#.
-#: ../calendar/libecal/e-cal.c:1250
+#: ../calendar/libecal/e-cal.c:1249
#, c-format
msgid "Enter password for %s to enable proxy for user %s"
msgstr "è¾?å?¥ %s ç??å¯?ç ?ï¼?以便为ç?¨æ?· %s å?¯ç?¨ä»£ç??æ??å?¡å?¨"
-#: ../calendar/libecal/e-cal.c:4148
+#: ../calendar/libecal/e-cal.c:4144
msgid "Backend is busy"
msgstr "å??å?°ç¹?å¿?"
-#: ../calendar/libecal/e-cal.c:4150
+#: ../calendar/libecal/e-cal.c:4146
msgid "Repository is offline"
msgstr "��离线"
-#: ../calendar/libecal/e-cal.c:4152
+#: ../calendar/libecal/e-cal.c:4148
msgid "No such calendar"
msgstr "没æ??è¿?æ ·ç??æ?¥å??"
-#: ../calendar/libecal/e-cal.c:4154 ../calendar/libedata-cal/e-data-cal.c:114
+#: ../calendar/libecal/e-cal.c:4150 ../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:4156 ../calendar/libedata-cal/e-data-cal.c:115
+#: ../calendar/libecal/e-cal.c:4152 ../calendar/libedata-cal/e-data-cal.c:113
#: ../servers/groupwise/e-gw-connection.c:229
msgid "Invalid object"
msgstr "æ? æ??对象"
-#: ../calendar/libecal/e-cal.c:4158
+#: ../calendar/libecal/e-cal.c:4154
msgid "URI not loaded"
msgstr "URI �载�"
-#: ../calendar/libecal/e-cal.c:4160
+#: ../calendar/libecal/e-cal.c:4156
msgid "URI already loaded"
msgstr "URI 已�载�"
-#: ../calendar/libecal/e-cal.c:4164 ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4160 ../servers/groupwise/e-gw-connection.c:237
msgid "Unknown User"
msgstr "����"
-#: ../calendar/libecal/e-cal.c:4166 ../calendar/libedata-cal/e-data-cal.c:116
+#: ../calendar/libecal/e-cal.c:4162 ../calendar/libedata-cal/e-data-cal.c:114
msgid "Object ID already exists"
msgstr "对象 ID å·²ç»?å?å?¨"
-#: ../calendar/libecal/e-cal.c:4168
+#: ../calendar/libecal/e-cal.c:4164
msgid "Protocol not supported"
msgstr "ä¸?æ?¯æ??ç??å??è®®"
-#: ../calendar/libecal/e-cal.c:4170
+#: ../calendar/libecal/e-cal.c:4166
msgid "Operation has been canceled"
msgstr "æ??ä½?å·²å??æ¶?"
-#: ../calendar/libecal/e-cal.c:4172
+#: ../calendar/libecal/e-cal.c:4168
msgid "Could not cancel operation"
msgstr "æ? æ³?å??æ¶?æ??ä½?"
-#: ../calendar/libecal/e-cal.c:4174
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1311
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1329
-#: ../camel/providers/groupwise/camel-groupwise-store.c:635
-#: ../camel/providers/groupwise/camel-groupwise-store.c:817
+#: ../calendar/libecal/e-cal.c:4170
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1306
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1324
+#: ../camel/providers/groupwise/camel-groupwise-store.c:628
+#: ../camel/providers/groupwise/camel-groupwise-store.c:810
#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
#, c-format
msgid "Authentication failed"
msgstr "认�失败"
-#: ../calendar/libecal/e-cal.c:4176
+#: ../calendar/libecal/e-cal.c:4172
#: ../camel/providers/smtp/camel-smtp-transport.c:775
msgid "Authentication required"
msgstr "�须认�"
-#: ../calendar/libecal/e-cal.c:4178
+#: ../calendar/libecal/e-cal.c:4174
msgid "A D-Bus exception has occurred"
msgstr "å??ç??äº?ä¸?个 D-Bus å¼?常"
-#: ../calendar/libecal/e-cal.c:4182
+#: ../calendar/libecal/e-cal.c:4178
msgid "No error"
msgstr "æ? é??误"
@@ -1352,228 +1412,228 @@ msgid ""
"be a boolean false (#f)"
msgstr "â??%sâ??ç??æ??æ??å??æ?°é?½åº?该为å?符串æ??è??å®?å?¯ä¸?ç??å??æ?°ä¸ºå¸?å°?å?? (#f)"
-#: ../calendar/libedata-cal/e-data-cal.c:113
+#: ../calendar/libedata-cal/e-data-cal.c:111
msgid "Invalid range"
msgstr "æ? æ??è??å?´"
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../calendar/libedata-cal/e-data-cal.c:118
msgid "Unsupported method"
msgstr "ä¸?æ?¯æ??ç??æ?¹å¼?"
-#: ../calendar/libedata-cal/e-data-cal.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:121
msgid "Calendar does not exist"
msgstr "æ?¥å??ä¸?å?å?¨"
-#: ../calendar/libedata-cal/e-data-cal.c:124
+#: ../calendar/libedata-cal/e-data-cal.c:122
msgid "Unknown user"
msgstr "����"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:610
+#: ../calendar/libedata-cal/e-data-cal.c:608
#, c-format
msgid "Cannot retrieve calendar address: %s"
msgstr "æ? æ³?è?·å??æ?¥å??å?°å??ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:635
+#: ../calendar/libedata-cal/e-data-cal.c:633
#, c-format
msgid "Cannot retrieve calendar alarm e-mail address: %s"
msgstr "æ? æ³?è?·å??æ?¥å??é?¹é??ç?µå?é?®ä»¶å?°å??ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:660
+#: ../calendar/libedata-cal/e-data-cal.c:658
#, c-format
msgid "Cannot retrieve calendar's LDAP attribute: %s"
msgstr "æ? æ³?è?·å??æ?¥å??ç?? LDAP å±?æ?§ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:685
+#: ../calendar/libedata-cal/e-data-cal.c:683
#, c-format
msgid "Cannot retrieve calendar scheduling information: %s"
msgstr "æ? æ³?è?·å??æ?¥å??计å??ä»»å?¡ä¿¡æ?¯ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:709
+#: ../calendar/libedata-cal/e-data-cal.c:707
#, c-format
msgid "Cannot open calendar: %s"
msgstr "æ? æ³?æ??å¼?æ?¥å??ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:730
+#: ../calendar/libedata-cal/e-data-cal.c:728
#, c-format
msgid "Cannot refresh calendar: %s"
msgstr "æ? æ³?å?·æ?°æ?¥å??ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:749
+#: ../calendar/libedata-cal/e-data-cal.c:747
#, c-format
msgid "Cannot remove calendar: %s"
msgstr "æ? æ³?移é?¤æ?¥å??ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:770
+#: ../calendar/libedata-cal/e-data-cal.c:768
#, c-format
msgid "Cannot create calendar object: %s"
msgstr "æ? æ³?å??建æ?¥å??对象ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:798
+#: ../calendar/libedata-cal/e-data-cal.c:796
#, c-format
msgid "Cannot modify calendar object: %s"
msgstr "æ? æ³?ä¿®æ?¹æ?¥å??对象ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:824
+#: ../calendar/libedata-cal/e-data-cal.c:822
#, c-format
msgid "Cannot remove calendar object: %s"
msgstr "æ? æ³?移é?¤æ?¥å??对象ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:845
+#: ../calendar/libedata-cal/e-data-cal.c:843
#, c-format
msgid "Cannot receive calendar objects: %s"
msgstr "æ? æ³?æ?¥æ?¶æ?¥å??对象ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:864
+#: ../calendar/libedata-cal/e-data-cal.c:862
#, c-format
msgid "Cannot discard calendar alarm: %s"
msgstr "æ? æ³?å??æ¶?æ?¥å??é?¹é??ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:885
+#: ../calendar/libedata-cal/e-data-cal.c:883
#, c-format
msgid "Cannot send calendar objects: %s"
msgstr "æ? æ³?å??é??æ?¥å??对象ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:912
+#: ../calendar/libedata-cal/e-data-cal.c:910
#, c-format
msgid "Cannot retrieve default calendar object path: %s"
msgstr "æ? æ³?è?·å??é»?认ç??æ?¥å??对象路å¾?ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:937
+#: ../calendar/libedata-cal/e-data-cal.c:935
#, c-format
msgid "Cannot retrieve calendar object path: %s"
msgstr "æ? æ³?è?·å??æ?¥å??对象ç??è·¯å¾?ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:962
+#: ../calendar/libedata-cal/e-data-cal.c:960
#, c-format
msgid "Cannot retrieve calendar object list: %s"
msgstr "æ? æ³?è?·å??æ?¥å??对象ç??å??表ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:990
+#: ../calendar/libedata-cal/e-data-cal.c:988
#, c-format
msgid "Could not retrieve attachment list: %s"
msgstr "æ? æ³?è?·å??é??件å??表ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1016
+#: ../calendar/libedata-cal/e-data-cal.c:1014
#, c-format
msgid "Could not complete calendar query: %s"
msgstr "æ? æ³?å®?æ??æ?¥å??æ?¥è¯¢ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1041
+#: ../calendar/libedata-cal/e-data-cal.c:1039
#, c-format
msgid "Could not retrieve calendar time zone: %s"
msgstr "æ? æ³?è?·å??æ?¥å??æ?¶å?ºï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1066
+#: ../calendar/libedata-cal/e-data-cal.c:1064
#, c-format
msgid "Could not add calendar time zone: %s"
msgstr "æ? æ³?æ·»å? æ?¥å??æ?¶å?ºï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1085
+#: ../calendar/libedata-cal/e-data-cal.c:1083
#, c-format
msgid "Could not set default calendar time zone: %s"
msgstr "æ? æ³?设置é»?认ç??æ?¥å??æ?¶å?ºï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1108
+#: ../calendar/libedata-cal/e-data-cal.c:1106
#, c-format
msgid "Cannot retrieve calendar changes: %s"
msgstr "æ? æ³?è?·å??æ?¥å??æ?´æ?¹ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1139
+#: ../calendar/libedata-cal/e-data-cal.c:1137
#, c-format
msgid "Cannot retrieve calendar free/busy list: %s"
msgstr "æ? æ³?è?·å??æ?¥å??空é?²ã??ç¹?å¿?å??表ï¼?%s"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:368
+#: ../calendar/libedata-cal/e-data-cal-factory.c:372
#, c-format
msgid "Invalid URI"
msgstr "æ? æ??ç?? URI"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:386
+#: ../calendar/libedata-cal/e-data-cal-factory.c:390
#, c-format
msgid "No backend factory for '%s' of '%s'"
msgstr "对â??%2$sâ??ç??â??%1$sâ??没æ??å??端工å??"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:436
+#: ../calendar/libedata-cal/e-data-cal-factory.c:440
#, c-format
msgid "Could not instantiate backend"
msgstr "æ? æ³?å®?ä¾?å??å??端"
-#: ../camel/camel-cipher-context.c:204
+#: ../camel/camel-cipher-context.c:200
#, c-format
msgid "Signing is not supported by this cipher"
msgstr "该å¯?ç ?ä¸?æ?¯æ??ç¾å??"
-#: ../camel/camel-cipher-context.c:217
+#: ../camel/camel-cipher-context.c:213
#, c-format
msgid "Verifying is not supported by this cipher"
msgstr "该å¯?ç ?ä¸?æ?¯æ??éª?è¯?"
-#: ../camel/camel-cipher-context.c:233
+#: ../camel/camel-cipher-context.c:229
#, c-format
msgid "Encryption is not supported by this cipher"
msgstr "该å¯?ç ?ä¸?æ?¯æ??å? å¯?"
-#: ../camel/camel-cipher-context.c:247
+#: ../camel/camel-cipher-context.c:243
#, c-format
msgid "Decryption is not supported by this cipher"
msgstr "该å¯?ç ?ä¸?æ?¯æ??解å¯?"
-#: ../camel/camel-cipher-context.c:260
+#: ../camel/camel-cipher-context.c:256
#, c-format
msgid "You may not import keys with this cipher"
msgstr "æ?¨ä¸?è?½ç?¨æ¤å¯?ç ?导å?¥å¯?é?¥"
-#: ../camel/camel-cipher-context.c:274
+#: ../camel/camel-cipher-context.c:270
#, c-format
msgid "You may not export keys with this cipher"
msgstr "æ?¨ä¸?è?½ç?¨æ¤å¯?ç ?导å?ºå¯?é?¥"
-#: ../camel/camel-cipher-context.c:815
+#: ../camel/camel-cipher-context.c:811
msgid "Signing message"
msgstr "ç¾å??æ¶?æ?¯"
-#: ../camel/camel-cipher-context.c:1056
+#: ../camel/camel-cipher-context.c:1052
msgid "Encrypting message"
msgstr "å? å¯?æ¶?æ?¯"
-#: ../camel/camel-cipher-context.c:1183
+#: ../camel/camel-cipher-context.c:1179
msgid "Decrypting message"
msgstr "解���"
-#: ../camel/camel-data-cache.c:181
+#: ../camel/camel-data-cache.c:177
#, c-format
msgid "Unable to create cache path"
msgstr "æ? æ³?å??建ç¼?å?è·¯å¾?"
-#: ../camel/camel-data-cache.c:494
+#: ../camel/camel-data-cache.c:495
#, c-format
msgid "Could not remove cache entry: %s: %s"
msgstr "æ? æ³?å? é?¤ç¼?å?æ?¡ç?®ï¼?%sï¼?%s"
-#: ../camel/camel-data-wrapper.c:147
+#: ../camel/camel-data-wrapper.c:143
#, c-format
msgid "No stream available"
msgstr "没æ??å?¯ç?¨ç??æµ?"
@@ -1610,21 +1670,21 @@ msgstr ""
msgid "Resynchronizing with server"
msgstr "é??æ?°ä¸?æ??å?¡å?¨å??æ¥"
-#: ../camel/camel-disco-folder.c:67 ../camel/camel-offline-folder.c:83
+#: ../camel/camel-disco-folder.c:63 ../camel/camel-offline-folder.c:79
msgid "Downloading new messages for offline mode"
msgstr "ä¸?è½½æ?°æ¶?æ?¯ä»¥è¿?è¡?è?±æ?ºæ??ä½?"
-#: ../camel/camel-disco-folder.c:389
+#: ../camel/camel-disco-folder.c:398
#, c-format
msgid "Preparing folder '%s' for offline"
msgstr "å??å¤?è?±æ?ºæ??件夹â??%sâ??"
-#: ../camel/camel-disco-folder.c:455 ../camel/camel-offline-folder.c:316
+#: ../camel/camel-disco-folder.c:464 ../camel/camel-offline-folder.c:312
msgid "Copy folder content locally for offline operation"
msgstr "å°?æ??件夹å??容å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?"
#: ../camel/camel-disco-store.c:420
-#: ../camel/providers/groupwise/camel-groupwise-store.c:232
+#: ../camel/providers/groupwise/camel-groupwise-store.c:228
#: ../camel/providers/imap/camel-imap-store.c:1250
#: ../camel/providers/imap/camel-imap-store.c:1771
#: ../camel/providers/imap/camel-imap-store.c:2244
@@ -1649,64 +1709,64 @@ msgstr "æ?¨å¿?é¡»å?¨çº¿å·¥ä½?以便å®?æ??该æ??ä½?"
msgid "Canceled"
msgstr "å·²å??æ¶?"
-#: ../camel/camel-filter-driver.c:839 ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:815 ../camel/camel-filter-search.c:582
#, c-format
msgid "Failed to create child process '%s': %s"
msgstr "å??建å?è¿?ç¨?â??%sâ??失败ï¼?%s"
-#: ../camel/camel-filter-driver.c:886
+#: ../camel/camel-filter-driver.c:862
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "æ?¶å?° %s å??æ?¥ç??æ? æ??æ¶?æ?¯æµ?ï¼?%s"
-#: ../camel/camel-filter-driver.c:1073 ../camel/camel-filter-driver.c:1082
+#: ../camel/camel-filter-driver.c:1049 ../camel/camel-filter-driver.c:1058
msgid "Syncing folders"
msgstr "å??æ¥æ??件夹"
-#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1620
+#: ../camel/camel-filter-driver.c:1146 ../camel/camel-filter-driver.c:1596
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "解æ??è¿?滤è§?å??å?ºé??ï¼?%sï¼?%s"
-#: ../camel/camel-filter-driver.c:1181 ../camel/camel-filter-driver.c:1631
+#: ../camel/camel-filter-driver.c:1157 ../camel/camel-filter-driver.c:1607
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "æ?§è¡?è¿?滤è§?å??é??误ï¼?%sï¼?%s"
-#: ../camel/camel-filter-driver.c:1278
+#: ../camel/camel-filter-driver.c:1254
#, c-format
msgid "Unable to open spool folder"
msgstr "æ? æ³?æ??å¼?è?±æ?ºæ??件夹"
-#: ../camel/camel-filter-driver.c:1289
+#: ../camel/camel-filter-driver.c:1265
#, c-format
msgid "Unable to process spool folder"
msgstr "æ? æ³?å¤?ç??è?±æ?ºæ??件夹"
-#: ../camel/camel-filter-driver.c:1307
+#: ../camel/camel-filter-driver.c:1283
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "è?·å??第%då°?ä¿¡(%d%%)"
-#: ../camel/camel-filter-driver.c:1314 ../camel/camel-filter-driver.c:1336
+#: ../camel/camel-filter-driver.c:1290 ../camel/camel-filter-driver.c:1312
#, c-format
msgid "Failed on message %d"
msgstr "�第%d�信失败"
-#: ../camel/camel-filter-driver.c:1351 ../camel/camel-filter-driver.c:1456
+#: ../camel/camel-filter-driver.c:1327 ../camel/camel-filter-driver.c:1432
msgid "Syncing folder"
msgstr "å??æ¥æ??件夹"
-#: ../camel/camel-filter-driver.c:1356 ../camel/camel-filter-driver.c:1462
+#: ../camel/camel-filter-driver.c:1332 ../camel/camel-filter-driver.c:1438
msgid "Complete"
msgstr "å®?æ??"
-#: ../camel/camel-filter-driver.c:1420
+#: ../camel/camel-filter-driver.c:1396
#, c-format
msgid "Getting message %d of %d"
msgstr "è?·å??第%då°?ä¿¡ï¼?å?±%då°?"
-#: ../camel/camel-filter-driver.c:1438
+#: ../camel/camel-filter-driver.c:1414
#, c-format
msgid "Failed at message %d of %d"
msgstr "�第%d�信失败��%d�"
@@ -1728,8 +1788,8 @@ msgstr "(user-tag)å??æ?°æ? æ??"
msgid "Error executing filter search: %s: %s"
msgstr "æ?§è¡?è¿?滤è§?å??æ??ç´¢é??误ï¼?%sï¼?%s"
-#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
-#: ../camel/camel-folder-search.c:627
+#: ../camel/camel-folder-search.c:341 ../camel/camel-folder-search.c:452
+#: ../camel/camel-folder-search.c:623
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -1738,8 +1798,8 @@ msgstr ""
"æ? æ³?解æ??æ??索表达å¼?ï¼?%sï¼?\n"
"%s"
-#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
-#: ../camel/camel-folder-search.c:639
+#: ../camel/camel-folder-search.c:353 ../camel/camel-folder-search.c:464
+#: ../camel/camel-folder-search.c:635
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -1748,76 +1808,76 @@ msgstr ""
"æ?§è¡?æ??索表达å¼?é??误ï¼?%sï¼?\n"
"%s"
-#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
+#: ../camel/camel-folder-search.c:839 ../camel/camel-folder-search.c:881
#, c-format
msgid "(%s) requires a single bool result"
msgstr "(%s) é??è¦?ä¸?个å¸?å°?ç»?æ??"
-#: ../camel/camel-folder-search.c:938
+#: ../camel/camel-folder-search.c:934
#, c-format
msgid "(%s) not allowed inside %s"
msgstr "(%s) ä¸?å??许å?¨ %s ä¸ä½¿ç?¨"
-#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
+#: ../camel/camel-folder-search.c:940 ../camel/camel-folder-search.c:947
#, c-format
msgid "(%s) requires a match type string"
msgstr "(%s) é??è¦?ä¸?个å?¹é??ç±»å??å?符串"
-#: ../camel/camel-folder-search.c:978
+#: ../camel/camel-folder-search.c:974
#, c-format
msgid "(%s) expects an array result"
msgstr "(%s) é??è¦?ä¸?个æ?°ç»?ç»?æ??"
-#: ../camel/camel-folder-search.c:987
+#: ../camel/camel-folder-search.c:983
#, c-format
msgid "(%s) requires the folder set"
msgstr "(%s) é??è¦?æ??件夹é??"
-#: ../camel/camel-folder.c:220
+#: ../camel/camel-folder.c:216
#, c-format
msgid "Learning new spam message in '%s'"
msgid_plural "Learning new spam messages in '%s'"
msgstr[0] "å?¨â??%sâ??ä¸å¦ä¹ æ?°ç??å??å?¾é?®ä»¶"
-#: ../camel/camel-folder.c:244
+#: ../camel/camel-folder.c:240
#, c-format
msgid "Learning new ham message in '%s'"
msgid_plural "Learning new ham messages in '%s'"
msgstr[0] "å?¨â??%sâ??ä¸å¦ä¹ æ?°ç??æ??害é?®ä»¶"
-#: ../camel/camel-folder.c:270
+#: ../camel/camel-folder.c:266
#, c-format
msgid "Filtering new message in '%s'"
msgid_plural "Filtering new messages in '%s'"
msgstr[0] "å?¨â??%sâ??ä¸è¿?滤æ?°æ¶?æ?¯"
-#: ../camel/camel-folder.c:881
+#: ../camel/camel-folder.c:875
#: ../camel/providers/local/camel-maildir-folder.c:293
msgid "Moving messages"
msgstr "移���"
-#: ../camel/camel-folder.c:884
+#: ../camel/camel-folder.c:878
msgid "Copying messages"
msgstr "����"
-#: ../camel/camel-folder.c:3253
+#: ../camel/camel-folder.c:3246
#, c-format
msgid "Retrieving message '%s'"
msgstr "æ£å?¨è?·å?? POP æ¶?æ?¯â??%sâ??"
-#: ../camel/camel-gpg-context.c:646 ../camel/camel-gpg-context.c:651
-#: ../camel/camel-gpg-context.c:1276
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "�� gpg 失败�%s"
-#: ../camel/camel-gpg-context.c:651
+#: ../camel/camel-gpg-context.c:647
#: ../camel/providers/smtp/camel-smtp-transport.c:723
#: ../camel/providers/smtp/camel-smtp-transport.c:778
msgid "Unknown"
msgstr "��"
-#: ../camel/camel-gpg-context.c:715
+#: ../camel/camel-gpg-context.c:711
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -1828,17 +1888,17 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:732
+#: ../camel/camel-gpg-context.c:728
#, c-format
msgid "Failed to parse gpg userid hint."
msgstr "解æ?? gpg userid æ??示失败ã??"
-#: ../camel/camel-gpg-context.c:757 ../camel/camel-gpg-context.c:772
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
#, c-format
msgid "Failed to parse gpg passphrase request."
msgstr "解æ?? gpg å¯?ç ?å?¥è¯·æ±?失败ã??"
-#: ../camel/camel-gpg-context.c:793
+#: ../camel/camel-gpg-context.c:789
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
@@ -1847,7 +1907,7 @@ msgstr ""
"æ?¨é??è¦?ä¸?个 PIN ç?¨æ?¥è§£é??æ?¨ç??æ?ºè?½å?¡ï¼?\n"
"â??%sâ??"
-#: ../camel/camel-gpg-context.c:797
+#: ../camel/camel-gpg-context.c:793
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -1856,83 +1916,83 @@ msgstr ""
"æ?¨é??è¦?ä¸?个å¯?ç ?å?¥ç?¨æ?¥è§£é??以ä¸?ç?¨æ?·ï¼?\n"
"â??%sâ??"
-#: ../camel/camel-gpg-context.c:803
+#: ../camel/camel-gpg-context.c:799
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr "GnuPG 对â??%sâ??ç??æ??å¤?å??åº?"
-#: ../camel/camel-gpg-context.c:832 ../camel/camel-net-utils.c:515
+#: ../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:4908
-#: ../camel/providers/imapx/camel-imapx-server.c:4925
+#: ../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:402
-#: ../camel/providers/pop3/camel-pop3-folder.c:364
-#: ../camel/providers/pop3/camel-pop3-folder.c:429
-#: ../camel/providers/pop3/camel-pop3-folder.c:504
+#: ../camel/providers/nntp/camel-nntp-summary.c:398
+#: ../camel/providers/pop3/camel-pop3-folder.c:366
+#: ../camel/providers/pop3/camel-pop3-folder.c:431
+#: ../camel/providers/pop3/camel-pop3-folder.c:506
#: ../camel/providers/pop3/camel-pop3-store.c:487
#: ../libedataserverui/e-book-auth-util.c:229
#, c-format
msgid "Cancelled"
msgstr "å·²å??æ¶?"
-#: ../camel/camel-gpg-context.c:850
+#: ../camel/camel-gpg-context.c:846
#, c-format
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr "解é??å¯?é?¥å¤±è´¥ï¼?ç»?å?ºäº? 3 个é??误ç??å¯?ç ?å?¥ã??"
-#: ../camel/camel-gpg-context.c:862
+#: ../camel/camel-gpg-context.c:858
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "æ?¥è?ª GnuPG ç??æ??å¤?åº?ç?ï¼?%s"
-#: ../camel/camel-gpg-context.c:993
+#: ../camel/camel-gpg-context.c:989
#, c-format
msgid "Failed to encrypt: No valid recipients specified."
msgstr "å? å¯?失败ï¼?没æ??æ??å®?æ??æ??ç??æ?¶ä»¶äººã??"
-#: ../camel/camel-gpg-context.c:1539 ../camel/camel-smime-context.c:824
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
msgid "Could not generate signing data: "
msgstr "æ? æ³?ç??æ??ç¾å??æ?°æ?®ï¼?"
-#: ../camel/camel-gpg-context.c:1586 ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1896 ../camel/camel-gpg-context.c:2042
-#: ../camel/camel-gpg-context.c:2141 ../camel/camel-gpg-context.c:2189
+#: ../camel/camel-gpg-context.c:1582 ../camel/camel-gpg-context.c:1782
+#: ../camel/camel-gpg-context.c:1892 ../camel/camel-gpg-context.c:2038
+#: ../camel/camel-gpg-context.c:2137 ../camel/camel-gpg-context.c:2185
msgid "Failed to execute gpg."
msgstr "æ?§è¡? gpg 失败ã??"
-#: ../camel/camel-gpg-context.c:1666 ../camel/camel-gpg-context.c:1674
-#: ../camel/camel-gpg-context.c:1682 ../camel/camel-gpg-context.c:1701
+#: ../camel/camel-gpg-context.c:1662 ../camel/camel-gpg-context.c:1670
+#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1697
#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
#: ../camel/camel-smime-context.c:971
#, c-format
msgid "Cannot verify message signature: Incorrect message format"
msgstr "æ? æ³?æ ¡éª?æ¶?æ?¯ç¾å??ï¼?æ¶?æ?¯æ ¼å¼?ä¸?对"
-#: ../camel/camel-gpg-context.c:1741
+#: ../camel/camel-gpg-context.c:1737
msgid "Cannot verify message signature: "
msgstr "æ? æ³?æ ¡éª?æ¶?æ?¯ç¾å??ï¼?"
-#: ../camel/camel-gpg-context.c:1862
+#: ../camel/camel-gpg-context.c:1858
msgid "Could not generate encrypting data: "
msgstr "æ? æ³?ç??æ??å? å¯?æ?°æ?®ï¼?"
-#: ../camel/camel-gpg-context.c:1915
+#: ../camel/camel-gpg-context.c:1911
msgid "This is a digitally encrypted message part"
msgstr "è¿?æ?¯æ¶?æ?¯ç??æ?°å?å? å¯?é?¨å??"
-#: ../camel/camel-gpg-context.c:1973 ../camel/camel-gpg-context.c:1982
-#: ../camel/camel-gpg-context.c:2005
+#: ../camel/camel-gpg-context.c:1969 ../camel/camel-gpg-context.c:1978
+#: ../camel/camel-gpg-context.c:2001
#, c-format
msgid "Cannot decrypt message: Incorrect message format"
msgstr "æ? æ³?解å¯?æ¶?æ?¯ï¼?æ¶?æ?¯æ ¼å¼?ä¸?对"
-#: ../camel/camel-gpg-context.c:1993
+#: ../camel/camel-gpg-context.c:1989
#, c-format
msgid "Failed to decrypt MIME part: protocol error"
msgstr "解å¯? MIME é?¨å??失败ï¼?å??è®®é??误"
-#: ../camel/camel-gpg-context.c:2082 ../camel/camel-smime-context.c:1255
+#: ../camel/camel-gpg-context.c:2078 ../camel/camel-smime-context.c:1255
msgid "Encrypted content"
msgstr "å? å¯?å??容"
@@ -2030,17 +2090,17 @@ msgstr "å??å?¥é?®ä»¶ä¸´æ?¶æ??件é??误ï¼?%s"
msgid "Error copying mail temp file: %s"
msgstr "å¤?å?¶é?®ä»¶ä¸´æ?¶æ??件é??误ï¼?%s"
-#: ../camel/camel-multipart-signed.c:286
+#: ../camel/camel-multipart-signed.c:329
#, c-format
msgid "No content available"
msgstr "没æ??å?¯ç?¨ç??å??容"
-#: ../camel/camel-multipart-signed.c:294
+#: ../camel/camel-multipart-signed.c:337
#, c-format
msgid "No signature available"
msgstr "没æ??å?¯ç?¨ç??ç¾å??"
-#: ../camel/camel-multipart-signed.c:620
+#: ../camel/camel-multipart-signed.c:665
#, c-format
msgid "parse error"
msgstr "解æ??é??误"
@@ -2072,7 +2132,7 @@ msgstr "å??称æ?¥é??失败"
msgid "Name lookup failed: %s"
msgstr "å??称æ?¥é??失败ï¼?%s"
-#: ../camel/camel-offline-folder.c:193
+#: ../camel/camel-offline-folder.c:189
#, c-format
msgid "Syncing messages in folder '%s' to disk"
msgstr "æ£å?¨å°?æ??件夹â??%sâ??ä¸ç??æ¶?æ?¯å??æ¥å?°ç£?ç??"
@@ -2105,7 +2165,7 @@ msgstr "æ? æ³?è½½å?¥ %sï¼?%s"
msgid "Could not load %s: No initialization code in module."
msgstr "æ? æ³?è½½å?¥ %sï¼?模å??ä¸æ²¡æ??å??å§?å??代ç ?ã??"
-#: ../camel/camel-provider.c:388 ../camel/camel-session.c:206
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:202
#, c-format
msgid "No provider available for protocol '%s'"
msgstr "å??è®®â??%sâ??没æ??å?¯ç?¨ç??æ??ä¾?è??"
@@ -2150,172 +2210,172 @@ msgstr ""
"æ? æ??ç??è·?踪信æ?¯ï¼?\n"
"%s"
-#: ../camel/camel-sasl-cram-md5.c:45
+#: ../camel/camel-sasl-cram-md5.c:41
msgid "CRAM-MD5"
msgstr "CRAM-MD5"
-#: ../camel/camel-sasl-cram-md5.c:47
+#: ../camel/camel-sasl-cram-md5.c:43
msgid ""
"This option will connect to the server using a secure CRAM-MD5 password, if "
"the server supports it."
msgstr "å¦?æ??æ??å?¡å?¨æ?¯æ??ç??è¯?ï¼?该é??项å°?ç?¨å®?å?¨ CRAM-MD5 å¯?ç ?è¿?æ?¥å?°æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-digest-md5.c:58
+#: ../camel/camel-sasl-digest-md5.c:54
msgid "DIGEST-MD5"
msgstr "DIGEST-MD5"
-#: ../camel/camel-sasl-digest-md5.c:60
+#: ../camel/camel-sasl-digest-md5.c:56
msgid ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
msgstr "å¦?æ??æ??å?¡å?¨æ?¯æ??ç??è¯?ï¼?该é??项å°?ç?¨å®?å?¨ DIGEST-MD5 å¯?ç ?è¿?æ?¥å?°æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-digest-md5.c:821
+#: ../camel/camel-sasl-digest-md5.c:817
#, c-format
msgid "Server challenge too long (>2048 octets)"
msgstr "æ??å?¡å?¨è´¨è¯¢è¿?é?¿ (>2048 å?è??)"
-#: ../camel/camel-sasl-digest-md5.c:832
+#: ../camel/camel-sasl-digest-md5.c:828
#, c-format
msgid "Server challenge invalid\n"
msgstr "æ??å?¡å?¨è´¨è¯¢æ? æ??\n"
-#: ../camel/camel-sasl-digest-md5.c:840
+#: ../camel/camel-sasl-digest-md5.c:836
#, c-format
msgid "Server challenge contained invalid \"Quality of Protection\" token"
msgstr "æ??å?¡å?¨è´¨è¯¢å?«æ??æ? æ??ç??â??å??è´¨ä¿?æ?¤â??æ ?å¿?"
-#: ../camel/camel-sasl-digest-md5.c:875
+#: ../camel/camel-sasl-digest-md5.c:871
#, c-format
msgid "Server response did not contain authorization data"
msgstr "æ??å?¡å?¨åº?ç?ä¸?å?«æ??认è¯?æ?°æ?®"
-#: ../camel/camel-sasl-digest-md5.c:896
+#: ../camel/camel-sasl-digest-md5.c:892
#, c-format
msgid "Server response contained incomplete authorization data"
msgstr "æ??å?¡å?¨åº?è¾¾å?«æ??ä¸?å®?æ?´ç??认è¯?æ?°æ?®"
-#: ../camel/camel-sasl-digest-md5.c:909
+#: ../camel/camel-sasl-digest-md5.c:905
#, c-format
msgid "Server response does not match"
msgstr "æ??å?¡å?¨åº?ç?ä¸?å?¹é??"
-#: ../camel/camel-sasl-gssapi.c:85
+#: ../camel/camel-sasl-gssapi.c:81
msgid "GSSAPI"
msgstr "GSSAPI"
-#: ../camel/camel-sasl-gssapi.c:87
+#: ../camel/camel-sasl-gssapi.c:83
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr "该é??项å°?ç?¨ Kerberos 5 认è¯?è¿?æ?¥å?°æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-gssapi.c:128
+#: ../camel/camel-sasl-gssapi.c:124
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
msgstr "æ??æ??ä¾?ç??è¯?书ä¸?æ?¯æ??æ??å®?ç??æ?ºå?¶ï¼?æ??è??æ? æ³?被å®?ç?°æ??è¯?å?«ã??"
-#: ../camel/camel-sasl-gssapi.c:133
+#: ../camel/camel-sasl-gssapi.c:129
msgid "The provided target_name parameter was ill-formed."
msgstr "æ??ä¾?ç?? target_name å??æ?°æ ¼å¼?ä¸?对ã??"
-#: ../camel/camel-sasl-gssapi.c:136
+#: ../camel/camel-sasl-gssapi.c:132
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
msgstr "æ??ä¾?ç?? target_name å??æ?°å??å?«æ? æ??æ??ä¸?æ?¯æ??ç??å??称类å??ã??"
-#: ../camel/camel-sasl-gssapi.c:140
+#: ../camel/camel-sasl-gssapi.c:136
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:145
+#: ../camel/camel-sasl-gssapi.c:141
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
msgstr "input_token å??å?«æ? æ??ç??ç¾å??ï¼?æ??è??æ? æ³?éª?è¯?ç¾å??ã??"
-#: ../camel/camel-sasl-gssapi.c:149
+#: ../camel/camel-sasl-gssapi.c:145
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:154
+#: ../camel/camel-sasl-gssapi.c:150
msgid "The supplied context handle did not refer to a valid context."
msgstr "æ??ä¾?ç??ä¸?ä¸?æ??å?¥æ??æ??å¼?ç?¨ç??ä¸?ä¸?æ??æ? æ??ã??"
-#: ../camel/camel-sasl-gssapi.c:157
+#: ../camel/camel-sasl-gssapi.c:153
msgid "The consistency checks performed on the input_token failed."
msgstr "对 input_token æ?§è¡?å®?æ?´æ?§æ£?æ?¥å¤±è´¥ã??"
-#: ../camel/camel-sasl-gssapi.c:160
+#: ../camel/camel-sasl-gssapi.c:156
msgid "The consistency checks performed on the credential failed."
msgstr "对è¯?书æ?§è¡?å®?æ?´æ?§æ£?æ?¥å¤±è´¥ã??"
-#: ../camel/camel-sasl-gssapi.c:163
+#: ../camel/camel-sasl-gssapi.c:159
msgid "The referenced credentials have expired."
msgstr "å¼?ç?¨ç??è¯?书已è¿?æ??ã??"
-#: ../camel/camel-sasl-gssapi.c:169 ../camel/camel-sasl-gssapi.c:309
-#: ../camel/camel-sasl-gssapi.c:353 ../camel/camel-sasl-gssapi.c:370
+#: ../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/providers/smtp/camel-smtp-transport.c:1256
#, c-format
msgid "Bad authentication response from server."
msgstr "æ?¥è?ªæ??å?¡å?¨ç??æ? æ??认è¯?åº?ç?ã??"
-#: ../camel/camel-sasl-gssapi.c:382
+#: ../camel/camel-sasl-gssapi.c:378
#, c-format
msgid "Unsupported security layer."
msgstr "ä¸?æ?¯æ??ç??å®?å?¨å±?ã??"
-#: ../camel/camel-sasl-login.c:39
+#: ../camel/camel-sasl-login.c:35
msgid "Login"
msgstr "Login"
-#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
msgid "This option will connect to the server using a simple password."
msgstr "该é??项å°?以æ?®é??å¯?ç ?è¿?æ?¥å?°æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-login.c:95
+#: ../camel/camel-sasl-login.c:91
#, c-format
msgid "Unknown authentication state."
msgstr "æ?ªç?¥ç??认è¯?ç?¶æ??ã??"
-#: ../camel/camel-sasl-ntlm.c:41
+#: ../camel/camel-sasl-ntlm.c:37
msgid "NTLM / SPA"
msgstr "NTLM / SPA"
-#: ../camel/camel-sasl-ntlm.c:43
+#: ../camel/camel-sasl-ntlm.c:39
msgid ""
"This option will connect to a Windows-based server using NTLM / Secure "
"Password Authentication."
msgstr "该é??项å°?使ç?¨ NTLM / Secure å?£ä»¤è®¤è¯?è¿?æ?¥å?°å?ºäº? Windows ç??æ??å?¡å?¨ã??"
-#: ../camel/camel-sasl-plain.c:43
+#: ../camel/camel-sasl-plain.c:39
msgid "PLAIN"
msgstr "PLAIN"
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:42
msgid "POP before SMTP"
msgstr "å?¨ SMTP ä¹?å?? POP"
-#: ../camel/camel-sasl-popb4smtp.c:48
+#: ../camel/camel-sasl-popb4smtp.c:44
msgid "This option will authorise a POP connection before attempting SMTP"
msgstr "该é??项å°?å?¨å°?è¯? SMTP ä¹?å??å??许 POP è¿?æ?¥"
-#: ../camel/camel-sasl-popb4smtp.c:83
+#: ../camel/camel-sasl-popb4smtp.c:79
msgid "POP Source URI"
msgstr "POP � URI"
-#: ../camel/camel-sasl-popb4smtp.c:90
+#: ../camel/camel-sasl-popb4smtp.c:86
#, c-format
msgid "POP Before SMTP authentication using an unknown transport"
msgstr "以æ?ªç?¥ç??ä¼ è¾?è¿?è¡? SMTP æ??æ??ä¹?å??ç?? POP"
-#: ../camel/camel-sasl-popb4smtp.c:98
+#: ../camel/camel-sasl-popb4smtp.c:94
#, c-format
msgid "POP Before SMTP authentication using a non-POP source"
msgstr "以é?? POP æº?è¿?è¡? SMTP æ??æ??ä¹?å??ç?? POP"
@@ -2325,22 +2385,22 @@ msgstr "以é?? POP æº?è¿?è¡? SMTP æ??æ??ä¹?å??ç?? POP"
msgid "Regular expression compilation failed: %s: %s"
msgstr "常�表达���失败�%s�%s"
-#: ../camel/camel-service.c:89
+#: ../camel/camel-service.c:85
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URLâ??%sâ??é??è¦?ç?¨æ?·å??ç»?件"
-#: ../camel/camel-service.c:93
+#: ../camel/camel-service.c:89
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URLâ??%sâ??é??è¦?主æ?ºç»?件"
-#: ../camel/camel-service.c:97
+#: ../camel/camel-service.c:93
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URLâ??%sâ??é??è¦?è·¯å¾?ç»?件"
-#: ../camel/camel-session.c:260
+#: ../camel/camel-session.c:256
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -2349,141 +2409,141 @@ msgstr ""
"æ? æ³?å??建ç?®å½? %sï¼?\n"
"%s"
-#: ../camel/camel-session.c:757
+#: ../camel/camel-session.c:752
#, c-format
msgid "Please enter the %s password for %s on host %s."
msgstr "请è¾?å?¥ %2$s %3$s ç?? %1$s å¯?ç ?"
-#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1048
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1048
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "æ? æ³?æ?¾å?°â??%sâ??ç??è¯?书"
-#: ../camel/camel-smime-context.c:376
+#: ../camel/camel-smime-context.c:372
msgid "Cannot create CMS message"
msgstr "æ? æ³?å??建 CMS æ¶?æ?¯"
-#: ../camel/camel-smime-context.c:381
+#: ../camel/camel-smime-context.c:377
msgid "Cannot create CMS signed data"
msgstr "æ? æ³?å??建 CMS ç¾å??æ?°æ?®"
-#: ../camel/camel-smime-context.c:387
+#: ../camel/camel-smime-context.c:383
msgid "Cannot attach CMS signed data"
msgstr "æ? æ³?é??å? CMS ç¾å??æ?°æ?®"
-#: ../camel/camel-smime-context.c:394
+#: ../camel/camel-smime-context.c:390
msgid "Cannot attach CMS data"
msgstr "æ? æ³?é??å? CMS æ?°æ?®"
-#: ../camel/camel-smime-context.c:400
+#: ../camel/camel-smime-context.c:396
msgid "Cannot create CMS Signer information"
msgstr "æ? æ³?å??建 CMS ç¾å??è??ä¿¡æ?¯"
-#: ../camel/camel-smime-context.c:406
+#: ../camel/camel-smime-context.c:402
msgid "Cannot find certificate chain"
msgstr "����书�"
-#: ../camel/camel-smime-context.c:412
+#: ../camel/camel-smime-context.c:408
msgid "Cannot add CMS Signing time"
msgstr "æ? æ³?æ·»å? CMS ç¾å??æ?¶é?´"
-#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
+#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
#, c-format
msgid "Encryption certificate for '%s' does not exist"
msgstr "â??%sâ??ç??å? å¯?è¯?书ä¸?å?å?¨"
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:454
msgid "Cannot add SMIMEEncKeyPrefs attribute"
msgstr "æ? æ³?æ·»å? SMIMEEncKeyPrefs å±?æ?§"
-#: ../camel/camel-smime-context.c:463
+#: ../camel/camel-smime-context.c:459
msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
msgstr "æ? æ³?æ·»å? MS SMIMEEncKeyPrefs å±?æ?§"
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:464
msgid "Cannot add encryption certificate"
msgstr "æ? æ³?æ·»å? å? å¯?è¯?书"
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:470
msgid "Cannot add CMS Signer information"
msgstr "æ? æ³?æ·»å? CMS ç¾å??è??ä¿¡æ?¯"
#. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:507
+#: ../camel/camel-smime-context.c:503
msgid "Unverified"
msgstr "æ?ªæ ¡éª?"
-#: ../camel/camel-smime-context.c:509
+#: ../camel/camel-smime-context.c:505
msgid "Good signature"
msgstr "å®?好ç¾å??"
-#: ../camel/camel-smime-context.c:511
+#: ../camel/camel-smime-context.c:507
msgid "Bad signature"
msgstr "æ? æ??ç¾å??"
-#: ../camel/camel-smime-context.c:513
+#: ../camel/camel-smime-context.c:509
msgid "Content tampered with or altered in transit"
msgstr "å??容å?¨ä¼ é??è¿?ç¨?ä¸è¢«ç¯¡æ?¹"
-#: ../camel/camel-smime-context.c:515
+#: ../camel/camel-smime-context.c:511
msgid "Signing certificate not found"
msgstr "ç¾å??è¯?书æ?¾ä¸?å?°"
-#: ../camel/camel-smime-context.c:517
+#: ../camel/camel-smime-context.c:513
msgid "Signing certificate not trusted"
msgstr "ç¾å??è¯?书ä¸?å?¯ä¿¡"
-#: ../camel/camel-smime-context.c:519
+#: ../camel/camel-smime-context.c:515
msgid "Signature algorithm unknown"
msgstr "ç¾å??ç®?æ³?æ?ªç?¥"
-#: ../camel/camel-smime-context.c:521
+#: ../camel/camel-smime-context.c:517
msgid "Signature algorithm unsupported"
msgstr "ç¾å??ç®?æ³?ä¸?æ?¯æ??"
-#: ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:519
msgid "Malformed signature"
msgstr "ç¾å??æ ¼å¼?ä¸?对"
-#: ../camel/camel-smime-context.c:525
+#: ../camel/camel-smime-context.c:521
msgid "Processing error"
msgstr "å¤?ç??é??误"
-#: ../camel/camel-smime-context.c:568
+#: ../camel/camel-smime-context.c:566
msgid "No signed data in signature"
msgstr "ç¾å??ä¸æ²¡æ??ç¾å??æ?°æ?®"
-#: ../camel/camel-smime-context.c:573
+#: ../camel/camel-smime-context.c:571
msgid "Digests missing from enveloped data"
msgstr "ä¿¡å°?æ?°æ?®ç¼ºå°?æ??è¦?"
-#: ../camel/camel-smime-context.c:586 ../camel/camel-smime-context.c:597
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
msgid "Cannot calculate digests"
msgstr "æ? æ³?计ç®?æ??è¦?"
-#: ../camel/camel-smime-context.c:604 ../camel/camel-smime-context.c:608
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
msgid "Cannot set message digests"
msgstr "æ? æ³?设置æ¶?æ?¯æ??è¦?"
-#: ../camel/camel-smime-context.c:618 ../camel/camel-smime-context.c:623
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
msgid "Certificate import failed"
msgstr "�书导�失败"
-#: ../camel/camel-smime-context.c:633
+#: ../camel/camel-smime-context.c:631
#, c-format
msgid "Certificate is the only message, cannot verify certificates"
msgstr "å?ªæ??è¯?书ç??æ¶?æ?¯ï¼?æ? æ³?æ ¡éª?è¯?书"
-#: ../camel/camel-smime-context.c:636
+#: ../camel/camel-smime-context.c:634
#, c-format
msgid "Certificate is the only message, certificates imported and verified"
msgstr "å?ªæ??è¯?书ç??æ¶?æ?¯ï¼?è¯?书已导å?¥å¹¶æ ¡éª?"
-#: ../camel/camel-smime-context.c:640
+#: ../camel/camel-smime-context.c:638
msgid "Cannot find signature digests"
msgstr "æ?¾ä¸?å?°ç¾å??æ??è¦?"
-#: ../camel/camel-smime-context.c:656
+#: ../camel/camel-smime-context.c:654
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "ç¾å??è??ï¼?%s <%s>ï¼?%s\n"
@@ -2544,34 +2604,36 @@ msgstr "å°?æ?°æ?®æ·»å? å?°ç¼?ç ?å?¨å¤±è´¥"
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME 解å¯?ï¼?没æ??æ?¾å?°å? å¯?å??容"
-#: ../camel/camel-store.c:2184
+#: ../camel/camel-store.c:2180
#, 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:2375 ../camel/camel-vtrash-folder.c:48
+#: ../camel/camel-store.c:2371 ../camel/camel-store.c:2381
+#: ../camel/camel-vtrash-folder.c:48
msgid "Trash"
msgstr "å??æ?¶ç«?"
#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2378 ../camel/camel-vtrash-folder.c:50
+#: ../camel/camel-store.c:2374 ../camel/camel-store.c:2385
+#: ../camel/camel-vtrash-folder.c:50
msgid "Junk"
msgstr "å??å?¾"
-#: ../camel/camel-store.c:2811
+#: ../camel/camel-store.c:2828
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "æ? æ³?å??建æ??件夹ï¼?%sï¼?æ??件夹已å?å?¨"
-#: ../camel/camel-store.c:2938 ../camel/camel-vee-store.c:367
+#: ../camel/camel-store.c:2955 ../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:3079 ../camel/camel-vee-store.c:417
-#: ../camel/providers/local/camel-maildir-store.c:662
+#: ../camel/camel-store.c:3096 ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:668
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "æ? æ³?é??å?½å??æ??件夹ï¼?%sï¼?æ? æ??æ??ä½?"
@@ -2654,7 +2716,7 @@ msgstr "主æ?ºå??太é?¿ (æ??é?¿ 255 å?符)"
msgid "Invalid reply from proxy server"
msgstr "代ç??æ??å?¡å?¨ç??å??åº?æ? æ??"
-#: ../camel/camel-tcp-stream-ssl.c:457
+#: ../camel/camel-tcp-stream-ssl.c:453
#, c-format
msgid ""
"Issuer: %s\n"
@@ -2667,16 +2729,16 @@ msgstr ""
"æ??纹ï¼? %s\n"
"ç¾å??ï¼? %s"
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
msgid "GOOD"
msgstr "好"
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
msgid "BAD"
msgstr "å??"
#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:467
+#: ../camel/camel-tcp-stream-ssl.c:463
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -2691,7 +2753,7 @@ msgstr ""
"\n"
"æ?¨å¸?æ??æ?¥å??å??ï¼?"
-#: ../camel/camel-tcp-stream-ssl.c:511
+#: ../camel/camel-tcp-stream-ssl.c:507
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -2700,7 +2762,7 @@ msgstr ""
"�书���%s\n"
"å??è¡?è??ï¼?%s"
-#: ../camel/camel-tcp-stream-ssl.c:563
+#: ../camel/camel-tcp-stream-ssl.c:559
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -2709,7 +2771,7 @@ msgstr ""
"æ? æ??ç??è¯?书å??å??ï¼?%s\n"
"å??è¡?è??ï¼?%s"
-#: ../camel/camel-tcp-stream-ssl.c:581
+#: ../camel/camel-tcp-stream-ssl.c:577
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -2718,7 +2780,7 @@ msgstr ""
"è¯?书è¿?æ??ï¼?%s\n"
"å??è¡?è??ï¼?%s"
-#: ../camel/camel-tcp-stream-ssl.c:598
+#: ../camel/camel-tcp-stream-ssl.c:594
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -2727,22 +2789,22 @@ msgstr ""
"è¯?书æ?¤é??å??表已è¿?æ??ï¼?%s\n"
"å??è¡?è??ï¼?%s"
-#: ../camel/camel-url.c:314
+#: ../camel/camel-url.c:316
#, c-format
msgid "Could not parse URL '%s'"
msgstr "æ? æ³?解æ?? URLâ??%sâ??"
-#: ../camel/camel-vee-folder.c:1251 ../camel/camel-vee-folder.c:1414
+#: ../camel/camel-vee-folder.c:1236 ../camel/camel-vee-folder.c:1399
#, c-format
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "æ? æ³?å°?æ¶?æ?¯ç§»å?¨æ??å¤?å?¶å?°è??æ??æ??件夹ä¸"
-#: ../camel/camel-vee-folder.c:1287
+#: ../camel/camel-vee-folder.c:1272
#, c-format
msgid "No such message %s in %s"
msgstr "å?¨ %2$s ä¸æ²¡æ??æ¶?æ?¯ %1$s"
-#: ../camel/camel-vee-folder.c:1355
+#: ../camel/camel-vee-folder.c:1340
#, c-format
msgid "Error storing '%s': "
msgstr "å?å?¨â??%sâ??å?ºé??ï¼?"
@@ -2770,48 +2832,48 @@ msgstr "æ? æ³?å°?æ¶?æ?¯å¤?å?¶å?°å??æ?¶ç«?æ??件夹"
msgid "Cannot copy messages to the Junk folder"
msgstr "æ? æ³?å°?æ¶?æ?¯å¤?å?¶å?°å??å?¾é?®ä»¶æ??件夹"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:959
-#: ../camel/providers/imap/camel-imap-folder.c:390
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:954
+#: ../camel/providers/imap/camel-imap-folder.c:391
#, c-format
msgid "Could not load summary for %s"
msgstr "æ? æ³?为 %s è½½å?¥æ¦?è¦?"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1035
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1030
#, c-format
msgid "Checking for deleted messages %s"
msgstr "æ£?æ?¥å·²å? é?¤ç??æ?°å»º %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1520
-#: ../camel/providers/groupwise/camel-groupwise-store.c:672
-#: ../camel/providers/groupwise/camel-groupwise-store.c:803
-#: ../camel/providers/imap/camel-imap-folder.c:3919
-#: ../camel/providers/imap/camel-imap-folder.c:4001
-#: ../camel/providers/imapx/camel-imapx-server.c:3889
-#: ../camel/providers/imapx/camel-imapx-server.c:4020
+#: ../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/imapx/camel-imapx-server.c:3871
+#: ../camel/providers/imapx/camel-imapx-server.c:4002
#, c-format
msgid "Fetching summary information for new messages in %s"
msgstr "ä»? %s ä¸ç??æ?°æ¶?æ?¯ä¸è?·å??æ¦?è¦?ä¿¡æ?¯"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1992
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2046
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2710
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2720
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1987
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2040
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2704
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2714
#, c-format
msgid "Could not get message"
msgstr "æ? æ³?è?·å¾?æ¶?æ?¯"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2430
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2480
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2424
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
#, c-format
msgid "Cannot append message to folder '%s': %s"
msgstr "æ? æ³?å°?æ¶?æ?¯è¿½å? å?°æ??件夹â??%sâ??ï¼?%s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2466
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2460
#, c-format
msgid "Cannot create message: %s"
msgstr "æ? æ³?å??建æ¶?æ?¯ï¼?%s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2646
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -2820,7 +2882,7 @@ msgstr ""
"æ? æ³?è?·å??æ¶?æ?¯ï¼?%s\n"
" %s"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2646
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
#: ../camel/providers/local/camel-maildir-folder.c:100
#: ../camel/providers/local/camel-maildir-folder.c:307
#: ../camel/providers/local/camel-mbox-folder.c:117
@@ -2829,17 +2891,17 @@ msgstr ""
msgid "No such message"
msgstr "没æ??该æ¶?æ?¯"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2665
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:418
-#: ../camel/providers/pop3/camel-pop3-folder.c:455
+#: ../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/pop3/camel-pop3-folder.c:457
#, c-format
msgid "Cannot get message %s: "
msgstr "æ? æ³?è?·å??æ¶?æ?¯ %sï¼?"
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2683
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2693
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2897
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2677
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2687
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2890
#, c-format
msgid "This message is not available in offline mode."
msgstr "该æ¶?æ?¯æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸ä½¿ç?¨ã??"
@@ -2878,6 +2940,8 @@ msgid "Options"
msgstr "é??项"
#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
msgid "_Apply filters to new messages in Inbox on this server"
msgstr "åº?ç?¨è¿?滤è§?å??å?°æ¤æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°æ¶?æ?¯(_A)"
@@ -2924,23 +2988,23 @@ msgid ""
"This option will connect to the GroupWise server using a plaintext password."
msgstr "该é??项å°?使ç?¨çº¯æ??æ?¬å¯?ç ?è¿?æ?¥å?° GroupWise æ??å?¡å?¨ã??"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#: ../camel/providers/groupwise/camel-groupwise-store.c:103
#, c-format
msgid "Host or user not available in url"
msgstr "URL ä¸ç??主æ?ºæ??ç?¨æ?·ä¸?å?¯ç?¨"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:209
+#: ../camel/providers/groupwise/camel-groupwise-store.c:205
#: ../camel/providers/imap/camel-imap-store.c:801
-#: ../camel/providers/imapx/camel-imapx-server.c:3100
+#: ../camel/providers/imapx/camel-imapx-server.c:3085
#, c-format
msgid "You did not enter a password."
msgstr "æ?¨æ²¡æ??è¾?å?¥å¯?ç ?ã??"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:332
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
msgid "Some features may not work correctly with your current server version"
msgstr "æ??äº?ç?¹æ?§å?¯è?½æ? æ³?ä¸?æ?¨ç?®å??ç??æ??å?¡å?¨ç??æ?¬å?±å??å·¥ä½?"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:563
+#: ../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
@@ -2948,17 +3012,17 @@ msgstr "æ??äº?ç?¹æ?§å?¯è?½æ? æ³?ä¸?æ?¨ç?®å??ç??æ??å?¡å?¨ç??æ?¬å?±å??å·¥ä½?"
msgid "No such folder %s"
msgstr "没æ??æ??件夹 %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1224
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1217
#, c-format
msgid "Cannot create GroupWise folders in offline mode."
msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?å??建 GroupWise æ??件夹ã??"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1233
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1226
#, c-format
msgid "Cannot create a special system folder"
msgstr "æ? æ³?å??建ç?¹æ®?ç³»ç»?æ??件夹"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1243
+#: ../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
@@ -2966,19 +3030,19 @@ msgstr "æ? æ³?å??建ç?¹æ®?ç³»ç»?æ??件夹"
msgid "The parent folder is not allowed to contain subfolders"
msgstr "ç?¶æ??件夹ä¸?å??许å?«æ??å?æ??件夹"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1328
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1353
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1321
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1346
#, c-format
msgid "Cannot rename GroupWise folder '%s' to '%s'"
msgstr "æ? æ³?å°? GroupWise æ??件夹â??%sâ??é??å?½å??为â??%sâ??"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1387
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1380
#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
#, c-format
msgid "GroupWise server %s"
msgstr "GroupWise æ??å?¡å?¨ %s"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1389
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
#, c-format
msgid "GroupWise service for %s on %s"
msgstr "%2$s 为 %1$s æ??ä¾?ç?? GroupWise æ??å?¡"
@@ -3070,54 +3134,54 @@ msgstr "IMAP æ??å?¡å?¨åº?ç?ä¸?å?«æ?? %s ä¿¡æ?¯"
msgid "Unexpected OK response from IMAP server: %s"
msgstr "æ?¥è?ª IMAP æ??å?¡å?¨æ??å¤?ç?? OK åº?ç?ï¼?%s"
-#: ../camel/providers/imap/camel-imap-folder.c:291
+#: ../camel/providers/imap/camel-imap-folder.c:292
msgid "Always check for new mail in this folder"
msgstr "æ?»æ?¯æ£?æ?¥æ¤æ??件夹ä¸ç??æ?°é?®ä»¶(_B)"
-#: ../camel/providers/imap/camel-imap-folder.c:367
+#: ../camel/providers/imap/camel-imap-folder.c:368
#, c-format
msgid "Could not create directory %s: %s"
msgstr "æ? æ³?å??建ç?®å½? %sï¼?%s"
-#: ../camel/providers/imap/camel-imap-folder.c:990
-#: ../camel/providers/imapx/camel-imapx-server.c:3933
+#: ../camel/providers/imap/camel-imap-folder.c:991
+#: ../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:3326
+#: ../camel/providers/imap/camel-imap-folder.c:3368
msgid "Unable to retrieve message: "
msgstr "æ? æ³?è?·å??æ¶?æ?¯ï¼?"
-#: ../camel/providers/imap/camel-imap-folder.c:3361
-#: ../camel/providers/imapx/camel-imapx-server.c:5217
+#: ../camel/providers/imap/camel-imap-folder.c:3403
+#: ../camel/providers/imapx/camel-imapx-server.c:5195
#, c-format
msgid "Cannot get message with message ID %s: %s"
msgstr "æ? æ³?è?·å??æ¶?æ?¯ ID %sï¼?%s"
-#: ../camel/providers/imap/camel-imap-folder.c:3362
-#: ../camel/providers/imapx/camel-imapx-server.c:5218
+#: ../camel/providers/imap/camel-imap-folder.c:3404
+#: ../camel/providers/imapx/camel-imapx-server.c:5196
msgid "No such message available."
msgstr "没æ??该æ¶?æ?¯ã??"
-#: ../camel/providers/imap/camel-imap-folder.c:3437
-#: ../camel/providers/imap/camel-imap-folder.c:4332
-#: ../camel/providers/nntp/camel-nntp-folder.c:407
+#: ../camel/providers/imap/camel-imap-folder.c:3479
+#: ../camel/providers/imap/camel-imap-folder.c:4374
+#: ../camel/providers/nntp/camel-nntp-folder.c:403
#, c-format
msgid "This message is not currently available"
msgstr "该æ¶?æ?¯ç?®å??ä¸?å?¯ç?¨"
-#: ../camel/providers/imap/camel-imap-folder.c:4133
+#: ../camel/providers/imap/camel-imap-folder.c:4175
#, c-format
msgid "Incomplete server response: no information provided for message %d"
msgstr "ä¸?å®?æ?´ç??æ??å?¡å?¨å??åº?ï¼?没æ??为第 %d å°?ä¿¡æ??ä¾?ä¿¡æ?¯"
-#: ../camel/providers/imap/camel-imap-folder.c:4143
+#: ../camel/providers/imap/camel-imap-folder.c:4185
#, c-format
msgid "Incomplete server response: no UID provided for message %d"
msgstr "ä¸?å®?æ?´ç??æ??å?¡å?¨å??åº?ï¼?没æ??为第 %d å°?ä¿¡æ??ä¾? UID"
-#: ../camel/providers/imap/camel-imap-folder.c:4372
+#: ../camel/providers/imap/camel-imap-folder.c:4414
#, c-format
msgid "Could not find message body in FETCH response."
msgstr "æ? æ³?å?¨ FETCH åº?ç?ä¸æ?¾å?°ä¿¡ä½?ã??"
@@ -3186,11 +3250,6 @@ msgstr "è¦?ç??æ??å?¡å?¨æ??ä¾?ç??æ??件夹å?½å??空é?´(_V)"
msgid "Names_pace:"
msgstr "å?½å??空é?´(_P)ï¼?"
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "åº?ç?¨è¿?滤è§?å??å?°æ?¬æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°æ¶?æ?¯(_A)"
-
#: ../camel/providers/imap/camel-imap-provider.c:68
#: ../camel/providers/imapx/camel-imapx-provider.c:76
msgid "Check new messages for Jun_k contents"
@@ -3216,7 +3275,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:313
+#: ../camel/providers/nntp/camel-nntp-store.c:309
#: ../camel/providers/pop3/camel-pop3-store.c:135
#: ../camel/providers/smtp/camel-smtp-transport.c:151
#, c-format
@@ -3224,14 +3283,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:314
+#: ../camel/providers/nntp/camel-nntp-store.c:310
#: ../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:333
+#: ../camel/providers/nntp/camel-nntp-store.c:329
#, c-format
msgid "Could not connect to %s: "
msgstr "æ? æ³?è¿?æ?¥å?° %sï¼?"
@@ -3240,20 +3299,20 @@ msgstr "æ? æ³?è¿?æ?¥å?° %sï¼?"
#: ../camel/providers/imap/camel-imap-store.c:390
#: ../camel/providers/imap/camel-imap-store.c:397
#: ../camel/providers/imap/camel-imap-store.c:424
-#: ../camel/providers/imapx/camel-imapx-server.c:2942
-#: ../camel/providers/imapx/camel-imapx-server.c:2982
+#: ../camel/providers/imapx/camel-imapx-server.c:2927
+#: ../camel/providers/imapx/camel-imapx-server.c:2967
#, 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:371
-#: ../camel/providers/imapx/camel-imapx-server.c:2943
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
#: ../camel/providers/smtp/camel-smtp-transport.c:238
msgid "STARTTLS not supported"
msgstr "ä¸?æ?¯æ?? STARTTLS"
#: ../camel/providers/imap/camel-imap-store.c:391
-#: ../camel/providers/imapx/camel-imapx-server.c:2983
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
msgid "SSL negotiations failed"
msgstr "SSL å??å??失败"
@@ -3263,32 +3322,32 @@ msgid "SSL is not available in this build"
msgstr "æ?¬æ¬¡ç¼?è¯?ä¸æ?ªå??å?« SSL"
#: ../camel/providers/imap/camel-imap-store.c:549
-#: ../camel/providers/imapx/camel-imapx-server.c:2770
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
#, c-format
msgid "Connection cancelled"
msgstr "è¿?æ?¥å·²å??æ¶?"
#: ../camel/providers/imap/camel-imap-store.c:554
-#: ../camel/providers/imapx/camel-imapx-server.c:2775
+#: ../camel/providers/imapx/camel-imapx-server.c:2760
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "æ? æ³?使ç?¨å?½ä»¤â??%sâ??è¿?æ?¥ï¼?%s"
#: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imapx/camel-imapx-server.c:3056
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP æ??å?¡å?¨ %s ä¸?æ?¯æ??è¦?æ±?ç??éª?è¯?ç±»å?? %s"
#: ../camel/providers/imap/camel-imap-store.c:752
-#: ../camel/providers/imapx/camel-imapx-server.c:3068
+#: ../camel/providers/imapx/camel-imapx-server.c:3053
#: ../camel/providers/smtp/camel-smtp-transport.c:420
#, c-format
msgid "No support for authentication type %s"
msgstr "ä¸?æ?¯æ??éª?è¯?ç±»å?? %s"
#: ../camel/providers/imap/camel-imap-store.c:836
-#: ../camel/providers/imapx/camel-imapx-server.c:3144
+#: ../camel/providers/imapx/camel-imapx-server.c:3129
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3318,9 +3377,9 @@ msgstr "%2$s 为 %1$s æ??ä¾?ç?? IMAP æ??å?¡"
#: ../camel/providers/imapx/camel-imapx-store.c:794
#: ../camel/providers/local/camel-maildir-folder.c:409
#: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:609
#: ../camel/providers/local/camel-maildir-store.c:615
-#: ../camel/providers/local/camel-maildir-store.c:663
+#: ../camel/providers/local/camel-maildir-store.c:621
+#: ../camel/providers/local/camel-maildir-store.c:669
#: ../camel/providers/local/camel-spool-store.c:289
msgid "Inbox"
msgstr "�件箱"
@@ -3335,7 +3394,7 @@ msgstr "æ??件夹å??â??%sâ??æ? æ??ï¼?å??å? æ?¯å?¶ä¸å?«æ??å?符â??%câ??"
#: ../camel/providers/imap/camel-imap-store.c:1939
#: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:413
+#: ../camel/providers/local/camel-mbox-store.c:407
#: ../camel/providers/local/camel-mh-store.c:504
#, c-format
msgid "Cannot create folder '%s': folder exists."
@@ -3390,35 +3449,31 @@ msgstr "å?½å??空é?´ï¼?"
msgid "IMAP+"
msgstr "IMAP+"
-#: ../camel/providers/imapx/camel-imapx-server.c:1410
+#: ../camel/providers/imapx/camel-imapx-server.c:1404
msgid "Error writing to cache stream: "
msgstr "å??å?¥ç¼?å?æµ?é??误ï¼?"
-#: ../camel/providers/imapx/camel-imapx-server.c:2092
+#: ../camel/providers/imapx/camel-imapx-server.c:2083
#, c-format
msgid "Not authenticated"
msgstr "没æ??éª?è¯?"
-#: ../camel/providers/imapx/camel-imapx-server.c:2865
+#: ../camel/providers/imapx/camel-imapx-server.c:2850
#, c-format
msgid "Could not connect to %s (port %s): "
msgstr "æ? æ³?è¿?æ?¥å?° %s(端å?£ %s)ï¼?"
-#: ../camel/providers/imapx/camel-imapx-server.c:3329
+#: ../camel/providers/imapx/camel-imapx-server.c:3311
msgid "Closing tmp stream failed: "
msgstr "å?³é?临æ?¶æµ?失败ï¼?"
-#: ../camel/providers/imapx/camel-imapx-server.c:5365
-#, c-format
-msgid "Cannot create spool file: %s"
-msgstr "æ? æ³?å??建è?±æ?ºæ??件ï¼?%s"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:5381
+#: ../camel/providers/imapx/camel-imapx-server.c:5345
+#: ../camel/providers/imapx/camel-imapx-server.c:5360
msgid "Cannot create spool file: "
msgstr "æ? æ³?å??建è?±æ?ºæ??件ï¼?"
#: ../camel/providers/imapx/camel-imapx-store.c:1136
-#: ../camel/providers/nntp/camel-nntp-store.c:1610
+#: ../camel/providers/nntp/camel-nntp-store.c:1606
#, c-format
msgid "No such folder: %s"
msgstr "没æ??æ??件夹ï¼?%s"
@@ -3433,27 +3488,27 @@ msgstr "æº?æµ?没è¿?å??æ?°æ?®"
msgid "Source stream unavailable"
msgstr "�����"
-#: ../camel/providers/local/camel-local-folder.c:182
+#: ../camel/providers/local/camel-local-folder.c:178
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:192
-#: ../camel/providers/local/camel-local-folder.c:201
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
#, c-format
msgid "mailbox: %s (%s)"
msgstr "�件箱�%s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:210
+#: ../camel/providers/local/camel-local-folder.c:206
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:469
+#: ../camel/providers/local/camel-local-folder.c:466
msgid "Index message body data"
msgstr "索�信���"
-#: ../camel/providers/local/camel-local-folder.c:685
+#: ../camel/providers/local/camel-local-folder.c:679
#, c-format
msgid ""
"Cannot get message %s from folder %s\n"
@@ -3523,7 +3578,7 @@ msgstr "æ ?å?? Unix mbox è?±æ?ºç?®å½?"
#: ../camel/providers/local/camel-local-store.c:174
#: ../camel/providers/local/camel-local-store.c:319
#: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:532
+#: ../camel/providers/local/camel-mbox-store.c:526
#: ../camel/providers/local/camel-spool-store.c:318
#, c-format
msgid "Store root %s is not an absolute path"
@@ -3563,13 +3618,13 @@ msgid "Could not rename '%s': %s"
msgstr "æ? æ³?é??å?½å??â??%sâ??ï¼?%s"
#: ../camel/providers/local/camel-local-store.c:498
-#: ../camel/providers/local/camel-mbox-store.c:701
+#: ../camel/providers/local/camel-mbox-store.c:695
#, c-format
msgid "Could not delete folder index file '%s': %s"
msgstr "æ? æ³?å? é?¤æ??件夹索å¼?æ??件â??%sâ??ï¼?%s"
#: ../camel/providers/local/camel-local-store.c:526
-#: ../camel/providers/local/camel-mbox-store.c:730
+#: ../camel/providers/local/camel-mbox-store.c:724
#, c-format
msgid "Could not delete folder meta file '%s': %s"
msgstr "æ? æ³?å? é?¤æ??件夹å??æ??件â??%sâ??ï¼?%s"
@@ -3604,28 +3659,28 @@ msgid "Cannot create folder: %s : Folder name cannot contain a dot"
msgstr "æ? æ³?å??建æ??件夹ï¼?%sï¼?æ??件夹å??称ä¸?è?½å??å?«ç?¹"
#: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:680
+#: ../camel/providers/local/camel-maildir-store.c:686
#, c-format
msgid "Folder %s already exists"
msgstr "æ??件夹 %s å·²ç»?å?å?¨"
#: ../camel/providers/local/camel-maildir-store.c:191
#: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:381
-#: ../camel/providers/local/camel-mbox-store.c:395
+#: ../camel/providers/local/camel-mbox-store.c:375
+#: ../camel/providers/local/camel-mbox-store.c:389
#, c-format
msgid "Cannot create folder '%s': %s"
msgstr "æ? æ³?å??建æ??件夹â??%sâ??ï¼?%s"
#: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:347
+#: ../camel/providers/local/camel-mbox-store.c:341
#: ../camel/providers/local/camel-mh-store.c:464
#, c-format
msgid "Cannot get folder '%s': %s"
msgstr "æ? æ³?è?·å??æ??件夹â??%sâ??ï¼?%s"
#: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:357
+#: ../camel/providers/local/camel-mbox-store.c:351
#: ../camel/providers/local/camel-mh-store.c:473
#, c-format
msgid "Cannot get folder '%s': folder does not exist."
@@ -3648,33 +3703,33 @@ msgid "not a maildir directory"
msgstr "�� maildir ��"
#: ../camel/providers/local/camel-maildir-store.c:508
-#: ../camel/providers/local/camel-maildir-store.c:819
+#: ../camel/providers/local/camel-maildir-store.c:825
#: ../camel/providers/local/camel-spool-store.c:143
#: ../camel/providers/local/camel-spool-store.c:159
#, c-format
msgid "Could not scan folder '%s': %s"
msgstr "æ? æ³?æ?«æ??æ??件夹â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-maildir-store.c:671
+#: ../camel/providers/local/camel-maildir-store.c:677
#, c-format
msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
msgstr "æ? æ³?é??å?½å??æ??件夹ï¼?%sï¼?æ??件夹å??称ä¸?è?½å??å?«ç?¹"
-#: ../camel/providers/local/camel-maildir-summary.c:435
-#: ../camel/providers/local/camel-maildir-summary.c:565
+#: ../camel/providers/local/camel-maildir-summary.c:430
+#: ../camel/providers/local/camel-maildir-summary.c:560
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "æ? æ³?æ??å¼?é?®ä»¶ç?®å½?è·¯å¾?ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-summary.c:551
msgid "Checking folder consistency"
msgstr "æ£?æ?¥æ??件夹ä¸?è?´æ?§"
-#: ../camel/providers/local/camel-maildir-summary.c:649
+#: ../camel/providers/local/camel-maildir-summary.c:644
msgid "Checking for new messages"
msgstr "�����"
-#: ../camel/providers/local/camel-maildir-summary.c:742
+#: ../camel/providers/local/camel-maildir-summary.c:737
#: ../camel/providers/local/camel-mbox-summary.c:468
#: ../camel/providers/local/camel-mbox-summary.c:690
#: ../camel/providers/local/camel-mbox-summary.c:826
@@ -3702,34 +3757,34 @@ msgstr "æ??件夹好å??å·²ç»?被ä¸?å?¯æ?¢å¤?å?°ç ´å??äº?ã??"
msgid "Cannot create folder lock on %s: %s"
msgstr "æ? æ³?å?¨ %s å??建æ??件夹é??ï¼?%s"
-#: ../camel/providers/local/camel-mbox-store.c:369
-#: ../camel/providers/local/camel-mbox-store.c:540
+#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:534
#, c-format
msgid "Cannot create a folder by this name."
msgstr "æ? æ³?以æ¤å??称å??建æ??件夹ã??"
-#: ../camel/providers/local/camel-mbox-store.c:406
+#: ../camel/providers/local/camel-mbox-store.c:400
#, c-format
msgid "Cannot get folder '%s': not a regular file."
msgstr "æ? æ³?è?·å??æ??件夹â??%sâ??ï¼?ä¸?æ?¯æ?®é??æ??件"
-#: ../camel/providers/local/camel-mbox-store.c:556
+#: ../camel/providers/local/camel-mbox-store.c:550
#, c-format
msgid "Cannot create directory '%s': %s."
msgstr "æ? æ³?å??建ç?®å½?â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-mbox-store.c:572
+#: ../camel/providers/local/camel-mbox-store.c:566
#, c-format
msgid "Cannot create folder: %s: %s"
msgstr "æ? æ³?å??建æ??件夹ï¼?%sï¼?%s"
-#: ../camel/providers/local/camel-mbox-store.c:574
+#: ../camel/providers/local/camel-mbox-store.c:568
msgid "Folder already exists"
msgstr "æ??件夹已ç»?å?å?¨"
-#: ../camel/providers/local/camel-mbox-store.c:615
-#: ../camel/providers/local/camel-mbox-store.c:628
-#: ../camel/providers/local/camel-mbox-store.c:657
+#: ../camel/providers/local/camel-mbox-store.c:609
+#: ../camel/providers/local/camel-mbox-store.c:622
+#: ../camel/providers/local/camel-mbox-store.c:651
#, c-format
msgid ""
"Could not delete folder '%s':\n"
@@ -3738,33 +3793,33 @@ msgstr ""
"æ? æ³?å? é?¤æ??件夹â??%sâ??ï¼?\n"
"%s"
-#: ../camel/providers/local/camel-mbox-store.c:638
+#: ../camel/providers/local/camel-mbox-store.c:632
#, c-format
msgid "'%s' is not a regular file."
msgstr "â??%sâ??并ä¸?æ?¯æ?®é??æ??件ã??"
-#: ../camel/providers/local/camel-mbox-store.c:647
+#: ../camel/providers/local/camel-mbox-store.c:641
#, c-format
msgid "Folder '%s' is not empty. Not deleted."
msgstr "æ??件夹â??%sâ??é??空ã??没æ??å? é?¤ã??"
-#: ../camel/providers/local/camel-mbox-store.c:673
-#: ../camel/providers/local/camel-mbox-store.c:687
+#: ../camel/providers/local/camel-mbox-store.c:667
+#: ../camel/providers/local/camel-mbox-store.c:681
#, c-format
msgid "Could not delete folder summary file '%s': %s"
msgstr "æ? æ³?å? é?¤æ??件夹æ¦?è¦?æ??件â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-mbox-store.c:767
+#: ../camel/providers/local/camel-mbox-store.c:761
#, c-format
msgid "The new folder name is illegal."
msgstr "æ??å®?ç??æ??件夹å??称ä¸?å??æ³?ã??"
-#: ../camel/providers/local/camel-mbox-store.c:782
+#: ../camel/providers/local/camel-mbox-store.c:776
#, c-format
msgid "Could not rename '%s': '%s': %s"
msgstr "æ? æ³?é??å?½å??â??%sâ??ï¼?â??%sâ??ï¼?%s"
-#: ../camel/providers/local/camel-mbox-store.c:865
+#: ../camel/providers/local/camel-mbox-store.c:859
#, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "æ? æ³?å°?â??%sâ??é??å?½å??为 %sï¼?%s"
@@ -3865,7 +3920,7 @@ msgstr "æ? æ³?å??建æ??件夹â??%sâ??ï¼?%s"
msgid "Cannot get folder '%s': not a directory."
msgstr "æ? æ³?è?·å??æ??件夹â??%sâ??ï¼?ä¸?æ?¯ç?®å½?ã??"
-#: ../camel/providers/local/camel-mh-summary.c:230
+#: ../camel/providers/local/camel-mh-summary.c:226
#, c-format
msgid "Cannot open MH directory path: %s: %s"
msgstr "æ? æ³?æ??å¼? MH ç?®å½?ï¼?%sï¼?%s"
@@ -3961,40 +4016,40 @@ msgstr ""
"æ? æ³?å??æ¥è?±æ?ºæ??件夹 %s: %s\n"
"æ??件夹å?¯è?½å·²æ??å??ï¼?å?¯æ?¬å·²å?æ?¾å?¨ '%s'"
-#: ../camel/providers/nntp/camel-nntp-folder.c:200
-#: ../camel/providers/nntp/camel-nntp-folder.c:279
-#: ../camel/providers/nntp/camel-nntp-folder.c:393
+#: ../camel/providers/nntp/camel-nntp-folder.c:196
+#: ../camel/providers/nntp/camel-nntp-folder.c:275
+#: ../camel/providers/nntp/camel-nntp-folder.c:389
#, 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:245
-#: ../camel/providers/pop3/camel-pop3-folder.c:369
-#: ../camel/providers/pop3/camel-pop3-folder.c:434
-#: ../camel/providers/pop3/camel-pop3-folder.c:446
-#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/pop3/camel-pop3-folder.c:371
+#: ../camel/providers/pop3/camel-pop3-folder.c:436
+#: ../camel/providers/pop3/camel-pop3-folder.c:448
+#: ../camel/providers/pop3/camel-pop3-folder.c:697
#, c-format
msgid "Cannot get message %s: %s"
msgstr "æ? æ³?è?·å??æ¶?æ?¯ %sï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:477
-#: ../camel/providers/nntp/camel-nntp-folder.c:483
-#: ../camel/providers/nntp/camel-nntp-folder.c:530
+#: ../camel/providers/nntp/camel-nntp-folder.c:473
+#: ../camel/providers/nntp/camel-nntp-folder.c:479
+#: ../camel/providers/nntp/camel-nntp-folder.c:526
#, c-format
msgid "Posting failed: %s"
msgstr "å??表失败ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-folder.c:525
+#: ../camel/providers/nntp/camel-nntp-folder.c:521
msgid "Posting failed: "
msgstr "å??表失败ï¼?"
-#: ../camel/providers/nntp/camel-nntp-folder.c:554
+#: ../camel/providers/nntp/camel-nntp-folder.c:550
#, c-format
msgid "You cannot post NNTP messages while working offline!"
msgstr "æ?¨ç¦»çº¿æ?¶æ? æ³?æ??é?? NNTP æ¶?æ?¯ï¼?"
-#: ../camel/providers/nntp/camel-nntp-folder.c:574
+#: ../camel/providers/nntp/camel-nntp-folder.c:570
#, c-format
msgid "You cannot copy messages from a NNTP folder!"
msgstr "æ?¨æ? æ³?ä»? NNTP æ??件夹å¤?å?¶æ¶?æ?¯ï¼?"
@@ -4022,32 +4077,32 @@ msgid ""
"password."
msgstr "该é??项å°?以æ??æ??å¯?ç ?å??è¿?è¡? NNTP æ??å?¡å?¨è¿?è¡?认è¯?ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:77
+#: ../camel/providers/nntp/camel-nntp-store.c:73
#, c-format
msgid "Authentication requested but no username provided"
msgstr "请æ±?äº?身份éª?è¯?ï¼?ä½?æ?ªæ??ä¾?ç?¨æ?·å??"
-#: ../camel/providers/nntp/camel-nntp-store.c:89
+#: ../camel/providers/nntp/camel-nntp-store.c:85
#, c-format
msgid "Cannot authenticate to server: %s"
msgstr "æ? æ³?认è¯?å?°æ??å?¡å?¨ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:346
+#: ../camel/providers/nntp/camel-nntp-store.c:342
#, c-format
msgid "Could not read greeting from %s: "
msgstr "æ? æ³?é??读æ?¥è?ª %s ç??欢è¿?ä¿¡æ?¯ï¼?"
-#: ../camel/providers/nntp/camel-nntp-store.c:359
+#: ../camel/providers/nntp/camel-nntp-store.c:355
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "NNTP æ??å?¡å?¨ %s è¿?å??é??误ç ? %dï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:527
+#: ../camel/providers/nntp/camel-nntp-store.c:523
#, c-format
msgid "USENET News via %s"
msgstr "USENET æ?°é?» %s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1045
+#: ../camel/providers/nntp/camel-nntp-store.c:1041
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -4058,7 +4113,7 @@ msgstr ""
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1160
+#: ../camel/providers/nntp/camel-nntp-store.c:1156
#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
@@ -4069,7 +4124,7 @@ msgstr ""
"\n"
"没æ??è¿?æ ·ç??æ?°é?»ç»?ã??é??ä¸é¡¹ç?®å?¯è?½æ?¯ç?¶æ??件夹ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1202
+#: ../camel/providers/nntp/camel-nntp-store.c:1198
#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
@@ -4080,80 +4135,80 @@ msgstr ""
"\n"
"æ?°é?»ç»?ä¸?å?å?¨ï¼?"
-#: ../camel/providers/nntp/camel-nntp-store.c:1235
+#: ../camel/providers/nntp/camel-nntp-store.c:1231
#, c-format
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸å??建æ??件夹ï¼?åº?该订é??ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1251
+#: ../camel/providers/nntp/camel-nntp-store.c:1247
#, c-format
msgid "You cannot rename a folder in a News store."
msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸é??å?½å??æ??件夹ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1268
+#: ../camel/providers/nntp/camel-nntp-store.c:1264
#, c-format
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr "æ?¨æ? æ³?å?¨æ?°é?»å?å?¨ä¸å? é?¤æ??件夹ï¼?åº?该é??订ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1479
+#: ../camel/providers/nntp/camel-nntp-store.c:1475
msgid "NNTP Command failed: "
msgstr "NNTP �令失败�"
-#: ../camel/providers/nntp/camel-nntp-store.c:1553
+#: ../camel/providers/nntp/camel-nntp-store.c:1549
#, c-format
msgid "Not connected."
msgstr "æ?ªè¿?æ?¥ã??"
-#: ../camel/providers/nntp/camel-nntp-summary.c:234
-#: ../camel/providers/nntp/camel-nntp-summary.c:345
+#: ../camel/providers/nntp/camel-nntp-summary.c:230
+#: ../camel/providers/nntp/camel-nntp-summary.c:341
#, c-format
msgid "%s: Scanning new messages"
msgstr "%sï¼?æ£å?¨æ?«æ??æ?°æ¶?æ?¯"
-#: ../camel/providers/nntp/camel-nntp-summary.c:246
+#: ../camel/providers/nntp/camel-nntp-summary.c:242
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "æ?¥è?ª xover ç??æ??å¤?æ??å?¡å?¨åº?ç?ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:362
+#: ../camel/providers/nntp/camel-nntp-summary.c:358
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "æ?¥è?ª head ç??æ??å¤?æ??å?¡å?¨åº?ç?ï¼?%s"
-#: ../camel/providers/nntp/camel-nntp-summary.c:407
+#: ../camel/providers/nntp/camel-nntp-summary.c:403
#, c-format
msgid "Operation failed: %s"
msgstr "æ??ä½?失败ï¼?%s"
#: ../camel/providers/pop3/camel-pop3-folder.c:277
-#: ../camel/providers/pop3/camel-pop3-folder.c:334
+#: ../camel/providers/pop3/camel-pop3-folder.c:336
#, c-format
msgid "No message with UID %s"
msgstr "没æ?? UID 为 %s ç??æ¶?æ?¯"
-#: ../camel/providers/pop3/camel-pop3-folder.c:342
+#: ../camel/providers/pop3/camel-pop3-folder.c:344
#, c-format
msgid "Retrieving POP message %d"
msgstr "æ£å?¨è?·å?? POP æ¶?æ?¯ %d"
-#: ../camel/providers/pop3/camel-pop3-folder.c:447
+#: ../camel/providers/pop3/camel-pop3-folder.c:449
msgid "Unknown reason"
msgstr "æ?ªç?¥å??å? "
-#: ../camel/providers/pop3/camel-pop3-folder.c:486
+#: ../camel/providers/pop3/camel-pop3-folder.c:488
msgid "Retrieving POP summary"
msgstr "æ£å?¨è?·å?? POP æ¦?è¦?"
-#: ../camel/providers/pop3/camel-pop3-folder.c:509
+#: ../camel/providers/pop3/camel-pop3-folder.c:511
#, c-format
msgid "Cannot get POP summary: %s"
msgstr "æ? æ³?è?·å?? POP æ¦?è¦?ï¼?%s"
-#: ../camel/providers/pop3/camel-pop3-folder.c:561
+#: ../camel/providers/pop3/camel-pop3-folder.c:563
msgid "Expunging old messages"
msgstr "é??æ¯?æ?§æ¶?æ?¯"
-#: ../camel/providers/pop3/camel-pop3-folder.c:575
+#: ../camel/providers/pop3/camel-pop3-folder.c:577
msgid "Expunging deleted messages"
msgstr "å½»åº?é??æ¯?å·²å? é?¤ç??æ¶?æ?¯"
@@ -4173,7 +4228,7 @@ msgstr "%s 天ä¹?å??å? é?¤(_D)"
#: ../camel/providers/pop3/camel-pop3-provider.c:46
msgid "Delete _expunged from local Inbox"
-msgstr ""
+msgstr "ä»?æ?¬å?°ç??æ?¶ä»¶ç®±ä¸å? é?¤å·²å?¨è¿?端æ¸?é?¤ç??é?®ä»¶(_E)"
#: ../camel/providers/pop3/camel-pop3-provider.c:48
msgid "Disable _support for all POP3 extensions"
@@ -4311,17 +4366,17 @@ msgstr "POP3 æ??å?¡å?¨ %s"
msgid "POP3 server for %s on %s"
msgstr "%2$s 为 %1$s æ??ä¾?ç?? POP æ??å?¡"
-#: ../camel/providers/pop3/camel-pop3-store.c:694
+#: ../camel/providers/pop3/camel-pop3-store.c:693
#, c-format
msgid "Could not connect to POP server %s"
msgstr "æ? æ³?è¿?æ?¥å?° POP æ??å?¡å?¨ %s"
-#: ../camel/providers/pop3/camel-pop3-store.c:721
+#: ../camel/providers/pop3/camel-pop3-store.c:720
#, c-format
msgid "No such folder '%s'."
msgstr "没æ??æ??件夹â??%sâ??ã??"
-#: ../camel/providers/pop3/camel-pop3-store.c:738
+#: ../camel/providers/pop3/camel-pop3-store.c:737
#, c-format
msgid "POP3 stores have no folder hierarchy"
msgstr "POP3 ç??å?å?¨æ²¡æ??æ??件夹ç»?æ??"
@@ -4854,146 +4909,146 @@ msgid "%I %p"
msgstr "%p%I"
#: ../libedataserverui/e-book-auth-util.c:93
-#: ../libedataserverui/e-book-auth-util.c:668
+#: ../libedataserverui/e-book-auth-util.c:673
msgid "Accessing LDAP Server anonymously"
msgstr "å?¿å??访é?® LDAP æ??å?¡å?¨"
#: ../libedataserverui/e-book-auth-util.c:199
-#: ../libedataserverui/e-book-auth-util.c:430
+#: ../libedataserverui/e-book-auth-util.c:435
msgid "Failed to authenticate.\n"
msgstr "身份éª?è¯?失败ã??\n"
-#: ../libedataserverui/e-categories-dialog.c:134
+#: ../libedataserverui/e-categories-dialog.c:127
msgid "Category Properties"
msgstr "类���"
-#: ../libedataserverui/e-categories-dialog.c:145
+#: ../libedataserverui/e-categories-dialog.c:138
msgid "Category _Name"
msgstr "ç±»å?«å??称(_N)"
-#: ../libedataserverui/e-categories-dialog.c:151
+#: ../libedataserverui/e-categories-dialog.c:144
msgid "Category _Icon"
msgstr "ç±»å?«å?¾æ ?(_I)"
-#: ../libedataserverui/e-categories-dialog.c:192
+#: ../libedataserverui/e-categories-dialog.c:185
msgid "Category Icon"
msgstr "ç±»å?«å?¾æ ?"
-#: ../libedataserverui/e-categories-dialog.c:198
+#: ../libedataserverui/e-categories-dialog.c:191
msgid "_No Image"
msgstr "没æ??å?¾å??(_N)"
-#: ../libedataserverui/e-categories-dialog.c:409
+#: ../libedataserverui/e-categories-dialog.c:406
#, c-format
msgid ""
"There is already a category '%s' in the configuration. Please use another "
"name"
msgstr "é??ç½®ä¸å·²ç»?æ??ç±»å?«â??%sâ??äº?ã??请使ç?¨å?¦å¤?ä¸?个å??称"
-#: ../libedataserverui/e-categories-dialog.c:664
+#: ../libedataserverui/e-categories-dialog.c:661
msgid "Currently _used categories:"
msgstr "å½?å??使ç?¨ç??å??ç±»(_U)ï¼?"
-#: ../libedataserverui/e-categories-dialog.c:671
+#: ../libedataserverui/e-categories-dialog.c:668
msgid "_Available Categories:"
msgstr "��类�(_A)�"
-#: ../libedataserverui/e-categories-dialog.c:714
+#: ../libedataserverui/e-categories-dialog.c:711
msgid "_Edit"
msgstr "ç¼?è¾?(_E)"
-#: ../libedataserverui/e-categories-dialog.c:770
+#: ../libedataserverui/e-categories-dialog.c:767
msgid "Icon"
msgstr "å?¾æ ?"
-#: ../libedataserverui/e-categories-dialog.c:775
+#: ../libedataserverui/e-categories-dialog.c:772
msgid "Category"
msgstr "类�"
-#: ../libedataserverui/e-category-completion.c:292
+#: ../libedataserverui/e-category-completion.c:294
#, c-format
msgid "Create category \"%s\""
msgstr "å??建å??ç±»â??%sâ??"
-#: ../libedataserverui/e-name-selector-dialog.c:176
+#: ../libedataserverui/e-name-selector-dialog.c:170
msgid "Show Contacts"
msgstr "æ?¾ç¤ºè??系人"
-#: ../libedataserverui/e-name-selector-dialog.c:198
+#: ../libedataserverui/e-name-selector-dialog.c:192
msgid "Address B_ook:"
msgstr "å?°å??ç°¿(_O)ï¼?"
-#: ../libedataserverui/e-name-selector-dialog.c:206
+#: ../libedataserverui/e-name-selector-dialog.c:200
msgid "Cate_gory:"
msgstr "类�(_G)�"
-#: ../libedataserverui/e-name-selector-dialog.c:224
+#: ../libedataserverui/e-name-selector-dialog.c:218
msgid "_Search:"
msgstr "æ??ç´¢(_S)ï¼?"
-#: ../libedataserverui/e-name-selector-dialog.c:242
-#: ../libedataserverui/e-name-selector-dialog.c:984
+#: ../libedataserverui/e-name-selector-dialog.c:236
+#: ../libedataserverui/e-name-selector-dialog.c:971
msgid "Any Category"
msgstr "任�类�"
-#: ../libedataserverui/e-name-selector-dialog.c:244
+#: ../libedataserverui/e-name-selector-dialog.c:238
msgid "Co_ntacts"
msgstr "è??系人(_N)"
-#: ../libedataserverui/e-name-selector-dialog.c:289
+#: ../libedataserverui/e-name-selector-dialog.c:283
msgid "Search"
msgstr "æ??ç´¢"
-#: ../libedataserverui/e-name-selector-dialog.c:292
+#: ../libedataserverui/e-name-selector-dialog.c:286
msgid "Address Book"
msgstr "å?°å??ç°¿"
-#: ../libedataserverui/e-name-selector-dialog.c:295
+#: ../libedataserverui/e-name-selector-dialog.c:289
msgid "Contacts"
msgstr "è??系人"
-#: ../libedataserverui/e-name-selector-dialog.c:415
+#: ../libedataserverui/e-name-selector-dialog.c:406
msgid "Select Contacts from Address Book"
msgstr "ä»?å?°å??ç°¿ä¸é??æ?©è??系人"
-#: ../libedataserverui/e-name-selector-dialog.c:754
+#: ../libedataserverui/e-name-selector-dialog.c:741
msgid "_Add"
msgstr "æ·»å? (_A)"
-#: ../libedataserverui/e-name-selector-dialog.c:758
+#: ../libedataserverui/e-name-selector-dialog.c:745
msgid "_Remove"
msgstr "å? é?¤(_R)"
-#: ../libedataserverui/e-name-selector-dialog.c:898
+#: ../libedataserverui/e-name-selector-dialog.c:885
#, c-format
msgid "Error loading address book: %s"
msgstr "è½½å?¥å?°å??ç°¿æ?¶å?ºé??ï¼?%s"
#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2658
+#: ../libedataserverui/e-name-selector-entry.c:2661
#, c-format
msgid "E_xpand %s Inline"
msgstr "����� %s(_X)"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2673
+#: ../libedataserverui/e-name-selector-entry.c:2676
#, c-format
msgid "Cop_y %s"
msgstr "�� %s(_Y)"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2683
+#: ../libedataserverui/e-name-selector-entry.c:2686
#, c-format
msgid "C_ut %s"
msgstr "å?ªå?? %s(_U)"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2700
+#: ../libedataserverui/e-name-selector-entry.c:2703
#, c-format
msgid "_Edit %s"
msgstr "ç¼?è¾? %s(_E)"
-#: ../libedataserverui/e-name-selector-list.c:516
+#: ../libedataserverui/e-name-selector-list.c:509
#, c-format
msgid "_Delete %s"
msgstr "å? é?¤ %s(_D)"
@@ -5007,19 +5062,19 @@ msgstr "å¯?é?¥ç?¯ä¸?å?¯ç?¨ï¼?没æ??ç?¨æ?·æ??主æ?ºå??"
msgid "You have the Caps Lock key on."
msgstr "æ?¨æ??å¼?äº? Caps Lockã??"
-#: ../libedataserverui/e-passwords.c:824
+#: ../libedataserverui/e-passwords.c:821
msgid "_Remember this passphrase"
msgstr "è®°ä½?æ¤å¯?ç ?å?¥(_R)"
-#: ../libedataserverui/e-passwords.c:825
+#: ../libedataserverui/e-passwords.c:822
msgid "_Remember this passphrase for the remainder of this session"
msgstr "æ?¬æ¬¡ä¼?è¯?è®°ä½?æ¤å¯?ç ?å?¥(_R)"
-#: ../libedataserverui/e-passwords.c:830
+#: ../libedataserverui/e-passwords.c:827
msgid "_Remember this password"
msgstr "è®°ä½?æ¤å¯?ç ?(_R)"
-#: ../libedataserverui/e-passwords.c:831
+#: ../libedataserverui/e-passwords.c:828
msgid "_Remember this password for the remainder of this session"
msgstr "æ?¬æ¬¡ä¼?è¯?è®°ä½?æ¤å¯?ç ?(_R)"
@@ -5028,7 +5083,7 @@ msgstr "æ?¬æ¬¡ä¼?è¯?è®°ä½?æ¤å¯?ç ?(_R)"
msgid "Select destination"
msgstr "é??æ?©ç?®ç??å?°"
-#: ../libedataserverui/e-source-selector-dialog.c:174
+#: ../libedataserverui/e-source-selector-dialog.c:170
msgid "_Destination"
msgstr "ç?®ç??(_D)"
@@ -5047,3 +5102,9 @@ msgstr "æ??å?¡å?¨ç??å??åº?æ? æ??"
#: ../servers/groupwise/e-gw-connection.c:239
msgid "Bad parameter"
msgstr "æ? æ??å??æ?°"
+
+#~ msgid "_Apply filters to new messages in INBOX on this server"
+#~ msgstr "åº?ç?¨è¿?滤è§?å??å?°æ?¬æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°æ¶?æ?¯(_A)"
+
+#~ msgid "Cannot create spool file: %s"
+#~ msgstr "æ? æ³?å??建è?±æ?ºæ??件ï¼?%s"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
