[evolution-data-server] Updated Traditional Chinese translation(Hong Kong and Taiwan)
- From: Chao-Hsiung Liao <chliao src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Updated Traditional Chinese translation(Hong Kong and Taiwan)
- Date: Sun, 12 Dec 2010 11:29:58 +0000 (UTC)
commit 02e3c29f233007cf05fb3abe22ce1406e3dc142b
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date: Sun Dec 12 19:29:49 2010 +0800
Updated Traditional Chinese translation(Hong Kong and Taiwan)
po/zh_HK.po | 2412 +++++++++++++++++++++++++++++++----------------------------
po/zh_TW.po | 2412 +++++++++++++++++++++++++++++++----------------------------
2 files changed, 2500 insertions(+), 2324 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 1b64280..3edb0de 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -3,15 +3,18 @@
# Joe Man <trmetal yahoo com hk>, 2001.
# Chao-Hsiung Liao <pesder liao msa hinet net>, 2003.
# Craig Jeffares <cjeffares novell com>,2004.
-# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005. 2008.
+# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005. 2008, 2010.
+# Wei-Lun Chao <chaoweilun gmail com>, 2010.
+#
msgid ""
msgstr ""
-"Project-Id-Version: evolution-data-server 2.31.92\n"
+"Project-Id-Version: evolution-data-server 2.91.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-22 18:51+0800\n"
-"PO-Revision-Date: 2010-09-22 18:54+0800\n"
+"POT-Creation-Date: 2010-12-12 19:28+0800\n"
+"PO-Revision-Date: 2010-12-12 19:29+0800\n"
"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
"Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +26,7 @@ msgstr ""
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
msgid "Loading..."
-msgstr "è¼?å?¥ä¸..."
+msgstr "è¼?å?¥ä¸â?¦"
# addressbook/gui/search/e-addressbook-search-dialog.c:158
# mail/mail-search.c:242
@@ -31,85 +34,111 @@ msgstr "è¼?å?¥ä¸..."
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4482
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
msgid "Searching..."
-msgstr "æ??å°?ä¸..."
+msgstr "æ??å°?ä¸â?¦"
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4641
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
#, c-format
msgid "Downloading contacts (%d)... "
-msgstr "æ£å?¨ä¸?è¼?è?¯çµ¡äºº (%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
#, c-format
msgid "Updating contacts cache (%d)... "
-msgstr "æ£å?¨æ?´æ?°è?¯çµ¡äººå¿«å?? (%d)..."
+msgstr "æ£å?¨æ?´æ?°è?¯çµ¡äººå¿«å?? (%d)â?¦"
# ui/evolution-addressbook.xml.h:17
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
msgid "Not connected"
msgstr "���"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
msgid "Using Distinguished Name (DN)"
msgstr "使ç?¨è¾¨èª?ç??å??稱 (DN)"
# mail/mail-config.glade.h:29
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
msgid "Using Email Address"
msgstr "使ç?¨é?»å?é?µä»¶å?°å??"
# mail/mail-config.c:1213
# mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
msgid "Reconnecting to LDAP server..."
-msgstr "æ£å?¨é??æ?°é?£æ?¥ LDAP 伺æ??å?¨..."
+msgstr "æ£å?¨é??æ?°é?£æ?¥ LDAP 伺æ??å?¨â?¦"
# camel/providers/local/camel-maildir-folder.c:218
# camel/providers/local/camel-mh-folder.c:203
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
msgid "Invalid DN syntax"
msgstr "ç?¡æ??ç?? DN èª?æ³?"
# mail/mail-config.c:1213
# mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1663
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
msgid "Adding contact to LDAP server..."
-msgstr "æ£å?¨æ?°å¢?è?¯çµ¡äººè?³ LDAP 伺æ??å?¨..."
+msgstr "æ£å?¨æ?°å¢?è?¯çµ¡äººè?³ LDAP 伺æ??å?¨â?¦"
# mail/mail-ops.c:1195
# mail/mail-ops.c:1333
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1795
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
msgid "Removing contact from LDAP server..."
-msgstr "æ£å?¨ç§»é?¤ LDAP 伺æ??å?¨ä¸ç??è?¯çµ¡äºº..."
+msgstr "æ£å?¨ç§»é?¤ LDAP 伺æ??å?¨ä¸ç??è?¯çµ¡äººâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2229
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
msgid "Modifying contact from LDAP server..."
-msgstr "æ£å?¨ä¿®æ?¹ LDAP 伺æ??å?¨ä¸ç??è?¯çµ¡äºº..."
+msgstr "æ£å?¨ä¿®æ?¹ LDAP 伺æ??å?¨ä¸ç??è?¯çµ¡äººâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4332
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
msgid "Receiving LDAP search results..."
-msgstr "æ£å?¨æ?¥æ?¶ LDAP æ??å°?çµ?æ??..."
+msgstr "æ£å?¨æ?¥æ?¶ LDAP æ??å°?çµ?æ??â?¦"
# executive-summary/component/e-summary.c:940
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4504
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
msgid "Error performing search"
msgstr "é?²è¡?æ??å°?æ??ç?¼ç??é?¯èª¤"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
+# camel/providers/imap/camel-imap-command.c:241
+# shell/e-storage.c:481
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../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:378
+#: ../calendar/libecal/e-cal.c:4180
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
+#: ../camel/providers/imap/camel-imap-command.c:481
+#: ../camel/providers/imap/camel-imap-store.c:425
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../servers/groupwise/e-gw-connection.c:243
+msgid "Unknown error"
+msgstr "ä¸?æ??ç??é?¯èª¤"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
#, c-format
-msgid "Create resource '%s' failed with HTTP status: %d"
-msgstr "建ç«?è³?æº?ã??%sã??失æ??ï¼?HTTP ç??æ??ï¼?%d"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "建ç«?è³?æº?ã??%sã??失æ??ï¼?HTTP ç??æ??ï¼?%d (%s)"
-#: ../addressbook/libebook/e-book.c:2995
+#: ../addressbook/libebook/e-book.c:3066
#, c-format
msgid "%s: there was no source for UID '%s' stored in GConf."
msgstr "%sï¼?æ²?æ??å?²å?æ?¼ GConf ä¸ç?? UIDã??%sã??ä¾?æº?ã??"
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#: ../addressbook/libebook/e-book.c:3422
+#: ../addressbook/libedata-book/e-data-book.c:183
+msgid "Address book does not exist"
+msgstr "é??è¨?é??ä¸?å?å?¨"
+
#. Dummy row as EContactField starts from 1
#: ../addressbook/libebook/e-contact.c:115
msgid "Unique ID"
@@ -349,7 +378,7 @@ msgstr "網� URL"
# calendar/gui/e-calendar-table.c:150
#. Contact categories
#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:670
+#: ../libedataserverui/e-categories-dialog.c:759
msgid "Categories"
msgstr "å??é¡?"
@@ -645,7 +674,6 @@ msgstr "å?ºç??æ?¥æ??"
# addressbook/contact-editor/contact-editor.glade.h:2
#: ../addressbook/libebook/e-contact.c:262
#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:44
msgid "Anniversary"
msgstr "�年�念�"
@@ -743,112 +771,105 @@ 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:342
-#: ../calendar/libedata-cal/e-data-cal-factory.c:354
+#: ../calendar/libedata-cal/e-data-cal-factory.c:346
+#: ../calendar/libedata-cal/e-data-cal-factory.c:358
#, c-format
msgid "Invalid source"
msgstr "ç?¡æ??ç??ä¾?æº?"
-#: ../addressbook/libedata-book/e-data-book.c:171
-#: ../calendar/libedata-cal/e-data-cal.c:109
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:110
msgid "Success"
msgstr "æ??å??"
# shell/e-shell-view-menu.c:602
# shell/e-shell-view-menu.c:614
-#: ../addressbook/libedata-book/e-data-book.c:172
-#: ../calendar/libedata-cal/e-data-cal.c:110
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:111
msgid "Repository offline"
msgstr "è³?æ??庫é?¢ç·?"
# shell/e-storage.c:475
-#: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libecal/e-cal.c:4065 ../calendar/libedata-cal/e-data-cal.c:111
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libecal/e-cal.c:4162 ../calendar/libedata-cal/e-data-cal.c:112
msgid "Permission denied"
msgstr "æ¬?é??ä¸?足"
-#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../addressbook/libedata-book/e-data-book.c:176
msgid "Contact not found"
msgstr "����絡人"
-#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../addressbook/libedata-book/e-data-book.c:177
msgid "Contact ID already exists"
msgstr "è?¯çµ¡äºº ID å·²ç¶?å?å?¨"
# camel/camel-sasl-anonymous.c:110
# camel/camel-sasl-plain.c:87
-#: ../addressbook/libedata-book/e-data-book.c:176
-#: ../calendar/libedata-cal/e-data-cal.c:116
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:117
msgid "Authentication Failed"
msgstr "é©?è?失æ??"
# camel/providers/smtp/camel-smtp-transport.c:218
-#: ../addressbook/libedata-book/e-data-book.c:177
-#: ../calendar/libedata-cal/e-data-cal.c:117
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:118
msgid "Authentication Required"
msgstr "è¦?æ±?é©?è?"
# mail/mail-config.glade.h:1
-#: ../addressbook/libedata-book/e-data-book.c:178
-#: ../calendar/libedata-cal/e-data-cal.c:118
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:119
msgid "Unsupported field"
msgstr "ä¸?æ?¯æ?´ç??æ¬?ä½?"
# camel/providers/imap/camel-imap-store.c:466
# camel/providers/smtp/camel-smtp-transport.c:366
-#: ../addressbook/libedata-book/e-data-book.c:179
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:121
msgid "Unsupported authentication method"
msgstr "ä¸?æ?¯æ?´ç??é©?è?æ?¹æ³?"
-#: ../addressbook/libedata-book/e-data-book.c:180
-#: ../calendar/libedata-cal/e-data-cal.c:121
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:122
msgid "TLS not available"
msgstr "��使� TLS"
-# camel/providers/local/camel-maildir-store.c:100
-# camel/providers/local/camel-mbox-store.c:101
-# camel/providers/local/camel-mh-store.c:97
-#: ../addressbook/libedata-book/e-data-book.c:181
-msgid "Address book does not exist"
-msgstr "é??è¨?é??ä¸?å?å?¨"
-
-#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../addressbook/libedata-book/e-data-book.c:184
msgid "Book removed"
msgstr "é??è¨?é??å·²ç¶?移é?¤"
# camel/providers/imap/camel-imap-folder.c:1047
# camel/providers/imap/camel-imap-folder.c:1281
-#: ../addressbook/libedata-book/e-data-book.c:183
-#: ../calendar/libedata-cal/e-data-cal.c:124
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:125
msgid "Not available in offline mode"
msgstr "�����模��使�"
-#: ../addressbook/libedata-book/e-data-book.c:184
-#: ../calendar/libedata-cal/e-data-cal.c:125
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:126
msgid "Search size limit exceeded"
msgstr "è¶?é??æ??å°?大å°?é??å?¶"
-#: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:126
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:127
msgid "Search time limit exceeded"
msgstr "è¶?é??æ??å°?æ??é??é??å?¶"
# camel/providers/local/camel-maildir-folder.c:218
# camel/providers/local/camel-mh-folder.c:203
-#: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:127
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:128
msgid "Invalid query"
msgstr "ç?¡æ??ç??æ?¥è©¢"
-#: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libedata-cal/e-data-cal.c:128
+#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../calendar/libedata-cal/e-data-cal.c:129
msgid "Query refused"
msgstr "æ?¥è©¢è¢«æ??çµ?"
# calendar/gui/e-itip-control.c:883
-#: ../addressbook/libedata-book/e-data-book.c:188
-#: ../calendar/libedata-cal/e-data-cal.c:129
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:130
msgid "Could not cancel"
msgstr "ç?¡æ³?å??æ¶?"
@@ -856,44 +877,45 @@ msgstr "ç?¡æ³?å??æ¶?"
# camel/providers/local/camel-mh-folder.c:203
#. { E_DATA_BOOK_STATUS_OTHER_ERROR, N_("Other error") },
#. { OtherError, N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:190
-#: ../calendar/libedata-cal/e-data-cal.c:131
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:132
msgid "Invalid server version"
msgstr "ç?¡æ??ç??伺æ??å?¨ç??æ?¬"
# camel/providers/imap/camel-imap-provider.c:54
-#: ../addressbook/libedata-book/e-data-book.c:191
+#: ../addressbook/libedata-book/e-data-book.c:193
msgid "No space"
msgstr "æ²?æ??空é??"
# camel/providers/local/camel-maildir-folder.c:218
# camel/providers/local/camel-mh-folder.c:203
-#: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libecal/e-cal.c:4049 ../calendar/libedata-cal/e-data-cal.c:132
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libecal/e-cal.c:4146 ../calendar/libedata-cal/e-data-cal.c:133
msgid "Invalid argument"
msgstr "ç?¡æ??ç??å??æ?¸"
# shell/e-storage.c:477
-#: ../addressbook/libedata-book/e-data-book.c:193
-#: ../calendar/libecal/e-cal.c:4087 ../calendar/libedata-cal/e-data-cal.c:133
+#. 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
msgid "Not supported"
msgstr "���"
# addressbook/gui/widgets/e-addressbook-view.c:718
-#: ../addressbook/libedata-book/e-data-book.c:201
-#: ../calendar/libedata-cal/e-data-cal.c:141
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:143
msgid "Other error"
msgstr "���誤"
# camel/camel-filter-driver.c:671
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:322
+#: ../addressbook/libedata-book/e-data-book.c:325
#, c-format
msgid "Cannot open book: %s"
msgstr "ä¸?è?½é??å??æ?¸ç±?ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:344
+#: ../addressbook/libedata-book/e-data-book.c:347
#, c-format
msgid "Cannot remove book: %s"
msgstr "��移����%s"
@@ -901,14 +923,14 @@ msgstr "��移����%s"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:361
-#: ../addressbook/libedata-book/e-data-book.c:380
+#: ../addressbook/libedata-book/e-data-book.c:364
+#: ../addressbook/libedata-book/e-data-book.c:383
#, c-format
msgid "Cannot get contact: %s"
msgstr "ä¸?è?½å??å¾?è?¯çµ¡äººï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:395
+#: ../addressbook/libedata-book/e-data-book.c:402
#, c-format
msgid "Empty query: %s"
msgstr "空ç??æ?¥è©¢ï¼?%s"
@@ -916,36 +938,36 @@ msgstr "空ç??æ?¥è©¢ï¼?%s"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:411
+#: ../addressbook/libedata-book/e-data-book.c:418
#, c-format
msgid "Cannot get contact list: %s"
msgstr "ä¸?è?½å??å¾?è?¯çµ¡äººæ¸?å?®ï¼?%s"
# camel/providers/pop3/camel-pop3-store.c:199
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:448
+#: ../addressbook/libedata-book/e-data-book.c:457
#, c-format
msgid "Cannot authenticate user: %s"
msgstr "ä¸?è?½é©?è?使ç?¨è??ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:463
-#: ../addressbook/libedata-book/e-data-book.c:482
+#: ../addressbook/libedata-book/e-data-book.c:472
+#: ../addressbook/libedata-book/e-data-book.c:491
#, c-format
msgid "Cannot add contact: %s"
msgstr "ä¸?è?½å? å?¥è?¯çµ¡äººï¼?%s"
# mail/mail-crypto.c:251
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:500
-#: ../addressbook/libedata-book/e-data-book.c:519
+#: ../addressbook/libedata-book/e-data-book.c:513
+#: ../addressbook/libedata-book/e-data-book.c:532
#, c-format
msgid "Cannot modify contact: %s"
msgstr "��修��絡人�%s"
# mail/mail-crypto.c:251
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:558
+#: ../addressbook/libedata-book/e-data-book.c:571
#, c-format
msgid "Cannot remove contacts: %s"
msgstr "��移��絡人�%s"
@@ -958,7 +980,7 @@ msgstr "��移��絡人�%s"
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:595
+#: ../addressbook/libedata-book/e-data-book.c:610
#, c-format
msgid "Cannot get supported fields: %s"
msgstr "ä¸?è?½å??å¾?æ?¯æ?´ç??æ¬?ä½?ï¼?%s"
@@ -971,7 +993,7 @@ msgstr "ä¸?è?½å??å¾?æ?¯æ?´ç??æ¬?ä½?ï¼?%s"
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:610
+#: ../addressbook/libedata-book/e-data-book.c:625
#, c-format
msgid "Cannot get required fields: %s"
msgstr "ä¸?è?½å??å¾?è¦?æ±?ç??æ¬?ä½?ï¼?%s"
@@ -979,7 +1001,7 @@ msgstr "ä¸?è?½å??å¾?è¦?æ±?ç??æ¬?ä½?ï¼?%s"
# camel/providers/imap/camel-imap-store.c:466
# camel/providers/smtp/camel-smtp-transport.c:366
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:625
+#: ../addressbook/libedata-book/e-data-book.c:640
#, c-format
msgid "Cannot get supported authentication methods: %s"
msgstr "ä¸?è?½å??å¾?æ?¯æ?´ç??é©?è?æ?¹æ³?ï¼?%s"
@@ -987,8 +1009,8 @@ msgstr "ä¸?è?½å??å¾?æ?¯æ?´ç??é©?è?æ?¹æ³?ï¼?%s"
# camel/providers/local/camel-maildir-folder.c:218
# camel/providers/local/camel-mh-folder.c:203
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:651
-#: ../addressbook/libedata-book/e-data-book.c:662
+#: ../addressbook/libedata-book/e-data-book.c:666
+#: ../addressbook/libedata-book/e-data-book.c:677
#, c-format
msgid "Invalid query: %s"
msgstr "ç?¡æ??ç??æ?¥è©¢ï¼?%s"
@@ -1001,7 +1023,7 @@ msgstr "ç?¡æ??ç??æ?¥è©¢ï¼?%s"
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:698
+#: ../addressbook/libedata-book/e-data-book.c:713
#, c-format
msgid "Cannot get changes: %s"
msgstr "ä¸?è?½å??å¾?æ?´æ?¹ï¼?%s"
@@ -1011,26 +1033,40 @@ msgstr "ä¸?è?½å??å¾?æ?´æ?¹ï¼?%s"
# camel/camel-remote-store.c:470
# camel/providers/imap/camel-imap-command.c:287
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:738
+#: ../addressbook/libedata-book/e-data-book.c:755
#, c-format
msgid "Cancel operation failed: %s"
msgstr "å??æ¶?æ??ä½?失æ??ï¼?%s"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:530
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
#, c-format
-msgid "Unexpected HTTP status code %d returned"
-msgstr "å?³å??æ?ªé ?æ??ç?? HTTP ç??æ??碼 %d"
+msgid "Server is unreachable (%s)"
+msgstr "ç?¡æ³?é?£æ?¥ä¼ºæ??å?¨ (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#, c-format
+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
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+"ç?¡æ³?é?£æ?¥ä¼ºæ??å?¨ï¼?è¡?äº?æ??æ??以å?¯è®?模å¼?é??å??ã??\n"
+"�誤���%s"
# camel/providers/local/camel-maildir-store.c:100
# camel/providers/local/camel-mbox-store.c:101
# camel/providers/local/camel-mh-store.c:97
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4142
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4266
msgid "Calendar doesn't support Free/Busy"
msgstr "è¡?äº?æ??ä¸?æ?¯æ?´ç©ºé??/å¿?ç¢?"
# addressbook/contact-editor/contact-editor.glade.h:20
#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
-#: ../libedataserver/e-categories.c:45
msgid "Birthday"
msgstr "ç??æ?¥"
@@ -1056,58 +1092,69 @@ msgid "Cannot save calendar data"
msgstr "ä¸?è?½å?²å?è¡?äº?æ??è³?æ??"
#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2251
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2107
msgid "Reply Requested: by "
msgstr "è¦?æ±?å??è¦?ï¼?æ ¹æ??"
#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2256
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2112
msgid "Reply Requested: When convenient"
msgstr "è¦?æ±?å??è¦?ï¼?ç?¶æ??空æ??"
#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:330
-#, c-format
-msgid "Loading %s items"
-msgstr "è¼?å?¥ %s å??é ?ç?®"
+msgid "Loading Appointment items"
+msgstr "æ£å?¨è¼?å?¥ç´?æ??é ?ç?®"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:332
+msgid "Loading Task items"
+msgstr "æ£å?¨è¼?å?¥å·¥ä½?é ?ç?®"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:334
+msgid "Loading Note items"
+msgstr "æ£å?¨è¼?å?¥ç?è¨?é ?ç?®"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:336
+msgid "Loading items"
+msgstr "æ£å?¨è¼?å?¥é ?ç?®"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
# ui/evolution-calendar.xml.h:3
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:959
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:963
msgid "Calendar"
msgstr "è¡?äº?æ??"
# camel/providers/local/camel-maildir-folder.c:218
# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1022
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1026
msgid "Invalid server URI"
msgstr "ç?¡æ??ç??伺æ??å?¨ URI"
# camel/providers/local/camel-mbox-store.c:110
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1123
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1383
-#: ../calendar/backends/http/e-cal-backend-http.c:690
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1387
+#: ../calendar/backends/http/e-cal-backend-http.c:721
#: ../calendar/backends/weather/e-cal-backend-weather.c:520
msgid "Could not create cache file"
msgstr "ç?¡æ³?建ç«?å¿«å??æª?æ¡?"
# camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1135
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1139
msgid "Could not create thread for populating cache"
msgstr "ç?¡æ³?建ç«?移æ¤?å¿«å??ç??å?·è¡?ç·?"
# mail/mail-config.glade.h:37
-#: ../calendar/backends/http/e-cal-backend-http.c:359
+#: ../calendar/backends/http/e-cal-backend-http.c:366
msgid "Redirected to Invalid URI"
msgstr "é??æ?°æ??å??ç?¡æ??ç?? URI"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/backends/http/e-cal-backend-http.c:382
+#: ../calendar/backends/http/e-cal-backend-http.c:399
msgid "Bad file format."
msgstr "é?¯èª¤ç??æª?æ¡?æ ¼å¼?ã??"
# camel/providers/imap/camel-imap-store.c:803
# mail/mail-local.c:334
-#: ../calendar/backends/http/e-cal-backend-http.c:389
+#: ../calendar/backends/http/e-cal-backend-http.c:406
msgid "Not a calendar."
msgstr "並é??è¡?äº?æ??ã??"
@@ -1159,7 +1206,7 @@ msgid "Forecast"
msgstr "天氣é ?å ±"
# calendar/gui/dialogs/alarm-notify.glade.h:2
-#: ../calendar/libecal/e-cal-component.c:1286
+#: ../calendar/libecal/e-cal-component.c:1306
msgid "Untitled appointment"
msgstr "æ?ªå?½å??ç??ç´?æ??"
@@ -1349,7 +1396,7 @@ msgid "Undefined"
msgstr "æ?ªæ??å®?"
# camel/camel-smime-context.c:194
-#: ../calendar/libecal/e-cal.c:1227 ../libedataserverui/e-book-auth-util.c:206
+#: ../calendar/libecal/e-cal.c:1236 ../libedataserverui/e-book-auth-util.c:206
#: ../libedataserverui/e-book-auth-util.c:435
#, c-format
msgid "Enter password for %s (user %s)"
@@ -1360,60 +1407,60 @@ 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:1241
+#: ../calendar/libecal/e-cal.c:1250
#, c-format
msgid "Enter password for %s to enable proxy for user %s"
msgstr "輸å?¥ %s ç??å¯?碼以便使ç?¨è?? %s è?½ä½¿ç?¨ä»£ç??伺æ??å?¨"
-#: ../calendar/libecal/e-cal.c:4051
+#: ../calendar/libecal/e-cal.c:4148
msgid "Backend is busy"
msgstr "å¾?端å¿?ç¢?ä¸"
# shell/e-shell-view-menu.c:602
# shell/e-shell-view-menu.c:614
-#: ../calendar/libecal/e-cal.c:4053
+#: ../calendar/libecal/e-cal.c:4150
msgid "Repository is offline"
msgstr "å??庫已é?¢ç·?"
# camel/providers/imap/camel-imap-store.c:803
# mail/mail-local.c:334
-#: ../calendar/libecal/e-cal.c:4055
+#: ../calendar/libecal/e-cal.c:4152
msgid "No such calendar"
msgstr "ç?¡æ¤è¡?äº?æ??"
-#: ../calendar/libecal/e-cal.c:4057 ../calendar/libedata-cal/e-data-cal.c:113
+#: ../calendar/libecal/e-cal.c:4154 ../calendar/libedata-cal/e-data-cal.c:114
#: ../servers/groupwise/e-gw-connection.c:235
msgid "Object not found"
msgstr "����件"
# camel/providers/local/camel-maildir-folder.c:218
# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libecal/e-cal.c:4059 ../calendar/libedata-cal/e-data-cal.c:114
+#: ../calendar/libecal/e-cal.c:4156 ../calendar/libedata-cal/e-data-cal.c:115
#: ../servers/groupwise/e-gw-connection.c:229
msgid "Invalid object"
msgstr "ç?¡æ??ç??ç?©ä»¶"
# addressbook/conduit/address-conduit.c:214
-#: ../calendar/libecal/e-cal.c:4061
+#: ../calendar/libecal/e-cal.c:4158
msgid "URI not loaded"
msgstr "URI ���"
-#: ../calendar/libecal/e-cal.c:4063
+#: ../calendar/libecal/e-cal.c:4160
msgid "URI already loaded"
msgstr "URI 已��"
# camel/providers/imap/camel-imap-command.c:241
# shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4067 ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4164 ../servers/groupwise/e-gw-connection.c:237
msgid "Unknown User"
msgstr "ä¸?æ??ç??使ç?¨è??"
-#: ../calendar/libecal/e-cal.c:4069 ../calendar/libedata-cal/e-data-cal.c:115
+#: ../calendar/libecal/e-cal.c:4166 ../calendar/libedata-cal/e-data-cal.c:116
msgid "Object ID already exists"
msgstr "ç?©ä»¶ ID å·²å?å?¨"
# shell/e-storage.c:477
-#: ../calendar/libecal/e-cal.c:4071
+#: ../calendar/libecal/e-cal.c:4168
msgid "Protocol not supported"
msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
@@ -1421,51 +1468,40 @@ msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
# camel/camel-remote-store.c:399
# camel/camel-remote-store.c:470
# camel/providers/imap/camel-imap-command.c:287
-#: ../calendar/libecal/e-cal.c:4073
+#: ../calendar/libecal/e-cal.c:4170
msgid "Operation has been canceled"
msgstr "æ??ä½?å·²å??æ¶?"
# calendar/gui/e-itip-control.c:883
-#: ../calendar/libecal/e-cal.c:4075
+#: ../calendar/libecal/e-cal.c:4172
msgid "Could not cancel operation"
msgstr "ç?¡æ³?å??æ¶?æ??ä½?"
# camel/camel-sasl-anonymous.c:110
# camel/camel-sasl-plain.c:87
-#: ../calendar/libecal/e-cal.c:4077
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1466
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1484
-#: ../camel/providers/groupwise/camel-groupwise-store.c:618
-#: ../camel/providers/groupwise/camel-groupwise-store.c:793
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
+#: ../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
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
#, c-format
msgid "Authentication failed"
msgstr "é©?è?失æ??"
# camel/providers/smtp/camel-smtp-transport.c:218
-#: ../calendar/libecal/e-cal.c:4079
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../calendar/libecal/e-cal.c:4176
+#: ../camel/providers/smtp/camel-smtp-transport.c:768
msgid "Authentication required"
msgstr "è¦?æ±?é©?è?"
-#: ../calendar/libecal/e-cal.c:4081
+#: ../calendar/libecal/e-cal.c:4178
msgid "A D-Bus exception has occurred"
msgstr "ç?¼ç?? D-Bus ä¾?å¤?"
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4083
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
-#: ../camel/providers/imap/camel-imap-command.c:457
-#: ../camel/providers/imap/camel-imap-store.c:627
-#: ../camel/providers/pop3/camel-pop3-store.c:474
-#: ../servers/groupwise/e-gw-connection.c:243
-msgid "Unknown error"
-msgstr "ä¸?æ??ç??é?¯èª¤"
-
# shell/e-storage.c:459
-#: ../calendar/libecal/e-cal.c:4085
+#: ../calendar/libecal/e-cal.c:4182
msgid "No error"
msgstr "æ²?æ??é?¯èª¤"
@@ -1563,246 +1599,241 @@ msgstr "ã??%sã??ç??æ??æ??å¼?æ?¸å¿?é ?ç?ºå?串ï¼?æ??å?ªæ??ä¸?å??å¼?æ?¸ç?ºé??輯
# camel/providers/local/camel-maildir-folder.c:218
# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-data-cal.c:112
+#: ../calendar/libedata-cal/e-data-cal.c:113
msgid "Invalid range"
msgstr "ç?¡æ??ç??ç¯?å??"
# mail/mail-config.glade.h:1
-#: ../calendar/libedata-cal/e-data-cal.c:119
+#: ../calendar/libedata-cal/e-data-cal.c:120
msgid "Unsupported method"
msgstr "ä¸?æ?¯æ?´ç??æ?¹æ³?"
# camel/providers/local/camel-maildir-store.c:100
# camel/providers/local/camel-mbox-store.c:101
# camel/providers/local/camel-mh-store.c:97
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#: ../calendar/libedata-cal/e-data-cal.c:123
msgid "Calendar does not exist"
msgstr "è¡?äº?æ??ä¸?å?å?¨"
# camel/providers/imap/camel-imap-command.c:241
# shell/e-storage.c:481
-#: ../calendar/libedata-cal/e-data-cal.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:124
msgid "Unknown user"
msgstr "ä¸?æ??ç??使ç?¨è??"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:608
+#: ../calendar/libedata-cal/e-data-cal.c:610
#, 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:628
+#: ../calendar/libedata-cal/e-data-cal.c:635
#, 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:648
+#: ../calendar/libedata-cal/e-data-cal.c:660
#, c-format
msgid "Cannot retrieve calendar's LDAP attribute: %s"
msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?? LDAP 屬æ?§ï¼?%s"
# camel/camel-filter-driver.c:671
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:668
+#: ../calendar/libedata-cal/e-data-cal.c:685
#, 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:687
+#: ../calendar/libedata-cal/e-data-cal.c:709
#, 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:708
+#: ../calendar/libedata-cal/e-data-cal.c:730
#, 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:727
+#: ../calendar/libedata-cal/e-data-cal.c:749
#, c-format
msgid "Cannot remove calendar: %s"
msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??ï¼?%s"
# mail/mail-crypto.c:251
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:748
+#: ../calendar/libedata-cal/e-data-cal.c:770
#, 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:772
+#: ../calendar/libedata-cal/e-data-cal.c:798
#, 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:798
+#: ../calendar/libedata-cal/e-data-cal.c:824
#, 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:819
+#: ../calendar/libedata-cal/e-data-cal.c:845
#, 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:838
+#: ../calendar/libedata-cal/e-data-cal.c:864
#, 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:859
+#: ../calendar/libedata-cal/e-data-cal.c:885
#, 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:884
+#: ../calendar/libedata-cal/e-data-cal.c:912
#, 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:904
+#: ../calendar/libedata-cal/e-data-cal.c:937
#, 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:924
+#: ../calendar/libedata-cal/e-data-cal.c:962
#, c-format
msgid "Cannot retrieve calendar object list: %s"
msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶æ¸?å?®ï¼?%s"
# mail/mail-ops.c:1872
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:952
+#: ../calendar/libedata-cal/e-data-cal.c:990
#, c-format
msgid "Could not retrieve attachment list: %s"
msgstr "ä¸?è?½å??å¾?é??件æ¸?å?®ï¼?%s"
# camel/providers/local/camel-mbox-store.c:110
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:978
+#: ../calendar/libedata-cal/e-data-cal.c:1016
#, c-format
msgid "Could not complete calendar query: %s"
msgstr "ä¸?è?½å®?æ??è¡?äº?æ??æ?¥è©¢ï¼?%s"
# mail/mail-ops.c:1872
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:998
+#: ../calendar/libedata-cal/e-data-cal.c:1041
#, c-format
msgid "Could not retrieve calendar time zone: %s"
msgstr "ä¸?è?½å??å¾?è¡?äº?æ??æ??å??ï¼?%s"
# calendar/gui/e-itip-control.c:883
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1018
+#: ../calendar/libedata-cal/e-data-cal.c:1066
#, 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:1037
+#: ../calendar/libedata-cal/e-data-cal.c:1085
#, 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:1060
+#: ../calendar/libedata-cal/e-data-cal.c:1108
#, 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:1091
+#: ../calendar/libedata-cal/e-data-cal.c:1139
#, c-format
msgid "Cannot retrieve calendar free/busy list: %s"
msgstr "ä¸?è?½å??å¾?è¡?äº?æ??空é??/å¿?ç¢?æ¸?å?®ï¼?%s"
# camel/providers/local/camel-maildir-folder.c:218
# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-data-cal-factory.c:364
+#: ../calendar/libedata-cal/e-data-cal-factory.c:368
#, c-format
msgid "Invalid URI"
msgstr "ç?¡æ??ç?? URI"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:382
+#: ../calendar/libedata-cal/e-data-cal-factory.c:386
#, c-format
msgid "No backend factory for '%s' of '%s'"
msgstr "æ²?æ??ã??%2$sã??ç??ã??%1$sã??ç??å¾?ç«¯å·¥å» "
# camel/providers/local/camel-mbox-store.c:110
-#: ../calendar/libedata-cal/e-data-cal-factory.c:432
+#: ../calendar/libedata-cal/e-data-cal-factory.c:436
#, c-format
msgid "Could not instantiate backend"
msgstr "ç?¡æ³?實é«?å??å¾?端ç¨?å¼?"
# camel/camel-cipher-context.c:171
-#: ../camel/camel-cipher-context.c:75
+#: ../camel/camel-cipher-context.c:204
#, c-format
msgid "Signing is not supported by this cipher"
msgstr "é??種å? å¯?æ?¹å¼?ä¸?æ?¯æ?´ç°½ç½²"
-# mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:110
-msgid "Signing message"
-msgstr "æ£å?¨ç°½ç½²è¨?æ?¯"
-
# camel/camel-cipher-context.c:251
-#: ../camel/camel-cipher-context.c:131
+#: ../camel/camel-cipher-context.c:217
#, c-format
msgid "Verifying is not supported by this cipher"
msgstr "é??種å? å¯?æ?¹å¼?ä¸?æ?¯æ?´é©?è?簽署"
-# mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:164
-msgid "Verifying message"
-msgstr "æ£å?¨ç¢ºèª?è¨?æ?¯"
-
# camel/camel-cipher-context.c:294
-#: ../camel/camel-cipher-context.c:188
+#: ../camel/camel-cipher-context.c:233
#, c-format
msgid "Encryption is not supported by this cipher"
msgstr "é??種å? å¯?æ?¹å¼?ä¸?æ?¯æ?´å? å¯?"
-# mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:223
-msgid "Encrypting message"
-msgstr "æ£å?¨å? å¯?è¨?æ?¯"
-
# camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:246
+#: ../camel/camel-cipher-context.c:247
#, c-format
msgid "Decryption is not supported by this cipher"
msgstr "é??種å? å¯?æ?¹å¼?ä¸?æ?¯æ?´è§£å¯?"
-# mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:276
-msgid "Decrypting message"
-msgstr "æ£å?¨è§£å¯?è¨?æ?¯"
-
# camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:297
+#: ../camel/camel-cipher-context.c:260
#, c-format
msgid "You may not import keys with this cipher"
msgstr "ä½ ä¸?è?½å?¯å?¥é??種å? å¯?æ?¹å¼?ç??å¯?碼å??"
# camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:341
+#: ../camel/camel-cipher-context.c:274
#, c-format
msgid "You may not export keys with this cipher"
msgstr "ä½ ä¸?è?½å?¯å?ºé??種å? å¯?æ?¹å¼?ç??å¯?碼å??"
+# mail/mail-ops.c:603
+#: ../camel/camel-cipher-context.c:815
+msgid "Signing message"
+msgstr "æ£å?¨ç°½ç½²è¨?æ?¯"
+
+# mail/mail-ops.c:603
+#: ../camel/camel-cipher-context.c:1056
+msgid "Encrypting message"
+msgstr "æ£å?¨å? å¯?è¨?æ?¯"
+
+# mail/mail-ops.c:603
+#: ../camel/camel-cipher-context.c:1183
+msgid "Decrypting message"
+msgstr "æ£å?¨è§£å¯?è¨?æ?¯"
+
# mail/mail-ops.c:1728
#: ../camel/camel-data-cache.c:181
#, c-format
@@ -1818,12 +1849,12 @@ msgstr "ç?¡æ³?移é?¤å¿«å??é ?ç?®ï¼? %sï¼? %s"
# camel/providers/local/camel-maildir-folder.c:197
# camel/providers/local/camel-mbox-folder.c:319
# camel/providers/local/camel-mh-folder.c:185
-#: ../camel/camel-data-wrapper.c:89
+#: ../camel/camel-data-wrapper.c:147
#, c-format
msgid "No stream available"
msgstr "æ²?æ??å?¯ç?¨ç??串æµ?"
-#: ../camel/camel-db.c:464
+#: ../camel/camel-db.c:455
#, c-format
msgid "Insufficient memory"
msgstr "����足"
@@ -1839,8 +1870,8 @@ msgstr ""
"æ?¥ä¸?ä¾?å?¨æ¤ä¼ºæ??å?¨ä¸?ç??æ??ä½?ï¼?å?¨ä½ é??æ?°é?£ç·?å?°ç¶²çµ¡æ??\n"
"å°?ä¸?æ??é??æ?ã??"
-#: ../camel/camel-disco-diary.c:258
-#: ../camel/providers/imap/camel-imap-journal.c:298
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:300
#, c-format
msgid ""
"Could not open '%s':\n"
@@ -1851,43 +1882,43 @@ msgstr ""
"%s\n"
"é??å??è³?æ??夾å?§æ??å??ç??æ?´æ?¹å°?ä¸?æ??é??æ?°å??æ¥ã??"
-#: ../camel/camel-disco-diary.c:299
+#: ../camel/camel-disco-diary.c:304
msgid "Resynchronizing with server"
msgstr "è??伺æ??å?¨é??æ?°å??æ¥"
-#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
+#: ../camel/camel-disco-folder.c:67 ../camel/camel-offline-folder.c:83
msgid "Downloading new messages for offline mode"
msgstr "æ£å?¨ä¸?è¼?æ?°è¨?æ?¯ç?¨æ?¼é?¢ç·?模å¼?"
# mail/mail-ops.c:1195
# mail/mail-ops.c:1333
-#: ../camel/camel-disco-folder.c:379
+#: ../camel/camel-disco-folder.c:389
#, c-format
msgid "Preparing folder '%s' for offline"
msgstr "æº?å??è³?æ??夾ã??%sã??ä¾?é?¢ç·?使ç?¨"
-#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
+#: ../camel/camel-disco-folder.c:455 ../camel/camel-offline-folder.c:316
msgid "Copy folder content locally for offline operation"
msgstr "è¤?製è³?æ??夾å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥"
# camel/camel-disco-store.c:271
-#: ../camel/camel-disco-store.c:398
-#: ../camel/providers/groupwise/camel-groupwise-store.c:230
-#: ../camel/providers/imap/camel-imap-store.c:876
-#: ../camel/providers/imap/camel-imap-store.c:1720
-#: ../camel/providers/imap/camel-imap-store.c:2178
-#: ../camel/providers/imap/camel-imap-store.c:3022
-#: ../camel/providers/imapx/camel-imapx-folder.c:164
-#: ../camel/providers/imapx/camel-imapx-folder.c:195
-#: ../camel/providers/imapx/camel-imapx-folder.c:224
-#: ../camel/providers/imapx/camel-imapx-folder.c:282
-#: ../camel/providers/imapx/camel-imapx-folder.c:325
-#: ../camel/providers/imapx/camel-imapx-folder.c:357
-#: ../camel/providers/imapx/camel-imapx-folder.c:388
-#: ../camel/providers/imapx/camel-imapx-store.c:193
-#: ../camel/providers/imapx/camel-imapx-store.c:720
-#: ../camel/providers/imapx/camel-imapx-store.c:783
-#: ../camel/providers/imapx/camel-imapx-store.c:842
+#: ../camel/camel-disco-store.c:420
+#: ../camel/providers/groupwise/camel-groupwise-store.c:232
+#: ../camel/providers/imap/camel-imap-store.c:1250
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2244
+#: ../camel/providers/imap/camel-imap-store.c:3094
+#: ../camel/providers/imapx/camel-imapx-folder.c:298
+#: ../camel/providers/imapx/camel-imapx-folder.c:331
+#: ../camel/providers/imapx/camel-imapx-folder.c:385
+#: ../camel/providers/imapx/camel-imapx-folder.c:431
+#: ../camel/providers/imapx/camel-imapx-folder.c:465
+#: ../camel/providers/imapx/camel-imapx-folder.c:505
+#: ../camel/providers/imapx/camel-imapx-folder.c:541
+#: ../camel/providers/imapx/camel-imapx-store.c:277
+#: ../camel/providers/imapx/camel-imapx-store.c:1299
+#: ../camel/providers/imapx/camel-imapx-store.c:1387
+#: ../camel/providers/imapx/camel-imapx-store.c:1422
#, c-format
msgid "You must be working online to complete this operation"
msgstr "ä½ å¿?é ?æ?¼ç¶²ä¸?å·¥ä½?æ??è?½å®?æ??æ¤æ??ä½?"
@@ -1898,114 +1929,88 @@ msgstr "ä½ å¿?é ?æ?¼ç¶²ä¸?å·¥ä½?æ??è?½å®?æ??æ¤æ??ä½?"
# calendar/gui/e-calendar-table.c:422
# camel/camel-service.c:544
# camel/camel-service.c:580
-#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
-#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
-#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
-#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:514
-#: ../camel/camel-net-utils.c:691 ../camel/camel-net-utils.c:840
-#: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:4691
-#: ../camel/providers/imapx/camel-imapx-server.c:4708
-#: ../camel/providers/imapx/camel-imapx-store.c:241
-#: ../camel/providers/nntp/camel-nntp-summary.c:396
-#: ../camel/providers/pop3/camel-pop3-folder.c:269
-#: ../camel/providers/pop3/camel-pop3-folder.c:625
-#: ../camel/providers/pop3/camel-pop3-folder.c:690
-#: ../camel/providers/pop3/camel-pop3-store.c:466
-#: ../libedataserverui/e-book-auth-util.c:229
-#, c-format
-msgid "Cancelled"
-msgstr "å·²å??æ¶?"
-
-# calendar/gui/calendar-model.c:647
-# calendar/gui/calendar-model.c:1182
-# calendar/gui/dialogs/task-editor-dialog.glade.h:4
-# calendar/gui/e-calendar-table.c:422
-# camel/camel-service.c:544
-# camel/camel-service.c:580
-#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
-#: ../camel/camel-file-utils.c:791
+#: ../camel/camel-file-utils.c:719
#, c-format
msgid "Canceled"
msgstr "å·²å??æ¶?"
# camel/camel-filter-driver.c:670
# camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:839 ../camel/camel-filter-search.c:582
#, c-format
msgid "Failed to create child process '%s': %s"
msgstr "ç?¡æ³?建ç«?å?代è??ç?? '%s'ï¼?%s"
# camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/camel-filter-driver.c:853
+#: ../camel/camel-filter-driver.c:886
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "ç?¡æ³?è®?å?? %s ç??æ¡è¿?è¾ï¼? %s"
# camel/camel-filter-driver.c:534
# camel/camel-filter-driver.c:543
-#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
+#: ../camel/camel-filter-driver.c:1073 ../camel/camel-filter-driver.c:1082
msgid "Syncing folders"
msgstr "å??æ¥è??ç??è³?æ??夾"
# camel/camel-filter-driver.c:866
-#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
+#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1620
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "å??æ??é??濾å?¨ç?¼ç??é?¯èª¤ï¼? %s: %s"
# camel/camel-filter-driver.c:871
-#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
+#: ../camel/camel-filter-driver.c:1181 ../camel/camel-filter-driver.c:1631
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "å?·è¡?é??濾å?¨ç?¼ç??é?¯èª¤ï¼? %s: %s"
# camel/camel-filter-driver.c:643
-#: ../camel/camel-filter-driver.c:1240
+#: ../camel/camel-filter-driver.c:1278
#, c-format
msgid "Unable to open spool folder"
msgstr "ç?¡æ³?é??å??æ??ç¨?å?¨è³?æ??夾"
# camel/camel-filter-driver.c:652
-#: ../camel/camel-filter-driver.c:1251
+#: ../camel/camel-filter-driver.c:1289
#, c-format
msgid "Unable to process spool folder"
msgstr "ç?¡æ³?è??ç??æ??ç¨?å?¨è³?æ??夾"
# camel/camel-filter-driver.c:666
-#: ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1307
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "���件 %d (%d%%)"
# camel/camel-filter-driver.c:670
# camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
+#: ../camel/camel-filter-driver.c:1314 ../camel/camel-filter-driver.c:1336
#, c-format
msgid "Failed on message %d"
msgstr "å?¨ç¬¬ %d å°?é?µä»¶ç?¼ç??é?¯èª¤"
# camel/camel-filter-driver.c:690
# camel/camel-filter-driver.c:788
-#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
+#: ../camel/camel-filter-driver.c:1351 ../camel/camel-filter-driver.c:1456
msgid "Syncing folder"
msgstr "å??æ¥è??ç??è³?æ??夾"
# camel/camel-filter-driver.c:694
# camel/camel-filter-driver.c:793
-#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
+#: ../camel/camel-filter-driver.c:1356 ../camel/camel-filter-driver.c:1462
msgid "Complete"
msgstr "å®?æ??"
# camel/camel-filter-driver.c:748
-#: ../camel/camel-filter-driver.c:1377
+#: ../camel/camel-filter-driver.c:1420
#, c-format
msgid "Getting message %d of %d"
msgstr "æ£å?¨æ?¥æ?¶ç¬¬ %d / %d å°?é?µä»¶"
# camel/camel-filter-driver.c:753
# camel/camel-filter-driver.c:771
-#: ../camel/camel-filter-driver.c:1395
+#: ../camel/camel-filter-driver.c:1438
#, c-format
msgid "Failed at message %d of %d"
msgstr "å?¨ç¬¬ %d / %d å°?é?µä»¶å¤±æ??"
@@ -2089,52 +2094,58 @@ msgid "(%s) requires the folder set"
msgstr "(%s) é??è¦?è³?æ??夾è¨å®?"
# mail/mail-ops.c:1649
-#: ../camel/camel-folder.c:125
+#: ../camel/camel-folder.c:220
#, c-format
msgid "Learning new spam message in '%s'"
msgid_plural "Learning new spam messages in '%s'"
msgstr[0] "æ£å?¨å¸ç¿?ã??%sã??ä¸ç??æ?°å??å?¾é?µä»¶"
# mail/mail-ops.c:1649
-#: ../camel/camel-folder.c:147
+#: ../camel/camel-folder.c:244
#, c-format
msgid "Learning new ham message in '%s'"
msgid_plural "Learning new ham messages in '%s'"
msgstr[0] "æ£å?¨å¸ç¿?ã??%sã??ä¸ç?? ham é?µä»¶"
# mail/mail-ops.c:1565
-#: ../camel/camel-folder.c:171
+#: ../camel/camel-folder.c:270
#, c-format
msgid "Filtering new message in '%s'"
msgid_plural "Filtering new messages in '%s'"
msgstr[0] "æ£å?¨é??濾ã??%sã??ä¸ç??æ?°é?µä»¶"
# mail/mail-ops.c:898
-#: ../camel/camel-folder.c:688
-#: ../camel/providers/local/camel-maildir-folder.c:366
+#: ../camel/camel-folder.c:881
+#: ../camel/providers/local/camel-maildir-folder.c:293
msgid "Moving messages"
msgstr "æ£å?¨ç§»å??é?µä»¶"
# mail/mail-ops.c:898
-#: ../camel/camel-folder.c:690
+#: ../camel/camel-folder.c:884
msgid "Copying messages"
msgstr "æ£å?¨è¤?製é?µä»¶"
+# camel/providers/pop3/camel-pop3-folder.c:296
+#: ../camel/camel-folder.c:3253
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "æ£å?¨å??å??é?µä»¶ã??%sã??"
+
# camel/camel-filter-driver.c:670
# camel/camel-filter-driver.c:679
-#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
-#: ../camel/camel-gpg-context.c:1330
+#: ../camel/camel-gpg-context.c:646 ../camel/camel-gpg-context.c:651
+#: ../camel/camel-gpg-context.c:1276
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "å?·è¡? gpg 失æ??ï¼? %s"
-#: ../camel/camel-gpg-context.c:706
-#: ../camel/providers/smtp/camel-smtp-transport.c:114
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/camel-gpg-context.c:651
+#: ../camel/providers/smtp/camel-smtp-transport.c:716
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
msgid "Unknown"
msgstr "ä¸?æ??"
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:715
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -2145,17 +2156,17 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:787
+#: ../camel/camel-gpg-context.c:732
#, c-format
msgid "Failed to parse gpg userid hint."
msgstr "解æ?? gpg userid æ??示æ??失æ??ã??"
-#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:757 ../camel/camel-gpg-context.c:772
#, c-format
msgid "Failed to parse gpg passphrase request."
msgstr "解æ?? gpg å¯?èª?è¦?æ±?æ??失æ??ã??"
-#: ../camel/camel-gpg-context.c:848
+#: ../camel/camel-gpg-context.c:793
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
@@ -2164,7 +2175,7 @@ msgstr ""
"é??è¦? PIN æ??è?½ç?ºä½ ç??æ?ºæ?§å?¡è§£é??ï¼?\n"
"ã??%sã??"
-#: ../camel/camel-gpg-context.c:852
+#: ../camel/camel-gpg-context.c:797
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -2174,77 +2185,98 @@ msgstr ""
"ã??%sã??"
# camel/providers/imap/camel-imap-command.c:232
-#: ../camel/camel-gpg-context.c:858
+#: ../camel/camel-gpg-context.c:803
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr "GnuPG å?³å??å°?ã??%sã??æ?ªé ?æ??ç??è¦?æ±?"
-#: ../camel/camel-gpg-context.c:905
+# calendar/gui/calendar-model.c:647
+# calendar/gui/calendar-model.c:1182
+# calendar/gui/dialogs/task-editor-dialog.glade.h:4
+# calendar/gui/e-calendar-table.c:422
+# camel/camel-service.c:544
+# camel/camel-service.c:580
+#: ../camel/camel-gpg-context.c:832 ../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-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/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "å·²å??æ¶?"
+
+#: ../camel/camel-gpg-context.c:850
#, c-format
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr "解é??ç§?å¯?å¯?碼å??æ??失æ??ï¼?輸å?¥äº? 3 次é?¯èª¤ç??å¯?èª? ã??"
# camel/providers/imap/camel-imap-command.c:232
-#: ../camel/camel-gpg-context.c:917
+#: ../camel/camel-gpg-context.c:862
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "å¾? GnuPG å?³å??æ??å¤?ç??å??æ??ï¼? %s"
# camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/camel-gpg-context.c:1048
+#: ../camel/camel-gpg-context.c:993
#, c-format
msgid "Failed to encrypt: No valid recipients specified."
msgstr "ä¸?è?½å? å¯?é?µä»¶ï¼?æ²?æ??æ??ä¾?æ??æ??ç??æ?¶ä»¶è??ã??"
# mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+#: ../camel/camel-gpg-context.c:1539 ../camel/camel-smime-context.c:824
msgid "Could not generate signing data: "
msgstr "ç?¡æ³?ç?¢ç??簽署è³?æ??ï¼?"
# camel/camel-filter-driver.c:670
# camel/camel-filter-driver.c:679
-#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
-#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
-#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
+#: ../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
msgid "Failed to execute gpg."
msgstr "å?·è¡? gpg 失æ??ã??"
# camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
-#: ../camel/camel-smime-context.c:966
+#: ../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-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-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1695
+#: ../camel/camel-gpg-context.c:1741
msgid "Cannot verify message signature: "
msgstr "ä¸?è?½é©?è?æ¤é?µä»¶ç??簽署ï¼?"
# mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1814
+#: ../camel/camel-gpg-context.c:1862
msgid "Could not generate encrypting data: "
msgstr "ç?¡æ³?ç?¢ç??å? å¯?è³?æ??ï¼?"
-#: ../camel/camel-gpg-context.c:1866
+#: ../camel/camel-gpg-context.c:1915
msgid "This is a digitally encrypted message part"
msgstr "é??æ?¯æ?¸ç¢¼å??å? å¯?è¨?æ?¯é?¨ä»½"
# camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
-#: ../camel/camel-gpg-context.c:1954
+#: ../camel/camel-gpg-context.c:1973 ../camel/camel-gpg-context.c:1982
+#: ../camel/camel-gpg-context.c:2005
#, c-format
msgid "Cannot decrypt message: Incorrect message format"
msgstr "ä¸?è?½è§£å¯?æ¤é?µä»¶ï¼?é?¯èª¤ç??è¨?æ?¯æ ¼å¼?"
-#: ../camel/camel-gpg-context.c:1942
+#: ../camel/camel-gpg-context.c:1993
#, c-format
msgid "Failed to decrypt MIME part: protocol error"
msgstr "解å¯? MIME çµ?件æ??失æ??ï¼?é??è¨?å??å®?é?¯èª¤"
-#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
+#: ../camel/camel-gpg-context.c:2082 ../camel/camel-smime-context.c:1255
msgid "Encrypted content"
msgstr "å? å¯?å?§å®¹"
@@ -2363,18 +2395,18 @@ msgstr "寫å?¥é?µä»¶æ?«å?æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
msgid "Error copying mail temp file: %s"
msgstr "è¤?製é?µä»¶æ?«å?æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
-#: ../camel/camel-multipart-signed.c:285
+#: ../camel/camel-multipart-signed.c:286
#, c-format
msgid "No content available"
msgstr "æ²?æ??å?¯ç?¨ç??å?§å®¹"
-#: ../camel/camel-multipart-signed.c:293
+#: ../camel/camel-multipart-signed.c:294
#, c-format
msgid "No signature available"
msgstr "æ²?æ??å?¯ç?¨ç??簽署"
# shell/e-storage.c:467
-#: ../camel/camel-multipart-signed.c:612
+#: ../camel/camel-multipart-signed.c:620
#, c-format
msgid "parse error"
msgstr "解æ??é?¯èª¤"
@@ -2386,40 +2418,40 @@ msgid "Resolving: %s"
msgstr "解æ??ï¼?%s"
# camel/camel-service.c:600
-#: ../camel/camel-net-utils.c:717
+#: ../camel/camel-net-utils.c:718
msgid "Host lookup failed"
msgstr "æ??å°?主æ©?失æ??"
# camel/camel-service.c:600
-#: ../camel/camel-net-utils.c:721
+#: ../camel/camel-net-utils.c:724
#, c-format
msgid "Host lookup failed: %s: %s"
msgstr "æ??å°?主æ©?失æ??ï¼? %s ï¼?%s"
# camel/camel-service.c:548
-#: ../camel/camel-net-utils.c:844
+#: ../camel/camel-net-utils.c:845
msgid "Resolving address"
msgstr "解æ??ä½?å??"
-#: ../camel/camel-net-utils.c:864
+#: ../camel/camel-net-utils.c:866
msgid "Name lookup failed"
msgstr "æ?¥è©¢å??稱失æ??"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/camel-net-utils.c:869
+#: ../camel/camel-net-utils.c:872
#, c-format
msgid "Name lookup failed: %s"
msgstr "æ??å°?å??稱失æ??ï¼? %s"
# mail/mail-ops.c:898
-#: ../camel/camel-offline-folder.c:169
+#: ../camel/camel-offline-folder.c:193
#, c-format
msgid "Syncing messages in folder '%s' to disk"
msgstr "æ£å?¨å°?è³?æ??夾ã??%sã??ä¸ç??é?µä»¶å??æ¥å?°ç£?ç¢?"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
#, c-format
msgid "Cannot write offline journal for folder '%s': %s"
msgstr "ä¸?è?½å¯«å?¥è³?æ??夾ã??%sã??ç??é?¢ç·?æ?¥èª?ï¼?%s"
@@ -2471,13 +2503,13 @@ msgstr "é??å??é?¸é ?å°?æ??使ç?¨å?¿å??ç?»å?¥è?³ä¼ºæ??å?¨ã??"
# camel/camel-sasl-anonymous.c:110
# camel/camel-sasl-plain.c:87
-#: ../camel/camel-sasl-anonymous.c:69
+#: ../camel/camel-sasl-anonymous.c:70
#, c-format
msgid "Authentication failed."
msgstr "é©?è?失æ??ã??"
# camel/camel-sasl-anonymous.c:119
-#: ../camel/camel-sasl-anonymous.c:80
+#: ../camel/camel-sasl-anonymous.c:81
#, c-format
msgid ""
"Invalid email address trace information:\n"
@@ -2487,7 +2519,7 @@ msgstr ""
"%s"
# camel/camel-sasl-anonymous.c:131
-#: ../camel/camel-sasl-anonymous.c:94
+#: ../camel/camel-sasl-anonymous.c:95
#, c-format
msgid ""
"Invalid opaque trace information:\n"
@@ -2497,7 +2529,7 @@ msgstr ""
"%s"
# camel/camel-sasl-anonymous.c:143
-#: ../camel/camel-sasl-anonymous.c:108
+#: ../camel/camel-sasl-anonymous.c:109
#, c-format
msgid ""
"Invalid trace information:\n"
@@ -2531,111 +2563,111 @@ msgid ""
msgstr "é??å??é?¸é ?å°?æ??使ç?¨ DIGEST-MD5 å? å¯?ç??å¯?碼é?£ç·?è?³ä¼ºæ??å?¨ï¼?è?¥ç?¼ç?¾è©²ä¼ºæ??å?¨æ?¯æ?´é??種æ??å??ã??"
# camel/camel-sasl-digest-md5.c:810
-#: ../camel/camel-sasl-digest-md5.c:820
+#: ../camel/camel-sasl-digest-md5.c:821
#, c-format
msgid "Server challenge too long (>2048 octets)"
msgstr "伺æ??å?¨æ?¥å??é??é?·(>2048 ä½?å?? )"
# camel/camel-sasl-digest-md5.c:819
-#: ../camel/camel-sasl-digest-md5.c:831
+#: ../camel/camel-sasl-digest-md5.c:832
#, c-format
msgid "Server challenge invalid\n"
msgstr "伺æ??å?¨æ?¥å??ç?¡æ??\n"
# camel/camel-sasl-digest-md5.c:825
-#: ../camel/camel-sasl-digest-md5.c:839
+#: ../camel/camel-sasl-digest-md5.c:840
#, c-format
msgid "Server challenge contained invalid \"Quality of Protection\" token"
msgstr "伺æ??å?¨æ?¥å??å??å?«ç?¡æ??ç?? ã??Quality of Protectionã??代符"
# camel/camel-sasl-digest-md5.c:847
-#: ../camel/camel-sasl-digest-md5.c:871
+#: ../camel/camel-sasl-digest-md5.c:875
#, c-format
msgid "Server response did not contain authorization data"
msgstr "伺æ??å?¨å??æ??並æ?ªå??å?«æ??æ¬?è³?æ??"
# camel/camel-sasl-digest-md5.c:865
-#: ../camel/camel-sasl-digest-md5.c:892
+#: ../camel/camel-sasl-digest-md5.c:896
#, c-format
msgid "Server response contained incomplete authorization data"
msgstr "伺æ??å?¨å??æ??å??å?«ä¸?å®?æ?´ç??æ??æ¬?è³?æ??"
# camel/camel-sasl-digest-md5.c:875
-#: ../camel/camel-sasl-digest-md5.c:905
+#: ../camel/camel-sasl-digest-md5.c:909
#, c-format
msgid "Server response does not match"
msgstr "伺æ??å?¨å??æ??ä¸?符"
-#: ../camel/camel-sasl-gssapi.c:80
+#: ../camel/camel-sasl-gssapi.c:85
msgid "GSSAPI"
msgstr "GSSAPI"
# camel/camel-sasl-kerberos4.c:42
-#: ../camel/camel-sasl-gssapi.c:82
+#: ../camel/camel-sasl-gssapi.c:87
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr "é??å??é?¸é ?å°?æ??使ç?¨ Kerberos 5 é©?è?é?£ç·?è?³ä¼ºæ??å?¨ã??"
-#: ../camel/camel-sasl-gssapi.c:119
+#: ../camel/camel-sasl-gssapi.c:128
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
msgstr "æ??ä¾?ç??è?件ä¸?æ?¯æ?´æ??å®?ç??æ©?å?¶ï¼?æ??è??æ?¯å?·è¡?ç?¡æ³?辨è?ã??"
-#: ../camel/camel-sasl-gssapi.c:124
+#: ../camel/camel-sasl-gssapi.c:133
msgid "The provided target_name parameter was ill-formed."
msgstr "æ??ä¾?ç?? target_name å??æ?¸æ ¼å¼?é?¯èª¤ã??"
-#: ../camel/camel-sasl-gssapi.c:127
+#: ../camel/camel-sasl-gssapi.c:136
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
msgstr "æ??ä¾?ç?? target_name å??æ?¸å??å?«ç?¡æ??æ??ä¸?æ?¯æ?´ç??å??稱é¡?å??ã??"
-#: ../camel/camel-sasl-gssapi.c:131
+#: ../camel/camel-sasl-gssapi.c:140
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:136
+#: ../camel/camel-sasl-gssapi.c:145
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
msgstr "input_token å??å?«ç?¡æ??ç??簽署ï¼?æ??è??ç?¡æ³?確èª?ç??簽署ã??"
-#: ../camel/camel-sasl-gssapi.c:140
+#: ../camel/camel-sasl-gssapi.c:149
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:145
+#: ../camel/camel-sasl-gssapi.c:154
msgid "The supplied context handle did not refer to a valid context."
msgstr "æ??ä¾?ç??網絡ä½?ç½®è?å?¥æ??æ¨?æ?ªå??ç?§æ??æ??ç??網絡ä½?ç½®ã??"
-#: ../camel/camel-sasl-gssapi.c:148
+#: ../camel/camel-sasl-gssapi.c:157
msgid "The consistency checks performed on the input_token failed."
msgstr "å?¨ input_token å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
-#: ../camel/camel-sasl-gssapi.c:151
+#: ../camel/camel-sasl-gssapi.c:160
msgid "The consistency checks performed on the credential failed."
msgstr "å?¨è?件å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
-#: ../camel/camel-sasl-gssapi.c:154
+#: ../camel/camel-sasl-gssapi.c:163
msgid "The referenced credentials have expired."
msgstr "å??ç?§ç??è?件已ç¶?é??æ??ã??"
# camel/camel-sasl-kerberos4.c:218
# camel/providers/imap/camel-imap-store.c:433
-#: ../camel/camel-sasl-gssapi.c:160 ../camel/camel-sasl-gssapi.c:296
-#: ../camel/camel-sasl-gssapi.c:340 ../camel/camel-sasl-gssapi.c:357
-#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../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/providers/smtp/camel-smtp-transport.c:1249
#, c-format
msgid "Bad authentication response from server."
msgstr "ä¾?è?ªä¼ºæ??å?¨ç??ä¸?è?¯è¨±å?¯å??æ??ã??"
# mail/mail-config.glade.h:1
-#: ../camel/camel-sasl-gssapi.c:369
+#: ../camel/camel-sasl-gssapi.c:382
#, c-format
msgid "Unsupported security layer."
msgstr "ä¸?æ?¯æ?´ç??é¡?å??"
@@ -2652,7 +2684,7 @@ msgid "This option will connect to the server using a simple password."
msgstr "é??å??é?¸é ?å°?æ??使ç?¨æ?®é??ç??å¯?碼é?£ç·?è?³ä¼ºæ??å?¨ã??"
# camel/camel-sasl-login.c:127
-#: ../camel/camel-sasl-login.c:94
+#: ../camel/camel-sasl-login.c:95
#, c-format
msgid "Unknown authentication state."
msgstr "æ?ªç?¥ç??é©?証ç??æ³?ã??"
@@ -2681,16 +2713,16 @@ msgid "This option will authorise a POP connection before attempting SMTP"
msgstr "é??å??é?¸é ?å°?æ??å?¨é?²è¡? SMTP ä¹?å??å??許 POPé?£ç·?"
# addressbook/gui/widgets/e-addressbook-view.c:735
-#: ../camel/camel-sasl-popb4smtp.c:82
+#: ../camel/camel-sasl-popb4smtp.c:83
msgid "POP Source URI"
msgstr "POP �� URI"
-#: ../camel/camel-sasl-popb4smtp.c:89
+#: ../camel/camel-sasl-popb4smtp.c:90
#, c-format
msgid "POP Before SMTP authentication using an unknown transport"
msgstr "POP å??æ?¼ SMTP å??許使ç?¨æ?ªç?¥ç??å?³è¼¸"
-#: ../camel/camel-sasl-popb4smtp.c:97
+#: ../camel/camel-sasl-popb4smtp.c:98
#, c-format
msgid "POP Before SMTP authentication using a non-POP source"
msgstr "POP å??æ?¼ SMTP å??許使ç?¨é?? POP ä¾?æº?"
@@ -2702,19 +2734,19 @@ msgid "Regular expression compilation failed: %s: %s"
msgstr "æ£è¦?表示å¼?ç·¨è¯å¤±æ??ï¼? %sï¼? %s"
# camel/camel-service.c:154
-#: ../camel/camel-service.c:88
+#: ../camel/camel-service.c:89
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URLã??%sã??é??è¦? username å??件"
# camel/camel-service.c:162
-#: ../camel/camel-service.c:92
+#: ../camel/camel-service.c:93
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URLã??%sã??é??è¦? host å??件"
# camel/camel-service.c:170
-#: ../camel/camel-service.c:96
+#: ../camel/camel-service.c:97
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URLã??%sã??é??è¦? path å??件"
@@ -2730,13 +2762,13 @@ msgstr ""
"%s"
# camel/providers/pop3/camel-pop3-store.c:361
-#: ../camel/camel-session.c:760
+#: ../camel/camel-session.c:757
#, 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:327
-#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1048
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "æ?¾ä¸?å?° '%s' ç??è?æ?¸"
@@ -2799,61 +2831,62 @@ msgstr "���� CMS SignerInfo"
# calendar/gui/calendar-model.c:1064
# calendar/gui/dialogs/task-editor-dialog.glade.h:22
# calendar/gui/e-calendar-table.c:348
-#: ../camel/camel-smime-context.c:506
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:507
msgid "Unverified"
msgstr "æ?ªæ??å®?"
# mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:509
msgid "Good signature"
msgstr "è?¯å¥½ç??簽署"
# mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:511
msgid "Bad signature"
msgstr "é?¯èª¤ç??簽署"
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:513
msgid "Content tampered with or altered in transit"
msgstr "å?§å®¹å?¨å?³é??æ??被ç«?æ?¹æ??æ?´æ?¹"
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:515
msgid "Signing certificate not found"
msgstr "æ?¾ä¸?å?°ç°½ç½²è?æ?¸"
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:517
msgid "Signing certificate not trusted"
msgstr "簽署è?æ?¸ä¸?å??ä¿¡ä»»"
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:519
msgid "Signature algorithm unknown"
msgstr "æ?ªç?¥ç??簽署æ¼?ç®?æ³?"
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:521
msgid "Signature algorithm unsupported"
msgstr "ä¸?æ?¯æ?´é??種簽署æ¼?ç®?æ³?"
# mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:523
msgid "Malformed signature"
msgstr "æ ¼å¼?ä¸?è?¯ç??簽署"
# shell/e-storage.c:467
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:525
msgid "Processing error"
msgstr "解æ??é?¯èª¤"
-#: ../camel/camel-smime-context.c:566
+#: ../camel/camel-smime-context.c:568
msgid "No signed data in signature"
msgstr "簽署ä¸æ²?æ??被簽署ç??è³?æ??"
-#: ../camel/camel-smime-context.c:571
+#: ../camel/camel-smime-context.c:573
msgid "Digests missing from enveloped data"
msgstr "å??裹ç??è³?æ??ä¸é?ºæ¼?æ??è¦?"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
+#: ../camel/camel-smime-context.c:586 ../camel/camel-smime-context.c:597
msgid "Cannot calculate digests"
msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
@@ -2864,223 +2897,223 @@ msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
# camel/providers/local/camel-mh-folder.c:185
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
+#: ../camel/camel-smime-context.c:604 ../camel/camel-smime-context.c:608
msgid "Cannot set message digests"
msgstr "ç?¡æ³?è¨å®?é?µä»¶æ??è¦?"
# mail/mail-crypto.c:59
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
+#: ../camel/camel-smime-context.c:618 ../camel/camel-smime-context.c:623
msgid "Certificate import failed"
msgstr "è?æ?¸å?¯å?¥å¤±æ??"
-#: ../camel/camel-smime-context.c:631
+#: ../camel/camel-smime-context.c:633
#, c-format
msgid "Certificate is the only message, cannot verify certificates"
msgstr "é??è?æ?¸è¨?æ?¯ï¼?ç?¡æ³?é©?è?è?æ?¸"
-#: ../camel/camel-smime-context.c:634
+#: ../camel/camel-smime-context.c:636
#, c-format
msgid "Certificate is the only message, certificates imported and verified"
msgstr "é??è?æ?¸è¨?æ?¯ã??å?¯å?¥å??é©?è?ç??è?æ?¸"
# mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:640
msgid "Cannot find signature digests"
msgstr "æ?¾ä¸?å?°ç°½ç½²æ??è¦?"
# mail/mail-config.glade.h:72
-#: ../camel/camel-smime-context.c:654
+#: ../camel/camel-smime-context.c:656
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "簽署è??ï¼? %s<%s>ï¼? %s\n"
# mail/mail-crypto.c:251
-#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
msgid "Cannot create encoder context"
msgstr "��建�編碼�網絡�置"
# camel/camel-movemail.c:274
-#: ../camel/camel-smime-context.c:838
+#: ../camel/camel-smime-context.c:841
msgid "Failed to add data to CMS encoder"
msgstr "ç?¡æ³?æ?°å¢?è³?æ??è?³ CMS 編碼å?¨"
-#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
msgid "Failed to encode data"
msgstr "ç?¡æ³?編碼è³?æ??"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
+#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
msgid "Decoder failed"
msgstr "解碼å?¨å¤±æ??"
-#: ../camel/camel-smime-context.c:1049
+#: ../camel/camel-smime-context.c:1056
msgid "Cannot find common bulk encryption algorithm"
msgstr "æ?¾ä¸?å?°ä¸?è?¬å¤§é??å? å¯?æ¼?ç®?æ³?"
-#: ../camel/camel-smime-context.c:1057
+#: ../camel/camel-smime-context.c:1064
msgid "Cannot allocate slot for encryption bulk key"
msgstr "ç?¡æ³?é??ç½®æ??槽給å? å¯?大é??å¯?碼å??"
# camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1068
+#: ../camel/camel-smime-context.c:1075
msgid "Cannot create CMS Message"
msgstr "��建� CMS ��"
# camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1074
+#: ../camel/camel-smime-context.c:1081
msgid "Cannot create CMS Enveloped data"
msgstr "��建� CMS EnvelopedData"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:1080
+#: ../camel/camel-smime-context.c:1087
msgid "Cannot attach CMS Enveloped data"
msgstr "ç?¡æ³?é??å? CMS EnvelopedData"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:1086
+#: ../camel/camel-smime-context.c:1093
msgid "Cannot attach CMS data object"
msgstr "ç?¡æ³?é??å? CMS è³?æ??ç?©ä»¶"
# camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1102
msgid "Cannot create CMS Recipient information"
msgstr "��建� CMS RecipientInfo"
-#: ../camel/camel-smime-context.c:1100
+#: ../camel/camel-smime-context.c:1107
msgid "Cannot add CMS Recipient information"
msgstr "���� CMS RecipientInfo"
# camel/providers/imap/camel-imap-store.c:531
-#: ../camel/camel-smime-context.c:1125
+#: ../camel/camel-smime-context.c:1132
msgid "Failed to add data to encoder"
msgstr "ç?¡æ³?æ?°å¢?è³?æ??è?³ç·¨ç¢¼å?¨"
-#: ../camel/camel-smime-context.c:1227
+#: ../camel/camel-smime-context.c:1240
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME 解å¯?ï¼?æ?¾ä¸?å?°å? å¯?å?§å®¹"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-store.c:444
+#: ../camel/camel-store.c:2184
#, c-format
msgid "Cannot create folder '%s': folder exists"
msgstr "ä¸?è?½å»ºç«?è³?æ??夾ã??%sã??ï¼?è³?æ??夾已å?å?¨"
+# camel/camel-store.c:378
+# mail/mail-ops.c:1007
+# mail/mail-ops.c:1014
+# mail/mail-ops.c:1032
+# mail/mail-ops.c:1033
+#. the name of the Trash folder, used for deleted messages
+#: ../camel/camel-store.c:2375 ../camel/camel-vtrash-folder.c:48
+msgid "Trash"
+msgstr "å??æ?¶ç?"
+
+# calendar/gui/goto-dialog.glade.h:9
+#. the name of the Junk folder, used for spam messages
+#: ../camel/camel-store.c:2378 ../camel/camel-vtrash-folder.c:50
+msgid "Junk"
+msgstr "å??å?¾é?µä»¶"
+
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-store.c:543
+#: ../camel/camel-store.c:2811
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "ç?¡æ³?建ç«?è³?æ??夾ï¼?%sï¼?è³?æ??夾已å?å?¨"
# camel/providers/local/camel-mbox-store.c:138
# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
-#: ../camel/providers/local/camel-maildir-store.c:224
+#: ../camel/camel-store.c:2938 ../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/providers/local/camel-mbox-summary.c:655
-#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
-#: ../camel/providers/local/camel-maildir-store.c:314
+#: ../camel/camel-store.c:3079 ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:662
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??夾ï¼? %s ï¼?ç?¡æ??ç??æ??ä½?"
-# camel/camel-store.c:378
-# mail/mail-ops.c:1007
-# mail/mail-ops.c:1014
-# mail/mail-ops.c:1032
-# mail/mail-ops.c:1033
-#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:1129 ../camel/camel-vtrash-folder.c:48
-msgid "Trash"
-msgstr "å??æ?¶ç?"
-
-# calendar/gui/goto-dialog.glade.h:9
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:1132 ../camel/camel-vtrash-folder.c:50
-msgid "Junk"
-msgstr "å??å?¾é?µä»¶"
-
-#: ../camel/camel-tcp-stream-raw.c:714 ../camel/camel-tcp-stream-raw.c:725
-#, fuzzy, c-format
+#: ../camel/camel-tcp-stream-raw.c:747 ../camel/camel-tcp-stream-raw.c:758
+#, c-format
msgid "The proxy host does not support SOCKS4"
-msgstr "代ç??伺æ??å?¨ä¸»æ©?ä¸?æ?¯æ?´ SOCKS5"
+msgstr "代ç??伺æ??å?¨ä¸»æ©?ä¸?æ?¯æ?´ SOCKS4"
-#: ../camel/camel-tcp-stream-raw.c:736
+#: ../camel/camel-tcp-stream-raw.c:769
#, c-format
msgid "The proxy host denied our request: code %d"
-msgstr ""
+msgstr "代ç??伺æ??å?¨ä¸»æ©?æ??çµ?æ??å??ç??è¦?æ±?ï¼?代碼 %d"
-#: ../camel/camel-tcp-stream-raw.c:825 ../camel/camel-tcp-stream-raw.c:831
+#: ../camel/camel-tcp-stream-raw.c:865 ../camel/camel-tcp-stream-raw.c:871
#, c-format
msgid "The proxy host does not support SOCKS5"
msgstr "代ç??伺æ??å?¨ä¸»æ©?ä¸?æ?¯æ?´ SOCKS5"
# camel/providers/imap/camel-imap-store.c:466
# camel/providers/smtp/camel-smtp-transport.c:366
-#: ../camel/camel-tcp-stream-raw.c:837
+#: ../camel/camel-tcp-stream-raw.c:877
#, c-format
msgid "Could not find a suitable authentication type: code 0x%x"
msgstr "æ?¾ä¸?å?°å??é?©ç??é©?è?é¡?å??ï¼?代碼 0x%x"
-#: ../camel/camel-tcp-stream-raw.c:849
+#: ../camel/camel-tcp-stream-raw.c:889
msgid "General SOCKS server failure"
msgstr "ä¸?è?¬æ?§ SOCKS 伺æ??å?¨å¤±æ??"
-#: ../camel/camel-tcp-stream-raw.c:850
+#: ../camel/camel-tcp-stream-raw.c:890
msgid "SOCKS server's rules do not allow connection"
msgstr "SOCKS 伺æ??å?¨ç??è¦?å??ä¸?å??許é?£ç·?"
-#: ../camel/camel-tcp-stream-raw.c:851
+#: ../camel/camel-tcp-stream-raw.c:891
msgid "Network is unreachable from SOCKS server"
msgstr "網絡ç?¡æ³?é??é?? SOCKS 伺æ??å?¨å?°é??"
-#: ../camel/camel-tcp-stream-raw.c:852
+#: ../camel/camel-tcp-stream-raw.c:892
msgid "Host is unreachable from SOCKS server"
msgstr "主æ©?ç?¡æ³?é??é?? SOCKS 伺æ??å?¨å?°é??"
# camel/camel-remote-store.c:252
-#: ../camel/camel-tcp-stream-raw.c:853
+#: ../camel/camel-tcp-stream-raw.c:893
msgid "Connection refused"
msgstr "é?£ç·?被æ??çµ?"
-#: ../camel/camel-tcp-stream-raw.c:854
+#: ../camel/camel-tcp-stream-raw.c:894
msgid "Time-to-live expired"
msgstr "è¶?é?? Time-to-live æ??é??"
# shell/e-storage.c:477
-#: ../camel/camel-tcp-stream-raw.c:855
+#: ../camel/camel-tcp-stream-raw.c:895
msgid "Command not supported by SOCKS server"
msgstr "SOCKS 伺æ??å?¨ä¸?æ?¯æ?´æ??令"
# shell/e-storage.c:477
-#: ../camel/camel-tcp-stream-raw.c:856
+#: ../camel/camel-tcp-stream-raw.c:896
msgid "Address type not supported by SOCKS server"
msgstr "SOCKS 伺æ??å?¨ä¸?æ?¯æ?´ä½?å??é¡?å??"
# camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/camel-tcp-stream-raw.c:857
+#: ../camel/camel-tcp-stream-raw.c:897
msgid "Unknown error from SOCKS server"
msgstr "ä¾?è?ª SOCKS 伺æ??å?¨ç??ä¸?æ??é?¯èª¤"
-#: ../camel/camel-tcp-stream-raw.c:887
+#: ../camel/camel-tcp-stream-raw.c:930
#, c-format
msgid "Got unknown address type from SOCKS server"
msgstr "å¾? SOCKS 伺æ??å?¨å??å¾?ä¸?æ??ç??ä½?å??é¡?å??"
# camel/camel-sasl-kerberos4.c:218
# camel/providers/imap/camel-imap-store.c:433
-#: ../camel/camel-tcp-stream-raw.c:905
+#: ../camel/camel-tcp-stream-raw.c:948
#, c-format
msgid "Incomplete reply from SOCKS server"
msgstr "ä¾?è?ª SOCKS 伺æ??å?¨ç??ä¸?å®?æ?´å??è¦?"
-#: ../camel/camel-tcp-stream-raw.c:920
+#: ../camel/camel-tcp-stream-raw.c:968
#, c-format
msgid "Hostname is too long (maximum is 255 characters)"
msgstr "主æ©?å??稱太é?·ï¼?æ??å¤? 255 å?符ï¼?"
@@ -3089,7 +3122,7 @@ msgstr "主æ©?å??稱太é?·ï¼?æ??å¤? 255 å?符ï¼?"
# camel/providers/imap/camel-imap-store.c:433
#. SOCKS5
#. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:952 ../camel/camel-tcp-stream-raw.c:962
+#: ../camel/camel-tcp-stream-raw.c:1000 ../camel/camel-tcp-stream-raw.c:1010
#, c-format
msgid "Invalid reply from proxy server"
msgstr "å¾?代ç??伺æ??å?¨å?³å??ç?¡æ??ç??å??è¦?"
@@ -3175,42 +3208,42 @@ msgstr ""
msgid "Could not parse URL '%s'"
msgstr "ç?¡æ³?解æ?? URLã??%sã??"
-# shell/e-shell-importer.c:384
-#: ../camel/camel-vee-folder.c:1045
+# camel/providers/imap/camel-imap-provider.c:45
+#: ../camel/camel-vee-folder.c:1251 ../camel/camel-vee-folder.c:1414
#, c-format
-msgid "Error storing '%s': "
-msgstr "å?²å?ã??%sã??ç?¼ç??é?¯èª¤ï¼?"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "ä¸?è?½è¤?製æ??移å??é?µä»¶å?°è??æ?¬è³?æ??夾ä¸"
# camel/camel-vee-folder.c:451
-#: ../camel/camel-vee-folder.c:1118
+#: ../camel/camel-vee-folder.c:1287
#, c-format
msgid "No such message %s in %s"
msgstr "æ²?æ?? %s é??é¡?é?µä»¶å?¨ %s ä¸"
-# camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/camel-vee-folder.c:1134 ../camel/camel-vee-folder.c:1149
+# shell/e-shell-importer.c:384
+#: ../camel/camel-vee-folder.c:1355
#, c-format
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "ä¸?è?½è¤?製æ??移å??é?µä»¶å?°è??æ?¬è³?æ??夾ä¸"
+msgid "Error storing '%s': "
+msgstr "å?²å?ã??%sã??ç?¼ç??é?¯èª¤ï¼?"
#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
-#: ../camel/camel-vee-store.c:417
+#: ../camel/camel-vee-store.c:322
msgid "Unmatched"
msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
-# camel/providers/local/camel-local-store.c:237
-#: ../camel/camel-vee-store.c:223
-#, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??夾ï¼? %s ï¼?æ²?æ??é??å??è³?æ??夾"
-
# camel/providers/local/camel-mbox-store.c:138
# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/camel-vee-store.c:289
+#: ../camel/camel-vee-store.c:393
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "ä¸?è?½å?ªé?¤è³?æ??夾ï¼? %s ï¼?æ²?æ??é??å??è³?æ??夾"
+# camel/providers/local/camel-local-store.c:237
+#: ../camel/camel-vee-store.c:427
+#, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??夾ï¼? %s ï¼?æ²?æ??é??å??è³?æ??夾"
+
# camel/providers/local/camel-mbox-summary.c:644
#: ../camel/camel-vtrash-folder.c:49
msgid "Cannot copy messages to the Trash folder"
@@ -3221,6 +3254,59 @@ msgstr "ç?¡æ³?è¤?製è¨?æ?¯å?°ã??å??æ?¶ç?ã??è³?æ??夾"
msgid "Cannot copy messages to the Junk folder"
msgstr "ç?¡æ³?è¤?製è¨?æ?¯å?°ã??å??å?¾é?µä»¶ã??è³?æ??夾"
+# camel/providers/imap/camel-imap-folder.c:191
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:959
+#: ../camel/providers/imap/camel-imap-folder.c:390
+#, c-format
+msgid "Could not load summary for %s"
+msgstr "ç?¡æ³?è¼?å?¥ %s ç??æ??è¦?"
+
+# mail/mail-ops.c:992
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1035
+#, 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
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "æ£å??å¾? %s ä¸æ?°é?µä»¶ç??æ??è¦?è³?è¨?"
+
+# camel/camel-movemail.c:306
+#: ../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
+#, c-format
+msgid "Could not get message"
+msgstr "ç?¡æ³?å??å¾?é?µä»¶ã??"
+
+# camel/providers/local/camel-mh-folder.c:149
+# camel/providers/local/camel-mh-folder.c:157
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2430
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2480
+#, c-format
+msgid "Cannot append message to folder '%s': %s"
+msgstr "ä¸?è?½å°?é?µä»¶å?²å?è?³è³?æ??夾ã??%sã??ï¼?%s"
+
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2466
+#, c-format
+msgid "Cannot create message: %s"
+msgstr "��建��件� %s"
+
# camel/providers/local/camel-maildir-folder.c:197
# camel/providers/local/camel-maildir-folder.c:209
# camel/providers/local/camel-maildir-folder.c:217
@@ -3228,7 +3314,7 @@ msgstr "ç?¡æ³?è¤?製è¨?æ?¯å?°ã??å??å?¾é?µä»¶ã??è³?æ??夾"
# camel/providers/local/camel-mh-folder.c:185
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2646
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -3240,13 +3326,12 @@ msgstr ""
# camel/providers/local/camel-maildir-folder.c:197
# camel/providers/local/camel-mbox-folder.c:319
# camel/providers/local/camel-mh-folder.c:185
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
-#: ../camel/providers/local/camel-maildir-folder.c:233
-#: ../camel/providers/local/camel-maildir-folder.c:268
-#: ../camel/providers/local/camel-maildir-folder.c:380
-#: ../camel/providers/local/camel-mbox-folder.c:329
-#: ../camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/local/camel-mh-folder.c:215
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2646
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:307
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
msgid "No such message"
msgstr "ç?¡æ¤é?µä»¶"
@@ -3257,92 +3342,39 @@ msgstr "ç?¡æ¤é?µä»¶"
# camel/providers/local/camel-mh-folder.c:185
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:158
-#: ../camel/providers/nntp/camel-nntp-folder.c:244
-#: ../camel/providers/nntp/camel-nntp-folder.c:337
-#: ../camel/providers/pop3/camel-pop3-folder.c:714
+#: ../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
#, c-format
msgid "Cannot get message %s: "
msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼?"
# camel/providers/imap/camel-imap-folder.c:1047
# camel/providers/imap/camel-imap-folder.c:1281
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2672
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2683
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2693
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2897
#, c-format
msgid "This message is not available in offline mode."
msgstr "é??å°?é?µä»¶ç?¡æ³?å?¨é?¢ç·?模å¼?ä¸?使ç?¨ã??"
-# camel/camel-movemail.c:306
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:203
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2136
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2190
-#, c-format
-msgid "Could not get message"
-msgstr "ç?¡æ³?å??å¾?é?µä»¶ã??"
-
-# camel/providers/imap/camel-imap-folder.c:191
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1070
-#: ../camel/providers/imap/camel-imap-folder.c:376
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "ç?¡æ³?è¼?å?¥ %s ç??æ??è¦?"
-
-# mail/mail-ops.c:992
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1144
-#, c-format
-msgid "Checking for deleted messages %s"
-msgstr "檢æ?¥å?ªé?¤ç??é?µä»¶ %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1670
-#: ../camel/providers/groupwise/camel-groupwise-store.c:654
-#: ../camel/providers/groupwise/camel-groupwise-store.c:779
-#: ../camel/providers/imap/camel-imap-folder.c:3814
-#: ../camel/providers/imap/camel-imap-folder.c:3892
-#: ../camel/providers/imapx/camel-imapx-server.c:3757
-#: ../camel/providers/imapx/camel-imapx-server.c:3881
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "æ£å??å¾? %s ä¸æ?°é?µä»¶ç??æ??è¦?è³?è¨?"
-
-# camel/providers/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2502
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2552
-#, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "ä¸?è?½å°?é?µä»¶å?²å?è?³è³?æ??夾ã??%sã??ï¼?%s"
-
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-maildir-folder.c:209
-# camel/providers/local/camel-maildir-folder.c:217
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
-# camel/providers/local/camel-mh-folder.c:194
-# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2538
-#, c-format
-msgid "Cannot create message: %s"
-msgstr "��建��件� %s"
-
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
#, c-format
msgid "Cannot get folder container %s"
msgstr "ä¸?è?½å??å¾?è³?æ??夾容å?¨ %s"
# camel/providers/local/camel-mh-folder.c:149
# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
#, c-format
msgid "Cannot append message in offline mode: cache unavailable"
msgstr "ä¸?è?½å?¨é?¢ç·?模å¼?ä¸å? å?¥é?µä»¶ï¼?ç?¡æ³?使ç?¨å¿«å??"
# camel/providers/local/camel-mbox-folder.c:259
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
msgid "Cannot append message in offline mode: "
msgstr "ä¸?è?½å?¨é?¢ç·?模å¼?ä¸å? å?¥é?µä»¶ï¼?"
@@ -3416,7 +3448,7 @@ msgstr "ç?¨æ?¼å?å?? Novell Groupwise 伺æ??å?¨"
#: ../camel/providers/imap/camel-imap-provider.c:97
#: ../camel/providers/imapx/camel-imapx-provider.c:104
#: ../camel/providers/nntp/camel-nntp-provider.c:72
-#: ../camel/providers/pop3/camel-pop3-provider.c:70
+#: ../camel/providers/pop3/camel-pop3-provider.c:73
msgid "Password"
msgstr "�碼"
@@ -3434,87 +3466,87 @@ msgstr "網å??ä¸ç??使ç?¨è??æ??主æ©?ç?¡æ³?使ç?¨"
# camel/providers/imap/camel-imap-store.c:505
# camel/providers/smtp/camel-smtp-transport.c:410
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1188
-#: ../camel/providers/imapx/camel-imapx-server.c:3008
+#: ../camel/providers/groupwise/camel-groupwise-store.c:209
+#: ../camel/providers/imap/camel-imap-store.c:801
+#: ../camel/providers/imapx/camel-imapx-server.c:3100
#, c-format
msgid "You did not enter a password."
msgstr "ä½ æ²?æ??輸å?¥å¯?碼ã??"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:328
+#: ../camel/providers/groupwise/camel-groupwise-store.c:332
msgid "Some features may not work correctly with your current server version"
msgstr "æ??äº?å??è?½å?¯è?½ç?¡æ³?å?¨ä½ ç?®å??ç??伺æ??å?¨ç??æ?¬ä¸?æ£å¸¸é??ä½?"
# camel/providers/imap/camel-imap-store.c:803
# mail/mail-local.c:334
-#: ../camel/providers/groupwise/camel-groupwise-store.c:550
-#: ../camel/providers/imap/camel-imap-store.c:1757
-#: ../camel/providers/imap/camel-imap-store.c:1952
-#: ../camel/providers/imapx/camel-imapx-store.c:421
+#: ../camel/providers/groupwise/camel-groupwise-store.c:563
+#: ../camel/providers/imap/camel-imap-store.c:1808
+#: ../camel/providers/imap/camel-imap-store.c:2005
+#: ../camel/providers/imapx/camel-imapx-store.c:342
#, c-format
msgid "No such folder %s"
msgstr "æ²?æ??é??å??è³?æ??夾 %s"
# camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1224
#, c-format
msgid "Cannot create GroupWise folders in offline mode."
msgstr "å?¨é?¢ç·?模å¼?ä¸ä¸?è?½å»ºç«? GroupWise è³?æ??夾ã??"
# camel/providers/local/camel-mbox-store.c:138
# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1196
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1233
#, c-format
msgid "Cannot create a special system folder"
msgstr "ä¸?è?½å»ºç«?ç?¹æ®?ç??系統è³?æ??夾"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
-#: ../camel/providers/imap/camel-imap-store.c:1835
-#: ../camel/providers/imap/camel-imap-store.c:2257
-#: ../camel/providers/imapx/camel-imapx-store.c:884
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1243
+#: ../camel/providers/imap/camel-imap-store.c:1886
+#: ../camel/providers/imap/camel-imap-store.c:2323
+#: ../camel/providers/imapx/camel-imapx-store.c:1341
#, c-format
msgid "The parent folder is not allowed to contain subfolders"
msgstr "æ¯?è³?æ??夾並ä¸?å??許å??å?«å?è³?æ??夾"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1328
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1353
#, c-format
msgid "Cannot rename GroupWise folder '%s' to '%s'"
msgstr "ä¸?è?½å°? GroupWise è³?æ??夾ã??%sã??é??æ?°å?½å??ç?ºã??%sã??"
# shell/e-shortcuts-view.c:137
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1387
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
#, c-format
msgid "GroupWise server %s"
msgstr "GroupWise 伺æ??å?¨ %s"
# camel/camel-remote-store.c:195
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1389
#, c-format
msgid "GroupWise service for %s on %s"
msgstr "%s ç?? GroupWise æ??å??æ?¼ %s"
# camel/providers/smtp/camel-smtp-transport.c:536
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
#, c-format
msgid "GroupWise mail delivery via %s"
msgstr "ç¶?ç?± %s å?³é?? GroupWise é?µä»¶"
# mail/mail-ops.c:603
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
msgid "Sending Message"
msgstr "æ£å?¨å?³é??é?µä»¶"
# camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
#, c-format
msgid "Cannot get folder: Invalid operation on this store"
msgstr "ä¸?è?½å??å¾?è³?æ??夾ï¼?å?¨æ¤å?²å?空é??ä¸?ç?¡æ??ç??æ??ä½?"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
#, c-format
msgid ""
"You have exceeded this account's storage limit. Your messages are queued in "
@@ -3523,19 +3555,19 @@ msgid ""
msgstr "ä½ å·²ç¶?è¶?é??é??å??帳è??ç??å?²å?é??å?¶ã??ä½ ç??é?µä»¶æ??å??å?å?¨å¯?件å?£ä¸ã??è«?å??å?ªé?¤/å°?å?ä½ ç??é?µä»¶å¾?å??æ?? å?³é??/æ?¥æ?¶ é??æ?°å¯?é??ã??\n"
# camel/providers/sendmail/camel-sendmail-transport.c:150
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
#, c-format
msgid "Could not send message: %s"
msgstr "é?µä»¶ç?¡æ³?å?³é??ï¼? %s"
-#: ../camel/providers/imap/camel-imap-command.c:190
-#: ../camel/providers/imap/camel-imap-command.c:288
+#: ../camel/providers/imap/camel-imap-command.c:197
+#: ../camel/providers/imap/camel-imap-command.c:301
#, c-format
msgid "No output stream"
msgstr "æ²?æ??輸å?ºä¸²æµ?"
-#: ../camel/providers/imap/camel-imap-command.c:198
-#: ../camel/providers/imap/camel-imap-command.c:296
+#: ../camel/providers/imap/camel-imap-command.c:205
+#: ../camel/providers/imap/camel-imap-command.c:309
#, c-format
msgid "No input stream"
msgstr "æ²?æ??輸å?¥ä¸²æµ?"
@@ -3544,13 +3576,13 @@ msgstr "æ²?æ??輸å?¥ä¸²æµ?"
# camel/camel-remote-store.c:399
# camel/camel-remote-store.c:470
# camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/imap/camel-imap-command.c:245
+#: ../camel/providers/imap/camel-imap-command.c:255
#, c-format
msgid "Operation cancelled"
msgstr "æ??ä½?ç¨?åº?å·²å??æ¶?"
# camel/camel-remote-store.c:476
-#: ../camel/providers/imap/camel-imap-command.c:353
+#: ../camel/providers/imap/camel-imap-command.c:373
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "伺æ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼? %s"
@@ -3558,7 +3590,7 @@ msgstr "伺æ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼? %s"
# camel/providers/imap/camel-imap-command.c:232
#. for imap ALERT codes, account user host
#. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:373
+#: ../camel/providers/imap/camel-imap-command.c:394
#, c-format
msgid ""
"Alert from IMAP server %s %s:\n"
@@ -3568,55 +3600,55 @@ msgstr ""
"%s"
# camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/imap/camel-imap-command.c:444
+#: ../camel/providers/imap/camel-imap-command.c:468
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "å¾? IMAP 伺æ??å?¨å?³å??ä¸?ç?¶ç??å??æ??ï¼? %s"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/imap/camel-imap-command.c:456
+#: ../camel/providers/imap/camel-imap-command.c:480
#, c-format
msgid "IMAP command failed: %s"
msgstr "IMAP æ??令失æ??ï¼? %s"
# camel/providers/imap/camel-imap-command.c:295
-#: ../camel/providers/imap/camel-imap-command.c:532
+#: ../camel/providers/imap/camel-imap-command.c:560
#, c-format
msgid "Server response ended too soon."
msgstr "伺æ??å?¨å¤ªæ?©å?³å??çµ?æ??ç??å??æ??ã??"
# camel/providers/imap/camel-imap-command.c:487
-#: ../camel/providers/imap/camel-imap-command.c:740
+#: ../camel/providers/imap/camel-imap-command.c:771
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "IMAP 伺æ??å?¨ç??å??æ??æ²?æ??å??å?« %s è³?è¨?"
# camel/providers/imap/camel-imap-command.c:524
-#: ../camel/providers/imap/camel-imap-command.c:778
+#: ../camel/providers/imap/camel-imap-command.c:809
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr "å¾? IMAP 伺æ??å?¨å?³å??ä¸?ç?¶ç?? OK å??æ??ï¼? %s"
# camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap/camel-imap-folder.c:281
+#: ../camel/providers/imap/camel-imap-folder.c:291
msgid "Always check for new mail in this folder"
msgstr "æ°¸é? 檢æ?¥é??å??è³?æ??夾ä¸æ?¯å?¦æ??æ?°é?µä»¶"
# camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/imap/camel-imap-folder.c:353
+#: ../camel/providers/imap/camel-imap-folder.c:367
#, c-format
msgid "Could not create directory %s: %s"
msgstr "ç?¡æ³?建ç«?ç?®é?? %sï¼?%s"
# mail/mail-ops.c:1649
-#: ../camel/providers/imap/camel-imap-folder.c:960
-#: ../camel/providers/imapx/camel-imapx-server.c:3797
+#: ../camel/providers/imap/camel-imap-folder.c:990
+#: ../camel/providers/imapx/camel-imapx-server.c:3933
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "æ??æ?? %s ä¸æ?´æ?¹é??ç??é?µä»¶"
# camel/providers/pop3/camel-pop3-folder.c:320
-#: ../camel/providers/imap/camel-imap-folder.c:3231
+#: ../camel/providers/imap/camel-imap-folder.c:3326
msgid "Unable to retrieve message: "
msgstr "ç?¡æ³?å??å??é?µä»¶ï¼?"
@@ -3627,8 +3659,8 @@ msgstr "ç?¡æ³?å??å??é?µä»¶ï¼?"
# camel/providers/local/camel-mh-folder.c:185
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/imap/camel-imap-folder.c:3266
-#: ../camel/providers/imapx/camel-imapx-server.c:4975
+#: ../camel/providers/imap/camel-imap-folder.c:3361
+#: ../camel/providers/imapx/camel-imapx-server.c:5217
#, c-format
msgid "Cannot get message with message ID %s: %s"
msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
@@ -3636,33 +3668,33 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
# camel/providers/local/camel-maildir-folder.c:197
# camel/providers/local/camel-mbox-folder.c:319
# camel/providers/local/camel-mh-folder.c:185
-#: ../camel/providers/imap/camel-imap-folder.c:3267
-#: ../camel/providers/imapx/camel-imapx-server.c:4976
+#: ../camel/providers/imap/camel-imap-folder.c:3362
+#: ../camel/providers/imapx/camel-imapx-server.c:5218
msgid "No such message available."
msgstr "æ²?æ??é??å??é?µä»¶ã??"
# camel/providers/imap/camel-imap-folder.c:1047
# camel/providers/imap/camel-imap-folder.c:1281
-#: ../camel/providers/imap/camel-imap-folder.c:3341
-#: ../camel/providers/imap/camel-imap-folder.c:4211
-#: ../camel/providers/nntp/camel-nntp-folder.c:326
+#: ../camel/providers/imap/camel-imap-folder.c:3437
+#: ../camel/providers/imap/camel-imap-folder.c:4332
+#: ../camel/providers/nntp/camel-nntp-folder.c:407
#, c-format
msgid "This message is not currently available"
msgstr "é??å°?é?µä»¶ç?®å??ä»?æ?ªå?¯ç?¨"
-#: ../camel/providers/imap/camel-imap-folder.c:4021
+#: ../camel/providers/imap/camel-imap-folder.c:4133
#, c-format
msgid "Incomplete server response: no information provided for message %d"
msgstr "ä¸?å®?æ?´ç??伺æ??å?¨å??æ??ï¼?æ?ªæ??ä¾?ä»»ä½?è³?è¨?給è¨?æ?¯ %d"
-#: ../camel/providers/imap/camel-imap-folder.c:4031
+#: ../camel/providers/imap/camel-imap-folder.c:4143
#, c-format
msgid "Incomplete server response: no UID provided for message %d"
msgstr "ä¸?å®?æ?´ç??伺æ??å?¨å??æ??ï¼?æ?ªæ??ä¾? UID 給è¨?æ?¯ %d"
# camel/providers/imap/camel-imap-folder.c:1075
# camel/providers/imap/camel-imap-folder.c:1314
-#: ../camel/providers/imap/camel-imap-folder.c:4251
+#: ../camel/providers/imap/camel-imap-folder.c:4372
#, c-format
msgid "Could not find message body in FETCH response."
msgstr "å?¨ FETCH ç??å??æ??å?§æ?¾ä¸?å?°é?µä»¶ç??å?§æ??ã??"
@@ -3682,14 +3714,14 @@ msgstr "å¿«å??é?µä»¶ %s 失æ??ï¼? %s"
# camel/camel-filter-driver.c:670
# camel/camel-filter-driver.c:679
-#: ../camel/providers/imap/camel-imap-message-cache.c:388
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
#, c-format
msgid "Failed to cache message %s: "
msgstr "å¿«å??é?µä»¶ %s 失æ??ï¼?"
# camel/camel-filter-driver.c:670
# camel/camel-filter-driver.c:679
-#: ../camel/providers/imap/camel-imap-message-cache.c:525
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
#, c-format
msgid "Failed to cache %s: "
msgstr "å¿«å?? %s 失æ??ï¼?"
@@ -3785,124 +3817,95 @@ msgstr "ç?¨ä½?è®?å??å??å?²å?é?µä»¶æ?¼ IMAP 伺æ??å?¨ã??"
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr "é??å??é?¸é ?å°?æ??使ç?¨ç°¡æ??ç??å¯?碼é?£ç·?è?³ IMAP 伺æ??å?¨ã??"
-# camel/providers/smtp/camel-smtp-transport.c:534
-#: ../camel/providers/imap/camel-imap-store.c:310
-#: ../camel/providers/imapx/camel-imapx-store.c:228
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP 伺æ??å?¨ %s"
-
-# camel/camel-remote-store.c:195
-#: ../camel/providers/imap/camel-imap-store.c:312
-#: ../camel/providers/imapx/camel-imapx-store.c:230
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s ç?? IMAP æ??å??æ?¼ %s"
-
# camel/camel-remote-store.c:255
# camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:447
-#: ../camel/providers/nntp/camel-nntp-store.c:234
-#: ../camel/providers/pop3/camel-pop3-store.c:132
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/imap/camel-imap-store.c:243
+#: ../camel/providers/nntp/camel-nntp-store.c:313
+#: ../camel/providers/pop3/camel-pop3-store.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
#, c-format
msgid "Could not connect to %s: %s"
msgstr "����� %s�%s"
-#: ../camel/providers/imap/camel-imap-store.c:448
-#: ../camel/providers/nntp/camel-nntp-store.c:235
-#: ../camel/providers/pop3/camel-pop3-store.c:133
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/imap/camel-imap-store.c:244
+#: ../camel/providers/nntp/camel-nntp-store.c:314
+#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
msgid "SSL unavailable"
msgstr "SSL ��使�"
# camel/camel-remote-store.c:255
# camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:466
-#: ../camel/providers/nntp/camel-nntp-store.c:252
+#: ../camel/providers/imap/camel-imap-store.c:264
+#: ../camel/providers/nntp/camel-nntp-store.c:333
#, c-format
msgid "Could not connect to %s: "
msgstr "����� %s�"
# camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/imap/camel-imap-store.c:572
-#: ../camel/providers/imap/camel-imap-store.c:592
-#: ../camel/providers/imap/camel-imap-store.c:599
-#: ../camel/providers/imap/camel-imap-store.c:626
-#: ../camel/providers/imapx/camel-imapx-server.c:2860
-#: ../camel/providers/imapx/camel-imapx-server.c:2896
+#: ../camel/providers/imap/camel-imap-store.c:370
+#: ../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
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "以å®?å?¨æ¨¡å¼?é?£ç·?å?° IMAP 伺æ??å?¨ %s æ??失æ??äº?ï¼? %s"
# shell/e-storage.c:477
-#: ../camel/providers/imap/camel-imap-store.c:573
-#: ../camel/providers/imapx/camel-imapx-server.c:2861
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#: ../camel/providers/imap/camel-imap-store.c:371
+#: ../camel/providers/imapx/camel-imapx-server.c:2943
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
msgid "STARTTLS not supported"
msgstr "��� STARTTLS"
# camel/camel-sasl-anonymous.c:110
# camel/camel-sasl-plain.c:87
-#: ../camel/providers/imap/camel-imap-store.c:593
-#: ../camel/providers/imapx/camel-imapx-server.c:2897
+#: ../camel/providers/imap/camel-imap-store.c:391
+#: ../camel/providers/imapx/camel-imapx-server.c:2983
msgid "SSL negotiations failed"
msgstr "SSL å??å??失æ??"
-#: ../camel/providers/imap/camel-imap-store.c:600
-#: ../camel/providers/smtp/camel-smtp-transport.c:339
+#: ../camel/providers/imap/camel-imap-store.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
msgid "SSL is not available in this build"
msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ SSL"
# camel/camel-remote-store.c:252
-#: ../camel/providers/imap/camel-imap-store.c:748
-#: ../camel/providers/imapx/camel-imapx-server.c:2696
+#: ../camel/providers/imap/camel-imap-store.c:549
+#: ../camel/providers/imapx/camel-imapx-server.c:2770
#, c-format
msgid "Connection cancelled"
msgstr "é?£ç·?å·²å??æ¶?"
# camel/camel-remote-store.c:255
# camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:753
-#: ../camel/providers/imapx/camel-imapx-server.c:2701
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imapx/camel-imapx-server.c:2775
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "ç?¡æ³?以æ??令ã??%sã??é?£ç·?ï¼? %s"
-# mail/local-config.glade.h:8
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:926
-#: ../camel/providers/imap/camel-imap-store.c:2350
-#: ../camel/providers/imapx/camel-imapx-store.c:468
-#: ../camel/providers/imapx/camel-imapx-store.c:1065
-#: ../camel/providers/local/camel-maildir-folder.c:90
-#: ../camel/providers/local/camel-maildir-store.c:225
-#: ../camel/providers/local/camel-maildir-store.c:315
-#: ../camel/providers/local/camel-maildir-store.c:562
-#: ../camel/providers/local/camel-maildir-store.c:575
-#: ../camel/providers/local/camel-spool-store.c:508
-msgid "Inbox"
-msgstr "�件�"
-
# camel/providers/imap/camel-imap-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1129
-#: ../camel/providers/imapx/camel-imapx-server.c:2964
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imapx/camel-imapx-server.c:3056
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP 伺æ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?é¡?å?? %s"
# camel/providers/imap/camel-imap-store.c:466
# camel/providers/smtp/camel-smtp-transport.c:366
-#: ../camel/providers/imap/camel-imap-store.c:1141
-#: ../camel/providers/imapx/camel-imapx-server.c:2976
-#: ../camel/providers/smtp/camel-smtp-transport.c:462
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:3068
+#: ../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:531
-#: ../camel/providers/imap/camel-imap-store.c:1220
-#: ../camel/providers/imapx/camel-imapx-server.c:3046
+#: ../camel/providers/imap/camel-imap-store.c:836
+#: ../camel/providers/imapx/camel-imapx-server.c:3144
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3913,9 +3916,38 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/imap/camel-imap-store.c:1771
-#: ../camel/providers/imap/camel-imap-store.c:2193
-#: ../camel/providers/imapx/camel-imapx-store.c:863
+# camel/providers/smtp/camel-smtp-transport.c:534
+#: ../camel/providers/imap/camel-imap-store.c:997
+#: ../camel/providers/imapx/camel-imapx-store.c:183
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP 伺æ??å?¨ %s"
+
+# camel/camel-remote-store.c:195
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:185
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s ç?? IMAP æ??å??æ?¼ %s"
+
+# mail/local-config.glade.h:8
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:1367
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imapx/camel-imapx-store.c:372
+#: ../camel/providers/imapx/camel-imapx-store.c:794
+#: ../camel/providers/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-spool-store.c:289
+msgid "Inbox"
+msgstr "�件�"
+
+#: ../camel/providers/imap/camel-imap-store.c:1822
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imapx/camel-imapx-store.c:1320
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -3923,29 +3955,29 @@ msgstr "è³?æ??夾å??稱ã??%sã??ç?¡æ??ï¼?å? ç?ºå®?å??æ?¬å?符ã??%cã??"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap/camel-imap-store.c:1887
-#: ../camel/providers/local/camel-maildir-store.c:189
-#: ../camel/providers/local/camel-mbox-store.c:193
-#: ../camel/providers/local/camel-mh-store.c:255
+#: ../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-mh-store.c:504
#, c-format
msgid "Cannot create folder '%s': folder exists."
msgstr "ä¸?è?½å»ºç«?è³?æ??夾ã??%sã??ï¼?è³?æ??夾已å?å?¨ã??"
# camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/providers/imap/camel-imap-store.c:2206
-#: ../camel/providers/imapx/camel-imapx-store.c:874
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imapx/camel-imapx-store.c:1331
#, c-format
msgid "Unknown parent folder: %s"
msgstr "ä¸?æ??ç??æ¯?è³?æ??夾ï¼? %s"
# camel/camel-remote-store.c:476
-#: ../camel/providers/imap/camel-imap-store.c:3062
+#: ../camel/providers/imap/camel-imap-store.c:3137
#, c-format
msgid "Server unexpectedly disconnected"
msgstr "伺æ??å?¨çª?ç?¶ä¸æ?·é?£ç·?"
# camel/camel-remote-store.c:476
-#: ../camel/providers/imap/camel-imap-store.c:3065
+#: ../camel/providers/imap/camel-imap-store.c:3140
msgid "Server unexpectedly disconnected: "
msgstr "伺æ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼?"
@@ -3989,19 +4021,19 @@ msgid "IMAP+"
msgstr "IMAP"
# camel/camel-movemail.c:256
-#: ../camel/providers/imapx/camel-imapx-server.c:1386
+#: ../camel/providers/imapx/camel-imapx-server.c:1410
msgid "Error writing to cache stream: "
msgstr "寫å?¥å¿«å??串æµ?æ??ç?¼ç??é?¯èª¤ï¼?"
# camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/imapx/camel-imapx-server.c:2044
+#: ../camel/providers/imapx/camel-imapx-server.c:2092
#, c-format
msgid "Not authenticated"
msgstr "å°?æ?ªé©?è?"
# camel/camel-remote-store.c:255
# camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imapx/camel-imapx-server.c:2787
+#: ../camel/providers/imapx/camel-imapx-server.c:2865
#, c-format
msgid "Could not connect to %s (port %s): "
msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼?"
@@ -4010,7 +4042,7 @@ msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼?"
# camel/camel-remote-store.c:399
# camel/camel-remote-store.c:470
# camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/imapx/camel-imapx-server.c:3218
+#: ../camel/providers/imapx/camel-imapx-server.c:3329
msgid "Closing tmp stream failed: "
msgstr "ç?¡æ³?é??é?? tmp 串æµ?ï¼?"
@@ -4021,7 +4053,7 @@ msgstr "ç?¡æ³?é??é?? tmp 串æµ?ï¼?"
# camel/providers/local/camel-mh-folder.c:185
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/imapx/camel-imapx-server.c:5100
+#: ../camel/providers/imapx/camel-imapx-server.c:5365
#, c-format
msgid "Cannot create spool file: %s"
msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?%s"
@@ -4033,55 +4065,55 @@ msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?%s"
# camel/providers/local/camel-mh-folder.c:185
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/imapx/camel-imapx-server.c:5116
+#: ../camel/providers/imapx/camel-imapx-server.c:5381
msgid "Cannot create spool file: "
msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?"
# camel/providers/imap/camel-imap-store.c:803
# mail/mail-local.c:334
-#: ../camel/providers/imapx/camel-imapx-store.c:437
-#: ../camel/providers/nntp/camel-nntp-store.c:1510
+#: ../camel/providers/imapx/camel-imapx-store.c:1136
+#: ../camel/providers/nntp/camel-nntp-store.c:1610
#, c-format
msgid "No such folder: %s"
msgstr "æ²?æ??é??å??è³?æ??夾ï¼? %s"
-#: ../camel/providers/imapx/camel-imapx-stream.c:68
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
#, c-format
msgid "Source stream returned no data"
msgstr "ä¾?æº?串æµ?å?³å??ç?¡è³?æ??"
-#: ../camel/providers/imapx/camel-imapx-stream.c:77
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
#, c-format
msgid "Source stream unavailable"
msgstr "��串���使�"
-#: ../camel/providers/local/camel-local-folder.c:199
+#: ../camel/providers/local/camel-local-folder.c:182
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
# camel/providers/local/camel-mbox-folder.c:203
-#: ../camel/providers/local/camel-local-folder.c:209
-#: ../camel/providers/local/camel-local-folder.c:218
+#: ../camel/providers/local/camel-local-folder.c:192
+#: ../camel/providers/local/camel-local-folder.c:201
#, c-format
msgid "mailbox: %s (%s)"
msgstr "信箱�%s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:227
+#: ../camel/providers/local/camel-local-folder.c:210
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
# addressbook/gui/widgets/e-addressbook-view.c:613
-#: ../camel/providers/local/camel-local-folder.c:272
+#: ../camel/providers/local/camel-local-folder.c:469
msgid "Index message body data"
msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº"
# camel/providers/local/camel-mbox-folder.c:335
# camel/providers/local/camel-mbox-folder.c:367
# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/local/camel-local-folder.c:686
+#: ../camel/providers/local/camel-local-folder.c:685
#, c-format
msgid ""
"Cannot get message %s from folder %s\n"
@@ -4154,69 +4186,71 @@ msgid "Standard Unix mbox spool directory"
msgstr "æ¨?æº? Unix mbox æ??ç¨?å?¨ç?®é??"
# camel/providers/local/camel-local-store.c:127
-#: ../camel/providers/local/camel-local-store.c:149
-#: ../camel/providers/local/camel-local-store.c:284
-#: ../camel/providers/local/camel-mbox-store.c:371
-#: ../camel/providers/local/camel-spool-store.c:109
+#: ../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-spool-store.c:318
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "å?²å?æ ¹ç?®é?? %s ä¸?æ?¯çµ?å°?è·¯å¾?"
# camel/providers/local/camel-local-store.c:134
-#: ../camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-local-store.c:183
#, c-format
msgid "Store root %s is not a regular directory"
msgstr "å?²å?æ ¹ç?®é?? %s ä¸?æ?¯å??æ³?ç??ç?®é??"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-local-store.c:169
-#: ../camel/providers/local/camel-local-store.c:179
-#: ../camel/providers/local/camel-local-store.c:297
+#: ../camel/providers/local/camel-local-store.c:194
+#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:332
+#: ../camel/providers/local/camel-maildir-store.c:124
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "ä¸?è?½å??å¾?è³?æ??夾ï¼?%sï¼?%s"
# camel/providers/local/camel-local-store.c:173
-#: ../camel/providers/local/camel-local-store.c:193
+#: ../camel/providers/local/camel-local-store.c:220
#, c-format
msgid "Local stores do not have an inbox"
msgstr "æ?¬å?°ç«¯ç??å?å?²æ²?æ??æ?¶ä»¶å?£"
# camel/providers/local/camel-local-store.c:183
-#: ../camel/providers/local/camel-local-store.c:250
+#: ../camel/providers/local/camel-local-store.c:281
#, c-format
msgid "Local mail file %s"
msgstr "��端�件�� %s"
# camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/local/camel-local-store.c:358
+#: ../camel/providers/local/camel-local-store.c:393
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "ç?¡æ³?å°?è³?æ??夾 %s é??æ?°å?½å??ç?º %sï¼? %s"
# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-local-store.c:431
+#: ../camel/providers/local/camel-local-store.c:467
#, c-format
msgid "Could not rename '%s': %s"
msgstr "ç?¡æ³?é??æ?°å?½å??ã??%sã??ï¼?%s "
# camel/providers/local/camel-local-store.c:289
-#: ../camel/providers/local/camel-local-store.c:461
-#: ../camel/providers/local/camel-mbox-store.c:304
+#: ../camel/providers/local/camel-local-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:701
#, c-format
msgid "Could not delete folder index file '%s': %s"
msgstr "ä¸?è?½å?ªé?¤è³?æ??夾索å¼?æª?æ¡?ã??%sã??ï¼? %s"
# camel/providers/local/camel-local-store.c:279
-#: ../camel/providers/local/camel-local-store.c:489
-#: ../camel/providers/local/camel-mbox-store.c:333
+#: ../camel/providers/local/camel-local-store.c:526
+#: ../camel/providers/local/camel-mbox-store.c:730
#, c-format
msgid "Could not delete folder meta file '%s': %s"
msgstr "ä¸?è?½å?ªé?¤è³?æ??夾ä¸ç¹¼æª?æ¡?ã??%sã??ï¼?%s"
# camel/providers/local/camel-local-summary.c:404
-#: ../camel/providers/local/camel-local-summary.c:537
+#: ../camel/providers/local/camel-local-summary.c:548
#, c-format
msgid "Unable to add message to summary: unknown reason"
msgstr "ç?¡æ³?æ?°å¢?é?µä»¶å?°æ??è¦?è³?è¨?ï¼?ä¸?æ??ç??å??å? "
@@ -4224,7 +4258,7 @@ msgstr "ç?¡æ³?æ?°å¢?é?µä»¶å?°æ??è¦?è³?è¨?ï¼?ä¸?æ??ç??å??å? "
# camel/providers/local/camel-maildir-folder.c:150
# camel/providers/local/camel-maildir-folder.c:158
# camel/providers/local/camel-maildir-folder.c:169
-#: ../camel/providers/local/camel-maildir-folder.c:195
+#: ../camel/providers/local/camel-maildir-folder.c:198
#, c-format
msgid "Cannot append message to maildir folder: %s: "
msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° maildir è³?æ??夾ï¼? %sï¼?"
@@ -4232,36 +4266,49 @@ msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° maildir è³?æ??夾ï¼? %sï¼?"
# camel/providers/local/camel-mbox-folder.c:335
# camel/providers/local/camel-mbox-folder.c:367
# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/local/camel-maildir-folder.c:283
-#: ../camel/providers/local/camel-maildir-folder.c:291
-#: ../camel/providers/local/camel-mbox-folder.c:440
-#: ../camel/providers/local/camel-mh-folder.c:227
-#: ../camel/providers/local/camel-mh-folder.c:235
+#: ../camel/providers/local/camel-maildir-folder.c:246
+#: ../camel/providers/local/camel-maildir-folder.c:256
+#: ../camel/providers/local/camel-mbox-folder.c:386
+#: ../camel/providers/local/camel-mh-folder.c:168
+#: ../camel/providers/local/camel-mh-folder.c:178
#, c-format
msgid "Cannot get message %s from folder %s: "
msgstr "ä¸?è?½å¾?è³?æ??夾 %2$s å??å¾?é?µä»¶ %1$sï¼?"
# camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/local/camel-maildir-folder.c:399
+#: ../camel/providers/local/camel-maildir-folder.c:326
#, c-format
msgid "Cannot transfer message to destination folder: %s"
msgstr "ä¸?è?½å°?é?µä»¶å?³è¼¸å?°ç?®ç??端è³?æ??夾ï¼?%s"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-maildir-store.c:136
-#: ../camel/providers/local/camel-maildir-store.c:167
-#: ../camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:175
+#: ../camel/providers/local/camel-maildir-store.c:100
+#, c-format
+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
+#, c-format
+msgid "Folder %s already exists"
+msgstr "è³?æ??夾 %s å·²å?å?¨"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../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
#, c-format
msgid "Cannot create folder '%s': %s"
msgstr "ä¸?è?½å»ºç«?è³?æ??夾ã??%sã??ï¼?%s"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-maildir-store.c:151
-#: ../camel/providers/local/camel-mbox-store.c:127
-#: ../camel/providers/local/camel-mh-store.c:215
+#: ../camel/providers/local/camel-maildir-store.c:206
+#: ../camel/providers/local/camel-mbox-store.c:347
+#: ../camel/providers/local/camel-mh-store.c:464
#, c-format
msgid "Cannot get folder '%s': %s"
msgstr "ä¸?è?½å»ºç«?è³?æ??夾ã??%sã??ï¼?%s"
@@ -4269,15 +4316,15 @@ msgstr "ä¸?è?½å»ºç«?è³?æ??夾ã??%sã??ï¼?%s"
# camel/providers/local/camel-maildir-store.c:100
# camel/providers/local/camel-mbox-store.c:101
# camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-maildir-store.c:157
-#: ../camel/providers/local/camel-mbox-store.c:137
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:212
+#: ../camel/providers/local/camel-mbox-store.c:357
+#: ../camel/providers/local/camel-mh-store.c:473
#, c-format
msgid "Cannot get folder '%s': folder does not exist."
msgstr "ä¸?è?½å??å¾?è³?æ??夾ã??%sã??ï¼?è³?æ??夾ä¸?å?å?¨ã??"
# camel/providers/local/camel-maildir-store.c:122
-#: ../camel/providers/local/camel-maildir-store.c:184
+#: ../camel/providers/local/camel-maildir-store.c:239
#, c-format
msgid "Cannot get folder '%s': not a maildir directory."
msgstr "ä¸?è?½å??å¾?è³?æ??夾ã??%sã??ï¼?ä¸?æ?¯ maildir ç?®é??ã??"
@@ -4285,99 +4332,124 @@ msgstr "ä¸?è?½å??å¾?è³?æ??夾ã??%sã??ï¼?ä¸?æ?¯ maildir ç?®é??ã??"
# camel/providers/local/camel-maildir-store.c:151
# camel/providers/local/camel-maildir-store.c:188
# camel/providers/local/camel-mh-store.c:127
-#: ../camel/providers/local/camel-maildir-store.c:242
-#: ../camel/providers/local/camel-maildir-store.c:282
-#: ../camel/providers/local/camel-mh-store.c:287
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:584
#, c-format
msgid "Could not delete folder '%s': %s"
msgstr "ç?¡æ³?å?ªé?¤è³?æ??夾ã??%sã??ï¼?%s"
# camel/providers/local/camel-maildir-store.c:152
-#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-maildir-store.c:295
msgid "not a maildir directory"
msgstr "ä¸?æ?¯ä¸?å?? maildir ç?®é??"
# camel/providers/local/camel-maildir-store.c:107
# camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-maildir-store.c:482
-#: ../camel/providers/local/camel-spool-store.c:364
-#: ../camel/providers/local/camel-spool-store.c:380
+#: ../camel/providers/local/camel-maildir-store.c:508
+#: ../camel/providers/local/camel-maildir-store.c:819
+#: ../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-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-maildir-store.c:671
+#, c-format
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??夾ï¼?%sï¼?è³?æ??夾å??稱ä¸?è?½å??å?«ã??.ã??"
+
# camel/providers/local/camel-maildir-summary.c:405
# camel/providers/local/camel-maildir-summary.c:526
#: ../camel/providers/local/camel-maildir-summary.c:435
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:565
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "ä¸?è?½é??å?? maildir ç?®é??è·¯å¾?ï¼?%sï¼? %s"
# camel/providers/imap/camel-imap-provider.c:43
# mail/mail-config.glade.h:13
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:556
msgid "Checking folder consistency"
msgstr "檢æ?¥è³?æ??夾ç??ä¸?è?´æ?§"
# mail/mail-ops.c:992
-#: ../camel/providers/local/camel-maildir-summary.c:641
+#: ../camel/providers/local/camel-maildir-summary.c:649
msgid "Checking for new messages"
msgstr "檢���件"
# camel/camel-filter-driver.c:690
# camel/camel-filter-driver.c:788
-#: ../camel/providers/local/camel-maildir-summary.c:732
-#: ../camel/providers/local/camel-mbox-summary.c:465
-#: ../camel/providers/local/camel-mbox-summary.c:679
-#: ../camel/providers/local/camel-mbox-summary.c:809
-#: ../camel/providers/local/camel-spool-summary.c:130
+#: ../camel/providers/local/camel-maildir-summary.c:742
+#: ../camel/providers/local/camel-mbox-summary.c:468
+#: ../camel/providers/local/camel-mbox-summary.c:690
+#: ../camel/providers/local/camel-mbox-summary.c:826
+#: ../camel/providers/local/camel-spool-summary.c:131
msgid "Storing folder"
msgstr "å?²å?è³?æ??夾"
-# camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/local/camel-mbox-folder.c:124
-#: ../camel/providers/local/camel-spool-folder.c:125
-#, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "ä¸?è?½å»ºç«?è³?æ??夾é??å®? %s ï¼? %s"
-
# camel/providers/local/camel-mbox-folder.c:203
-#: ../camel/providers/local/camel-mbox-folder.c:194
+#: ../camel/providers/local/camel-mbox-folder.c:183
#, c-format
msgid "Cannot open mailbox: %s: "
msgstr "ä¸?è?½é??å?? mailboxï¼?%s"
# camel/providers/local/camel-mbox-folder.c:259
-#: ../camel/providers/local/camel-mbox-folder.c:260
+#: ../camel/providers/local/camel-mbox-folder.c:249
#, c-format
msgid "Cannot append message to mbox file: %s: "
msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° mbox æª?æ¡?ï¼?%s"
# camel/providers/local/camel-mbox-folder.c:368
-#: ../camel/providers/local/camel-mbox-folder.c:433
+#: ../camel/providers/local/camel-mbox-folder.c:378
msgid "The folder appears to be irrecoverably corrupted."
msgstr "è³?æ??夾好å??å·²ç¶?æ??æ¯?並ä¸?ä¸?è?½å¾©å??ã??"
# camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/local/camel-mbox-store.c:149
-#: ../camel/providers/local/camel-mbox-store.c:379
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../camel/providers/local/camel-spool-folder.c:70
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "ä¸?è?½å»ºç«?è³?æ??夾é??å®? %s ï¼? %s"
+
+# camel/providers/local/camel-mbox-folder.c:152
+#: ../camel/providers/local/camel-mbox-store.c:369
+#: ../camel/providers/local/camel-mbox-store.c:540
#, c-format
msgid "Cannot create a folder by this name."
msgstr "ç?¡æ³?建ç«?以æ¤ç?ºå??ç??è³?æ??夾"
# camel/providers/local/camel-mbox-store.c:119
# camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:186
+#: ../camel/providers/local/camel-mbox-store.c:406
#, c-format
msgid "Cannot get folder '%s': not a regular file."
msgstr "ä¸?è?½å??å¾?è³?æ??夾ã??%sã??ï¼?ä¸?æ?¯ä¸?è?¬æª?æ¡?ã??"
+# camel/providers/imap/camel-imap-folder.c:172
+#: ../camel/providers/local/camel-mbox-store.c:556
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "ä¸?è?½å»ºç«?ç?®é??ã??%sã??ï¼? %sã??"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-mbox-store.c:572
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "ä¸?è?½å??å¾?è³?æ??夾ï¼?%sï¼?%s"
+
+#: ../camel/providers/local/camel-mbox-store.c:574
+msgid "Folder already exists"
+msgstr "è³?æ??夾已å?å?¨"
+
# camel/providers/local/camel-mbox-store.c:138
# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:218
-#: ../camel/providers/local/camel-mbox-store.c:231
-#: ../camel/providers/local/camel-mbox-store.c:260
+#: ../camel/providers/local/camel-mbox-store.c:615
+#: ../camel/providers/local/camel-mbox-store.c:628
+#: ../camel/providers/local/camel-mbox-store.c:657
#, c-format
msgid ""
"Could not delete folder '%s':\n"
@@ -4388,208 +4460,202 @@ msgstr ""
# camel/providers/local/camel-mbox-store.c:119
# camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:241
+#: ../camel/providers/local/camel-mbox-store.c:638
#, c-format
msgid "'%s' is not a regular file."
msgstr "ã??%sã??ä¸?æ?¯æ?®é??ç??æª?æ¡?ã??"
# camel/providers/local/camel-mbox-store.c:153
-#: ../camel/providers/local/camel-mbox-store.c:250
+#: ../camel/providers/local/camel-mbox-store.c:647
#, c-format
msgid "Folder '%s' is not empty. Not deleted."
msgstr "è³?æ??夾ã??%sã??å?§ä»?æ??æª?æ¡?ã??æ??以ä¸?å?ªé?¤ã??"
# camel/providers/local/camel-local-store.c:279
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:290
+#: ../camel/providers/local/camel-mbox-store.c:673
+#: ../camel/providers/local/camel-mbox-store.c:687
#, c-format
msgid "Could not delete folder summary file '%s': %s"
msgstr "ç?¡æ³?å?ªé?¤è³?æ??夾æ??è¦?æª?æ¡?ã??%sã??ï¼? %s"
-# camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/local/camel-mbox-store.c:395
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "ä¸?è?½å»ºç«?ç?®é??ã??%sã??ï¼? %sã??"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mbox-store.c:411
-#, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "ä¸?è?½å??å¾?è³?æ??夾ï¼?%sï¼?%s"
-
-#: ../camel/providers/local/camel-mbox-store.c:413
-msgid "Folder already exists"
-msgstr "è³?æ??夾已å?å?¨"
-
# shell/e-shell-folder-creation-dialog.c:156
-#: ../camel/providers/local/camel-mbox-store.c:507
+#: ../camel/providers/local/camel-mbox-store.c:767
#, c-format
msgid "The new folder name is illegal."
msgstr "æ?°ç??è³?æ??夾å??稱ä¸?å??æ³?ã??"
# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-store.c:522
+#: ../camel/providers/local/camel-mbox-store.c:782
#, c-format
msgid "Could not rename '%s': '%s': %s"
msgstr "ç?¡æ³?é??æ?°å?½å??ã??%sã??ï¼?ã??%sã??ï¼?%s"
# camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/local/camel-mbox-store.c:605
+#: ../camel/providers/local/camel-mbox-store.c:865
#, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "ç?¡æ³?å°? '%s' é??æ?°å?½å??æ?? %sï¼?%s"
# camel/providers/local/camel-maildir-store.c:96
# camel/providers/local/camel-mh-store.c:90
-#: ../camel/providers/local/camel-mbox-summary.c:473
+#: ../camel/providers/local/camel-mbox-summary.c:476
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "ç?¡æ³?é??å??è³?æ??夾ï¼? %sï¼? %s"
# camel/providers/local/camel-mbox-summary.c:296
-#: ../camel/providers/local/camel-mbox-summary.c:533
+#: ../camel/providers/local/camel-mbox-summary.c:537
#, c-format
msgid "Fatal mail parser error near position %s in folder %s"
msgstr "é? è¿? %s (æ?¼è³?æ??夾 %s)ç??ä½?ç½®ç?¼ç??å?´é??ç??é?µä»¶å??æ??é?¯èª¤"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mbox-summary.c:615
+#: ../camel/providers/local/camel-mbox-summary.c:622
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "ä¸?è?½æª¢æ?¥è³?æ??夾ï¼?%sï¼? %s"
# camel/providers/local/camel-mbox-store.c:94
-#: ../camel/providers/local/camel-mbox-summary.c:686
-#: ../camel/providers/local/camel-mbox-summary.c:816
-#: ../camel/providers/local/camel-spool-summary.c:137
+#: ../camel/providers/local/camel-mbox-summary.c:697
+#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../camel/providers/local/camel-spool-summary.c:138
#, c-format
msgid "Could not open file: %s: %s"
msgstr "ç?¡æ³?é??å??æª?æ¡?ï¼? %sï¼? %s"
# camel/providers/local/camel-mbox-summary.c:524
-#: ../camel/providers/local/camel-mbox-summary.c:700
-#: ../camel/providers/local/camel-spool-summary.c:152
+#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-spool-summary.c:153
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "ä¸?è?½é??å??æ?«å? mailboxï¼?%s"
# camel/providers/local/camel-mbox-summary.c:635
# camel/providers/local/camel-mbox-summary.c:804
-#: ../camel/providers/local/camel-mbox-summary.c:715
-#: ../camel/providers/local/camel-mbox-summary.c:932
+#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:949
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "ç?¡æ³?é??é??ä¾?æº?è³?æ??夾 %s ï¼? %s"
# camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/local/camel-mbox-summary.c:726
+#: ../camel/providers/local/camel-mbox-summary.c:739
#, c-format
msgid "Could not close temporary folder: %s"
msgstr "ç?¡æ³?é??é??æ?«å?è³?æ??夾ï¼? %s"
# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:756
#, c-format
msgid "Could not rename folder: %s"
msgstr "ç?¡æ³?é??æ?°å?½å??è³?æ??夾ï¼?%s "
# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-summary.c:829
-#: ../camel/providers/local/camel-mbox-summary.c:1070
+#: ../camel/providers/local/camel-mbox-summary.c:846
+#: ../camel/providers/local/camel-mbox-summary.c:1099
#, c-format
msgid "Could not store folder: %s"
msgstr "ç?¡æ³?å?²å?è³?æ??夾ï¼?%s "
-#: ../camel/providers/local/camel-mbox-summary.c:869
-#: ../camel/providers/local/camel-mbox-summary.c:1102
+#: ../camel/providers/local/camel-mbox-summary.c:886
+#: ../camel/providers/local/camel-mbox-summary.c:1131
#, c-format
msgid ""
"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
"it.)"
-msgstr "MBOX æª?æ¡?å·²æ??å£?ï¼?è«?ä¿®æ£å®?ã??ï¼?é ?æ??æ?? From é??ä¸?è¡?ï¼?å?»æ?¾ä¸?å?°å®?ã??ï¼?"
+msgstr "MBOX æª?æ¡?å·²æ??å£?ï¼?è«?ä¿®æ£å®?ã??ï¼?é ?æ??æ?? From é??ä¸?å??ï¼?å?»æ?¾ä¸?å?°å®?ã??ï¼?"
# camel/providers/local/camel-mbox-summary.c:549
# camel/providers/local/camel-mbox-summary.c:557
# camel/providers/local/camel-mbox-summary.c:746
# camel/providers/local/camel-mbox-summary.c:754
-#: ../camel/providers/local/camel-mbox-summary.c:878
-#: ../camel/providers/local/camel-mbox-summary.c:1111
+#: ../camel/providers/local/camel-mbox-summary.c:895
+#: ../camel/providers/local/camel-mbox-summary.c:1140
#, c-format
msgid "Summary and folder mismatch, even after a sync"
msgstr "æ??è¦?è??è³?æ??夾ä¸?å??調ï¼?å?³ä½¿ç¶?é??å??æ¥"
# camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/providers/local/camel-mbox-summary.c:1029
-#: ../camel/providers/local/camel-spool-summary.c:337
+#: ../camel/providers/local/camel-mbox-summary.c:1052
+#: ../camel/providers/local/camel-spool-summary.c:343
#, c-format
msgid "Unknown error: %s"
msgstr "ä¸?æ??ç??é?¯èª¤ï¼? %s"
# camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1211
+#: ../camel/providers/local/camel-mbox-summary.c:1210
+#: ../camel/providers/local/camel-mbox-summary.c:1240
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "寫å?¥æ?«å?é?µç®±å¤±æ??ï¼? %s"
# camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1200
+#: ../camel/providers/local/camel-mbox-summary.c:1229
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "寫å?¥æ?«å?é?µç®±å¤±æ??ï¼? %sï¼? %s"
# camel/providers/local/camel-mh-folder.c:149
# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/local/camel-mh-folder.c:165
+#: ../camel/providers/local/camel-mh-folder.c:115
#, c-format
msgid "Cannot append message to mh folder: %s: "
msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° mh è³?æ??夾ï¼? %sï¼?"
# camel/providers/local/camel-maildir-store.c:107
# camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-mh-store.c:234
+#: ../camel/providers/local/camel-mh-store.c:483
#, c-format
msgid "Could not create folder '%s': %s"
msgstr "ç?¡æ³?建ç«?è³?æ??夾ã??%sã??ï¼?%s"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mh-store.c:248
+#: ../camel/providers/local/camel-mh-store.c:497
#, c-format
msgid "Cannot get folder '%s': not a directory."
msgstr "ä¸?è?½å??å¾?è³?æ??夾ã??%sã??ï¼?ä¸?æ?¯ç?®é??ã??"
# camel/providers/local/camel-mh-summary.c:218
-#: ../camel/providers/local/camel-mh-summary.c:228
+#: ../camel/providers/local/camel-mh-summary.c:230
#, c-format
msgid "Cannot open MH directory path: %s: %s"
msgstr "ä¸?è?½é??å?? MH ç?®é??è·¯å¾?ï¼? %sï¼? %s"
-#: ../camel/providers/local/camel-spool-store.c:118
+#: ../camel/providers/local/camel-spool-store.c:327
#, c-format
msgid "Spool '%s' cannot be opened: %s"
msgstr "æ??ç¨?å?¨ã??%sã??ä¸?è?½è¢«é??å??ï¼?%s"
# camel/providers/local/camel-local-store.c:134
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../camel/providers/local/camel-spool-store.c:341
#, c-format
msgid "Spool '%s' is not a regular file or directory"
msgstr "æ??ç¨?å?¨ã??%sã??ä¸?æ?¯ä¸?è?¬æª?æ¡?æ??ç?®é??ã??"
+# camel/providers/local/camel-local-store.c:183
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool mail file %s"
+msgstr "æ??ç¨?é?µä»¶æª?æ¡? %s"
+
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "æ??ç¨?è³?æ??夾樹ç??çµ?æ§? %s"
+
# camel/providers/local/camel-maildir-store.c:100
# camel/providers/local/camel-mbox-store.c:101
# camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-spool-store.c:158
+#: ../camel/providers/local/camel-spool-store.c:391
#, c-format
msgid "Folder '%s/%s' does not exist."
msgstr "è³?æ??夾ã??%s/%sã??ä¸?å?å?¨ã??"
# camel/providers/local/camel-maildir-store.c:96
# camel/providers/local/camel-mh-store.c:90
-#: ../camel/providers/local/camel-spool-store.c:170
+#: ../camel/providers/local/camel-spool-store.c:403
#, c-format
msgid ""
"Could not open folder '%s':\n"
@@ -4601,14 +4667,14 @@ msgstr ""
# camel/providers/local/camel-maildir-store.c:100
# camel/providers/local/camel-mbox-store.c:101
# camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:409
#, c-format
msgid "Folder '%s' does not exist."
msgstr "è³?æ??夾ã??%sã??ä¸?å?å?¨ã??"
# camel/providers/local/camel-maildir-store.c:107
# camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-spool-store.c:183
+#: ../camel/providers/local/camel-spool-store.c:416
#, c-format
msgid ""
"Could not create folder '%s':\n"
@@ -4619,55 +4685,44 @@ msgstr ""
# camel/providers/local/camel-mbox-store.c:119
# camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:426
#, c-format
msgid "'%s' is not a mailbox file."
msgstr "ã??%sã??ä¸?æ?¯ mailbox æª?æ¡?ã??"
-#: ../camel/providers/local/camel-spool-store.c:213
+#: ../camel/providers/local/camel-spool-store.c:462
#, c-format
msgid "Store does not support an INBOX"
msgstr "å?²å?並ä¸?æ?¯æ?´ INBOX"
-# camel/providers/local/camel-local-store.c:183
-#: ../camel/providers/local/camel-spool-store.c:226
+#: ../camel/providers/local/camel-spool-store.c:476
#, c-format
-msgid "Spool mail file %s"
-msgstr "æ??ç¨?é?µä»¶æª?æ¡? %s"
-
-#: ../camel/providers/local/camel-spool-store.c:226
-#, c-format
-msgid "Spool folder tree %s"
-msgstr "æ??ç¨?è³?æ??夾樹ç??çµ?æ§? %s"
+msgid "Spool folders cannot be deleted"
+msgstr "æ??ç¨?è³?æ??夾ä¸?è?½å?ªé?¤"
-#: ../camel/providers/local/camel-spool-store.c:238
+#: ../camel/providers/local/camel-spool-store.c:491
#, c-format
msgid "Spool folders cannot be renamed"
msgstr "æ??ç¨?è³?æ??夾ä¸?è?½é??æ?°å?½å??"
-#: ../camel/providers/local/camel-spool-store.c:251
-#, c-format
-msgid "Spool folders cannot be deleted"
-msgstr "æ??ç¨?è³?æ??夾ä¸?è?½å?ªé?¤"
-
# camel/camel-movemail.c:158
-#: ../camel/providers/local/camel-spool-summary.c:166
-#: ../camel/providers/local/camel-spool-summary.c:178
-#: ../camel/providers/local/camel-spool-summary.c:190
+#: ../camel/providers/local/camel-spool-summary.c:169
+#: ../camel/providers/local/camel-spool-summary.c:181
+#: ../camel/providers/local/camel-spool-summary.c:193
#, c-format
msgid "Could not synchronize temporary folder %s: %s"
msgstr "ç?¡æ³?å??æ¥æ?«å?è³?æ??夾 %sï¼?%s"
# camel/providers/local/camel-maildir-store.c:107
# camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-spool-summary.c:208
+#: ../camel/providers/local/camel-spool-summary.c:211
#, c-format
msgid "Could not synchronize spool folder %s: %s"
msgstr "ç?¡æ³?å??æ¥æ??ç¨?è³?æ??夾%sï¼?%s"
-#: ../camel/providers/local/camel-spool-summary.c:240
-#: ../camel/providers/local/camel-spool-summary.c:259
-#: ../camel/providers/local/camel-spool-summary.c:272
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
#, c-format
msgid ""
"Could not synchronize spool folder %s: %s\n"
@@ -4676,9 +4731,9 @@ msgstr ""
"ç?¡æ³?å??æ¥æ??ç¨?è³?æ??夾 %sï¼?%s\n"
"è³?æ??夾å?¯è?½æ??æ¯?ï¼?è¤?æ?¬å?²å?æ?¼ã??%sã??"
-#: ../camel/providers/nntp/camel-nntp-folder.c:197
-#: ../camel/providers/nntp/camel-nntp-folder.c:271
-#: ../camel/providers/nntp/camel-nntp-folder.c:312
+#: ../camel/providers/nntp/camel-nntp-folder.c:200
+#: ../camel/providers/nntp/camel-nntp-folder.c:279
+#: ../camel/providers/nntp/camel-nntp-folder.c:393
#, c-format
msgid "Internal error: UID in invalid format: %s"
msgstr "å?§é?¨é?¯èª¤ï¼?UID æ ¼å¼?ç?¡æ??ï¼?%s"
@@ -4690,12 +4745,12 @@ msgstr "å?§é?¨é?¯èª¤ï¼?UID æ ¼å¼?ç?¡æ??ï¼?%s"
# camel/providers/local/camel-mh-folder.c:185
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/nntp/camel-nntp-folder.c:234
-#: ../camel/providers/nntp/camel-nntp-folder.c:238
-#: ../camel/providers/pop3/camel-pop3-folder.c:402
-#: ../camel/providers/pop3/camel-pop3-folder.c:630
+#: ../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:706
#, c-format
msgid "Cannot get message %s: %s"
msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼? %s"
@@ -4704,9 +4759,9 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼? %s"
# camel/camel-remote-store.c:399
# camel/camel-remote-store.c:470
# camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/nntp/camel-nntp-folder.c:465
-#: ../camel/providers/nntp/camel-nntp-folder.c:471
-#: ../camel/providers/nntp/camel-nntp-folder.c:518
+#: ../camel/providers/nntp/camel-nntp-folder.c:477
+#: ../camel/providers/nntp/camel-nntp-folder.c:483
+#: ../camel/providers/nntp/camel-nntp-folder.c:530
#, c-format
msgid "Posting failed: %s"
msgstr "張貼失æ??ï¼?%s"
@@ -4715,17 +4770,17 @@ msgstr "張貼失æ??ï¼?%s"
# camel/camel-remote-store.c:399
# camel/camel-remote-store.c:470
# camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/nntp/camel-nntp-folder.c:513
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
msgid "Posting failed: "
msgstr "張貼失æ??ï¼?"
-#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#: ../camel/providers/nntp/camel-nntp-folder.c:554
#, c-format
msgid "You cannot post NNTP messages while working offline!"
msgstr "é?¢ç·?å·¥ä½?æ??ç?¡æ³?張貼 NNTP è¨?æ?¯ï¼?"
# camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/nntp/camel-nntp-folder.c:560
+#: ../camel/providers/nntp/camel-nntp-folder.c:574
#, c-format
msgid "You cannot copy messages from a NNTP folder!"
msgstr "ä½ ç?¡æ³?å¾? NNTP è³?æ??夾è¤?製è¨?æ?¯ï¼?"
@@ -4756,25 +4811,37 @@ msgid ""
"password."
msgstr "é??å??é?¸é ?å°?æ??使ç?¨ç´?æ??å?ç??å¯?碼é©?è? NNTP 伺æ??å?¨ã??"
+# camel/providers/smtp/camel-smtp-transport.c:218
+#: ../camel/providers/nntp/camel-nntp-store.c:77
+#, c-format
+msgid "Authentication requested but no username provided"
+msgstr "é??è¦?é©?è?ï¼?ä½?æ?ªæ??ä¾?使ç?¨è??å??稱"
+
+# camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/nntp/camel-nntp-store.c:89
+#, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "ç?¡æ³?é©?è?伺æ??å?¨ï¼?%s"
+
# camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/nntp/camel-nntp-store.c:265
+#: ../camel/providers/nntp/camel-nntp-store.c:346
#, c-format
msgid "Could not read greeting from %s: "
msgstr "ç?¡æ³?è®?å?? %s ç??æ¡è¿?è¾ï¼?"
-#: ../camel/providers/nntp/camel-nntp-store.c:278
+#: ../camel/providers/nntp/camel-nntp-store.c:359
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "NNTP 伺æ??å?¨ %s å?³å??é?¯èª¤ä»£ç¢¼ %d ï¼? %s"
# camel/providers/nntp/camel-nntp-store.c:286
-#: ../camel/providers/nntp/camel-nntp-store.c:434
+#: ../camel/providers/nntp/camel-nntp-store.c:527
#, c-format
msgid "USENET News via %s"
msgstr "ç¶?ç?± %s ç?? USENET æ?°è??"
# mail/mail-ops.c:1755
-#: ../camel/providers/nntp/camel-nntp-store.c:927
+#: ../camel/providers/nntp/camel-nntp-store.c:1045
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -4785,7 +4852,7 @@ msgstr ""
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1024
+#: ../camel/providers/nntp/camel-nntp-store.c:1160
#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
@@ -4796,7 +4863,7 @@ msgstr ""
"\n"
"æ²?æ??é¡?ä¼¼ç??æ?°è??ç¾£çµ?ã??é?¸å??ç??é ?ç?®å?¯è?½æ?¯ç?¶ä»£è³?æ??夾ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1064
+#: ../camel/providers/nntp/camel-nntp-store.c:1202
#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
@@ -4807,60 +4874,48 @@ msgstr ""
"\n"
"æ?°è??ç¾£çµ?ä¸?å?å?¨ï¼?"
-#: ../camel/providers/nntp/camel-nntp-store.c:1094
+#: ../camel/providers/nntp/camel-nntp-store.c:1235
#, c-format
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr "ä½ ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??建ç«?è³?æ??夾ï¼?æ?¹ä»¥è¨?é?±ã??"
# camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/nntp/camel-nntp-store.c:1106
+#: ../camel/providers/nntp/camel-nntp-store.c:1251
#, c-format
msgid "You cannot rename a folder in a News store."
msgstr "ä½ ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??é??æ?°å?½å??è³?æ??夾ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1119
+#: ../camel/providers/nntp/camel-nntp-store.c:1268
#, c-format
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr "ä½ ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??移é?¤è³?æ??夾ï¼?æ?¹ä»¥å??æ¶?è¨?é?±ã??"
-# camel/providers/smtp/camel-smtp-transport.c:218
-#: ../camel/providers/nntp/camel-nntp-store.c:1257
-#, c-format
-msgid "Authentication requested but no username provided"
-msgstr "é??è¦?é©?è?ï¼?ä½?æ?ªæ??ä¾?使ç?¨è??å??稱"
-
-# camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/nntp/camel-nntp-store.c:1269
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "ç?¡æ³?é©?è?伺æ??å?¨ï¼?%s"
-
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/nntp/camel-nntp-store.c:1395
+#: ../camel/providers/nntp/camel-nntp-store.c:1479
msgid "NNTP Command failed: "
msgstr "NNTP æ??令失æ??ï¼?"
# ui/evolution-addressbook.xml.h:17
-#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#: ../camel/providers/nntp/camel-nntp-store.c:1553
#, c-format
msgid "Not connected."
msgstr "æ?ªé?£ç·?ã??"
# mail/mail-ops.c:992
-#: ../camel/providers/nntp/camel-nntp-summary.c:238
-#: ../camel/providers/nntp/camel-nntp-summary.c:340
+#: ../camel/providers/nntp/camel-nntp-summary.c:234
+#: ../camel/providers/nntp/camel-nntp-summary.c:345
#, c-format
msgid "%s: Scanning new messages"
msgstr "%sï¼?æ??æ??æ?°é?µä»¶"
# camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/nntp/camel-nntp-summary.c:249
+#: ../camel/providers/nntp/camel-nntp-summary.c:246
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "xover å?³ä¾?æ??å¤?ç??伺æ??å?¨å??æ??ï¼?%s"
# camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/nntp/camel-nntp-summary.c:356
+#: ../camel/providers/nntp/camel-nntp-summary.c:362
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "æ¨?é¡?å?³ä¾?æ??å¤?ç??伺æ??å?¨å??æ??ï¼?%s"
@@ -4869,53 +4924,51 @@ msgstr "æ¨?é¡?å?³ä¾?æ??å¤?ç??伺æ??å?¨å??æ??ï¼?%s"
# camel/camel-remote-store.c:399
# camel/camel-remote-store.c:470
# camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/nntp/camel-nntp-summary.c:401
+#: ../camel/providers/nntp/camel-nntp-summary.c:407
#, c-format
msgid "Operation failed: %s"
msgstr "ä½?æ¥å¤±æ??ï¼? %s"
+# camel/providers/pop3/camel-pop3-folder.c:292
+#: ../camel/providers/pop3/camel-pop3-folder.c:277
+#: ../camel/providers/pop3/camel-pop3-folder.c:334
+#, c-format
+msgid "No message with UID %s"
+msgstr "æ²?æ??é?µä»¶å?·æ??é??å?? UID %s"
+
+# camel/providers/pop3/camel-pop3-folder.c:296
+#: ../camel/providers/pop3/camel-pop3-folder.c:342
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "�� POP �件 %d"
+
+# camel/camel-sasl-login.c:127
+#: ../camel/providers/pop3/camel-pop3-folder.c:447
+msgid "Unknown reason"
+msgstr "ä¸?æ??ç??å??å? "
+
# camel/providers/pop3/camel-pop3-folder.c:149
-#: ../camel/providers/pop3/camel-pop3-folder.c:251
+#: ../camel/providers/pop3/camel-pop3-folder.c:486
msgid "Retrieving POP summary"
msgstr "å??å?? POP ç??æ??è¦?"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/pop3/camel-pop3-folder.c:274
+#: ../camel/providers/pop3/camel-pop3-folder.c:509
#, c-format
msgid "Cannot get POP summary: %s"
msgstr "ä¸?è?½å??å¾? POP æ??è¦?ï¼? %s"
# mail/message-browser.c:199
-#: ../camel/providers/pop3/camel-pop3-folder.c:324
+#: ../camel/providers/pop3/camel-pop3-folder.c:561
msgid "Expunging old messages"
msgstr "æ¸?空è??ç??é?µä»¶"
# mail/message-browser.c:199
-#: ../camel/providers/pop3/camel-pop3-folder.c:332
+#: ../camel/providers/pop3/camel-pop3-folder.c:575
msgid "Expunging deleted messages"
msgstr "æ¸?空å?ªé?¤ç??é?µä»¶"
-# camel/providers/pop3/camel-pop3-folder.c:292
-#: ../camel/providers/pop3/camel-pop3-folder.c:566
-#: ../camel/providers/pop3/camel-pop3-folder.c:596
-#, c-format
-msgid "No message with UID %s"
-msgstr "æ²?æ??é?µä»¶å?·æ??é??å?? UID %s"
-
-# camel/providers/pop3/camel-pop3-folder.c:296
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code. Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:603
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "�� POP �件 %d"
-
-# camel/camel-sasl-login.c:127
-#: ../camel/providers/pop3/camel-pop3-folder.c:707
-msgid "Unknown reason"
-msgstr "ä¸?æ??ç??å??å? "
-
# camel/providers/pop3/camel-pop3-provider.c:37
#: ../camel/providers/pop3/camel-pop3-provider.c:39
msgid "Message storage"
@@ -4927,35 +4980,40 @@ msgid "_Leave messages on server"
msgstr "å?¨ä¼ºæ??å?¨ä¿?ç??é?µä»¶å??份(_L)"
# camel/providers/pop3/camel-pop3-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
#, c-format
msgid "_Delete after %s day(s)"
msgstr "å?ªé?¤ %s 天å¾?ç??é?µä»¶(_D)"
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr "å?ªé?¤å?¨æ?¬å?°ç«¯æ?¶ä»¶å?£æ¸?é?¤ç??(_E)"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
msgid "Disable _support for all POP3 extensions"
msgstr "å??æ¢æ??æ?? P_OP3 延伸å??è?½ç??æ?¯æ?´"
# camel/providers/pop3/camel-pop3-provider.c:48
# mail/mail-config.glade.h:51
-#: ../camel/providers/pop3/camel-pop3-provider.c:53
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
msgid "POP"
msgstr "POP"
# camel/providers/imap/camel-imap-provider.c:65
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:58
msgid "For connecting to and downloading mail from POP servers."
msgstr "ç?¨æ?¼é?£ç·?å?° POP 伺æ??å?¨ä¸¦ä¸?è¼?é?µä»¶ã??"
# camel/providers/pop3/camel-pop3-provider.c:69
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:75
msgid ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
msgstr "é??å??é?¸é ?å°?æ??使ç?¨ç´?æ??å?ç??å¯?碼é?£ç·?å?° POP 伺æ??å?¨ã??ä¸?è?¬ç?? POP 伺æ??å?¨å?ªæ??æ?¯æ?´é??種æ?¹å¼?ã??"
# camel/providers/pop3/camel-pop3-provider.c:79
-#: ../camel/providers/pop3/camel-pop3-provider.c:82
+#: ../camel/providers/pop3/camel-pop3-provider.c:85
msgid ""
"This option will connect to the POP server using an encrypted password via "
"the APOP protocol. This may not work for all users even on servers that "
@@ -4968,44 +5026,44 @@ msgid ": "
msgstr "ï¼?"
# camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:168
+#: ../camel/providers/pop3/camel-pop3-store.c:181
#, c-format
msgid "Failed to read a valid greeting from POP server %s"
msgstr "ç?¡æ³?å¾? POP 伺æ??å?¨ %s è®?å??æ??æ??ç??å??å??èª?"
# camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/pop3/camel-pop3-store.c:217
-#: ../camel/providers/pop3/camel-pop3-store.c:224
+#: ../camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/pop3/camel-pop3-store.c:230
+#: ../camel/providers/pop3/camel-pop3-store.c:237
#, c-format
msgid "Failed to connect to POP server %s in secure mode: %s"
msgstr "ç?¡æ³?以å®?å?¨æ¨¡å¼?é?£ç·?å?° POP 伺æ??å?¨ %sï¼? %s"
# shell/e-storage.c:477
-#: ../camel/providers/pop3/camel-pop3-store.c:187
+#: ../camel/providers/pop3/camel-pop3-store.c:200
msgid "STLS not supported by server"
msgstr "伺æ??å?¨ä¸?æ?¯æ?´ STLS"
# camel/providers/pop3/camel-pop3-store.c:379
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:205
+#: ../camel/providers/pop3/camel-pop3-store.c:218
#, c-format
msgid "Failed to connect to POP server %s in secure mode%s"
msgstr "ç?¡æ³?以å®?å?¨æ¨¡å¼?é?£ç·?å?° POP 伺æ??å?¨ %s%s"
# camel/camel-sasl-anonymous.c:110
# camel/camel-sasl-plain.c:87
-#: ../camel/providers/pop3/camel-pop3-store.c:218
+#: ../camel/providers/pop3/camel-pop3-store.c:231
msgid "TLS negotiations failed"
msgstr "TLS å??å??失æ??"
-#: ../camel/providers/pop3/camel-pop3-store.c:225
+#: ../camel/providers/pop3/camel-pop3-store.c:238
msgid "TLS is not available in this build"
msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ TLS"
# camel/providers/pop3/camel-pop3-store.c:409
-#: ../camel/providers/pop3/camel-pop3-store.c:300
-#: ../camel/providers/pop3/camel-pop3-store.c:452
+#: ../camel/providers/pop3/camel-pop3-store.c:317
+#: ../camel/providers/pop3/camel-pop3-store.c:472
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -5013,23 +5071,23 @@ msgid ""
msgstr "ç?¡æ³?é?£ç·?å?° POP 伺æ??å?¨ %sï¼?ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?æ©?å?¶ã??"
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:323
+#: ../camel/providers/pop3/camel-pop3-store.c:340
#, c-format
msgid "SASL '%s' Login failed for POP server %s%s"
msgstr "å?¨ POP 伺æ??å?¨ %2$s 以 SASL ã??%1$sã??ç?»å?¥å¤±æ??%3$s"
-#: ../camel/providers/pop3/camel-pop3-store.c:340
+#: ../camel/providers/pop3/camel-pop3-store.c:357
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "ä¸?è?½ç?»å?¥ POP 伺æ??å?¨ %sï¼? SASL é??è¨?å??å®?é?¯èª¤"
# camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:357
+#: ../camel/providers/pop3/camel-pop3-store.c:374
#, c-format
msgid "Failed to authenticate on POP server %s: "
msgstr "ç?¡æ³?é©?è? POP 伺æ??å?¨ %sï¼?"
-#: ../camel/providers/pop3/camel-pop3-store.c:421
+#: ../camel/providers/pop3/camel-pop3-store.c:439
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -5037,7 +5095,7 @@ msgid ""
msgstr "ç?¡æ³?é?£ç·?è?³ POP 伺æ??å?¨ %sï¼?\tæ?¶å?°ç?¡æ??ç?? APOP IDã??æ?¨æ¸¬å?¯è?½æ?¯ä½¿ç?¨è??å??å??æ?»æ??ã??è«?è?¯çµ¡ä½ ç??系統管ç??è??ã??"
# camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:471
+#: ../camel/providers/pop3/camel-pop3-store.c:492
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -5048,7 +5106,7 @@ msgstr ""
# camel/providers/pop3/camel-pop3-store.c:417
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:484
+#: ../camel/providers/pop3/camel-pop3-store.c:505
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -5059,7 +5117,7 @@ msgstr ""
# camel/providers/pop3/camel-pop3-store.c:417
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:497
+#: ../camel/providers/pop3/camel-pop3-store.c:518
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -5068,31 +5126,31 @@ msgstr ""
"ç?¡æ³?é?£ç·?å?° POP 伺æ??å?¨ %sã??\n"
"å?³é??å¯?碼æ??ç?¼ç??é?¯èª¤%s"
-# camel/providers/pop3/camel-pop3-store.c:322
-#: ../camel/providers/pop3/camel-pop3-store.c:653
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "ç?¡æ³?é?£ç·?å?° POP 伺æ??å?¨ %s"
-
# camel/providers/smtp/camel-smtp-transport.c:534
-#: ../camel/providers/pop3/camel-pop3-store.c:666
+#: ../camel/providers/pop3/camel-pop3-store.c:558
#, c-format
msgid "POP3 server %s"
msgstr "POP3 伺æ??å?¨ %s"
# camel/camel-remote-store.c:195
-#: ../camel/providers/pop3/camel-pop3-store.c:670
+#: ../camel/providers/pop3/camel-pop3-store.c:562
#, c-format
msgid "POP3 server for %s on %s"
msgstr "%s å?¨ %s ç?? POP3 伺æ??å?¨"
+# camel/providers/pop3/camel-pop3-store.c:322
+#: ../camel/providers/pop3/camel-pop3-store.c:694
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "ç?¡æ³?é?£ç·?å?° POP 伺æ??å?¨ %s"
+
# camel/providers/pop3/camel-pop3-store.c:484
-#: ../camel/providers/pop3/camel-pop3-store.c:685
+#: ../camel/providers/pop3/camel-pop3-store.c:721
#, c-format
msgid "No such folder '%s'."
msgstr "æ²?æ??é??å??è³?æ??夾ã??%sã??ã??"
-#: ../camel/providers/pop3/camel-pop3-store.c:709
+#: ../camel/providers/pop3/camel-pop3-store.c:738
#, c-format
msgid "POP3 stores have no folder hierarchy"
msgstr "POP3 å?²å?å??æ²?æ??è³?æ??夾é??層"
@@ -5110,57 +5168,57 @@ msgid ""
"system."
msgstr "å°?é??é??ç??é?µä»¶äº¤çµ¦æ?¬å?°ç«¯ç³»çµ±ä¸?ç??ã??sendmailã??ç¨?å¼?è??ç??ã??"
+# camel/providers/sendmail/camel-sendmail-transport.c:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+# camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "ç¶?ç?± sendmail ç¨?å¼?å?³é??é?µä»¶"
+
# camel/camel-url.c:289
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
#, c-format
msgid "Could not parse recipient list"
msgstr "ç?¡æ³?å??æ??æ?¶ä»¶äººæ¸?å?®"
# camel/providers/sendmail/camel-sendmail-transport.c:107
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
#, c-format
msgid "Could not create pipe to sendmail: %s: mail not sent"
msgstr "ç?¡æ³?建ç«?å°?管å?°ã??sendmailã??ç¨?å¼?ï¼? %sï¼?é?µä»¶ç?¡æ³?å?³é??"
# camel/providers/sendmail/camel-sendmail-transport.c:124
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
#, c-format
msgid "Could not fork sendmail: %s: mail not sent"
msgstr "ç?¡æ³?å?¦å¤?å??å??å??ä¸?å?? sendmail è¡?ç¨?ï¼? %sï¼?é?µä»¶ç?¡æ³?å?³é??"
# camel/providers/sendmail/camel-sendmail-transport.c:150
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
msgid "Could not send message: "
msgstr "ç?¡æ³?å?³é??é?µä»¶ï¼?"
# camel/providers/sendmail/camel-sendmail-transport.c:163
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr "sendmail å??å?³é??é??è¨?æ?¯ %sï¼?é?µä»¶ç?¡æ³?å?³é??"
# camel/providers/sendmail/camel-sendmail-transport.c:170
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr "ç?¡æ³?å?·è¡? %sï¼? é?µä»¶ç?¡æ³?å?³é??ã??"
# camel/providers/sendmail/camel-sendmail-transport.c:175
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr "sendmail ç?±æ?¼ç??æ³? %d é??é??ï¼? é?µä»¶ç?¡æ³?å?³é??ã??"
-# camel/providers/sendmail/camel-sendmail-transport.c:247
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
-msgid "sendmail"
-msgstr "sendmail"
-
-# camel/providers/sendmail/camel-sendmail-transport.c:249
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
-msgid "Mail delivery via the sendmail program"
-msgstr "ç¶?ç?± sendmail ç¨?å¼?å?³é??é?µä»¶"
-
# camel/providers/smtp/camel-smtp-provider.c:38
# mail/mail-config.glade.h:62
#: ../camel/providers/smtp/camel-smtp-provider.c:43
@@ -5172,370 +5230,402 @@ msgstr "SMTP"
msgid "For delivering mail by connecting to a remote mailhub using SMTP."
msgstr "使ç?¨ SMTP é?£ç·?å?°é? 端 mailhub ä¾?å?³é??é?µä»¶ã??"
+# camel/providers/smtp/camel-smtp-transport.c:1043
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+msgid "Welcome response error: "
+msgstr "è¿?æ?¥ç??å??æ??é?¯èª¤ï¼?"
+
+# camel/providers/pop3/camel-pop3-store.c:379
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:277
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "ç?¡æ³?以å®?å?¨æ¨¡å¼?é?£ç·?å?° SMTP 伺æ??å?¨ %sï¼? %s"
+
+# camel/providers/imap/camel-imap-command.c:240
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS æ??令失æ??ï¼?"
+
+# camel/providers/smtp/camel-smtp-transport.c:534
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP 伺æ??å?¨ %s"
+
+# camel/providers/smtp/camel-smtp-transport.c:536
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "ç¶?ç?± %s å?³é?? SMTP é?µä»¶"
+
+# camel/providers/smtp/camel-smtp-transport.c:356
+#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "SMTP 伺æ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?é¡?å?? %sã??"
+
+# camel/providers/smtp/camel-smtp-transport.c:418
+#: ../camel/providers/smtp/camel-smtp-transport.c:488
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"ç?¡æ³?é©?è?ç?»å?¥ SMTP 伺æ??å?¨ã??\n"
+"%s\n"
+"\n"
+
+# camel/providers/smtp/camel-smtp-transport.c:582
+#: ../camel/providers/smtp/camel-smtp-transport.c:606
+#, c-format
+msgid "Cannot send message: service not connected."
+msgstr "ç?¡æ³?å?³é??è¨?æ?¯ï¼?æ??å??æ?ªé?£ç·?ã??"
+
+# camel/providers/smtp/camel-smtp-transport.c:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?å¯?件è??ç??å?°å??ç?¡æ??ã??"
+
+# mail/mail-ops.c:603
+#: ../camel/providers/smtp/camel-smtp-transport.c:617
+msgid "Sending message"
+msgstr "å?³é??é?µä»¶"
+
+# camel/providers/smtp/camel-smtp-transport.c:582
+#: ../camel/providers/smtp/camel-smtp-transport.c:642
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?æ²?æ??å®?義æ?¶ä»¶è??ã??"
+
+# camel/providers/smtp/camel-smtp-transport.c:582
+#: ../camel/providers/smtp/camel-smtp-transport.c:655
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?ä¸?æ??å¤?å??ç?¡æ??ç??æ?¶ä»¶è??"
+
# camel/providers/smtp/camel-smtp-transport.c:168
-#: ../camel/providers/smtp/camel-smtp-transport.c:116
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
msgid "Syntax error, command unrecognized"
msgstr "èª?æ³?é?¯èª¤ï¼?ä¸?èª?è?ç??æ??令"
# camel/providers/smtp/camel-smtp-transport.c:170
-#: ../camel/providers/smtp/camel-smtp-transport.c:118
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
msgid "Syntax error in parameters or arguments"
msgstr "å??æ?¸å?§ç??èª?æ³?é?¯èª¤"
# camel/providers/smtp/camel-smtp-transport.c:172
-#: ../camel/providers/smtp/camel-smtp-transport.c:120
+#: ../camel/providers/smtp/camel-smtp-transport.c:722
msgid "Command not implemented"
msgstr "æ??令æ²?æ??實ä½?"
# camel/providers/smtp/camel-smtp-transport.c:174
-#: ../camel/providers/smtp/camel-smtp-transport.c:122
+#: ../camel/providers/smtp/camel-smtp-transport.c:724
msgid "Command parameter not implemented"
msgstr "æ??令ç??å??æ?¸æ²?æ??實ä½?"
# camel/providers/smtp/camel-smtp-transport.c:176
-#: ../camel/providers/smtp/camel-smtp-transport.c:124
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
msgid "System status, or system help reply"
msgstr "系統ç??æ³?ï¼?æ??è??æ?¯ç³»çµ±ç??æ±?å?©èªªæ??å??æ??"
# camel/providers/smtp/camel-smtp-transport.c:178
-#: ../camel/providers/smtp/camel-smtp-transport.c:126
+#: ../camel/providers/smtp/camel-smtp-transport.c:728
msgid "Help message"
msgstr "æ±?å?©èªªæ??è¨?æ?¯"
# camel/providers/smtp/camel-smtp-transport.c:180
-#: ../camel/providers/smtp/camel-smtp-transport.c:128
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
msgid "Service ready"
msgstr "æ??å??已就ç·?"
# camel/providers/smtp/camel-smtp-transport.c:182
-#: ../camel/providers/smtp/camel-smtp-transport.c:130
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
msgid "Service closing transmission channel"
msgstr "æ¤æ??å??å°?å?³è¼¸é??é??é??é??"
# camel/providers/smtp/camel-smtp-transport.c:184
-#: ../camel/providers/smtp/camel-smtp-transport.c:132
+#: ../camel/providers/smtp/camel-smtp-transport.c:734
msgid "Service not available, closing transmission channel"
msgstr "æ¤æ??å??ä»?æ?ªå?¯ç?¨ï¼?å?³è¼¸é??é??é??é??"
# camel/providers/smtp/camel-smtp-transport.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:134
+#: ../camel/providers/smtp/camel-smtp-transport.c:736
msgid "Requested mail action okay, completed"
msgstr " æ??è¦?æ±?ç??é?µä»¶å??ä½?å·²æ??å??å®?æ??"
# camel/providers/smtp/camel-smtp-transport.c:188
-#: ../camel/providers/smtp/camel-smtp-transport.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:738
msgid "User not local; will forward to <forward-path>"
msgstr "ä¸?æ?¯æ?¬å?°ç«¯ç??使ç?¨è??ï¼?å°?æ??è½?å¯?è?³ <è½?å¯?è·¯å¾?>"
# camel/providers/smtp/camel-smtp-transport.c:190
-#: ../camel/providers/smtp/camel-smtp-transport.c:138
+#: ../camel/providers/smtp/camel-smtp-transport.c:740
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "æ??è¦?æ±?ç??é?µä»¶å??ä½?ç?¡æ³?å?·è¡?ï¼?é?µç®±ä»?æ?ªå?¯ç?¨"
# camel/providers/smtp/camel-smtp-transport.c:192
-#: ../camel/providers/smtp/camel-smtp-transport.c:140
+#: ../camel/providers/smtp/camel-smtp-transport.c:742
msgid "Requested action not taken: mailbox unavailable"
msgstr "æ??è¦?æ±?ç??å??ä½?ç?¡æ³?å?·è¡?ï¼?é?µç®±ä»?æ?ªå?¯ç?¨"
# camel/providers/smtp/camel-smtp-transport.c:194
-#: ../camel/providers/smtp/camel-smtp-transport.c:142
+#: ../camel/providers/smtp/camel-smtp-transport.c:744
msgid "Requested action aborted: error in processing"
msgstr "æ??è¦?æ±?ç??å??ä½?å·²æ?¾æ£?ï¼?æ£å?¨è??ç??æ??ç?¼ç??é?¯èª¤"
# camel/providers/smtp/camel-smtp-transport.c:196
-#: ../camel/providers/smtp/camel-smtp-transport.c:144
+#: ../camel/providers/smtp/camel-smtp-transport.c:746
msgid "User not local; please try <forward-path>"
msgstr "ä¸?æ?¯æ?¬å?°ç«¯ç??使ç?¨è??ï¼?è«?å??試使ç?¨ <è½?å¯?è·¯å¾?>"
# camel/providers/smtp/camel-smtp-transport.c:198
-#: ../camel/providers/smtp/camel-smtp-transport.c:146
+#: ../camel/providers/smtp/camel-smtp-transport.c:748
msgid "Requested action not taken: insufficient system storage"
msgstr "æ??è¦?æ±?ç??å??ä½?ç?¡æ³?å?·è¡?ï¼?系統ç??å?²å?空é??ä¸?足"
# camel/providers/smtp/camel-smtp-transport.c:200
-#: ../camel/providers/smtp/camel-smtp-transport.c:148
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "æ??è¦?æ±?ç??é?µä»¶å??ä½?å·²æ?¾æ£?ï¼?è¶?å?ºå?¯ä¾?å?²å?空é??ç??é??å?¶"
# camel/providers/smtp/camel-smtp-transport.c:202
-#: ../camel/providers/smtp/camel-smtp-transport.c:150
+#: ../camel/providers/smtp/camel-smtp-transport.c:752
msgid "Requested action not taken: mailbox name not allowed"
msgstr "æ??è¦?æ±?ç??å??ä½?å·²æ?¾æ£?ï¼?ä¸?å??許ç??é?µç®±å??稱"
# camel/providers/smtp/camel-smtp-transport.c:204
-#: ../camel/providers/smtp/camel-smtp-transport.c:152
+#: ../camel/providers/smtp/camel-smtp-transport.c:754
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "è«?é??å§?輸å?¥é?µä»¶ç??è³?æ??ï¼?<CRLF>.<CRLF> çµ?æ??æ?°å¯«é?µä»¶"
# camel/providers/smtp/camel-smtp-transport.c:206
-#: ../camel/providers/smtp/camel-smtp-transport.c:154
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
msgid "Transaction failed"
msgstr "å?·è¡?失æ??"
# camel/providers/smtp/camel-smtp-transport.c:210
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
+#: ../camel/providers/smtp/camel-smtp-transport.c:760
msgid "A password transition is needed"
msgstr "é??è¦?å¯?碼å?³é??"
# camel/providers/smtp/camel-smtp-transport.c:212
-#: ../camel/providers/smtp/camel-smtp-transport.c:160
+#: ../camel/providers/smtp/camel-smtp-transport.c:762
msgid "Authentication mechanism is too weak"
msgstr "é©?è?æ©?å?¶å¤ªå¼±äº?"
# camel/providers/smtp/camel-smtp-transport.c:214
-#: ../camel/providers/smtp/camel-smtp-transport.c:162
+#: ../camel/providers/smtp/camel-smtp-transport.c:764
msgid "Encryption required for requested authentication mechanism"
msgstr "æ??è¦?æ±?ç??é©?è?æ©?å?¶å¿?é ?å? å¯?è??ç??"
# camel/providers/smtp/camel-smtp-transport.c:216
-#: ../camel/providers/smtp/camel-smtp-transport.c:164
+#: ../camel/providers/smtp/camel-smtp-transport.c:766
msgid "Temporary authentication failure"
msgstr "è?¨æ??é©?è?失æ??"
-# camel/providers/smtp/camel-smtp-transport.c:1043
-#: ../camel/providers/smtp/camel-smtp-transport.c:252
-#: ../camel/providers/smtp/camel-smtp-transport.c:258
-msgid "Welcome response error: "
-msgstr "è¿?æ?¥ç??å??æ??é?¯èª¤ï¼?"
-
-# camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/smtp/camel-smtp-transport.c:294
-#: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:338
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "ç?¡æ³?以å®?å?¨æ¨¡å¼?é?£ç·?å?° SMTP 伺æ??å?¨ %sï¼? %s"
-
-# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:302
-#: ../camel/providers/smtp/camel-smtp-transport.c:314
-#: ../camel/providers/smtp/camel-smtp-transport.c:320
-msgid "STARTTLS command failed: "
-msgstr "STARTTLS æ??令失æ??ï¼?"
-
-# camel/providers/smtp/camel-smtp-transport.c:356
-#: ../camel/providers/smtp/camel-smtp-transport.c:450
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP 伺æ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?é¡?å?? %sã??"
-
-# camel/providers/smtp/camel-smtp-transport.c:418
-#: ../camel/providers/smtp/camel-smtp-transport.c:526
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"ç?¡æ³?é©?è?ç?»å?¥ SMTP 伺æ??å?¨ã??\n"
-"%s\n"
-"\n"
-
-# camel/providers/smtp/camel-smtp-transport.c:534
-#: ../camel/providers/smtp/camel-smtp-transport.c:669
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP 伺æ??å?¨ %s"
-
-# camel/providers/smtp/camel-smtp-transport.c:536
-#: ../camel/providers/smtp/camel-smtp-transport.c:671
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "ç¶?ç?± %s å?³é?? SMTP é?µä»¶"
-
-# camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:691
-#, c-format
-msgid "Cannot send message: service not connected."
-msgstr "ç?¡æ³?å?³é??è¨?æ?¯ï¼?æ??å??æ?ªé?£ç·?ã??"
-
-# camel/providers/smtp/camel-smtp-transport.c:568
-#: ../camel/providers/smtp/camel-smtp-transport.c:698
-#, c-format
-msgid "Cannot send message: sender address not valid."
-msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?å¯?件è??ç??å?°å??ç?¡æ??ã??"
-
-# mail/mail-ops.c:603
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
-msgid "Sending message"
-msgstr "å?³é??é?µä»¶"
-
-# camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:718
-#, c-format
-msgid "Cannot send message: no recipients defined."
-msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?æ²?æ??å®?義æ?¶ä»¶è??ã??"
-
-# camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
-#, c-format
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?ä¸?æ??å¤?å??ç?¡æ??ç??æ?¶ä»¶è??"
-
# importers/netscape-importer.c:790
# importers/pine-importer.c:656
-#: ../camel/providers/smtp/camel-smtp-transport.c:966
+#: ../camel/providers/smtp/camel-smtp-transport.c:1023
msgid "SMTP Greeting"
msgstr "SMTP è¿?æ?¥"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:990
-#: ../camel/providers/smtp/camel-smtp-transport.c:1005
-#: ../camel/providers/smtp/camel-smtp-transport.c:1012
+#: ../camel/providers/smtp/camel-smtp-transport.c:1050
+#: ../camel/providers/smtp/camel-smtp-transport.c:1067
+#: ../camel/providers/smtp/camel-smtp-transport.c:1075
msgid "HELO command failed: "
msgstr "HELO æ??令失æ??ï¼?"
# mail/mail-config.glade.h:10
-#: ../camel/providers/smtp/camel-smtp-transport.c:1079
+#: ../camel/providers/smtp/camel-smtp-transport.c:1143
msgid "SMTP Authentication"
msgstr "SMTP é©?è?"
# camel/providers/smtp/camel-smtp-transport.c:728
-#: ../camel/providers/smtp/camel-smtp-transport.c:1086
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
#, c-format
msgid "Error creating SASL authentication object."
msgstr "建ç«? SASL é©?è?ç?©ä»¶æ??ç?¼ç??é?¯èª¤ã??"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1102
-#: ../camel/providers/smtp/camel-smtp-transport.c:1112
-#: ../camel/providers/smtp/camel-smtp-transport.c:1120
+#: ../camel/providers/smtp/camel-smtp-transport.c:1169
+#: ../camel/providers/smtp/camel-smtp-transport.c:1180
+#: ../camel/providers/smtp/camel-smtp-transport.c:1189
msgid "AUTH command failed: "
msgstr "AUTH æ??令失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1219
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#: ../camel/providers/smtp/camel-smtp-transport.c:1238
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#: ../camel/providers/smtp/camel-smtp-transport.c:1311
+#: ../camel/providers/smtp/camel-smtp-transport.c:1320
msgid "MAIL FROM command failed: "
msgstr "MAIL FROM æ??令失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1261
+#: ../camel/providers/smtp/camel-smtp-transport.c:1347
msgid "RCPT TO command failed: "
msgstr "RCPT TO æ??令失æ??ï¼?"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1275
-#: ../camel/providers/smtp/camel-smtp-transport.c:1283
+#: ../camel/providers/smtp/camel-smtp-transport.c:1363
+#: ../camel/providers/smtp/camel-smtp-transport.c:1372
#, c-format
msgid "RCPT TO <%s> failed: "
msgstr "RCPT TO <%s> 失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1321
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1340
-#: ../camel/providers/smtp/camel-smtp-transport.c:1397
-#: ../camel/providers/smtp/camel-smtp-transport.c:1413
+#: ../camel/providers/smtp/camel-smtp-transport.c:1414
#: ../camel/providers/smtp/camel-smtp-transport.c:1424
-#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1434
+#: ../camel/providers/smtp/camel-smtp-transport.c:1493
+#: ../camel/providers/smtp/camel-smtp-transport.c:1512
+#: ../camel/providers/smtp/camel-smtp-transport.c:1525
+#: ../camel/providers/smtp/camel-smtp-transport.c:1533
msgid "DATA command failed: "
msgstr "DATA æ??令失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1453
-#: ../camel/providers/smtp/camel-smtp-transport.c:1465
-#: ../camel/providers/smtp/camel-smtp-transport.c:1472
+#: ../camel/providers/smtp/camel-smtp-transport.c:1558
+#: ../camel/providers/smtp/camel-smtp-transport.c:1572
+#: ../camel/providers/smtp/camel-smtp-transport.c:1580
msgid "RSET command failed: "
msgstr "RSET æ??令失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1494
-#: ../camel/providers/smtp/camel-smtp-transport.c:1507
-#: ../camel/providers/smtp/camel-smtp-transport.c:1513
+#: ../camel/providers/smtp/camel-smtp-transport.c:1605
+#: ../camel/providers/smtp/camel-smtp-transport.c:1619
+#: ../camel/providers/smtp/camel-smtp-transport.c:1626
msgid "QUIT command failed: "
msgstr "QUIT æ??令失æ??ï¼?"
+# addressbook/contact-editor/contact-editor.glade.h:2
+#: ../libedataserver/e-categories.c:47
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "�年�念�"
+
+# addressbook/contact-editor/contact-editor.glade.h:20
+#: ../libedataserver/e-categories.c:48
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "ç??æ?¥"
+
# addressbook/contact-editor/e-contact-editor.c:1243
# addressbook/contact-editor/e-contact-editor.c:1310
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:49
+msgctxt "CategoryName"
msgid "Business"
-msgstr "å??å??é?»è©±"
+msgstr "å??å??"
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:50
+msgctxt "CategoryName"
msgid "Competition"
msgstr "競ç?è??"
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:51
+msgctxt "CategoryName"
msgid "Favorites"
msgstr "å??æ??ç??"
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:52
+msgctxt "CategoryName"
msgid "Gifts"
msgstr "禮�"
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:53
+msgctxt "CategoryName"
msgid "Goals/Objectives"
msgstr "��/��"
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:54
+msgctxt "CategoryName"
msgid "Holiday"
msgstr "å??æ?¥"
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:55
+msgctxt "CategoryName"
msgid "Holiday Cards"
msgstr "å??æ?¥é??è«?å?¡"
# ui/evolution-addressbook.xml.h:17
#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:57
+msgctxt "CategoryName"
msgid "Hot Contacts"
msgstr "ç?±é??è?¯çµ¡äºº"
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:58
+msgctxt "CategoryName"
msgid "Ideas"
msgstr "å?µæ??"
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:59
+msgctxt "CategoryName"
msgid "International"
msgstr "å??é??ç??"
# ui/evolution-event-editor.xml.h:15
# ui/evolution-task-editor-dialog.xml.h:16
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:60
+msgctxt "CategoryName"
msgid "Key Customer"
msgstr "é??é?µå®¢æ?¶"
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:61
+msgctxt "CategoryName"
msgid "Miscellaneous"
msgstr "é??é ?"
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:62
+msgctxt "CategoryName"
msgid "Personal"
msgstr "å??人"
# calendar/gui/e-meeting-dialog.glade.h:21
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:63
+msgctxt "CategoryName"
msgid "Phone Calls"
msgstr "�話"
# calendar/gui/e-meeting-dialog.glade.h:23
# mail/message-list.c:1081
#. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:65
+msgctxt "CategoryName"
msgid "Status"
msgstr "ç??æ??"
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:66
+msgctxt "CategoryName"
msgid "Strategies"
msgstr "ç?ç?¥"
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:67
+msgctxt "CategoryName"
msgid "Suppliers"
msgstr "ä¾?æ??å??"
# addressbook/backend/ebook/e-card.c:3434
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:68
+msgctxt "CategoryName"
msgid "Time & Expenses"
msgstr "æ??é??è??é??é?·"
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:69
+msgctxt "CategoryName"
msgid "VIP"
msgstr "VIP"
# mail/mail-send-recv.c:287
# mail/mail-send-recv.c:333
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:70
+msgctxt "CategoryName"
msgid "Waiting"
msgstr "æ£å?¨ç?å¾?"
@@ -5723,63 +5813,58 @@ msgstr "æ£ä»¥å?¿å??æ?¹å¼?å?å?? LDAP 伺æ??å?¨"
msgid "Failed to authenticate.\n"
msgstr "é©?è?è?æ?¸å¤±æ??ã??\n"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: ../libedataserverui/e-categories-dialog.c:134
+msgid "Category Properties"
+msgstr "å??é¡?屬æ?§"
+
+# calendar/gui/e-calendar-table.c:150
+#: ../libedataserverui/e-categories-dialog.c:145
+msgid "Category _Name"
+msgstr "å??é¡?å??稱(_N)"
+
# calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.c:148
+#: ../libedataserverui/e-categories-dialog.c:151
+msgid "Category _Icon"
+msgstr "å??é¡?å??示(_I)"
+
+# calendar/gui/e-calendar-table.c:150
+#: ../libedataserverui/e-categories-dialog.c:192
msgid "Category Icon"
msgstr "å??é¡?å??示"
-#: ../libedataserverui/e-categories-dialog.c:154
+#: ../libedataserverui/e-categories-dialog.c:198
msgid "_No Image"
msgstr "æ²?æ??å??ç??(_N)"
-#: ../libedataserverui/e-categories-dialog.c:371
+#: ../libedataserverui/e-categories-dialog.c:409
#, c-format
msgid ""
"There is already a category '%s' in the configuration. Please use another "
"name"
msgstr "å?¨çµ?æ??ä¸å·²ç¶?æ??å??ç?ºã??%sã??ç??å??é¡?ã??è«?使ç?¨å?¦å¤?ç??å??稱"
-#: ../libedataserverui/e-categories-dialog.c:679
-msgid "Icon"
-msgstr "å??示"
-
-# calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-categories-dialog.c:684
-msgid "Category"
-msgstr "å??é¡?"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: ../libedataserverui/e-categories-dialog.ui.h:1
-msgid "Category Properties"
-msgstr "å??é¡?屬æ?§"
-
-# calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.ui.h:2
-msgid "Category _Icon"
-msgstr "å??é¡?å??示(_I)"
-
-# calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.ui.h:3
-msgid "Category _Name"
-msgstr "å??é¡?å??稱(_N)"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:4
+#: ../libedataserverui/e-categories-dialog.c:664
msgid "Currently _used categories:"
msgstr "ç?®å??使ç?¨ç??å??é¡?(_U):"
# calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.ui.h:5
+#: ../libedataserverui/e-categories-dialog.c:671
msgid "_Available Categories:"
msgstr "å?¯ç?¨ç??å??é¡?(_A):"
-#: ../libedataserverui/e-categories-dialog.ui.h:6
+#: ../libedataserverui/e-categories-dialog.c:714
msgid "_Edit"
msgstr "編輯(_E)"
-# calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.ui.h:7
-msgid "categories"
+#: ../libedataserverui/e-categories-dialog.c:770
+msgid "Icon"
+msgstr "å??示"
+
+# calendar/gui/e-tasks.c:155
+#: ../libedataserverui/e-categories-dialog.c:775
+msgid "Category"
msgstr "å??é¡?"
# calendar/gui/e-calendar-table.c:150
@@ -5788,114 +5873,117 @@ msgstr "å??é¡?"
msgid "Create category \"%s\""
msgstr "建ç«?å??é¡?ã??%sã??"
-#: ../libedataserverui/e-name-selector-dialog.c:324
-msgid "Select Contacts from Address Book"
-msgstr "å¾?é??è¨?é??é?¸å??è?¯çµ¡äºº"
+# ui/evolution-addressbook.xml.h:17
+#: ../libedataserverui/e-name-selector-dialog.c:176
+msgid "Show Contacts"
+msgstr "顯示�絡人"
-#: ../libedataserverui/e-name-selector-dialog.c:663
-msgid "_Add"
-msgstr "å? å?¥(_A)"
+#: ../libedataserverui/e-name-selector-dialog.c:198
+msgid "Address B_ook:"
+msgstr "é??è¨?é??(_O):"
-#: ../libedataserverui/e-name-selector-dialog.c:667
-msgid "_Remove"
-msgstr "移�(_R)"
+# calendar/gui/e-tasks.c:155
+#: ../libedataserverui/e-name-selector-dialog.c:206
+msgid "Cate_gory:"
+msgstr "å??é¡?(_G):"
+
+#: ../libedataserverui/e-name-selector-dialog.c:224
+msgid "_Search:"
+msgstr "æ??å°?(_S):"
# calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.c:895
-#: ../libedataserverui/e-name-selector-dialog.ui.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:242
+#: ../libedataserverui/e-name-selector-dialog.c:984
msgid "Any Category"
msgstr "ä»»ä½?å??é¡?"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:1
-msgid "*"
-msgstr "*"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>�絡人(_N)</b>"
-
# ui/evolution-addressbook.xml.h:17
-#: ../libedataserverui/e-name-selector-dialog.ui.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>顯示�絡人</b>"
+#: ../libedataserverui/e-name-selector-dialog.c:244
+msgid "Co_ntacts"
+msgstr "�絡人(_N)"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:4
-msgid "Address B_ook:"
-msgstr "é??è¨?é??(_O):"
+#: ../libedataserverui/e-name-selector-dialog.c:289
+msgid "Search"
+msgstr "æ??å°?"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:5
+#: ../libedataserverui/e-name-selector-dialog.c:292
msgid "Address Book"
msgstr "é??è¨?é??"
-# calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.ui.h:7
-msgid "Cate_gory:"
-msgstr "å??é¡?(_G):"
-
# ui/evolution-addressbook.xml.h:17
-#: ../libedataserverui/e-name-selector-dialog.ui.h:8
+#: ../libedataserverui/e-name-selector-dialog.c:295
msgid "Contacts"
msgstr "�絡人"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:9
-msgid "Search"
-msgstr "æ??å°?"
+#: ../libedataserverui/e-name-selector-dialog.c:415
+msgid "Select Contacts from Address Book"
+msgstr "å¾?é??è¨?é??é?¸å??è?¯çµ¡äºº"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:10
-msgid "_Search:"
-msgstr "æ??å°?(_S):"
+#: ../libedataserverui/e-name-selector-dialog.c:754
+msgid "_Add"
+msgstr "å? å?¥(_A)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:758
+msgid "_Remove"
+msgstr "移�(_R)"
+
+# camel/camel-movemail.c:245
+#: ../libedataserverui/e-name-selector-dialog.c:898
+#, 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:2640
+#: ../libedataserverui/e-name-selector-entry.c:2658
#, c-format
msgid "E_xpand %s Inline"
msgstr "å±?é??è¡?å?§ %s"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2655
+#: ../libedataserverui/e-name-selector-entry.c:2673
#, c-format
msgid "Cop_y %s"
msgstr "�製(_Y) %s"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2665
+#: ../libedataserverui/e-name-selector-entry.c:2683
#, c-format
msgid "C_ut %s"
msgstr "��(_U) %s"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2682
+#: ../libedataserverui/e-name-selector-entry.c:2700
#, c-format
msgid "_Edit %s"
msgstr "編輯 %s(_E)"
-#: ../libedataserverui/e-name-selector-list.c:519
+#: ../libedataserverui/e-name-selector-list.c:516
#, c-format
msgid "_Delete %s"
msgstr "��(_D) %s"
-#: ../libedataserverui/e-passwords.c:257
+#: ../libedataserverui/e-passwords.c:127
#, c-format
msgid "Keyring key is unusable: no user or host name"
msgstr "å¯?碼å??å??å¯?碼å??ç?¡æ³?使ç?¨ï¼?æ²?æ??使ç?¨è??æ??主æ©?å??稱"
-#: ../libedataserverui/e-passwords.c:1120
+#: ../libedataserverui/e-passwords.c:701
msgid "You have the Caps Lock key on."
msgstr "ä½ ç?? Caps Lock æ?¯é??å??ç??ã??"
-#: ../libedataserverui/e-passwords.c:1243
+#: ../libedataserverui/e-passwords.c:824
msgid "_Remember this passphrase"
msgstr "è¨?ä½?é??å??å¯?èª?(_R)"
-#: ../libedataserverui/e-passwords.c:1244
+#: ../libedataserverui/e-passwords.c:825
msgid "_Remember this passphrase for the remainder of this session"
msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??段ç??å¯?èª?(_R)"
-#: ../libedataserverui/e-passwords.c:1249
+#: ../libedataserverui/e-passwords.c:830
msgid "_Remember this password"
msgstr "è¨?ä½?é??å??å¯?碼(_R)"
-#: ../libedataserverui/e-passwords.c:1250
+#: ../libedataserverui/e-passwords.c:831
msgid "_Remember this password for the remainder of this session"
msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??段ç??å¯?碼(_R)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index db0c00d..1329f9c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,15 +3,18 @@
# Joe Man <trmetal yahoo com hk>, 2001.
# Chao-Hsiung Liao <pesder liao msa hinet net>, 2003.
# Craig Jeffares <cjeffares novell com>,2004.
-# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005. 2008.
+# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005. 2008, 2010.
+# Wei-Lun Chao <chaoweilun gmail com>, 2010.
+#
msgid ""
msgstr ""
-"Project-Id-Version: evolution-data-server 2.31.92\n"
+"Project-Id-Version: evolution-data-server 2.91.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-22 18:51+0800\n"
-"PO-Revision-Date: 2010-09-21 21:07+0800\n"
+"POT-Creation-Date: 2010-12-12 19:28+0800\n"
+"PO-Revision-Date: 2010-12-11 07:11+0800\n"
"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
"Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +26,7 @@ msgstr ""
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
msgid "Loading..."
-msgstr "è¼?å?¥ä¸..."
+msgstr "è¼?å?¥ä¸â?¦"
# addressbook/gui/search/e-addressbook-search-dialog.c:158
# mail/mail-search.c:242
@@ -31,85 +34,111 @@ msgstr "è¼?å?¥ä¸..."
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4482
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
msgid "Searching..."
-msgstr "æ??å°?ä¸..."
+msgstr "æ??å°?ä¸â?¦"
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4641
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
#, c-format
msgid "Downloading contacts (%d)... "
-msgstr "æ£å?¨ä¸?è¼?é?£çµ¡äºº (%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
#, c-format
msgid "Updating contacts cache (%d)... "
-msgstr "æ£å?¨æ?´æ?°é?£çµ¡äººå¿«å?? (%d)..."
+msgstr "æ£å?¨æ?´æ?°é?£çµ¡äººå¿«å?? (%d)â?¦"
# ui/evolution-addressbook.xml.h:17
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
msgid "Not connected"
msgstr "���"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
msgid "Using Distinguished Name (DN)"
msgstr "使ç?¨è¾¨èª?ç??å??稱 (DN)"
# mail/mail-config.glade.h:29
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
msgid "Using Email Address"
msgstr "使ç?¨é?»å?é?µä»¶å?°å??"
# mail/mail-config.c:1213
# mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
msgid "Reconnecting to LDAP server..."
-msgstr "æ£å?¨é??æ?°é?£æ?¥ LDAP 伺æ??å?¨..."
+msgstr "æ£å?¨é??æ?°é?£æ?¥ LDAP 伺æ??å?¨â?¦"
# camel/providers/local/camel-maildir-folder.c:218
# camel/providers/local/camel-mh-folder.c:203
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
msgid "Invalid DN syntax"
msgstr "ç?¡æ??ç?? DN èª?æ³?"
# mail/mail-config.c:1213
# mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1663
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
msgid "Adding contact to LDAP server..."
-msgstr "æ£å?¨æ?°å¢?é?£çµ¡äººè?³ LDAP 伺æ??å?¨..."
+msgstr "æ£å?¨æ?°å¢?é?£çµ¡äººè?³ LDAP 伺æ??å?¨â?¦"
# mail/mail-ops.c:1195
# mail/mail-ops.c:1333
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1795
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
msgid "Removing contact from LDAP server..."
-msgstr "æ£å?¨ç§»é?¤ LDAP 伺æ??å?¨ä¸ç??é?£çµ¡äºº..."
+msgstr "æ£å?¨ç§»é?¤ LDAP 伺æ??å?¨ä¸ç??é?£çµ¡äººâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2229
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
msgid "Modifying contact from LDAP server..."
-msgstr "æ£å?¨ä¿®æ?¹ LDAP 伺æ??å?¨ä¸ç??é?£çµ¡äºº..."
+msgstr "æ£å?¨ä¿®æ?¹ LDAP 伺æ??å?¨ä¸ç??é?£çµ¡äººâ?¦"
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4332
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
msgid "Receiving LDAP search results..."
-msgstr "æ£å?¨æ?¥æ?¶ LDAP æ??å°?çµ?æ??..."
+msgstr "æ£å?¨æ?¥æ?¶ LDAP æ??å°?çµ?æ??â?¦"
# executive-summary/component/e-summary.c:940
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4504
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
msgid "Error performing search"
msgstr "é?²è¡?æ??å°?æ??ç?¼ç??é?¯èª¤"
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
+# camel/providers/imap/camel-imap-command.c:241
+# shell/e-storage.c:481
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../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:378
+#: ../calendar/libecal/e-cal.c:4180
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
+#: ../camel/providers/imap/camel-imap-command.c:481
+#: ../camel/providers/imap/camel-imap-store.c:425
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../servers/groupwise/e-gw-connection.c:243
+msgid "Unknown error"
+msgstr "ä¸?æ??ç??é?¯èª¤"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
#, c-format
-msgid "Create resource '%s' failed with HTTP status: %d"
-msgstr "建ç«?è³?æº?ã??%sã??失æ??ï¼?HTTP ç??æ??ï¼?%d"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "建ç«?è³?æº?ã??%sã??失æ??ï¼?HTTP ç??æ??ï¼?%d (%s)"
-#: ../addressbook/libebook/e-book.c:2995
+#: ../addressbook/libebook/e-book.c:3066
#, c-format
msgid "%s: there was no source for UID '%s' stored in GConf."
msgstr "%sï¼?æ²?æ??å?²å?æ?¼ GConf ä¸ç?? UIDã??%sã??ä¾?æº?ã??"
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#: ../addressbook/libebook/e-book.c:3422
+#: ../addressbook/libedata-book/e-data-book.c:183
+msgid "Address book does not exist"
+msgstr "é??è¨?é??ä¸?å?å?¨"
+
#. Dummy row as EContactField starts from 1
#: ../addressbook/libebook/e-contact.c:115
msgid "Unique ID"
@@ -349,7 +378,7 @@ msgstr "網� URL"
# calendar/gui/e-calendar-table.c:150
#. Contact categories
#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:670
+#: ../libedataserverui/e-categories-dialog.c:759
msgid "Categories"
msgstr "å??é¡?"
@@ -645,7 +674,6 @@ msgstr "å?ºç??æ?¥æ??"
# addressbook/contact-editor/contact-editor.glade.h:2
#: ../addressbook/libebook/e-contact.c:262
#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:44
msgid "Anniversary"
msgstr "�年�念�"
@@ -743,112 +771,105 @@ 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:342
-#: ../calendar/libedata-cal/e-data-cal-factory.c:354
+#: ../calendar/libedata-cal/e-data-cal-factory.c:346
+#: ../calendar/libedata-cal/e-data-cal-factory.c:358
#, c-format
msgid "Invalid source"
msgstr "ç?¡æ??ç??ä¾?æº?"
-#: ../addressbook/libedata-book/e-data-book.c:171
-#: ../calendar/libedata-cal/e-data-cal.c:109
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:110
msgid "Success"
msgstr "æ??å??"
# shell/e-shell-view-menu.c:602
# shell/e-shell-view-menu.c:614
-#: ../addressbook/libedata-book/e-data-book.c:172
-#: ../calendar/libedata-cal/e-data-cal.c:110
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:111
msgid "Repository offline"
msgstr "è³?æ??庫é?¢ç·?"
# shell/e-storage.c:475
-#: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libecal/e-cal.c:4065 ../calendar/libedata-cal/e-data-cal.c:111
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libecal/e-cal.c:4162 ../calendar/libedata-cal/e-data-cal.c:112
msgid "Permission denied"
msgstr "æ¬?é??ä¸?足"
-#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../addressbook/libedata-book/e-data-book.c:176
msgid "Contact not found"
msgstr "����絡人"
-#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../addressbook/libedata-book/e-data-book.c:177
msgid "Contact ID already exists"
msgstr "é?£çµ¡äºº ID å·²ç¶?å?å?¨"
# camel/camel-sasl-anonymous.c:110
# camel/camel-sasl-plain.c:87
-#: ../addressbook/libedata-book/e-data-book.c:176
-#: ../calendar/libedata-cal/e-data-cal.c:116
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:117
msgid "Authentication Failed"
msgstr "é©?è?失æ??"
# camel/providers/smtp/camel-smtp-transport.c:218
-#: ../addressbook/libedata-book/e-data-book.c:177
-#: ../calendar/libedata-cal/e-data-cal.c:117
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:118
msgid "Authentication Required"
msgstr "è¦?æ±?é©?è?"
# mail/mail-config.glade.h:1
-#: ../addressbook/libedata-book/e-data-book.c:178
-#: ../calendar/libedata-cal/e-data-cal.c:118
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:119
msgid "Unsupported field"
msgstr "ä¸?æ?¯æ?´ç??æ¬?ä½?"
# camel/providers/imap/camel-imap-store.c:466
# camel/providers/smtp/camel-smtp-transport.c:366
-#: ../addressbook/libedata-book/e-data-book.c:179
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:121
msgid "Unsupported authentication method"
msgstr "ä¸?æ?¯æ?´ç??é©?è?æ?¹æ³?"
-#: ../addressbook/libedata-book/e-data-book.c:180
-#: ../calendar/libedata-cal/e-data-cal.c:121
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:122
msgid "TLS not available"
msgstr "��使� TLS"
-# camel/providers/local/camel-maildir-store.c:100
-# camel/providers/local/camel-mbox-store.c:101
-# camel/providers/local/camel-mh-store.c:97
-#: ../addressbook/libedata-book/e-data-book.c:181
-msgid "Address book does not exist"
-msgstr "é??è¨?é??ä¸?å?å?¨"
-
-#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../addressbook/libedata-book/e-data-book.c:184
msgid "Book removed"
msgstr "é??è¨?é??å·²ç¶?移é?¤"
# camel/providers/imap/camel-imap-folder.c:1047
# camel/providers/imap/camel-imap-folder.c:1281
-#: ../addressbook/libedata-book/e-data-book.c:183
-#: ../calendar/libedata-cal/e-data-cal.c:124
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:125
msgid "Not available in offline mode"
msgstr "�����模��使�"
-#: ../addressbook/libedata-book/e-data-book.c:184
-#: ../calendar/libedata-cal/e-data-cal.c:125
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:126
msgid "Search size limit exceeded"
msgstr "è¶?é??æ??å°?大å°?é??å?¶"
-#: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:126
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:127
msgid "Search time limit exceeded"
msgstr "è¶?é??æ??å°?æ??é??é??å?¶"
# camel/providers/local/camel-maildir-folder.c:218
# camel/providers/local/camel-mh-folder.c:203
-#: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:127
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:128
msgid "Invalid query"
msgstr "ç?¡æ??ç??æ?¥è©¢"
-#: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libedata-cal/e-data-cal.c:128
+#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../calendar/libedata-cal/e-data-cal.c:129
msgid "Query refused"
msgstr "æ?¥è©¢è¢«æ??çµ?"
# calendar/gui/e-itip-control.c:883
-#: ../addressbook/libedata-book/e-data-book.c:188
-#: ../calendar/libedata-cal/e-data-cal.c:129
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:130
msgid "Could not cancel"
msgstr "ç?¡æ³?å??æ¶?"
@@ -856,44 +877,45 @@ msgstr "ç?¡æ³?å??æ¶?"
# camel/providers/local/camel-mh-folder.c:203
#. { E_DATA_BOOK_STATUS_OTHER_ERROR, N_("Other error") },
#. { OtherError, N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:190
-#: ../calendar/libedata-cal/e-data-cal.c:131
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:132
msgid "Invalid server version"
msgstr "ç?¡æ??ç??伺æ??å?¨ç??æ?¬"
# camel/providers/imap/camel-imap-provider.c:54
-#: ../addressbook/libedata-book/e-data-book.c:191
+#: ../addressbook/libedata-book/e-data-book.c:193
msgid "No space"
msgstr "æ²?æ??空é??"
# camel/providers/local/camel-maildir-folder.c:218
# camel/providers/local/camel-mh-folder.c:203
-#: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libecal/e-cal.c:4049 ../calendar/libedata-cal/e-data-cal.c:132
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libecal/e-cal.c:4146 ../calendar/libedata-cal/e-data-cal.c:133
msgid "Invalid argument"
msgstr "ç?¡æ??ç??å??æ?¸"
# shell/e-storage.c:477
-#: ../addressbook/libedata-book/e-data-book.c:193
-#: ../calendar/libecal/e-cal.c:4087 ../calendar/libedata-cal/e-data-cal.c:133
+#. 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
msgid "Not supported"
msgstr "���"
# addressbook/gui/widgets/e-addressbook-view.c:718
-#: ../addressbook/libedata-book/e-data-book.c:201
-#: ../calendar/libedata-cal/e-data-cal.c:141
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:143
msgid "Other error"
msgstr "���誤"
# camel/camel-filter-driver.c:671
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:322
+#: ../addressbook/libedata-book/e-data-book.c:325
#, c-format
msgid "Cannot open book: %s"
msgstr "ä¸?è?½é??å??æ?¸ç±?ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:344
+#: ../addressbook/libedata-book/e-data-book.c:347
#, c-format
msgid "Cannot remove book: %s"
msgstr "��移����%s"
@@ -901,14 +923,14 @@ msgstr "��移����%s"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:361
-#: ../addressbook/libedata-book/e-data-book.c:380
+#: ../addressbook/libedata-book/e-data-book.c:364
+#: ../addressbook/libedata-book/e-data-book.c:383
#, c-format
msgid "Cannot get contact: %s"
msgstr "ä¸?è?½å??å¾?é?£çµ¡äººï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:395
+#: ../addressbook/libedata-book/e-data-book.c:402
#, c-format
msgid "Empty query: %s"
msgstr "空ç??æ?¥è©¢ï¼?%s"
@@ -916,36 +938,36 @@ msgstr "空ç??æ?¥è©¢ï¼?%s"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:411
+#: ../addressbook/libedata-book/e-data-book.c:418
#, c-format
msgid "Cannot get contact list: %s"
msgstr "ä¸?è?½å??å¾?é?£çµ¡äººæ¸?å?®ï¼?%s"
# camel/providers/pop3/camel-pop3-store.c:199
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:448
+#: ../addressbook/libedata-book/e-data-book.c:457
#, c-format
msgid "Cannot authenticate user: %s"
msgstr "ä¸?è?½é©?è?使ç?¨è??ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:463
-#: ../addressbook/libedata-book/e-data-book.c:482
+#: ../addressbook/libedata-book/e-data-book.c:472
+#: ../addressbook/libedata-book/e-data-book.c:491
#, c-format
msgid "Cannot add contact: %s"
msgstr "ä¸?è?½å? å?¥é?£çµ¡äººï¼?%s"
# mail/mail-crypto.c:251
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:500
-#: ../addressbook/libedata-book/e-data-book.c:519
+#: ../addressbook/libedata-book/e-data-book.c:513
+#: ../addressbook/libedata-book/e-data-book.c:532
#, c-format
msgid "Cannot modify contact: %s"
msgstr "��修��絡人�%s"
# mail/mail-crypto.c:251
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:558
+#: ../addressbook/libedata-book/e-data-book.c:571
#, c-format
msgid "Cannot remove contacts: %s"
msgstr "��移��絡人�%s"
@@ -958,7 +980,7 @@ msgstr "��移��絡人�%s"
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:595
+#: ../addressbook/libedata-book/e-data-book.c:610
#, c-format
msgid "Cannot get supported fields: %s"
msgstr "ä¸?è?½å??å¾?æ?¯æ?´ç??æ¬?ä½?ï¼?%s"
@@ -971,7 +993,7 @@ msgstr "ä¸?è?½å??å¾?æ?¯æ?´ç??æ¬?ä½?ï¼?%s"
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:610
+#: ../addressbook/libedata-book/e-data-book.c:625
#, c-format
msgid "Cannot get required fields: %s"
msgstr "ä¸?è?½å??å¾?è¦?æ±?ç??æ¬?ä½?ï¼?%s"
@@ -979,7 +1001,7 @@ msgstr "ä¸?è?½å??å¾?è¦?æ±?ç??æ¬?ä½?ï¼?%s"
# camel/providers/imap/camel-imap-store.c:466
# camel/providers/smtp/camel-smtp-transport.c:366
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:625
+#: ../addressbook/libedata-book/e-data-book.c:640
#, c-format
msgid "Cannot get supported authentication methods: %s"
msgstr "ä¸?è?½å??å¾?æ?¯æ?´ç??é©?è?æ?¹æ³?ï¼?%s"
@@ -987,8 +1009,8 @@ msgstr "ä¸?è?½å??å¾?æ?¯æ?´ç??é©?è?æ?¹æ³?ï¼?%s"
# camel/providers/local/camel-maildir-folder.c:218
# camel/providers/local/camel-mh-folder.c:203
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:651
-#: ../addressbook/libedata-book/e-data-book.c:662
+#: ../addressbook/libedata-book/e-data-book.c:666
+#: ../addressbook/libedata-book/e-data-book.c:677
#, c-format
msgid "Invalid query: %s"
msgstr "ç?¡æ??ç??æ?¥è©¢ï¼?%s"
@@ -1001,7 +1023,7 @@ msgstr "ç?¡æ??ç??æ?¥è©¢ï¼?%s"
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:698
+#: ../addressbook/libedata-book/e-data-book.c:713
#, c-format
msgid "Cannot get changes: %s"
msgstr "ä¸?è?½å??å¾?è®?æ?´ï¼?%s"
@@ -1011,26 +1033,40 @@ msgstr "ä¸?è?½å??å¾?è®?æ?´ï¼?%s"
# camel/camel-remote-store.c:470
# camel/providers/imap/camel-imap-command.c:287
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:738
+#: ../addressbook/libedata-book/e-data-book.c:755
#, c-format
msgid "Cancel operation failed: %s"
msgstr "å??æ¶?æ??ä½?失æ??ï¼?%s"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:530
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
#, c-format
-msgid "Unexpected HTTP status code %d returned"
-msgstr "å?³å??æ?ªé ?æ??ç?? HTTP ç??æ??碼 %d"
+msgid "Server is unreachable (%s)"
+msgstr "ç?¡æ³?é?£æ?¥ä¼ºæ??å?¨ (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#, c-format
+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
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+"ç?¡æ³?é?£æ?¥ä¼ºæ??å?¨ï¼?è¡?äº?æ??æ??以å?¯è®?模å¼?é??å??ã??\n"
+"�誤���%s"
# camel/providers/local/camel-maildir-store.c:100
# camel/providers/local/camel-mbox-store.c:101
# camel/providers/local/camel-mh-store.c:97
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4142
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4266
msgid "Calendar doesn't support Free/Busy"
msgstr "è¡?äº?æ??ä¸?æ?¯æ?´ç©ºé??/å¿?ç¢?"
# addressbook/contact-editor/contact-editor.glade.h:20
#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
-#: ../libedataserver/e-categories.c:45
msgid "Birthday"
msgstr "ç??æ?¥"
@@ -1056,58 +1092,69 @@ msgid "Cannot save calendar data"
msgstr "ä¸?è?½å?²å?è¡?äº?æ??è³?æ??"
#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2251
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2107
msgid "Reply Requested: by "
msgstr "è¦?æ±?å??è¦?ï¼?ä¾?"
#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2256
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2112
msgid "Reply Requested: When convenient"
msgstr "è¦?æ±?å??è¦?ï¼?ç?¶æ??空æ??"
#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:330
-#, c-format
-msgid "Loading %s items"
-msgstr "è¼?å?¥ %s å??é ?ç?®"
+msgid "Loading Appointment items"
+msgstr "æ£å?¨è¼?å?¥ç´?æ??é ?ç?®"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:332
+msgid "Loading Task items"
+msgstr "æ£å?¨è¼?å?¥å·¥ä½?é ?ç?®"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:334
+msgid "Loading Note items"
+msgstr "æ£å?¨è¼?å?¥ç?è¨?é ?ç?®"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:336
+msgid "Loading items"
+msgstr "æ£å?¨è¼?å?¥é ?ç?®"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
# ui/evolution-calendar.xml.h:3
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:959
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:963
msgid "Calendar"
msgstr "è¡?äº?æ??"
# camel/providers/local/camel-maildir-folder.c:218
# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1022
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1026
msgid "Invalid server URI"
msgstr "ç?¡æ??ç??伺æ??å?¨ URI"
# camel/providers/local/camel-mbox-store.c:110
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1123
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1383
-#: ../calendar/backends/http/e-cal-backend-http.c:690
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1387
+#: ../calendar/backends/http/e-cal-backend-http.c:721
#: ../calendar/backends/weather/e-cal-backend-weather.c:520
msgid "Could not create cache file"
msgstr "ç?¡æ³?建æ§?å¿«å??æª?æ¡?"
# camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1135
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1139
msgid "Could not create thread for populating cache"
msgstr "ç?¡æ³?建æ§?移æ¤?å¿«å??ç??å?·è¡?ç·?"
# mail/mail-config.glade.h:37
-#: ../calendar/backends/http/e-cal-backend-http.c:359
+#: ../calendar/backends/http/e-cal-backend-http.c:366
msgid "Redirected to Invalid URI"
msgstr "é??æ?°æ??å??ç?¡æ??ç?? URI"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/backends/http/e-cal-backend-http.c:382
+#: ../calendar/backends/http/e-cal-backend-http.c:399
msgid "Bad file format."
msgstr "é?¯èª¤ç??æª?æ¡?æ ¼å¼?ã??"
# camel/providers/imap/camel-imap-store.c:803
# mail/mail-local.c:334
-#: ../calendar/backends/http/e-cal-backend-http.c:389
+#: ../calendar/backends/http/e-cal-backend-http.c:406
msgid "Not a calendar."
msgstr "並é??è¡?äº?æ??ã??"
@@ -1159,7 +1206,7 @@ msgid "Forecast"
msgstr "天氣é ?å ±"
# calendar/gui/dialogs/alarm-notify.glade.h:2
-#: ../calendar/libecal/e-cal-component.c:1286
+#: ../calendar/libecal/e-cal-component.c:1306
msgid "Untitled appointment"
msgstr "æ?ªå?½å??ç??ç´?æ??"
@@ -1349,7 +1396,7 @@ msgid "Undefined"
msgstr "æ?ªæ??å®?"
# camel/camel-smime-context.c:194
-#: ../calendar/libecal/e-cal.c:1227 ../libedataserverui/e-book-auth-util.c:206
+#: ../calendar/libecal/e-cal.c:1236 ../libedataserverui/e-book-auth-util.c:206
#: ../libedataserverui/e-book-auth-util.c:435
#, c-format
msgid "Enter password for %s (user %s)"
@@ -1360,60 +1407,60 @@ 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:1241
+#: ../calendar/libecal/e-cal.c:1250
#, c-format
msgid "Enter password for %s to enable proxy for user %s"
msgstr "輸å?¥ %s ç??å¯?碼以便使ç?¨è?? %s è?½ä½¿ç?¨ä»£ç??伺æ??å?¨"
-#: ../calendar/libecal/e-cal.c:4051
+#: ../calendar/libecal/e-cal.c:4148
msgid "Backend is busy"
msgstr "å¾?端å¿?ç¢?ä¸"
# shell/e-shell-view-menu.c:602
# shell/e-shell-view-menu.c:614
-#: ../calendar/libecal/e-cal.c:4053
+#: ../calendar/libecal/e-cal.c:4150
msgid "Repository is offline"
msgstr "å??庫已é?¢ç·?"
# camel/providers/imap/camel-imap-store.c:803
# mail/mail-local.c:334
-#: ../calendar/libecal/e-cal.c:4055
+#: ../calendar/libecal/e-cal.c:4152
msgid "No such calendar"
msgstr "ç?¡æ¤è¡?äº?æ??"
-#: ../calendar/libecal/e-cal.c:4057 ../calendar/libedata-cal/e-data-cal.c:113
+#: ../calendar/libecal/e-cal.c:4154 ../calendar/libedata-cal/e-data-cal.c:114
#: ../servers/groupwise/e-gw-connection.c:235
msgid "Object not found"
msgstr "����件"
# camel/providers/local/camel-maildir-folder.c:218
# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libecal/e-cal.c:4059 ../calendar/libedata-cal/e-data-cal.c:114
+#: ../calendar/libecal/e-cal.c:4156 ../calendar/libedata-cal/e-data-cal.c:115
#: ../servers/groupwise/e-gw-connection.c:229
msgid "Invalid object"
msgstr "ç?¡æ??ç??ç?©ä»¶"
# addressbook/conduit/address-conduit.c:214
-#: ../calendar/libecal/e-cal.c:4061
+#: ../calendar/libecal/e-cal.c:4158
msgid "URI not loaded"
msgstr "URI ���"
-#: ../calendar/libecal/e-cal.c:4063
+#: ../calendar/libecal/e-cal.c:4160
msgid "URI already loaded"
msgstr "URI 已��"
# camel/providers/imap/camel-imap-command.c:241
# shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4067 ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4164 ../servers/groupwise/e-gw-connection.c:237
msgid "Unknown User"
msgstr "ä¸?æ??ç??使ç?¨è??"
-#: ../calendar/libecal/e-cal.c:4069 ../calendar/libedata-cal/e-data-cal.c:115
+#: ../calendar/libecal/e-cal.c:4166 ../calendar/libedata-cal/e-data-cal.c:116
msgid "Object ID already exists"
msgstr "ç?©ä»¶ ID å·²å?å?¨"
# shell/e-storage.c:477
-#: ../calendar/libecal/e-cal.c:4071
+#: ../calendar/libecal/e-cal.c:4168
msgid "Protocol not supported"
msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
@@ -1421,51 +1468,40 @@ msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
# camel/camel-remote-store.c:399
# camel/camel-remote-store.c:470
# camel/providers/imap/camel-imap-command.c:287
-#: ../calendar/libecal/e-cal.c:4073
+#: ../calendar/libecal/e-cal.c:4170
msgid "Operation has been canceled"
msgstr "æ??ä½?å·²å??æ¶?"
# calendar/gui/e-itip-control.c:883
-#: ../calendar/libecal/e-cal.c:4075
+#: ../calendar/libecal/e-cal.c:4172
msgid "Could not cancel operation"
msgstr "ç?¡æ³?å??æ¶?æ??ä½?"
# camel/camel-sasl-anonymous.c:110
# camel/camel-sasl-plain.c:87
-#: ../calendar/libecal/e-cal.c:4077
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1466
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1484
-#: ../camel/providers/groupwise/camel-groupwise-store.c:618
-#: ../camel/providers/groupwise/camel-groupwise-store.c:793
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
+#: ../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
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
#, c-format
msgid "Authentication failed"
msgstr "é©?è?失æ??"
# camel/providers/smtp/camel-smtp-transport.c:218
-#: ../calendar/libecal/e-cal.c:4079
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../calendar/libecal/e-cal.c:4176
+#: ../camel/providers/smtp/camel-smtp-transport.c:768
msgid "Authentication required"
msgstr "è¦?æ±?é©?è?"
-#: ../calendar/libecal/e-cal.c:4081
+#: ../calendar/libecal/e-cal.c:4178
msgid "A D-Bus exception has occurred"
msgstr "ç?¼ç?? D-Bus ä¾?å¤?"
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4083
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
-#: ../camel/providers/imap/camel-imap-command.c:457
-#: ../camel/providers/imap/camel-imap-store.c:627
-#: ../camel/providers/pop3/camel-pop3-store.c:474
-#: ../servers/groupwise/e-gw-connection.c:243
-msgid "Unknown error"
-msgstr "ä¸?æ??ç??é?¯èª¤"
-
# shell/e-storage.c:459
-#: ../calendar/libecal/e-cal.c:4085
+#: ../calendar/libecal/e-cal.c:4182
msgid "No error"
msgstr "æ²?æ??é?¯èª¤"
@@ -1565,246 +1601,241 @@ msgstr "ã??%sã??ç??æ??æ??å¼?æ?¸å¿?é ?ç?ºå?串ï¼?æ??å?ªæ??ä¸?å??å¼?æ?¸ç?ºå¸?æ??
# camel/providers/local/camel-maildir-folder.c:218
# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-data-cal.c:112
+#: ../calendar/libedata-cal/e-data-cal.c:113
msgid "Invalid range"
msgstr "ç?¡æ??ç??ç¯?å??"
# mail/mail-config.glade.h:1
-#: ../calendar/libedata-cal/e-data-cal.c:119
+#: ../calendar/libedata-cal/e-data-cal.c:120
msgid "Unsupported method"
msgstr "ä¸?æ?¯æ?´ç??æ?¹æ³?"
# camel/providers/local/camel-maildir-store.c:100
# camel/providers/local/camel-mbox-store.c:101
# camel/providers/local/camel-mh-store.c:97
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#: ../calendar/libedata-cal/e-data-cal.c:123
msgid "Calendar does not exist"
msgstr "è¡?äº?æ??ä¸?å?å?¨"
# camel/providers/imap/camel-imap-command.c:241
# shell/e-storage.c:481
-#: ../calendar/libedata-cal/e-data-cal.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:124
msgid "Unknown user"
msgstr "ä¸?æ??ç??使ç?¨è??"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:608
+#: ../calendar/libedata-cal/e-data-cal.c:610
#, 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:628
+#: ../calendar/libedata-cal/e-data-cal.c:635
#, 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:648
+#: ../calendar/libedata-cal/e-data-cal.c:660
#, c-format
msgid "Cannot retrieve calendar's LDAP attribute: %s"
msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?? LDAP 屬æ?§ï¼?%s"
# camel/camel-filter-driver.c:671
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:668
+#: ../calendar/libedata-cal/e-data-cal.c:685
#, 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:687
+#: ../calendar/libedata-cal/e-data-cal.c:709
#, 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:708
+#: ../calendar/libedata-cal/e-data-cal.c:730
#, 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:727
+#: ../calendar/libedata-cal/e-data-cal.c:749
#, c-format
msgid "Cannot remove calendar: %s"
msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??ï¼?%s"
# mail/mail-crypto.c:251
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:748
+#: ../calendar/libedata-cal/e-data-cal.c:770
#, 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:772
+#: ../calendar/libedata-cal/e-data-cal.c:798
#, 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:798
+#: ../calendar/libedata-cal/e-data-cal.c:824
#, 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:819
+#: ../calendar/libedata-cal/e-data-cal.c:845
#, 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:838
+#: ../calendar/libedata-cal/e-data-cal.c:864
#, 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:859
+#: ../calendar/libedata-cal/e-data-cal.c:885
#, 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:884
+#: ../calendar/libedata-cal/e-data-cal.c:912
#, 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:904
+#: ../calendar/libedata-cal/e-data-cal.c:937
#, 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:924
+#: ../calendar/libedata-cal/e-data-cal.c:962
#, c-format
msgid "Cannot retrieve calendar object list: %s"
msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶æ¸?å?®ï¼?%s"
# mail/mail-ops.c:1872
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:952
+#: ../calendar/libedata-cal/e-data-cal.c:990
#, c-format
msgid "Could not retrieve attachment list: %s"
msgstr "ä¸?è?½å??å¾?é??件æ¸?å?®ï¼?%s"
# camel/providers/local/camel-mbox-store.c:110
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:978
+#: ../calendar/libedata-cal/e-data-cal.c:1016
#, c-format
msgid "Could not complete calendar query: %s"
msgstr "ä¸?è?½å®?æ??è¡?äº?æ??æ?¥è©¢ï¼?%s"
# mail/mail-ops.c:1872
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:998
+#: ../calendar/libedata-cal/e-data-cal.c:1041
#, c-format
msgid "Could not retrieve calendar time zone: %s"
msgstr "ä¸?è?½å??å¾?è¡?äº?æ??æ??å??ï¼?%s"
# calendar/gui/e-itip-control.c:883
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1018
+#: ../calendar/libedata-cal/e-data-cal.c:1066
#, 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:1037
+#: ../calendar/libedata-cal/e-data-cal.c:1085
#, 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:1060
+#: ../calendar/libedata-cal/e-data-cal.c:1108
#, 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:1091
+#: ../calendar/libedata-cal/e-data-cal.c:1139
#, c-format
msgid "Cannot retrieve calendar free/busy list: %s"
msgstr "ä¸?è?½å??å¾?è¡?äº?æ??空é??/å¿?ç¢?æ¸?å?®ï¼?%s"
# camel/providers/local/camel-maildir-folder.c:218
# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-data-cal-factory.c:364
+#: ../calendar/libedata-cal/e-data-cal-factory.c:368
#, c-format
msgid "Invalid URI"
msgstr "ç?¡æ??ç?? URI"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:382
+#: ../calendar/libedata-cal/e-data-cal-factory.c:386
#, c-format
msgid "No backend factory for '%s' of '%s'"
msgstr "æ²?æ??ã??%2$sã??ç??ã??%1$sã??ç??å¾?ç«¯å·¥å» "
# camel/providers/local/camel-mbox-store.c:110
-#: ../calendar/libedata-cal/e-data-cal-factory.c:432
+#: ../calendar/libedata-cal/e-data-cal-factory.c:436
#, c-format
msgid "Could not instantiate backend"
msgstr "ç?¡æ³?實é«?å??å¾?端ç¨?å¼?"
# camel/camel-cipher-context.c:171
-#: ../camel/camel-cipher-context.c:75
+#: ../camel/camel-cipher-context.c:204
#, c-format
msgid "Signing is not supported by this cipher"
msgstr "é??種å? å¯?æ?¹å¼?ä¸?æ?¯æ?´ç°½ç½²"
-# mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:110
-msgid "Signing message"
-msgstr "æ£å?¨ç°½ç½²è¨?æ?¯"
-
# camel/camel-cipher-context.c:251
-#: ../camel/camel-cipher-context.c:131
+#: ../camel/camel-cipher-context.c:217
#, c-format
msgid "Verifying is not supported by this cipher"
msgstr "é??種å? å¯?æ?¹å¼?ä¸?æ?¯æ?´é©?è?簽署"
-# mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:164
-msgid "Verifying message"
-msgstr "æ£å?¨ç¢ºèª?è¨?æ?¯"
-
# camel/camel-cipher-context.c:294
-#: ../camel/camel-cipher-context.c:188
+#: ../camel/camel-cipher-context.c:233
#, c-format
msgid "Encryption is not supported by this cipher"
msgstr "é??種å? å¯?æ?¹å¼?ä¸?æ?¯æ?´å? å¯?"
-# mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:223
-msgid "Encrypting message"
-msgstr "æ£å?¨å? å¯?è¨?æ?¯"
-
# camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:246
+#: ../camel/camel-cipher-context.c:247
#, c-format
msgid "Decryption is not supported by this cipher"
msgstr "é??種å? å¯?æ?¹å¼?ä¸?æ?¯æ?´è§£å¯?"
-# mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:276
-msgid "Decrypting message"
-msgstr "æ£å?¨è§£å¯?è¨?æ?¯"
-
# camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:297
+#: ../camel/camel-cipher-context.c:260
#, c-format
msgid "You may not import keys with this cipher"
msgstr "æ?¨ä¸?è?½å?¯å?¥é??種å? å¯?æ?¹å¼?ç??é??é?°"
# camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:341
+#: ../camel/camel-cipher-context.c:274
#, c-format
msgid "You may not export keys with this cipher"
msgstr "æ?¨ä¸?è?½å?¯å?ºé??種å? å¯?æ?¹å¼?ç??é??é?°"
+# mail/mail-ops.c:603
+#: ../camel/camel-cipher-context.c:815
+msgid "Signing message"
+msgstr "æ£å?¨ç°½ç½²è¨?æ?¯"
+
+# mail/mail-ops.c:603
+#: ../camel/camel-cipher-context.c:1056
+msgid "Encrypting message"
+msgstr "æ£å?¨å? å¯?è¨?æ?¯"
+
+# mail/mail-ops.c:603
+#: ../camel/camel-cipher-context.c:1183
+msgid "Decrypting message"
+msgstr "æ£å?¨è§£å¯?è¨?æ?¯"
+
# mail/mail-ops.c:1728
#: ../camel/camel-data-cache.c:181
#, c-format
@@ -1820,12 +1851,12 @@ msgstr "ç?¡æ³?移é?¤å¿«å??é ?ç?®ï¼? %sï¼? %s"
# camel/providers/local/camel-maildir-folder.c:197
# camel/providers/local/camel-mbox-folder.c:319
# camel/providers/local/camel-mh-folder.c:185
-#: ../camel/camel-data-wrapper.c:89
+#: ../camel/camel-data-wrapper.c:147
#, c-format
msgid "No stream available"
msgstr "æ²?æ??å?¯ç?¨ç??串æµ?"
-#: ../camel/camel-db.c:464
+#: ../camel/camel-db.c:455
#, c-format
msgid "Insufficient memory"
msgstr "����足"
@@ -1841,8 +1872,8 @@ msgstr ""
"æ?¥ä¸?ä¾?å?¨æ¤ä¼ºæ??å?¨ä¸?ç??æ??ä½?ï¼?å?¨æ?¨é??æ?°é?£ç·?å?°ç¶²è·¯æ??\n"
"å°?ä¸?æ??é??æ?ã??"
-#: ../camel/camel-disco-diary.c:258
-#: ../camel/providers/imap/camel-imap-journal.c:298
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:300
#, c-format
msgid ""
"Could not open '%s':\n"
@@ -1853,43 +1884,43 @@ msgstr ""
"%s\n"
"é??å??è³?æ??夾å?§æ??å??ç??è®?æ?´å°?ä¸?æ??é??æ?°å??æ¥ã??"
-#: ../camel/camel-disco-diary.c:299
+#: ../camel/camel-disco-diary.c:304
msgid "Resynchronizing with server"
msgstr "è??伺æ??å?¨é??æ?°å??æ¥"
-#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
+#: ../camel/camel-disco-folder.c:67 ../camel/camel-offline-folder.c:83
msgid "Downloading new messages for offline mode"
msgstr "æ£å?¨ä¸?è¼?æ?°è¨?æ?¯ç?¨æ?¼é?¢ç·?模å¼?"
# mail/mail-ops.c:1195
# mail/mail-ops.c:1333
-#: ../camel/camel-disco-folder.c:379
+#: ../camel/camel-disco-folder.c:389
#, c-format
msgid "Preparing folder '%s' for offline"
msgstr "æº?å??è³?æ??夾ã??%sã??ä¾?é?¢ç·?使ç?¨"
-#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
+#: ../camel/camel-disco-folder.c:455 ../camel/camel-offline-folder.c:316
msgid "Copy folder content locally for offline operation"
msgstr "è¤?製è³?æ??夾å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥"
# camel/camel-disco-store.c:271
-#: ../camel/camel-disco-store.c:398
-#: ../camel/providers/groupwise/camel-groupwise-store.c:230
-#: ../camel/providers/imap/camel-imap-store.c:876
-#: ../camel/providers/imap/camel-imap-store.c:1720
-#: ../camel/providers/imap/camel-imap-store.c:2178
-#: ../camel/providers/imap/camel-imap-store.c:3022
-#: ../camel/providers/imapx/camel-imapx-folder.c:164
-#: ../camel/providers/imapx/camel-imapx-folder.c:195
-#: ../camel/providers/imapx/camel-imapx-folder.c:224
-#: ../camel/providers/imapx/camel-imapx-folder.c:282
-#: ../camel/providers/imapx/camel-imapx-folder.c:325
-#: ../camel/providers/imapx/camel-imapx-folder.c:357
-#: ../camel/providers/imapx/camel-imapx-folder.c:388
-#: ../camel/providers/imapx/camel-imapx-store.c:193
-#: ../camel/providers/imapx/camel-imapx-store.c:720
-#: ../camel/providers/imapx/camel-imapx-store.c:783
-#: ../camel/providers/imapx/camel-imapx-store.c:842
+#: ../camel/camel-disco-store.c:420
+#: ../camel/providers/groupwise/camel-groupwise-store.c:232
+#: ../camel/providers/imap/camel-imap-store.c:1250
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2244
+#: ../camel/providers/imap/camel-imap-store.c:3094
+#: ../camel/providers/imapx/camel-imapx-folder.c:298
+#: ../camel/providers/imapx/camel-imapx-folder.c:331
+#: ../camel/providers/imapx/camel-imapx-folder.c:385
+#: ../camel/providers/imapx/camel-imapx-folder.c:431
+#: ../camel/providers/imapx/camel-imapx-folder.c:465
+#: ../camel/providers/imapx/camel-imapx-folder.c:505
+#: ../camel/providers/imapx/camel-imapx-folder.c:541
+#: ../camel/providers/imapx/camel-imapx-store.c:277
+#: ../camel/providers/imapx/camel-imapx-store.c:1299
+#: ../camel/providers/imapx/camel-imapx-store.c:1387
+#: ../camel/providers/imapx/camel-imapx-store.c:1422
#, c-format
msgid "You must be working online to complete this operation"
msgstr "æ?¨å¿?é ?æ?¼ç·?ä¸?å·¥ä½?æ??è?½å®?æ??æ¤æ??ä½?"
@@ -1900,114 +1931,88 @@ msgstr "æ?¨å¿?é ?æ?¼ç·?ä¸?å·¥ä½?æ??è?½å®?æ??æ¤æ??ä½?"
# calendar/gui/e-calendar-table.c:422
# camel/camel-service.c:544
# camel/camel-service.c:580
-#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
-#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
-#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
-#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:514
-#: ../camel/camel-net-utils.c:691 ../camel/camel-net-utils.c:840
-#: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:4691
-#: ../camel/providers/imapx/camel-imapx-server.c:4708
-#: ../camel/providers/imapx/camel-imapx-store.c:241
-#: ../camel/providers/nntp/camel-nntp-summary.c:396
-#: ../camel/providers/pop3/camel-pop3-folder.c:269
-#: ../camel/providers/pop3/camel-pop3-folder.c:625
-#: ../camel/providers/pop3/camel-pop3-folder.c:690
-#: ../camel/providers/pop3/camel-pop3-store.c:466
-#: ../libedataserverui/e-book-auth-util.c:229
-#, c-format
-msgid "Cancelled"
-msgstr "å·²å??æ¶?"
-
-# calendar/gui/calendar-model.c:647
-# calendar/gui/calendar-model.c:1182
-# calendar/gui/dialogs/task-editor-dialog.glade.h:4
-# calendar/gui/e-calendar-table.c:422
-# camel/camel-service.c:544
-# camel/camel-service.c:580
-#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
-#: ../camel/camel-file-utils.c:791
+#: ../camel/camel-file-utils.c:719
#, c-format
msgid "Canceled"
msgstr "å·²å??æ¶?"
# camel/camel-filter-driver.c:670
# camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:839 ../camel/camel-filter-search.c:582
#, c-format
msgid "Failed to create child process '%s': %s"
msgstr "ç?¡æ³?建æ§?å?代è??ç?? '%s'ï¼?%s"
# camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/camel-filter-driver.c:853
+#: ../camel/camel-filter-driver.c:886
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "ç?¡æ³?è®?å?? %s ç??æ¡è¿?è¾ï¼? %s"
# camel/camel-filter-driver.c:534
# camel/camel-filter-driver.c:543
-#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
+#: ../camel/camel-filter-driver.c:1073 ../camel/camel-filter-driver.c:1082
msgid "Syncing folders"
msgstr "å??æ¥è??ç??è³?æ??夾"
# camel/camel-filter-driver.c:866
-#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
+#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1620
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "å??æ??é??濾å?¨ç?¼ç??é?¯èª¤ï¼? %s: %s"
# camel/camel-filter-driver.c:871
-#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
+#: ../camel/camel-filter-driver.c:1181 ../camel/camel-filter-driver.c:1631
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "å?·è¡?é??濾å?¨ç?¼ç??é?¯èª¤ï¼? %s: %s"
# camel/camel-filter-driver.c:643
-#: ../camel/camel-filter-driver.c:1240
+#: ../camel/camel-filter-driver.c:1278
#, c-format
msgid "Unable to open spool folder"
msgstr "ç?¡æ³?é??å??æ??ç¨?å?¨è³?æ??夾"
# camel/camel-filter-driver.c:652
-#: ../camel/camel-filter-driver.c:1251
+#: ../camel/camel-filter-driver.c:1289
#, c-format
msgid "Unable to process spool folder"
msgstr "ç?¡æ³?è??ç??æ??ç¨?å?¨è³?æ??夾"
# camel/camel-filter-driver.c:666
-#: ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1307
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "���件 %d (%d%%)"
# camel/camel-filter-driver.c:670
# camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
+#: ../camel/camel-filter-driver.c:1314 ../camel/camel-filter-driver.c:1336
#, c-format
msgid "Failed on message %d"
msgstr "å?¨ç¬¬ %d å°?é?µä»¶ç?¼ç??é?¯èª¤"
# camel/camel-filter-driver.c:690
# camel/camel-filter-driver.c:788
-#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
+#: ../camel/camel-filter-driver.c:1351 ../camel/camel-filter-driver.c:1456
msgid "Syncing folder"
msgstr "å??æ¥è??ç??è³?æ??夾"
# camel/camel-filter-driver.c:694
# camel/camel-filter-driver.c:793
-#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
+#: ../camel/camel-filter-driver.c:1356 ../camel/camel-filter-driver.c:1462
msgid "Complete"
msgstr "å®?æ??"
# camel/camel-filter-driver.c:748
-#: ../camel/camel-filter-driver.c:1377
+#: ../camel/camel-filter-driver.c:1420
#, c-format
msgid "Getting message %d of %d"
msgstr "æ£å?¨æ?¥æ?¶ç¬¬ %d / %d å°?é?µä»¶"
# camel/camel-filter-driver.c:753
# camel/camel-filter-driver.c:771
-#: ../camel/camel-filter-driver.c:1395
+#: ../camel/camel-filter-driver.c:1438
#, c-format
msgid "Failed at message %d of %d"
msgstr "å?¨ç¬¬ %d / %d å°?é?µä»¶å¤±æ??"
@@ -2091,52 +2096,58 @@ msgid "(%s) requires the folder set"
msgstr "(%s) é??è¦?è³?æ??夾è¨å®?"
# mail/mail-ops.c:1649
-#: ../camel/camel-folder.c:125
+#: ../camel/camel-folder.c:220
#, c-format
msgid "Learning new spam message in '%s'"
msgid_plural "Learning new spam messages in '%s'"
msgstr[0] "æ£å?¨å¸ç¿?ã??%sã??ä¸ç??æ?°å??å?¾é?µä»¶"
# mail/mail-ops.c:1649
-#: ../camel/camel-folder.c:147
+#: ../camel/camel-folder.c:244
#, c-format
msgid "Learning new ham message in '%s'"
msgid_plural "Learning new ham messages in '%s'"
msgstr[0] "æ£å?¨å¸ç¿?ã??%sã??ä¸ç?? ham é?µä»¶"
# mail/mail-ops.c:1565
-#: ../camel/camel-folder.c:171
+#: ../camel/camel-folder.c:270
#, c-format
msgid "Filtering new message in '%s'"
msgid_plural "Filtering new messages in '%s'"
msgstr[0] "æ£å?¨é??濾ã??%sã??ä¸ç??æ?°é?µä»¶"
# mail/mail-ops.c:898
-#: ../camel/camel-folder.c:688
-#: ../camel/providers/local/camel-maildir-folder.c:366
+#: ../camel/camel-folder.c:881
+#: ../camel/providers/local/camel-maildir-folder.c:293
msgid "Moving messages"
msgstr "æ£å?¨ç§»å??é?µä»¶"
# mail/mail-ops.c:898
-#: ../camel/camel-folder.c:690
+#: ../camel/camel-folder.c:884
msgid "Copying messages"
msgstr "æ£å?¨è¤?製é?µä»¶"
+# camel/providers/pop3/camel-pop3-folder.c:296
+#: ../camel/camel-folder.c:3253
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "æ£å?¨å??å??é?µä»¶ã??%sã??"
+
# camel/camel-filter-driver.c:670
# camel/camel-filter-driver.c:679
-#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
-#: ../camel/camel-gpg-context.c:1330
+#: ../camel/camel-gpg-context.c:646 ../camel/camel-gpg-context.c:651
+#: ../camel/camel-gpg-context.c:1276
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "å?·è¡? gpg 失æ??ï¼? %s"
-#: ../camel/camel-gpg-context.c:706
-#: ../camel/providers/smtp/camel-smtp-transport.c:114
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/camel-gpg-context.c:651
+#: ../camel/providers/smtp/camel-smtp-transport.c:716
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
msgid "Unknown"
msgstr "ä¸?æ??"
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:715
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -2147,17 +2158,17 @@ msgstr ""
"\n"
"%s"
-#: ../camel/camel-gpg-context.c:787
+#: ../camel/camel-gpg-context.c:732
#, c-format
msgid "Failed to parse gpg userid hint."
msgstr "解æ?? gpg userid æ??示æ??失æ??ã??"
-#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:757 ../camel/camel-gpg-context.c:772
#, c-format
msgid "Failed to parse gpg passphrase request."
msgstr "解æ?? gpg å¯?èª?è¦?æ±?æ??失æ??ã??"
-#: ../camel/camel-gpg-context.c:848
+#: ../camel/camel-gpg-context.c:793
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
@@ -2166,7 +2177,7 @@ msgstr ""
"é??è¦? PIN æ??è?½ç?ºæ?¨ç??æ?ºæ?§å?¡è§£é??ï¼?\n"
"ã??%sã??"
-#: ../camel/camel-gpg-context.c:852
+#: ../camel/camel-gpg-context.c:797
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -2176,77 +2187,98 @@ msgstr ""
"ã??%sã??"
# camel/providers/imap/camel-imap-command.c:232
-#: ../camel/camel-gpg-context.c:858
+#: ../camel/camel-gpg-context.c:803
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr "GnuPG å?³å??å°?ã??%sã??æ?ªé ?æ??ç??è¦?æ±?"
-#: ../camel/camel-gpg-context.c:905
+# calendar/gui/calendar-model.c:647
+# calendar/gui/calendar-model.c:1182
+# calendar/gui/dialogs/task-editor-dialog.glade.h:4
+# calendar/gui/e-calendar-table.c:422
+# camel/camel-service.c:544
+# camel/camel-service.c:580
+#: ../camel/camel-gpg-context.c:832 ../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-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/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "å·²å??æ¶?"
+
+#: ../camel/camel-gpg-context.c:850
#, c-format
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr "解é??ç§?å¯?é??é?°æ??失æ??ï¼?輸å?¥äº? 3 次é?¯èª¤ç??å¯?èª? ã??"
# camel/providers/imap/camel-imap-command.c:232
-#: ../camel/camel-gpg-context.c:917
+#: ../camel/camel-gpg-context.c:862
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "å¾? GnuPG å?³å??æ??å¤?ç??å??æ??ï¼? %s"
# camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/camel-gpg-context.c:1048
+#: ../camel/camel-gpg-context.c:993
#, c-format
msgid "Failed to encrypt: No valid recipients specified."
msgstr "ä¸?è?½å? å¯?é?µä»¶ï¼?æ²?æ??æ??ä¾?æ??æ??ç??æ?¶ä»¶è??ã??"
# mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+#: ../camel/camel-gpg-context.c:1539 ../camel/camel-smime-context.c:824
msgid "Could not generate signing data: "
msgstr "ç?¡æ³?ç?¢ç??ç°½ç« è³?æ??ï¼?"
# camel/camel-filter-driver.c:670
# camel/camel-filter-driver.c:679
-#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
-#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
-#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
+#: ../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
msgid "Failed to execute gpg."
msgstr "å?·è¡? gpg 失æ??ã??"
# camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
-#: ../camel/camel-smime-context.c:966
+#: ../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-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-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1695
+#: ../camel/camel-gpg-context.c:1741
msgid "Cannot verify message signature: "
msgstr "ä¸?è?½é©?è?æ¤é?µä»¶ç??ç°½ç« ï¼?"
# mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1814
+#: ../camel/camel-gpg-context.c:1862
msgid "Could not generate encrypting data: "
msgstr "ç?¡æ³?ç?¢ç??å? å¯?è³?æ??ï¼?"
-#: ../camel/camel-gpg-context.c:1866
+#: ../camel/camel-gpg-context.c:1915
msgid "This is a digitally encrypted message part"
msgstr "é??æ?¯æ?¸ä½?å??å? å¯?è¨?æ?¯é?¨ä»½"
# camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
-#: ../camel/camel-gpg-context.c:1954
+#: ../camel/camel-gpg-context.c:1973 ../camel/camel-gpg-context.c:1982
+#: ../camel/camel-gpg-context.c:2005
#, c-format
msgid "Cannot decrypt message: Incorrect message format"
msgstr "ä¸?è?½è§£å¯?æ¤é?µä»¶ï¼?é?¯èª¤ç??è¨?æ?¯æ ¼å¼?"
-#: ../camel/camel-gpg-context.c:1942
+#: ../camel/camel-gpg-context.c:1993
#, c-format
msgid "Failed to decrypt MIME part: protocol error"
msgstr "解å¯? MIME çµ?件æ??失æ??ï¼?é??è¨?å??å®?é?¯èª¤"
-#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
+#: ../camel/camel-gpg-context.c:2082 ../camel/camel-smime-context.c:1255
msgid "Encrypted content"
msgstr "å? å¯?å?§å®¹"
@@ -2365,18 +2397,18 @@ msgstr "寫å?¥é?µä»¶æ?«å?æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
msgid "Error copying mail temp file: %s"
msgstr "è¤?製é?µä»¶æ?«å?æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
-#: ../camel/camel-multipart-signed.c:285
+#: ../camel/camel-multipart-signed.c:286
#, c-format
msgid "No content available"
msgstr "æ²?æ??å?¯ç?¨ç??å?§å®¹"
-#: ../camel/camel-multipart-signed.c:293
+#: ../camel/camel-multipart-signed.c:294
#, c-format
msgid "No signature available"
msgstr "æ²?æ??å?¯ç?¨ç??ç°½ç« "
# shell/e-storage.c:467
-#: ../camel/camel-multipart-signed.c:612
+#: ../camel/camel-multipart-signed.c:620
#, c-format
msgid "parse error"
msgstr "解æ??é?¯èª¤"
@@ -2388,40 +2420,40 @@ msgid "Resolving: %s"
msgstr "解æ??ï¼?%s"
# camel/camel-service.c:600
-#: ../camel/camel-net-utils.c:717
+#: ../camel/camel-net-utils.c:718
msgid "Host lookup failed"
msgstr "æ??å°?主æ©?失æ??"
# camel/camel-service.c:600
-#: ../camel/camel-net-utils.c:721
+#: ../camel/camel-net-utils.c:724
#, c-format
msgid "Host lookup failed: %s: %s"
msgstr "æ??å°?主æ©?失æ??ï¼? %s ï¼?%s"
# camel/camel-service.c:548
-#: ../camel/camel-net-utils.c:844
+#: ../camel/camel-net-utils.c:845
msgid "Resolving address"
msgstr "解æ??ä½?å??"
-#: ../camel/camel-net-utils.c:864
+#: ../camel/camel-net-utils.c:866
msgid "Name lookup failed"
msgstr "æ?¥è©¢å??稱失æ??"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/camel-net-utils.c:869
+#: ../camel/camel-net-utils.c:872
#, c-format
msgid "Name lookup failed: %s"
msgstr "æ??å°?å??稱失æ??ï¼? %s"
# mail/mail-ops.c:898
-#: ../camel/camel-offline-folder.c:169
+#: ../camel/camel-offline-folder.c:193
#, c-format
msgid "Syncing messages in folder '%s' to disk"
msgstr "æ£å?¨å°?è³?æ??夾ã??%sã??ä¸ç??é?µä»¶å??æ¥å?°ç£?ç¢?"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
#, c-format
msgid "Cannot write offline journal for folder '%s': %s"
msgstr "ä¸?è?½å¯«å?¥è³?æ??夾ã??%sã??ç??é?¢ç·?æ?¥èª?ï¼?%s"
@@ -2473,13 +2505,13 @@ msgstr "é??å??é?¸é ?å°?æ??使ç?¨å?¿å??ç?»å?¥è?³ä¼ºæ??å?¨ã??"
# camel/camel-sasl-anonymous.c:110
# camel/camel-sasl-plain.c:87
-#: ../camel/camel-sasl-anonymous.c:69
+#: ../camel/camel-sasl-anonymous.c:70
#, c-format
msgid "Authentication failed."
msgstr "é©?è?失æ??ã??"
# camel/camel-sasl-anonymous.c:119
-#: ../camel/camel-sasl-anonymous.c:80
+#: ../camel/camel-sasl-anonymous.c:81
#, c-format
msgid ""
"Invalid email address trace information:\n"
@@ -2489,7 +2521,7 @@ msgstr ""
"%s"
# camel/camel-sasl-anonymous.c:131
-#: ../camel/camel-sasl-anonymous.c:94
+#: ../camel/camel-sasl-anonymous.c:95
#, c-format
msgid ""
"Invalid opaque trace information:\n"
@@ -2499,7 +2531,7 @@ msgstr ""
"%s"
# camel/camel-sasl-anonymous.c:143
-#: ../camel/camel-sasl-anonymous.c:108
+#: ../camel/camel-sasl-anonymous.c:109
#, c-format
msgid ""
"Invalid trace information:\n"
@@ -2537,112 +2569,112 @@ msgstr ""
"å??ã??"
# camel/camel-sasl-digest-md5.c:810
-#: ../camel/camel-sasl-digest-md5.c:820
+#: ../camel/camel-sasl-digest-md5.c:821
#, c-format
msgid "Server challenge too long (>2048 octets)"
msgstr "伺æ??å?¨æ?¥å??é??é?·(>2048 ä½?å?? )"
# camel/camel-sasl-digest-md5.c:819
-#: ../camel/camel-sasl-digest-md5.c:831
+#: ../camel/camel-sasl-digest-md5.c:832
#, c-format
msgid "Server challenge invalid\n"
msgstr "伺æ??å?¨æ?¥å??ç?¡æ??\n"
# camel/camel-sasl-digest-md5.c:825
-#: ../camel/camel-sasl-digest-md5.c:839
+#: ../camel/camel-sasl-digest-md5.c:840
#, c-format
msgid "Server challenge contained invalid \"Quality of Protection\" token"
msgstr "伺æ??å?¨æ?¥å??å??å?«ç?¡æ??ç?? ã??Quality of Protectionã??代符"
# camel/camel-sasl-digest-md5.c:847
-#: ../camel/camel-sasl-digest-md5.c:871
+#: ../camel/camel-sasl-digest-md5.c:875
#, c-format
msgid "Server response did not contain authorization data"
msgstr "伺æ??å?¨å??æ??並æ?ªå??å?«æ??æ¬?è³?æ??"
# camel/camel-sasl-digest-md5.c:865
-#: ../camel/camel-sasl-digest-md5.c:892
+#: ../camel/camel-sasl-digest-md5.c:896
#, c-format
msgid "Server response contained incomplete authorization data"
msgstr "伺æ??å?¨å??æ??å??å?«ä¸?å®?æ?´ç??æ??æ¬?è³?æ??"
# camel/camel-sasl-digest-md5.c:875
-#: ../camel/camel-sasl-digest-md5.c:905
+#: ../camel/camel-sasl-digest-md5.c:909
#, c-format
msgid "Server response does not match"
msgstr "伺æ??å?¨å??æ??ä¸?符"
-#: ../camel/camel-sasl-gssapi.c:80
+#: ../camel/camel-sasl-gssapi.c:85
msgid "GSSAPI"
msgstr "GSSAPI"
# camel/camel-sasl-kerberos4.c:42
-#: ../camel/camel-sasl-gssapi.c:82
+#: ../camel/camel-sasl-gssapi.c:87
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr "é??å??é?¸é ?å°?æ??使ç?¨ Kerberos 5 é©?è?é?£ç·?è?³ä¼ºæ??å?¨ã??"
-#: ../camel/camel-sasl-gssapi.c:119
+#: ../camel/camel-sasl-gssapi.c:128
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
msgstr "æ??ä¾?ç??è?件ä¸?æ?¯æ?´æ??å®?ç??æ©?å?¶ï¼?æ??è??æ?¯å?·è¡?ç?¡æ³?辨è?ã??"
-#: ../camel/camel-sasl-gssapi.c:124
+#: ../camel/camel-sasl-gssapi.c:133
msgid "The provided target_name parameter was ill-formed."
msgstr "æ??ä¾?ç?? target_name å??æ?¸æ ¼å¼?é?¯èª¤ã??"
-#: ../camel/camel-sasl-gssapi.c:127
+#: ../camel/camel-sasl-gssapi.c:136
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
msgstr "æ??ä¾?ç?? target_name å??æ?¸å??å?«ç?¡æ??æ??ä¸?æ?¯æ?´ç??å??稱é¡?å??ã??"
-#: ../camel/camel-sasl-gssapi.c:131
+#: ../camel/camel-sasl-gssapi.c:140
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:136
+#: ../camel/camel-sasl-gssapi.c:145
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
msgstr "input_token å??å?«ç?¡æ??ç??ç°½ç« ï¼?æ??è??ç?¡æ³?確èª?ç??ç°½ç« ã??"
-#: ../camel/camel-sasl-gssapi.c:140
+#: ../camel/camel-sasl-gssapi.c:149
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:145
+#: ../camel/camel-sasl-gssapi.c:154
msgid "The supplied context handle did not refer to a valid context."
msgstr "æ??ä¾?ç??網路ä½?ç½®è?å?¥æ??æ¨?æ?ªå??ç?§æ??æ??ç??網路ä½?ç½®ã??"
-#: ../camel/camel-sasl-gssapi.c:148
+#: ../camel/camel-sasl-gssapi.c:157
msgid "The consistency checks performed on the input_token failed."
msgstr "å?¨ input_token å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
-#: ../camel/camel-sasl-gssapi.c:151
+#: ../camel/camel-sasl-gssapi.c:160
msgid "The consistency checks performed on the credential failed."
msgstr "å?¨è?件å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
-#: ../camel/camel-sasl-gssapi.c:154
+#: ../camel/camel-sasl-gssapi.c:163
msgid "The referenced credentials have expired."
msgstr "å??ç?§ç??è?件已ç¶?é??æ??ã??"
# camel/camel-sasl-kerberos4.c:218
# camel/providers/imap/camel-imap-store.c:433
-#: ../camel/camel-sasl-gssapi.c:160 ../camel/camel-sasl-gssapi.c:296
-#: ../camel/camel-sasl-gssapi.c:340 ../camel/camel-sasl-gssapi.c:357
-#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../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/providers/smtp/camel-smtp-transport.c:1249
#, c-format
msgid "Bad authentication response from server."
msgstr "ä¾?è?ªä¼ºæ??å?¨ç??ä¸?è?¯è¨±å?¯å??æ??ã??"
# mail/mail-config.glade.h:1
-#: ../camel/camel-sasl-gssapi.c:369
+#: ../camel/camel-sasl-gssapi.c:382
#, c-format
msgid "Unsupported security layer."
msgstr "ä¸?æ?¯æ?´ç??é¡?å??"
@@ -2659,7 +2691,7 @@ msgid "This option will connect to the server using a simple password."
msgstr "é??å??é?¸é ?å°?æ??使ç?¨æ?®é??ç??å¯?碼é?£ç·?è?³ä¼ºæ??å?¨ã??"
# camel/camel-sasl-login.c:127
-#: ../camel/camel-sasl-login.c:94
+#: ../camel/camel-sasl-login.c:95
#, c-format
msgid "Unknown authentication state."
msgstr "æ?ªç?¥ç??é©?証ç??æ³?ã??"
@@ -2688,16 +2720,16 @@ msgid "This option will authorise a POP connection before attempting SMTP"
msgstr "é??å??é?¸é ?å°?æ??å?¨é?²è¡? SMTP ä¹?å??å??許 POPé?£ç·?"
# addressbook/gui/widgets/e-addressbook-view.c:735
-#: ../camel/camel-sasl-popb4smtp.c:82
+#: ../camel/camel-sasl-popb4smtp.c:83
msgid "POP Source URI"
msgstr "POP �� URI"
-#: ../camel/camel-sasl-popb4smtp.c:89
+#: ../camel/camel-sasl-popb4smtp.c:90
#, c-format
msgid "POP Before SMTP authentication using an unknown transport"
msgstr "POP å??æ?¼ SMTP å??許使ç?¨æ?ªç?¥ç??å?³è¼¸"
-#: ../camel/camel-sasl-popb4smtp.c:97
+#: ../camel/camel-sasl-popb4smtp.c:98
#, c-format
msgid "POP Before SMTP authentication using a non-POP source"
msgstr "POP å??æ?¼ SMTP å??許使ç?¨é?? POP ä¾?æº?"
@@ -2709,19 +2741,19 @@ msgid "Regular expression compilation failed: %s: %s"
msgstr "æ£è¦?表示å¼?ç·¨è¯å¤±æ??ï¼? %sï¼? %s"
# camel/camel-service.c:154
-#: ../camel/camel-service.c:88
+#: ../camel/camel-service.c:89
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URLã??%sã??é??è¦? username å??件"
# camel/camel-service.c:162
-#: ../camel/camel-service.c:92
+#: ../camel/camel-service.c:93
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URLã??%sã??é??è¦? host å??件"
# camel/camel-service.c:170
-#: ../camel/camel-service.c:96
+#: ../camel/camel-service.c:97
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URLã??%sã??é??è¦? path å??件"
@@ -2737,13 +2769,13 @@ msgstr ""
"%s"
# camel/providers/pop3/camel-pop3-store.c:361
-#: ../camel/camel-session.c:760
+#: ../camel/camel-session.c:757
#, 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:327
-#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1048
#, c-format
msgid "Cannot find certificate for '%s'"
msgstr "æ?¾ä¸?å?° '%s' ç??æ??è?"
@@ -2806,61 +2838,62 @@ msgstr "���� CMS SignerInfo"
# calendar/gui/calendar-model.c:1064
# calendar/gui/dialogs/task-editor-dialog.glade.h:22
# calendar/gui/e-calendar-table.c:348
-#: ../camel/camel-smime-context.c:506
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:507
msgid "Unverified"
msgstr "æ?ªæ??å®?"
# mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:509
msgid "Good signature"
msgstr "è?¯å¥½ç??ç°½ç« "
# mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:511
msgid "Bad signature"
msgstr "é?¯èª¤ç??ç°½ç« "
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:513
msgid "Content tampered with or altered in transit"
msgstr "å?§å®¹å?¨å?³é??æ??被ç«?æ?¹æ??è®?æ?´"
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:515
msgid "Signing certificate not found"
msgstr "æ?¾ä¸?å?°ç°½ç½²æ??è?"
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:517
msgid "Signing certificate not trusted"
msgstr "簽署æ??è?ä¸?å??ä¿¡ä»»"
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:519
msgid "Signature algorithm unknown"
msgstr "æ?ªç?¥ç??ç°½ç« æ¼?ç®?æ³?"
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:521
msgid "Signature algorithm unsupported"
msgstr "ä¸?æ?¯æ?´é??ç¨®ç°½ç« æ¼?ç®?æ³?"
# mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:523
msgid "Malformed signature"
msgstr "æ ¼å¼?ä¸?è?¯ç??ç°½ç« "
# shell/e-storage.c:467
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:525
msgid "Processing error"
msgstr "解æ??é?¯èª¤"
-#: ../camel/camel-smime-context.c:566
+#: ../camel/camel-smime-context.c:568
msgid "No signed data in signature"
msgstr "ç°½ç« ä¸æ²?æ??被簽署ç??è³?æ??"
-#: ../camel/camel-smime-context.c:571
+#: ../camel/camel-smime-context.c:573
msgid "Digests missing from enveloped data"
msgstr "å??裹ç??è³?æ??ä¸é?ºæ¼?æ??è¦?"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
+#: ../camel/camel-smime-context.c:586 ../camel/camel-smime-context.c:597
msgid "Cannot calculate digests"
msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
@@ -2871,223 +2904,223 @@ msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
# camel/providers/local/camel-mh-folder.c:185
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
+#: ../camel/camel-smime-context.c:604 ../camel/camel-smime-context.c:608
msgid "Cannot set message digests"
msgstr "ç?¡æ³?è¨å®?é?µä»¶æ??è¦?"
# mail/mail-crypto.c:59
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
+#: ../camel/camel-smime-context.c:618 ../camel/camel-smime-context.c:623
msgid "Certificate import failed"
msgstr "æ??è?å?¯å?¥å¤±æ??"
-#: ../camel/camel-smime-context.c:631
+#: ../camel/camel-smime-context.c:633
#, c-format
msgid "Certificate is the only message, cannot verify certificates"
msgstr "é??æ??è?è¨?æ?¯ï¼?ç?¡æ³?é©?è?æ??è?"
-#: ../camel/camel-smime-context.c:634
+#: ../camel/camel-smime-context.c:636
#, c-format
msgid "Certificate is the only message, certificates imported and verified"
msgstr "é??æ??è?è¨?æ?¯ã??å?¯å?¥å??é©?è?ç??æ??è?"
# mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:640
msgid "Cannot find signature digests"
msgstr "æ?¾ä¸?å?°ç°½ç« æ??è¦?"
# mail/mail-config.glade.h:72
-#: ../camel/camel-smime-context.c:654
+#: ../camel/camel-smime-context.c:656
#, c-format
msgid "Signer: %s <%s>: %s\n"
msgstr "簽署è??ï¼? %s<%s>ï¼? %s\n"
# mail/mail-crypto.c:251
-#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
msgid "Cannot create encoder context"
msgstr "��建�編碼�網路�置"
# camel/camel-movemail.c:274
-#: ../camel/camel-smime-context.c:838
+#: ../camel/camel-smime-context.c:841
msgid "Failed to add data to CMS encoder"
msgstr "ç?¡æ³?æ?°å¢?è³?æ??è?³ CMS 編碼å?¨"
-#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
msgid "Failed to encode data"
msgstr "ç?¡æ³?編碼è³?æ??"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
+#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
msgid "Decoder failed"
msgstr "解碼å?¨å¤±æ??"
-#: ../camel/camel-smime-context.c:1049
+#: ../camel/camel-smime-context.c:1056
msgid "Cannot find common bulk encryption algorithm"
msgstr "æ?¾ä¸?å?°ä¸?è?¬å¤§é??å? å¯?æ¼?ç®?æ³?"
-#: ../camel/camel-smime-context.c:1057
+#: ../camel/camel-smime-context.c:1064
msgid "Cannot allocate slot for encryption bulk key"
msgstr "ç?¡æ³?é??ç½®æ??槽給å? å¯?大é??é?°å??"
# camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1068
+#: ../camel/camel-smime-context.c:1075
msgid "Cannot create CMS Message"
msgstr "��建� CMS ��"
# camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1074
+#: ../camel/camel-smime-context.c:1081
msgid "Cannot create CMS Enveloped data"
msgstr "��建� CMS EnvelopedData"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:1080
+#: ../camel/camel-smime-context.c:1087
msgid "Cannot attach CMS Enveloped data"
msgstr "ç?¡æ³?é??å? CMS EnvelopedData"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:1086
+#: ../camel/camel-smime-context.c:1093
msgid "Cannot attach CMS data object"
msgstr "ç?¡æ³?é??å? CMS è³?æ??ç?©ä»¶"
# camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1102
msgid "Cannot create CMS Recipient information"
msgstr "��建� CMS RecipientInfo"
-#: ../camel/camel-smime-context.c:1100
+#: ../camel/camel-smime-context.c:1107
msgid "Cannot add CMS Recipient information"
msgstr "���� CMS RecipientInfo"
# camel/providers/imap/camel-imap-store.c:531
-#: ../camel/camel-smime-context.c:1125
+#: ../camel/camel-smime-context.c:1132
msgid "Failed to add data to encoder"
msgstr "ç?¡æ³?æ?°å¢?è³?æ??è?³ç·¨ç¢¼å?¨"
-#: ../camel/camel-smime-context.c:1227
+#: ../camel/camel-smime-context.c:1240
msgid "S/MIME Decrypt: No encrypted content found"
msgstr "S/MIME 解å¯?ï¼?æ?¾ä¸?å?°å? å¯?å?§å®¹"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-store.c:444
+#: ../camel/camel-store.c:2184
#, c-format
msgid "Cannot create folder '%s': folder exists"
msgstr "ä¸?è?½å»ºç«?è³?æ??夾ã??%sã??ï¼?è³?æ??夾已å?å?¨"
+# camel/camel-store.c:378
+# mail/mail-ops.c:1007
+# mail/mail-ops.c:1014
+# mail/mail-ops.c:1032
+# mail/mail-ops.c:1033
+#. the name of the Trash folder, used for deleted messages
+#: ../camel/camel-store.c:2375 ../camel/camel-vtrash-folder.c:48
+msgid "Trash"
+msgstr "å??æ?¶ç?"
+
+# calendar/gui/goto-dialog.glade.h:9
+#. the name of the Junk folder, used for spam messages
+#: ../camel/camel-store.c:2378 ../camel/camel-vtrash-folder.c:50
+msgid "Junk"
+msgstr "å??å?¾é?µä»¶"
+
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-store.c:543
+#: ../camel/camel-store.c:2811
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "ç?¡æ³?建æ§?è³?æ??夾ï¼?%sï¼?è³?æ??夾已å?å?¨"
# camel/providers/local/camel-mbox-store.c:138
# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
-#: ../camel/providers/local/camel-maildir-store.c:224
+#: ../camel/camel-store.c:2938 ../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/providers/local/camel-mbox-summary.c:655
-#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
-#: ../camel/providers/local/camel-maildir-store.c:314
+#: ../camel/camel-store.c:3079 ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:662
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??夾ï¼? %s ï¼?ç?¡æ??ç??æ??ä½?"
-# camel/camel-store.c:378
-# mail/mail-ops.c:1007
-# mail/mail-ops.c:1014
-# mail/mail-ops.c:1032
-# mail/mail-ops.c:1033
-#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:1129 ../camel/camel-vtrash-folder.c:48
-msgid "Trash"
-msgstr "å??æ?¶ç?"
-
-# calendar/gui/goto-dialog.glade.h:9
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:1132 ../camel/camel-vtrash-folder.c:50
-msgid "Junk"
-msgstr "å??å?¾é?µä»¶"
-
-#: ../camel/camel-tcp-stream-raw.c:714 ../camel/camel-tcp-stream-raw.c:725
-#, fuzzy, c-format
+#: ../camel/camel-tcp-stream-raw.c:747 ../camel/camel-tcp-stream-raw.c:758
+#, c-format
msgid "The proxy host does not support SOCKS4"
-msgstr "代ç??伺æ??å?¨ä¸»æ©?ä¸?æ?¯æ?´ SOCKS5"
+msgstr "代ç??伺æ??å?¨ä¸»æ©?ä¸?æ?¯æ?´ SOCKS4"
-#: ../camel/camel-tcp-stream-raw.c:736
+#: ../camel/camel-tcp-stream-raw.c:769
#, c-format
msgid "The proxy host denied our request: code %d"
-msgstr ""
+msgstr "代ç??伺æ??å?¨ä¸»æ©?æ??çµ?æ??å??ç??è¦?æ±?ï¼?代碼 %d"
-#: ../camel/camel-tcp-stream-raw.c:825 ../camel/camel-tcp-stream-raw.c:831
+#: ../camel/camel-tcp-stream-raw.c:865 ../camel/camel-tcp-stream-raw.c:871
#, c-format
msgid "The proxy host does not support SOCKS5"
msgstr "代ç??伺æ??å?¨ä¸»æ©?ä¸?æ?¯æ?´ SOCKS5"
# camel/providers/imap/camel-imap-store.c:466
# camel/providers/smtp/camel-smtp-transport.c:366
-#: ../camel/camel-tcp-stream-raw.c:837
+#: ../camel/camel-tcp-stream-raw.c:877
#, c-format
msgid "Could not find a suitable authentication type: code 0x%x"
msgstr "æ?¾ä¸?å?°å??é?©ç??é©?è?é¡?å??ï¼?代碼 0x%x"
-#: ../camel/camel-tcp-stream-raw.c:849
+#: ../camel/camel-tcp-stream-raw.c:889
msgid "General SOCKS server failure"
msgstr "ä¸?è?¬æ?§ SOCKS 伺æ??å?¨å¤±æ??"
-#: ../camel/camel-tcp-stream-raw.c:850
+#: ../camel/camel-tcp-stream-raw.c:890
msgid "SOCKS server's rules do not allow connection"
msgstr "SOCKS 伺æ??å?¨ç??è¦?å??ä¸?å??許é?£ç·?"
-#: ../camel/camel-tcp-stream-raw.c:851
+#: ../camel/camel-tcp-stream-raw.c:891
msgid "Network is unreachable from SOCKS server"
msgstr "網路ç?¡æ³?é??é?? SOCKS 伺æ??å?¨å?°é??"
-#: ../camel/camel-tcp-stream-raw.c:852
+#: ../camel/camel-tcp-stream-raw.c:892
msgid "Host is unreachable from SOCKS server"
msgstr "主æ©?ç?¡æ³?é??é?? SOCKS 伺æ??å?¨å?°é??"
# camel/camel-remote-store.c:252
-#: ../camel/camel-tcp-stream-raw.c:853
+#: ../camel/camel-tcp-stream-raw.c:893
msgid "Connection refused"
msgstr "é?£ç·?被æ??çµ?"
-#: ../camel/camel-tcp-stream-raw.c:854
+#: ../camel/camel-tcp-stream-raw.c:894
msgid "Time-to-live expired"
msgstr "è¶?é?? Time-to-live æ??é??"
# shell/e-storage.c:477
-#: ../camel/camel-tcp-stream-raw.c:855
+#: ../camel/camel-tcp-stream-raw.c:895
msgid "Command not supported by SOCKS server"
msgstr "SOCKS 伺æ??å?¨ä¸?æ?¯æ?´æ??令"
# shell/e-storage.c:477
-#: ../camel/camel-tcp-stream-raw.c:856
+#: ../camel/camel-tcp-stream-raw.c:896
msgid "Address type not supported by SOCKS server"
msgstr "SOCKS 伺æ??å?¨ä¸?æ?¯æ?´ä½?å??é¡?å??"
# camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/camel-tcp-stream-raw.c:857
+#: ../camel/camel-tcp-stream-raw.c:897
msgid "Unknown error from SOCKS server"
msgstr "ä¾?è?ª SOCKS 伺æ??å?¨ç??ä¸?æ??é?¯èª¤"
-#: ../camel/camel-tcp-stream-raw.c:887
+#: ../camel/camel-tcp-stream-raw.c:930
#, c-format
msgid "Got unknown address type from SOCKS server"
msgstr "å¾? SOCKS 伺æ??å?¨å??å¾?ä¸?æ??ç??ä½?å??é¡?å??"
# camel/camel-sasl-kerberos4.c:218
# camel/providers/imap/camel-imap-store.c:433
-#: ../camel/camel-tcp-stream-raw.c:905
+#: ../camel/camel-tcp-stream-raw.c:948
#, c-format
msgid "Incomplete reply from SOCKS server"
msgstr "ä¾?è?ª SOCKS 伺æ??å?¨ç??ä¸?å®?æ?´å??è¦?"
-#: ../camel/camel-tcp-stream-raw.c:920
+#: ../camel/camel-tcp-stream-raw.c:968
#, c-format
msgid "Hostname is too long (maximum is 255 characters)"
msgstr "主æ©?å??稱太é?·ï¼?æ??å¤? 255 å?å??ï¼?"
@@ -3096,7 +3129,7 @@ msgstr "主æ©?å??稱太é?·ï¼?æ??å¤? 255 å?å??ï¼?"
# camel/providers/imap/camel-imap-store.c:433
#. SOCKS5
#. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:952 ../camel/camel-tcp-stream-raw.c:962
+#: ../camel/camel-tcp-stream-raw.c:1000 ../camel/camel-tcp-stream-raw.c:1010
#, c-format
msgid "Invalid reply from proxy server"
msgstr "å¾?代ç??伺æ??å?¨å?³å??ç?¡æ??ç??å??è¦?"
@@ -3182,42 +3215,42 @@ msgstr ""
msgid "Could not parse URL '%s'"
msgstr "ç?¡æ³?解æ?? URLã??%sã??"
-# shell/e-shell-importer.c:384
-#: ../camel/camel-vee-folder.c:1045
+# camel/providers/imap/camel-imap-provider.c:45
+#: ../camel/camel-vee-folder.c:1251 ../camel/camel-vee-folder.c:1414
#, c-format
-msgid "Error storing '%s': "
-msgstr "å?²å?ã??%sã??ç?¼ç??é?¯èª¤ï¼?"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "ä¸?è?½è¤?製æ??移å??é?µä»¶å?°è??æ?¬è³?æ??夾ä¸"
# camel/camel-vee-folder.c:451
-#: ../camel/camel-vee-folder.c:1118
+#: ../camel/camel-vee-folder.c:1287
#, c-format
msgid "No such message %s in %s"
msgstr "æ²?æ?? %s é??é¡?é?µä»¶å?¨ %s ä¸"
-# camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/camel-vee-folder.c:1134 ../camel/camel-vee-folder.c:1149
+# shell/e-shell-importer.c:384
+#: ../camel/camel-vee-folder.c:1355
#, c-format
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "ä¸?è?½è¤?製æ??移å??é?µä»¶å?°è??æ?¬è³?æ??夾ä¸"
+msgid "Error storing '%s': "
+msgstr "å?²å?ã??%sã??ç?¼ç??é?¯èª¤ï¼?"
#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
-#: ../camel/camel-vee-store.c:417
+#: ../camel/camel-vee-store.c:322
msgid "Unmatched"
msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
-# camel/providers/local/camel-local-store.c:237
-#: ../camel/camel-vee-store.c:223
-#, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??夾ï¼? %s ï¼?æ²?æ??é??å??è³?æ??夾"
-
# camel/providers/local/camel-mbox-store.c:138
# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/camel-vee-store.c:289
+#: ../camel/camel-vee-store.c:393
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "ä¸?è?½å?ªé?¤è³?æ??夾ï¼? %s ï¼?æ²?æ??é??å??è³?æ??夾"
+# camel/providers/local/camel-local-store.c:237
+#: ../camel/camel-vee-store.c:427
+#, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??夾ï¼? %s ï¼?æ²?æ??é??å??è³?æ??夾"
+
# camel/providers/local/camel-mbox-summary.c:644
#: ../camel/camel-vtrash-folder.c:49
msgid "Cannot copy messages to the Trash folder"
@@ -3228,6 +3261,59 @@ msgstr "ç?¡æ³?è¤?製è¨?æ?¯å?°ã??å??æ?¶ç?ã??è³?æ??夾"
msgid "Cannot copy messages to the Junk folder"
msgstr "ç?¡æ³?è¤?製è¨?æ?¯å?°ã??å??å?¾é?µä»¶ã??è³?æ??夾"
+# camel/providers/imap/camel-imap-folder.c:191
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:959
+#: ../camel/providers/imap/camel-imap-folder.c:390
+#, c-format
+msgid "Could not load summary for %s"
+msgstr "ç?¡æ³?è¼?å?¥ %s ç??æ??è¦?"
+
+# mail/mail-ops.c:992
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1035
+#, 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
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "æ£å??å¾? %s ä¸æ?°é?µä»¶ç??æ??è¦?è³?è¨?"
+
+# camel/camel-movemail.c:306
+#: ../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
+#, c-format
+msgid "Could not get message"
+msgstr "ç?¡æ³?å??å¾?é?µä»¶ã??"
+
+# camel/providers/local/camel-mh-folder.c:149
+# camel/providers/local/camel-mh-folder.c:157
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2430
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2480
+#, c-format
+msgid "Cannot append message to folder '%s': %s"
+msgstr "ä¸?è?½å°?é?µä»¶å?²å?è?³è³?æ??夾ã??%sã??ï¼?%s"
+
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2466
+#, c-format
+msgid "Cannot create message: %s"
+msgstr "��建��件� %s"
+
# camel/providers/local/camel-maildir-folder.c:197
# camel/providers/local/camel-maildir-folder.c:209
# camel/providers/local/camel-maildir-folder.c:217
@@ -3235,7 +3321,7 @@ msgstr "ç?¡æ³?è¤?製è¨?æ?¯å?°ã??å??å?¾é?µä»¶ã??è³?æ??夾"
# camel/providers/local/camel-mh-folder.c:185
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2646
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -3247,13 +3333,12 @@ msgstr ""
# camel/providers/local/camel-maildir-folder.c:197
# camel/providers/local/camel-mbox-folder.c:319
# camel/providers/local/camel-mh-folder.c:185
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
-#: ../camel/providers/local/camel-maildir-folder.c:233
-#: ../camel/providers/local/camel-maildir-folder.c:268
-#: ../camel/providers/local/camel-maildir-folder.c:380
-#: ../camel/providers/local/camel-mbox-folder.c:329
-#: ../camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/local/camel-mh-folder.c:215
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2646
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:307
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
msgid "No such message"
msgstr "ç?¡æ¤é?µä»¶"
@@ -3264,92 +3349,39 @@ msgstr "ç?¡æ¤é?µä»¶"
# camel/providers/local/camel-mh-folder.c:185
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:158
-#: ../camel/providers/nntp/camel-nntp-folder.c:244
-#: ../camel/providers/nntp/camel-nntp-folder.c:337
-#: ../camel/providers/pop3/camel-pop3-folder.c:714
+#: ../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
#, c-format
msgid "Cannot get message %s: "
msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼?"
# camel/providers/imap/camel-imap-folder.c:1047
# camel/providers/imap/camel-imap-folder.c:1281
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2672
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2683
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2693
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2897
#, c-format
msgid "This message is not available in offline mode."
msgstr "é??å°?é?µä»¶ç?¡æ³?å?¨é?¢ç·?模å¼?ä¸?使ç?¨ã??"
-# camel/camel-movemail.c:306
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:203
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2136
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2190
-#, c-format
-msgid "Could not get message"
-msgstr "ç?¡æ³?å??å¾?é?µä»¶ã??"
-
-# camel/providers/imap/camel-imap-folder.c:191
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1070
-#: ../camel/providers/imap/camel-imap-folder.c:376
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "ç?¡æ³?è¼?å?¥ %s ç??æ??è¦?"
-
-# mail/mail-ops.c:992
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1144
-#, c-format
-msgid "Checking for deleted messages %s"
-msgstr "檢æ?¥å?ªé?¤ç??é?µä»¶ %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1670
-#: ../camel/providers/groupwise/camel-groupwise-store.c:654
-#: ../camel/providers/groupwise/camel-groupwise-store.c:779
-#: ../camel/providers/imap/camel-imap-folder.c:3814
-#: ../camel/providers/imap/camel-imap-folder.c:3892
-#: ../camel/providers/imapx/camel-imapx-server.c:3757
-#: ../camel/providers/imapx/camel-imapx-server.c:3881
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "æ£å??å¾? %s ä¸æ?°é?µä»¶ç??æ??è¦?è³?è¨?"
-
-# camel/providers/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2502
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2552
-#, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "ä¸?è?½å°?é?µä»¶å?²å?è?³è³?æ??夾ã??%sã??ï¼?%s"
-
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-maildir-folder.c:209
-# camel/providers/local/camel-maildir-folder.c:217
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
-# camel/providers/local/camel-mh-folder.c:194
-# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2538
-#, c-format
-msgid "Cannot create message: %s"
-msgstr "��建��件� %s"
-
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
#, c-format
msgid "Cannot get folder container %s"
msgstr "ä¸?è?½å??å¾?è³?æ??夾容å?¨ %s"
# camel/providers/local/camel-mh-folder.c:149
# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
#, c-format
msgid "Cannot append message in offline mode: cache unavailable"
msgstr "ä¸?è?½å?¨é?¢ç·?模å¼?ä¸å? å?¥é?µä»¶ï¼?ç?¡æ³?使ç?¨å¿«å??"
# camel/providers/local/camel-mbox-folder.c:259
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
msgid "Cannot append message in offline mode: "
msgstr "ä¸?è?½å?¨é?¢ç·?模å¼?ä¸å? å?¥é?µä»¶ï¼?"
@@ -3423,7 +3455,7 @@ msgstr "ç?¨æ?¼å?å?? Novell Groupwise 伺æ??å?¨"
#: ../camel/providers/imap/camel-imap-provider.c:97
#: ../camel/providers/imapx/camel-imapx-provider.c:104
#: ../camel/providers/nntp/camel-nntp-provider.c:72
-#: ../camel/providers/pop3/camel-pop3-provider.c:70
+#: ../camel/providers/pop3/camel-pop3-provider.c:73
msgid "Password"
msgstr "�碼"
@@ -3441,87 +3473,87 @@ msgstr "網å??ä¸ç??使ç?¨è??æ??主æ©?ç?¡æ³?使ç?¨"
# camel/providers/imap/camel-imap-store.c:505
# camel/providers/smtp/camel-smtp-transport.c:410
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1188
-#: ../camel/providers/imapx/camel-imapx-server.c:3008
+#: ../camel/providers/groupwise/camel-groupwise-store.c:209
+#: ../camel/providers/imap/camel-imap-store.c:801
+#: ../camel/providers/imapx/camel-imapx-server.c:3100
#, c-format
msgid "You did not enter a password."
msgstr "æ?¨æ²?æ??輸å?¥å¯?碼ã??"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:328
+#: ../camel/providers/groupwise/camel-groupwise-store.c:332
msgid "Some features may not work correctly with your current server version"
msgstr "æ??äº?å??è?½å?¯è?½ç?¡æ³?å?¨æ?¨ç?®å??ç??伺æ??å?¨ç??æ?¬ä¸?æ£å¸¸é??ä½?"
# camel/providers/imap/camel-imap-store.c:803
# mail/mail-local.c:334
-#: ../camel/providers/groupwise/camel-groupwise-store.c:550
-#: ../camel/providers/imap/camel-imap-store.c:1757
-#: ../camel/providers/imap/camel-imap-store.c:1952
-#: ../camel/providers/imapx/camel-imapx-store.c:421
+#: ../camel/providers/groupwise/camel-groupwise-store.c:563
+#: ../camel/providers/imap/camel-imap-store.c:1808
+#: ../camel/providers/imap/camel-imap-store.c:2005
+#: ../camel/providers/imapx/camel-imapx-store.c:342
#, c-format
msgid "No such folder %s"
msgstr "æ²?æ??é??å??è³?æ??夾 %s"
# camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1224
#, c-format
msgid "Cannot create GroupWise folders in offline mode."
msgstr "å?¨é?¢ç·?模å¼?ä¸ä¸?è?½å»ºæ§? GroupWise è³?æ??夾ã??"
# camel/providers/local/camel-mbox-store.c:138
# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1196
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1233
#, c-format
msgid "Cannot create a special system folder"
msgstr "ä¸?è?½å»ºç«?ç?¹æ®?ç??系統è³?æ??夾"
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
-#: ../camel/providers/imap/camel-imap-store.c:1835
-#: ../camel/providers/imap/camel-imap-store.c:2257
-#: ../camel/providers/imapx/camel-imapx-store.c:884
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1243
+#: ../camel/providers/imap/camel-imap-store.c:1886
+#: ../camel/providers/imap/camel-imap-store.c:2323
+#: ../camel/providers/imapx/camel-imapx-store.c:1341
#, c-format
msgid "The parent folder is not allowed to contain subfolders"
msgstr "æ¯?è³?æ??夾並ä¸?å??許å??å?«å?è³?æ??夾"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1328
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1353
#, c-format
msgid "Cannot rename GroupWise folder '%s' to '%s'"
msgstr "ä¸?è?½å°? GroupWise è³?æ??夾ã??%sã??é??æ?°å?½å??ç?ºã??%sã??"
# shell/e-shortcuts-view.c:137
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1387
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
#, c-format
msgid "GroupWise server %s"
msgstr "GroupWise 伺æ??å?¨ %s"
# camel/camel-remote-store.c:195
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1389
#, c-format
msgid "GroupWise service for %s on %s"
msgstr "%s ç?? GroupWise æ??å??æ?¼ %s"
# camel/providers/smtp/camel-smtp-transport.c:536
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
#, c-format
msgid "GroupWise mail delivery via %s"
msgstr "ç¶?ç?± %s å?³é?? GroupWise é?µä»¶"
# mail/mail-ops.c:603
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
msgid "Sending Message"
msgstr "æ£å?¨å?³é??é?µä»¶"
# camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
#, c-format
msgid "Cannot get folder: Invalid operation on this store"
msgstr "ä¸?è?½å??å¾?è³?æ??夾ï¼?å?¨æ¤å?²å?空é??ä¸?ç?¡æ??ç??æ??ä½?"
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
#, c-format
msgid ""
"You have exceeded this account's storage limit. Your messages are queued in "
@@ -3532,19 +3564,19 @@ msgstr ""
"å¾?å??æ?? å?³é??/æ?¥æ?¶ é??æ?°å¯?é??ã??\n"
# camel/providers/sendmail/camel-sendmail-transport.c:150
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
#, c-format
msgid "Could not send message: %s"
msgstr "é?µä»¶ç?¡æ³?å?³é??ï¼? %s"
-#: ../camel/providers/imap/camel-imap-command.c:190
-#: ../camel/providers/imap/camel-imap-command.c:288
+#: ../camel/providers/imap/camel-imap-command.c:197
+#: ../camel/providers/imap/camel-imap-command.c:301
#, c-format
msgid "No output stream"
msgstr "æ²?æ??輸å?ºä¸²æµ?"
-#: ../camel/providers/imap/camel-imap-command.c:198
-#: ../camel/providers/imap/camel-imap-command.c:296
+#: ../camel/providers/imap/camel-imap-command.c:205
+#: ../camel/providers/imap/camel-imap-command.c:309
#, c-format
msgid "No input stream"
msgstr "æ²?æ??輸å?¥ä¸²æµ?"
@@ -3553,13 +3585,13 @@ msgstr "æ²?æ??輸å?¥ä¸²æµ?"
# camel/camel-remote-store.c:399
# camel/camel-remote-store.c:470
# camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/imap/camel-imap-command.c:245
+#: ../camel/providers/imap/camel-imap-command.c:255
#, c-format
msgid "Operation cancelled"
msgstr "æ??ä½?ç¨?åº?å·²å??æ¶?"
# camel/camel-remote-store.c:476
-#: ../camel/providers/imap/camel-imap-command.c:353
+#: ../camel/providers/imap/camel-imap-command.c:373
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "伺æ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼? %s"
@@ -3567,7 +3599,7 @@ msgstr "伺æ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼? %s"
# camel/providers/imap/camel-imap-command.c:232
#. for imap ALERT codes, account user host
#. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:373
+#: ../camel/providers/imap/camel-imap-command.c:394
#, c-format
msgid ""
"Alert from IMAP server %s %s:\n"
@@ -3577,55 +3609,55 @@ msgstr ""
"%s"
# camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/imap/camel-imap-command.c:444
+#: ../camel/providers/imap/camel-imap-command.c:468
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "å¾? IMAP 伺æ??å?¨å?³å??ä¸?ç?¶ç??å??æ??ï¼? %s"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/imap/camel-imap-command.c:456
+#: ../camel/providers/imap/camel-imap-command.c:480
#, c-format
msgid "IMAP command failed: %s"
msgstr "IMAP æ??令失æ??ï¼? %s"
# camel/providers/imap/camel-imap-command.c:295
-#: ../camel/providers/imap/camel-imap-command.c:532
+#: ../camel/providers/imap/camel-imap-command.c:560
#, c-format
msgid "Server response ended too soon."
msgstr "伺æ??å?¨å¤ªæ?©å?³å??çµ?æ??ç??å??æ??ã??"
# camel/providers/imap/camel-imap-command.c:487
-#: ../camel/providers/imap/camel-imap-command.c:740
+#: ../camel/providers/imap/camel-imap-command.c:771
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "IMAP 伺æ??å?¨ç??å??æ??æ²?æ??å??å?« %s è³?è¨?"
# camel/providers/imap/camel-imap-command.c:524
-#: ../camel/providers/imap/camel-imap-command.c:778
+#: ../camel/providers/imap/camel-imap-command.c:809
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr "å¾? IMAP 伺æ??å?¨å?³å??ä¸?ç?¶ç?? OK å??æ??ï¼? %s"
# camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap/camel-imap-folder.c:281
+#: ../camel/providers/imap/camel-imap-folder.c:291
msgid "Always check for new mail in this folder"
msgstr "æ°¸é? 檢æ?¥é??å??è³?æ??夾ä¸æ?¯å?¦æ??æ?°é?µä»¶"
# camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/imap/camel-imap-folder.c:353
+#: ../camel/providers/imap/camel-imap-folder.c:367
#, c-format
msgid "Could not create directory %s: %s"
msgstr "ç?¡æ³?建ç«?ç?®é?? %sï¼?%s"
# mail/mail-ops.c:1649
-#: ../camel/providers/imap/camel-imap-folder.c:960
-#: ../camel/providers/imapx/camel-imapx-server.c:3797
+#: ../camel/providers/imap/camel-imap-folder.c:990
+#: ../camel/providers/imapx/camel-imapx-server.c:3933
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "æ??æ?? %s ä¸è®?æ?´é??ç??é?µä»¶"
# camel/providers/pop3/camel-pop3-folder.c:320
-#: ../camel/providers/imap/camel-imap-folder.c:3231
+#: ../camel/providers/imap/camel-imap-folder.c:3326
msgid "Unable to retrieve message: "
msgstr "ç?¡æ³?å??å??é?µä»¶ï¼?"
@@ -3636,8 +3668,8 @@ msgstr "ç?¡æ³?å??å??é?µä»¶ï¼?"
# camel/providers/local/camel-mh-folder.c:185
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/imap/camel-imap-folder.c:3266
-#: ../camel/providers/imapx/camel-imapx-server.c:4975
+#: ../camel/providers/imap/camel-imap-folder.c:3361
+#: ../camel/providers/imapx/camel-imapx-server.c:5217
#, c-format
msgid "Cannot get message with message ID %s: %s"
msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
@@ -3645,33 +3677,33 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
# camel/providers/local/camel-maildir-folder.c:197
# camel/providers/local/camel-mbox-folder.c:319
# camel/providers/local/camel-mh-folder.c:185
-#: ../camel/providers/imap/camel-imap-folder.c:3267
-#: ../camel/providers/imapx/camel-imapx-server.c:4976
+#: ../camel/providers/imap/camel-imap-folder.c:3362
+#: ../camel/providers/imapx/camel-imapx-server.c:5218
msgid "No such message available."
msgstr "æ²?æ??é??å??é?µä»¶ã??"
# camel/providers/imap/camel-imap-folder.c:1047
# camel/providers/imap/camel-imap-folder.c:1281
-#: ../camel/providers/imap/camel-imap-folder.c:3341
-#: ../camel/providers/imap/camel-imap-folder.c:4211
-#: ../camel/providers/nntp/camel-nntp-folder.c:326
+#: ../camel/providers/imap/camel-imap-folder.c:3437
+#: ../camel/providers/imap/camel-imap-folder.c:4332
+#: ../camel/providers/nntp/camel-nntp-folder.c:407
#, c-format
msgid "This message is not currently available"
msgstr "é??å°?é?µä»¶ç?®å??ä»?æ?ªå?¯ç?¨"
-#: ../camel/providers/imap/camel-imap-folder.c:4021
+#: ../camel/providers/imap/camel-imap-folder.c:4133
#, c-format
msgid "Incomplete server response: no information provided for message %d"
msgstr "ä¸?å®?æ?´ç??伺æ??å?¨å??æ??ï¼?æ?ªæ??ä¾?ä»»ä½?è³?è¨?給è¨?æ?¯ %d"
-#: ../camel/providers/imap/camel-imap-folder.c:4031
+#: ../camel/providers/imap/camel-imap-folder.c:4143
#, c-format
msgid "Incomplete server response: no UID provided for message %d"
msgstr "ä¸?å®?æ?´ç??伺æ??å?¨å??æ??ï¼?æ?ªæ??ä¾? UID 給è¨?æ?¯ %d"
# camel/providers/imap/camel-imap-folder.c:1075
# camel/providers/imap/camel-imap-folder.c:1314
-#: ../camel/providers/imap/camel-imap-folder.c:4251
+#: ../camel/providers/imap/camel-imap-folder.c:4372
#, c-format
msgid "Could not find message body in FETCH response."
msgstr "å?¨ FETCH ç??å??æ??å?§æ?¾ä¸?å?°é?µä»¶ç??å?§æ??ã??"
@@ -3691,14 +3723,14 @@ msgstr "å¿«å??é?µä»¶ %s 失æ??ï¼? %s"
# camel/camel-filter-driver.c:670
# camel/camel-filter-driver.c:679
-#: ../camel/providers/imap/camel-imap-message-cache.c:388
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
#, c-format
msgid "Failed to cache message %s: "
msgstr "å¿«å??é?µä»¶ %s 失æ??ï¼?"
# camel/camel-filter-driver.c:670
# camel/camel-filter-driver.c:679
-#: ../camel/providers/imap/camel-imap-message-cache.c:525
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
#, c-format
msgid "Failed to cache %s: "
msgstr "å¿«å?? %s 失æ??ï¼?"
@@ -3794,124 +3826,95 @@ msgstr "ç?¨ä½?è®?å??å??å?²å?é?µä»¶æ?¼ IMAP 伺æ??å?¨ã??"
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr "é??å??é?¸é ?å°?æ??使ç?¨ç°¡æ??ç??å¯?碼é?£ç·?è?³ IMAP 伺æ??å?¨ã??"
-# camel/providers/smtp/camel-smtp-transport.c:534
-#: ../camel/providers/imap/camel-imap-store.c:310
-#: ../camel/providers/imapx/camel-imapx-store.c:228
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP 伺æ??å?¨ %s"
-
-# camel/camel-remote-store.c:195
-#: ../camel/providers/imap/camel-imap-store.c:312
-#: ../camel/providers/imapx/camel-imapx-store.c:230
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s ç?? IMAP æ??å??æ?¼ %s"
-
# camel/camel-remote-store.c:255
# camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:447
-#: ../camel/providers/nntp/camel-nntp-store.c:234
-#: ../camel/providers/pop3/camel-pop3-store.c:132
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/imap/camel-imap-store.c:243
+#: ../camel/providers/nntp/camel-nntp-store.c:313
+#: ../camel/providers/pop3/camel-pop3-store.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
#, c-format
msgid "Could not connect to %s: %s"
msgstr "����� %s�%s"
-#: ../camel/providers/imap/camel-imap-store.c:448
-#: ../camel/providers/nntp/camel-nntp-store.c:235
-#: ../camel/providers/pop3/camel-pop3-store.c:133
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/imap/camel-imap-store.c:244
+#: ../camel/providers/nntp/camel-nntp-store.c:314
+#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
msgid "SSL unavailable"
msgstr "SSL ��使�"
# camel/camel-remote-store.c:255
# camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:466
-#: ../camel/providers/nntp/camel-nntp-store.c:252
+#: ../camel/providers/imap/camel-imap-store.c:264
+#: ../camel/providers/nntp/camel-nntp-store.c:333
#, c-format
msgid "Could not connect to %s: "
msgstr "����� %s�"
# camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/imap/camel-imap-store.c:572
-#: ../camel/providers/imap/camel-imap-store.c:592
-#: ../camel/providers/imap/camel-imap-store.c:599
-#: ../camel/providers/imap/camel-imap-store.c:626
-#: ../camel/providers/imapx/camel-imapx-server.c:2860
-#: ../camel/providers/imapx/camel-imapx-server.c:2896
+#: ../camel/providers/imap/camel-imap-store.c:370
+#: ../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
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "以å®?å?¨æ¨¡å¼?é?£ç·?å?° IMAP 伺æ??å?¨ %s æ??失æ??äº?ï¼? %s"
# shell/e-storage.c:477
-#: ../camel/providers/imap/camel-imap-store.c:573
-#: ../camel/providers/imapx/camel-imapx-server.c:2861
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#: ../camel/providers/imap/camel-imap-store.c:371
+#: ../camel/providers/imapx/camel-imapx-server.c:2943
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
msgid "STARTTLS not supported"
msgstr "��� STARTTLS"
# camel/camel-sasl-anonymous.c:110
# camel/camel-sasl-plain.c:87
-#: ../camel/providers/imap/camel-imap-store.c:593
-#: ../camel/providers/imapx/camel-imapx-server.c:2897
+#: ../camel/providers/imap/camel-imap-store.c:391
+#: ../camel/providers/imapx/camel-imapx-server.c:2983
msgid "SSL negotiations failed"
msgstr "SSL å??å??失æ??"
-#: ../camel/providers/imap/camel-imap-store.c:600
-#: ../camel/providers/smtp/camel-smtp-transport.c:339
+#: ../camel/providers/imap/camel-imap-store.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
msgid "SSL is not available in this build"
msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ SSL"
# camel/camel-remote-store.c:252
-#: ../camel/providers/imap/camel-imap-store.c:748
-#: ../camel/providers/imapx/camel-imapx-server.c:2696
+#: ../camel/providers/imap/camel-imap-store.c:549
+#: ../camel/providers/imapx/camel-imapx-server.c:2770
#, c-format
msgid "Connection cancelled"
msgstr "é?£ç·?å·²å??æ¶?"
# camel/camel-remote-store.c:255
# camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:753
-#: ../camel/providers/imapx/camel-imapx-server.c:2701
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imapx/camel-imapx-server.c:2775
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "ç?¡æ³?以æ??令ã??%sã??é?£ç·?ï¼? %s"
-# mail/local-config.glade.h:8
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:926
-#: ../camel/providers/imap/camel-imap-store.c:2350
-#: ../camel/providers/imapx/camel-imapx-store.c:468
-#: ../camel/providers/imapx/camel-imapx-store.c:1065
-#: ../camel/providers/local/camel-maildir-folder.c:90
-#: ../camel/providers/local/camel-maildir-store.c:225
-#: ../camel/providers/local/camel-maildir-store.c:315
-#: ../camel/providers/local/camel-maildir-store.c:562
-#: ../camel/providers/local/camel-maildir-store.c:575
-#: ../camel/providers/local/camel-spool-store.c:508
-msgid "Inbox"
-msgstr "�件�"
-
# camel/providers/imap/camel-imap-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1129
-#: ../camel/providers/imapx/camel-imapx-server.c:2964
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imapx/camel-imapx-server.c:3056
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP 伺æ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?é¡?å?? %s"
# camel/providers/imap/camel-imap-store.c:466
# camel/providers/smtp/camel-smtp-transport.c:366
-#: ../camel/providers/imap/camel-imap-store.c:1141
-#: ../camel/providers/imapx/camel-imapx-server.c:2976
-#: ../camel/providers/smtp/camel-smtp-transport.c:462
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:3068
+#: ../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:531
-#: ../camel/providers/imap/camel-imap-store.c:1220
-#: ../camel/providers/imapx/camel-imapx-server.c:3046
+#: ../camel/providers/imap/camel-imap-store.c:836
+#: ../camel/providers/imapx/camel-imapx-server.c:3144
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3922,9 +3925,38 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/imap/camel-imap-store.c:1771
-#: ../camel/providers/imap/camel-imap-store.c:2193
-#: ../camel/providers/imapx/camel-imapx-store.c:863
+# camel/providers/smtp/camel-smtp-transport.c:534
+#: ../camel/providers/imap/camel-imap-store.c:997
+#: ../camel/providers/imapx/camel-imapx-store.c:183
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP 伺æ??å?¨ %s"
+
+# camel/camel-remote-store.c:195
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:185
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s ç?? IMAP æ??å??æ?¼ %s"
+
+# mail/local-config.glade.h:8
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:1367
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imapx/camel-imapx-store.c:372
+#: ../camel/providers/imapx/camel-imapx-store.c:794
+#: ../camel/providers/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-spool-store.c:289
+msgid "Inbox"
+msgstr "�件�"
+
+#: ../camel/providers/imap/camel-imap-store.c:1822
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imapx/camel-imapx-store.c:1320
#, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -3932,29 +3964,29 @@ msgstr "è³?æ??夾å??稱ã??%sã??ç?¡æ??ï¼?å? ç?ºå®?å??æ?¬å?å??ã??%cã??"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap/camel-imap-store.c:1887
-#: ../camel/providers/local/camel-maildir-store.c:189
-#: ../camel/providers/local/camel-mbox-store.c:193
-#: ../camel/providers/local/camel-mh-store.c:255
+#: ../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-mh-store.c:504
#, c-format
msgid "Cannot create folder '%s': folder exists."
msgstr "ä¸?è?½å»ºç«?è³?æ??夾ã??%sã??ï¼?è³?æ??夾已å?å?¨ã??"
# camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/providers/imap/camel-imap-store.c:2206
-#: ../camel/providers/imapx/camel-imapx-store.c:874
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imapx/camel-imapx-store.c:1331
#, c-format
msgid "Unknown parent folder: %s"
msgstr "ä¸?æ??ç??æ¯?è³?æ??夾ï¼? %s"
# camel/camel-remote-store.c:476
-#: ../camel/providers/imap/camel-imap-store.c:3062
+#: ../camel/providers/imap/camel-imap-store.c:3137
#, c-format
msgid "Server unexpectedly disconnected"
msgstr "伺æ??å?¨çª?ç?¶ä¸æ?·é?£ç·?"
# camel/camel-remote-store.c:476
-#: ../camel/providers/imap/camel-imap-store.c:3065
+#: ../camel/providers/imap/camel-imap-store.c:3140
msgid "Server unexpectedly disconnected: "
msgstr "伺æ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼?"
@@ -3998,19 +4030,19 @@ msgid "IMAP+"
msgstr "IMAP"
# camel/camel-movemail.c:256
-#: ../camel/providers/imapx/camel-imapx-server.c:1386
+#: ../camel/providers/imapx/camel-imapx-server.c:1410
msgid "Error writing to cache stream: "
msgstr "寫å?¥å¿«å??串æµ?æ??ç?¼ç??é?¯èª¤ï¼?"
# camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/imapx/camel-imapx-server.c:2044
+#: ../camel/providers/imapx/camel-imapx-server.c:2092
#, c-format
msgid "Not authenticated"
msgstr "å°?æ?ªé©?è?"
# camel/camel-remote-store.c:255
# camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imapx/camel-imapx-server.c:2787
+#: ../camel/providers/imapx/camel-imapx-server.c:2865
#, c-format
msgid "Could not connect to %s (port %s): "
msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼?"
@@ -4019,7 +4051,7 @@ msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼?"
# camel/camel-remote-store.c:399
# camel/camel-remote-store.c:470
# camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/imapx/camel-imapx-server.c:3218
+#: ../camel/providers/imapx/camel-imapx-server.c:3329
msgid "Closing tmp stream failed: "
msgstr "ç?¡æ³?é??é?? tmp 串æµ?ï¼?"
@@ -4030,7 +4062,7 @@ msgstr "ç?¡æ³?é??é?? tmp 串æµ?ï¼?"
# camel/providers/local/camel-mh-folder.c:185
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/imapx/camel-imapx-server.c:5100
+#: ../camel/providers/imapx/camel-imapx-server.c:5365
#, c-format
msgid "Cannot create spool file: %s"
msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?%s"
@@ -4042,55 +4074,55 @@ msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?%s"
# camel/providers/local/camel-mh-folder.c:185
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/imapx/camel-imapx-server.c:5116
+#: ../camel/providers/imapx/camel-imapx-server.c:5381
msgid "Cannot create spool file: "
msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?"
# camel/providers/imap/camel-imap-store.c:803
# mail/mail-local.c:334
-#: ../camel/providers/imapx/camel-imapx-store.c:437
-#: ../camel/providers/nntp/camel-nntp-store.c:1510
+#: ../camel/providers/imapx/camel-imapx-store.c:1136
+#: ../camel/providers/nntp/camel-nntp-store.c:1610
#, c-format
msgid "No such folder: %s"
msgstr "æ²?æ??é??å??è³?æ??夾ï¼? %s"
-#: ../camel/providers/imapx/camel-imapx-stream.c:68
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
#, c-format
msgid "Source stream returned no data"
msgstr "ä¾?æº?串æµ?å?³å??ç?¡è³?æ??"
-#: ../camel/providers/imapx/camel-imapx-stream.c:77
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
#, c-format
msgid "Source stream unavailable"
msgstr "��串���使�"
-#: ../camel/providers/local/camel-local-folder.c:199
+#: ../camel/providers/local/camel-local-folder.c:182
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
# camel/providers/local/camel-mbox-folder.c:203
-#: ../camel/providers/local/camel-local-folder.c:209
-#: ../camel/providers/local/camel-local-folder.c:218
+#: ../camel/providers/local/camel-local-folder.c:192
+#: ../camel/providers/local/camel-local-folder.c:201
#, c-format
msgid "mailbox: %s (%s)"
msgstr "信箱�%s (%s)"
-#: ../camel/providers/local/camel-local-folder.c:227
+#: ../camel/providers/local/camel-local-folder.c:210
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
# addressbook/gui/widgets/e-addressbook-view.c:613
-#: ../camel/providers/local/camel-local-folder.c:272
+#: ../camel/providers/local/camel-local-folder.c:469
msgid "Index message body data"
msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº"
# camel/providers/local/camel-mbox-folder.c:335
# camel/providers/local/camel-mbox-folder.c:367
# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/local/camel-local-folder.c:686
+#: ../camel/providers/local/camel-local-folder.c:685
#, c-format
msgid ""
"Cannot get message %s from folder %s\n"
@@ -4164,69 +4196,71 @@ msgid "Standard Unix mbox spool directory"
msgstr "æ¨?æº? Unix mbox æ??ç¨?å?¨ç?®é??"
# camel/providers/local/camel-local-store.c:127
-#: ../camel/providers/local/camel-local-store.c:149
-#: ../camel/providers/local/camel-local-store.c:284
-#: ../camel/providers/local/camel-mbox-store.c:371
-#: ../camel/providers/local/camel-spool-store.c:109
+#: ../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-spool-store.c:318
#, c-format
msgid "Store root %s is not an absolute path"
msgstr "å?²å?æ ¹ç?®é?? %s ä¸?æ?¯çµ?å°?è·¯å¾?"
# camel/providers/local/camel-local-store.c:134
-#: ../camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-local-store.c:183
#, c-format
msgid "Store root %s is not a regular directory"
msgstr "å?²å?æ ¹ç?®é?? %s ä¸?æ?¯å??æ³?ç??ç?®é??"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-local-store.c:169
-#: ../camel/providers/local/camel-local-store.c:179
-#: ../camel/providers/local/camel-local-store.c:297
+#: ../camel/providers/local/camel-local-store.c:194
+#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:332
+#: ../camel/providers/local/camel-maildir-store.c:124
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "ä¸?è?½å??å¾?è³?æ??夾ï¼?%sï¼?%s"
# camel/providers/local/camel-local-store.c:173
-#: ../camel/providers/local/camel-local-store.c:193
+#: ../camel/providers/local/camel-local-store.c:220
#, c-format
msgid "Local stores do not have an inbox"
msgstr "æ?¬å?°ç«¯ç??å?å?²æ²?æ??æ?¶ä»¶å?£"
# camel/providers/local/camel-local-store.c:183
-#: ../camel/providers/local/camel-local-store.c:250
+#: ../camel/providers/local/camel-local-store.c:281
#, c-format
msgid "Local mail file %s"
msgstr "��端�件�� %s"
# camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/local/camel-local-store.c:358
+#: ../camel/providers/local/camel-local-store.c:393
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "ç?¡æ³?å°?è³?æ??夾 %s é??æ?°å?½å??ç?º %sï¼? %s"
# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-local-store.c:431
+#: ../camel/providers/local/camel-local-store.c:467
#, c-format
msgid "Could not rename '%s': %s"
msgstr "ç?¡æ³?é??æ?°å?½å??ã??%sã??ï¼?%s "
# camel/providers/local/camel-local-store.c:289
-#: ../camel/providers/local/camel-local-store.c:461
-#: ../camel/providers/local/camel-mbox-store.c:304
+#: ../camel/providers/local/camel-local-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:701
#, c-format
msgid "Could not delete folder index file '%s': %s"
msgstr "ä¸?è?½å?ªé?¤è³?æ??夾索å¼?æª?æ¡?ã??%sã??ï¼? %s"
# camel/providers/local/camel-local-store.c:279
-#: ../camel/providers/local/camel-local-store.c:489
-#: ../camel/providers/local/camel-mbox-store.c:333
+#: ../camel/providers/local/camel-local-store.c:526
+#: ../camel/providers/local/camel-mbox-store.c:730
#, c-format
msgid "Could not delete folder meta file '%s': %s"
msgstr "ä¸?è?½å?ªé?¤è³?æ??夾ä¸ç¹¼æª?æ¡?ã??%sã??ï¼?%s"
# camel/providers/local/camel-local-summary.c:404
-#: ../camel/providers/local/camel-local-summary.c:537
+#: ../camel/providers/local/camel-local-summary.c:548
#, c-format
msgid "Unable to add message to summary: unknown reason"
msgstr "ç?¡æ³?æ?°å¢?é?µä»¶å?°æ??è¦?è³?è¨?ï¼?ä¸?æ??ç??å??å? "
@@ -4234,7 +4268,7 @@ msgstr "ç?¡æ³?æ?°å¢?é?µä»¶å?°æ??è¦?è³?è¨?ï¼?ä¸?æ??ç??å??å? "
# camel/providers/local/camel-maildir-folder.c:150
# camel/providers/local/camel-maildir-folder.c:158
# camel/providers/local/camel-maildir-folder.c:169
-#: ../camel/providers/local/camel-maildir-folder.c:195
+#: ../camel/providers/local/camel-maildir-folder.c:198
#, c-format
msgid "Cannot append message to maildir folder: %s: "
msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° maildir è³?æ??夾ï¼? %sï¼?"
@@ -4242,36 +4276,49 @@ msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° maildir è³?æ??夾ï¼? %sï¼?"
# camel/providers/local/camel-mbox-folder.c:335
# camel/providers/local/camel-mbox-folder.c:367
# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/local/camel-maildir-folder.c:283
-#: ../camel/providers/local/camel-maildir-folder.c:291
-#: ../camel/providers/local/camel-mbox-folder.c:440
-#: ../camel/providers/local/camel-mh-folder.c:227
-#: ../camel/providers/local/camel-mh-folder.c:235
+#: ../camel/providers/local/camel-maildir-folder.c:246
+#: ../camel/providers/local/camel-maildir-folder.c:256
+#: ../camel/providers/local/camel-mbox-folder.c:386
+#: ../camel/providers/local/camel-mh-folder.c:168
+#: ../camel/providers/local/camel-mh-folder.c:178
#, c-format
msgid "Cannot get message %s from folder %s: "
msgstr "ä¸?è?½å¾?è³?æ??夾 %2$s å??å¾?é?µä»¶ %1$sï¼?"
# camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/local/camel-maildir-folder.c:399
+#: ../camel/providers/local/camel-maildir-folder.c:326
#, c-format
msgid "Cannot transfer message to destination folder: %s"
msgstr "ä¸?è?½å°?é?µä»¶å?³è¼¸å?°ç?®ç??端è³?æ??夾ï¼?%s"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-maildir-store.c:136
-#: ../camel/providers/local/camel-maildir-store.c:167
-#: ../camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:175
+#: ../camel/providers/local/camel-maildir-store.c:100
+#, c-format
+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
+#, c-format
+msgid "Folder %s already exists"
+msgstr "è³?æ??夾 %s å·²å?å?¨"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../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
#, c-format
msgid "Cannot create folder '%s': %s"
msgstr "ä¸?è?½å»ºç«?è³?æ??夾ã??%sã??ï¼?%s"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-maildir-store.c:151
-#: ../camel/providers/local/camel-mbox-store.c:127
-#: ../camel/providers/local/camel-mh-store.c:215
+#: ../camel/providers/local/camel-maildir-store.c:206
+#: ../camel/providers/local/camel-mbox-store.c:347
+#: ../camel/providers/local/camel-mh-store.c:464
#, c-format
msgid "Cannot get folder '%s': %s"
msgstr "ä¸?è?½å»ºç«?è³?æ??夾ã??%sã??ï¼?%s"
@@ -4279,15 +4326,15 @@ msgstr "ä¸?è?½å»ºç«?è³?æ??夾ã??%sã??ï¼?%s"
# camel/providers/local/camel-maildir-store.c:100
# camel/providers/local/camel-mbox-store.c:101
# camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-maildir-store.c:157
-#: ../camel/providers/local/camel-mbox-store.c:137
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:212
+#: ../camel/providers/local/camel-mbox-store.c:357
+#: ../camel/providers/local/camel-mh-store.c:473
#, c-format
msgid "Cannot get folder '%s': folder does not exist."
msgstr "ä¸?è?½å??å¾?è³?æ??夾ã??%sã??ï¼?è³?æ??夾ä¸?å?å?¨ã??"
# camel/providers/local/camel-maildir-store.c:122
-#: ../camel/providers/local/camel-maildir-store.c:184
+#: ../camel/providers/local/camel-maildir-store.c:239
#, c-format
msgid "Cannot get folder '%s': not a maildir directory."
msgstr "ä¸?è?½å??å¾?è³?æ??夾ã??%sã??ï¼?ä¸?æ?¯ maildir ç?®é??ã??"
@@ -4295,99 +4342,124 @@ msgstr "ä¸?è?½å??å¾?è³?æ??夾ã??%sã??ï¼?ä¸?æ?¯ maildir ç?®é??ã??"
# camel/providers/local/camel-maildir-store.c:151
# camel/providers/local/camel-maildir-store.c:188
# camel/providers/local/camel-mh-store.c:127
-#: ../camel/providers/local/camel-maildir-store.c:242
-#: ../camel/providers/local/camel-maildir-store.c:282
-#: ../camel/providers/local/camel-mh-store.c:287
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:584
#, c-format
msgid "Could not delete folder '%s': %s"
msgstr "ç?¡æ³?å?ªé?¤è³?æ??夾ã??%sã??ï¼?%s"
# camel/providers/local/camel-maildir-store.c:152
-#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-maildir-store.c:295
msgid "not a maildir directory"
msgstr "ä¸?æ?¯ä¸?å?? maildir ç?®é??"
# camel/providers/local/camel-maildir-store.c:107
# camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-maildir-store.c:482
-#: ../camel/providers/local/camel-spool-store.c:364
-#: ../camel/providers/local/camel-spool-store.c:380
+#: ../camel/providers/local/camel-maildir-store.c:508
+#: ../camel/providers/local/camel-maildir-store.c:819
+#: ../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-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-maildir-store.c:671
+#, c-format
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??夾ï¼?%sï¼?è³?æ??夾å??稱ä¸?è?½å??å?«ã??.ã??"
+
# camel/providers/local/camel-maildir-summary.c:405
# camel/providers/local/camel-maildir-summary.c:526
#: ../camel/providers/local/camel-maildir-summary.c:435
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:565
#, c-format
msgid "Cannot open maildir directory path: %s: %s"
msgstr "ä¸?è?½é??å?? maildir ç?®é??è·¯å¾?ï¼?%sï¼? %s"
# camel/providers/imap/camel-imap-provider.c:43
# mail/mail-config.glade.h:13
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:556
msgid "Checking folder consistency"
msgstr "檢æ?¥è³?æ??夾ç??ä¸?è?´æ?§"
# mail/mail-ops.c:992
-#: ../camel/providers/local/camel-maildir-summary.c:641
+#: ../camel/providers/local/camel-maildir-summary.c:649
msgid "Checking for new messages"
msgstr "檢���件"
# camel/camel-filter-driver.c:690
# camel/camel-filter-driver.c:788
-#: ../camel/providers/local/camel-maildir-summary.c:732
-#: ../camel/providers/local/camel-mbox-summary.c:465
-#: ../camel/providers/local/camel-mbox-summary.c:679
-#: ../camel/providers/local/camel-mbox-summary.c:809
-#: ../camel/providers/local/camel-spool-summary.c:130
+#: ../camel/providers/local/camel-maildir-summary.c:742
+#: ../camel/providers/local/camel-mbox-summary.c:468
+#: ../camel/providers/local/camel-mbox-summary.c:690
+#: ../camel/providers/local/camel-mbox-summary.c:826
+#: ../camel/providers/local/camel-spool-summary.c:131
msgid "Storing folder"
msgstr "å?²å?è³?æ??夾"
-# camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/local/camel-mbox-folder.c:124
-#: ../camel/providers/local/camel-spool-folder.c:125
-#, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "ä¸?è?½å»ºæ§?è³?æ??夾é??å®? %s ï¼? %s"
-
# camel/providers/local/camel-mbox-folder.c:203
-#: ../camel/providers/local/camel-mbox-folder.c:194
+#: ../camel/providers/local/camel-mbox-folder.c:183
#, c-format
msgid "Cannot open mailbox: %s: "
msgstr "ä¸?è?½é??å?? mailboxï¼?%s"
# camel/providers/local/camel-mbox-folder.c:259
-#: ../camel/providers/local/camel-mbox-folder.c:260
+#: ../camel/providers/local/camel-mbox-folder.c:249
#, c-format
msgid "Cannot append message to mbox file: %s: "
msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° mbox æª?æ¡?ï¼?%s"
# camel/providers/local/camel-mbox-folder.c:368
-#: ../camel/providers/local/camel-mbox-folder.c:433
+#: ../camel/providers/local/camel-mbox-folder.c:378
msgid "The folder appears to be irrecoverably corrupted."
msgstr "è³?æ??夾好å??å·²ç¶?æ??æ¯?並ä¸?ä¸?è?½å¾©å??ã??"
# camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/local/camel-mbox-store.c:149
-#: ../camel/providers/local/camel-mbox-store.c:379
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../camel/providers/local/camel-spool-folder.c:70
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "ä¸?è?½å»ºæ§?è³?æ??夾é??å®? %s ï¼? %s"
+
+# camel/providers/local/camel-mbox-folder.c:152
+#: ../camel/providers/local/camel-mbox-store.c:369
+#: ../camel/providers/local/camel-mbox-store.c:540
#, c-format
msgid "Cannot create a folder by this name."
msgstr "ç?¡æ³?建æ§?以æ¤ç?ºå??ç??è³?æ??夾"
# camel/providers/local/camel-mbox-store.c:119
# camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:186
+#: ../camel/providers/local/camel-mbox-store.c:406
#, c-format
msgid "Cannot get folder '%s': not a regular file."
msgstr "ä¸?è?½å??å¾?è³?æ??夾ã??%sã??ï¼?ä¸?æ?¯ä¸?è?¬æª?æ¡?ã??"
+# camel/providers/imap/camel-imap-folder.c:172
+#: ../camel/providers/local/camel-mbox-store.c:556
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "ä¸?è?½å»ºç«?ç?®é??ã??%sã??ï¼? %sã??"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-mbox-store.c:572
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "ä¸?è?½å??å¾?è³?æ??夾ï¼?%sï¼?%s"
+
+#: ../camel/providers/local/camel-mbox-store.c:574
+msgid "Folder already exists"
+msgstr "è³?æ??夾已å?å?¨"
+
# camel/providers/local/camel-mbox-store.c:138
# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:218
-#: ../camel/providers/local/camel-mbox-store.c:231
-#: ../camel/providers/local/camel-mbox-store.c:260
+#: ../camel/providers/local/camel-mbox-store.c:615
+#: ../camel/providers/local/camel-mbox-store.c:628
+#: ../camel/providers/local/camel-mbox-store.c:657
#, c-format
msgid ""
"Could not delete folder '%s':\n"
@@ -4398,208 +4470,202 @@ msgstr ""
# camel/providers/local/camel-mbox-store.c:119
# camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:241
+#: ../camel/providers/local/camel-mbox-store.c:638
#, c-format
msgid "'%s' is not a regular file."
msgstr "ã??%sã??ä¸?æ?¯æ?®é??ç??æª?æ¡?ã??"
# camel/providers/local/camel-mbox-store.c:153
-#: ../camel/providers/local/camel-mbox-store.c:250
+#: ../camel/providers/local/camel-mbox-store.c:647
#, c-format
msgid "Folder '%s' is not empty. Not deleted."
msgstr "è³?æ??夾ã??%sã??å?§ä»?æ??æª?æ¡?ã??æ??以ä¸?å?ªé?¤ã??"
# camel/providers/local/camel-local-store.c:279
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:290
+#: ../camel/providers/local/camel-mbox-store.c:673
+#: ../camel/providers/local/camel-mbox-store.c:687
#, c-format
msgid "Could not delete folder summary file '%s': %s"
msgstr "ç?¡æ³?å?ªé?¤è³?æ??夾æ??è¦?æª?æ¡?ã??%sã??ï¼? %s"
-# camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/local/camel-mbox-store.c:395
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "ä¸?è?½å»ºç«?ç?®é??ã??%sã??ï¼? %sã??"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mbox-store.c:411
-#, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "ä¸?è?½å??å¾?è³?æ??夾ï¼?%sï¼?%s"
-
-#: ../camel/providers/local/camel-mbox-store.c:413
-msgid "Folder already exists"
-msgstr "è³?æ??夾已å?å?¨"
-
# shell/e-shell-folder-creation-dialog.c:156
-#: ../camel/providers/local/camel-mbox-store.c:507
+#: ../camel/providers/local/camel-mbox-store.c:767
#, c-format
msgid "The new folder name is illegal."
msgstr "æ?°ç??è³?æ??夾å??稱ä¸?å??æ³?ã??"
# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-store.c:522
+#: ../camel/providers/local/camel-mbox-store.c:782
#, c-format
msgid "Could not rename '%s': '%s': %s"
msgstr "ç?¡æ³?é??æ?°å?½å??ã??%sã??ï¼?ã??%sã??ï¼?%s"
# camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/local/camel-mbox-store.c:605
+#: ../camel/providers/local/camel-mbox-store.c:865
#, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "ç?¡æ³?å°? '%s' é??æ?°å?½å??æ?? %sï¼?%s"
# camel/providers/local/camel-maildir-store.c:96
# camel/providers/local/camel-mh-store.c:90
-#: ../camel/providers/local/camel-mbox-summary.c:473
+#: ../camel/providers/local/camel-mbox-summary.c:476
#, c-format
msgid "Could not open folder: %s: %s"
msgstr "ç?¡æ³?é??å??è³?æ??夾ï¼? %sï¼? %s"
# camel/providers/local/camel-mbox-summary.c:296
-#: ../camel/providers/local/camel-mbox-summary.c:533
+#: ../camel/providers/local/camel-mbox-summary.c:537
#, c-format
msgid "Fatal mail parser error near position %s in folder %s"
msgstr "é? è¿? %s (æ?¼è³?æ??夾 %s)ç??ä½?ç½®ç?¼ç??å?´é??ç??é?µä»¶å??æ??é?¯èª¤"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mbox-summary.c:615
+#: ../camel/providers/local/camel-mbox-summary.c:622
#, c-format
msgid "Cannot check folder: %s: %s"
msgstr "ä¸?è?½æª¢æ?¥è³?æ??夾ï¼?%sï¼? %s"
# camel/providers/local/camel-mbox-store.c:94
-#: ../camel/providers/local/camel-mbox-summary.c:686
-#: ../camel/providers/local/camel-mbox-summary.c:816
-#: ../camel/providers/local/camel-spool-summary.c:137
+#: ../camel/providers/local/camel-mbox-summary.c:697
+#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../camel/providers/local/camel-spool-summary.c:138
#, c-format
msgid "Could not open file: %s: %s"
msgstr "ç?¡æ³?é??å??æª?æ¡?ï¼? %sï¼? %s"
# camel/providers/local/camel-mbox-summary.c:524
-#: ../camel/providers/local/camel-mbox-summary.c:700
-#: ../camel/providers/local/camel-spool-summary.c:152
+#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-spool-summary.c:153
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "ä¸?è?½é??å??æ?«å? mailboxï¼?%s"
# camel/providers/local/camel-mbox-summary.c:635
# camel/providers/local/camel-mbox-summary.c:804
-#: ../camel/providers/local/camel-mbox-summary.c:715
-#: ../camel/providers/local/camel-mbox-summary.c:932
+#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:949
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "ç?¡æ³?é??é??ä¾?æº?è³?æ??夾 %s ï¼? %s"
# camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/local/camel-mbox-summary.c:726
+#: ../camel/providers/local/camel-mbox-summary.c:739
#, c-format
msgid "Could not close temporary folder: %s"
msgstr "ç?¡æ³?é??é??æ?«å?è³?æ??夾ï¼? %s"
# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:756
#, c-format
msgid "Could not rename folder: %s"
msgstr "ç?¡æ³?é??æ?°å?½å??è³?æ??夾ï¼?%s "
# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-summary.c:829
-#: ../camel/providers/local/camel-mbox-summary.c:1070
+#: ../camel/providers/local/camel-mbox-summary.c:846
+#: ../camel/providers/local/camel-mbox-summary.c:1099
#, c-format
msgid "Could not store folder: %s"
msgstr "ç?¡æ³?å?²å?è³?æ??夾ï¼?%s "
-#: ../camel/providers/local/camel-mbox-summary.c:869
-#: ../camel/providers/local/camel-mbox-summary.c:1102
+#: ../camel/providers/local/camel-mbox-summary.c:886
+#: ../camel/providers/local/camel-mbox-summary.c:1131
#, c-format
msgid ""
"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
"it.)"
-msgstr "MBOX æª?æ¡?å·²æ??å£?ï¼?è«?ä¿®æ£å®?ã??ï¼?é ?æ??æ?? From é??ä¸?è¡?ï¼?å?»æ?¾ä¸?å?°å®?ã??ï¼?"
+msgstr "MBOX æª?æ¡?å·²æ??å£?ï¼?è«?ä¿®æ£å®?ã??ï¼?é ?æ??æ?? From é??ä¸?å??ï¼?å?»æ?¾ä¸?å?°å®?ã??ï¼?"
# camel/providers/local/camel-mbox-summary.c:549
# camel/providers/local/camel-mbox-summary.c:557
# camel/providers/local/camel-mbox-summary.c:746
# camel/providers/local/camel-mbox-summary.c:754
-#: ../camel/providers/local/camel-mbox-summary.c:878
-#: ../camel/providers/local/camel-mbox-summary.c:1111
+#: ../camel/providers/local/camel-mbox-summary.c:895
+#: ../camel/providers/local/camel-mbox-summary.c:1140
#, c-format
msgid "Summary and folder mismatch, even after a sync"
msgstr "æ??è¦?è??è³?æ??夾ä¸?å??調ï¼?å?³ä½¿ç¶?é??å??æ¥"
# camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/providers/local/camel-mbox-summary.c:1029
-#: ../camel/providers/local/camel-spool-summary.c:337
+#: ../camel/providers/local/camel-mbox-summary.c:1052
+#: ../camel/providers/local/camel-spool-summary.c:343
#, c-format
msgid "Unknown error: %s"
msgstr "ä¸?æ??ç??é?¯èª¤ï¼? %s"
# camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1211
+#: ../camel/providers/local/camel-mbox-summary.c:1210
+#: ../camel/providers/local/camel-mbox-summary.c:1240
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "寫å?¥æ?«å?é?µç®±å¤±æ??ï¼? %s"
# camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1200
+#: ../camel/providers/local/camel-mbox-summary.c:1229
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "寫å?¥æ?«å?é?µç®±å¤±æ??ï¼? %sï¼? %s"
# camel/providers/local/camel-mh-folder.c:149
# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/local/camel-mh-folder.c:165
+#: ../camel/providers/local/camel-mh-folder.c:115
#, c-format
msgid "Cannot append message to mh folder: %s: "
msgstr "ä¸?è?½å°?é?µä»¶å?²å?å?° mh è³?æ??夾ï¼? %sï¼?"
# camel/providers/local/camel-maildir-store.c:107
# camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-mh-store.c:234
+#: ../camel/providers/local/camel-mh-store.c:483
#, c-format
msgid "Could not create folder '%s': %s"
msgstr "ç?¡æ³?建ç«?è³?æ??夾ã??%sã??ï¼?%s"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mh-store.c:248
+#: ../camel/providers/local/camel-mh-store.c:497
#, c-format
msgid "Cannot get folder '%s': not a directory."
msgstr "ä¸?è?½å??å¾?è³?æ??夾ã??%sã??ï¼?ä¸?æ?¯ç?®é??ã??"
# camel/providers/local/camel-mh-summary.c:218
-#: ../camel/providers/local/camel-mh-summary.c:228
+#: ../camel/providers/local/camel-mh-summary.c:230
#, c-format
msgid "Cannot open MH directory path: %s: %s"
msgstr "ä¸?è?½é??å?? MH ç?®é??è·¯å¾?ï¼? %sï¼? %s"
-#: ../camel/providers/local/camel-spool-store.c:118
+#: ../camel/providers/local/camel-spool-store.c:327
#, c-format
msgid "Spool '%s' cannot be opened: %s"
msgstr "æ??ç¨?å?¨ã??%sã??ä¸?è?½è¢«é??å??ï¼?%s"
# camel/providers/local/camel-local-store.c:134
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../camel/providers/local/camel-spool-store.c:341
#, c-format
msgid "Spool '%s' is not a regular file or directory"
msgstr "æ??ç¨?å?¨ã??%sã??ä¸?æ?¯ä¸?è?¬æª?æ¡?æ??ç?®é??ã??"
+# camel/providers/local/camel-local-store.c:183
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool mail file %s"
+msgstr "æ??ç¨?é?µä»¶æª?æ¡? %s"
+
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "æ??ç¨?è³?æ??夾樹ç??çµ?æ§? %s"
+
# camel/providers/local/camel-maildir-store.c:100
# camel/providers/local/camel-mbox-store.c:101
# camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-spool-store.c:158
+#: ../camel/providers/local/camel-spool-store.c:391
#, c-format
msgid "Folder '%s/%s' does not exist."
msgstr "è³?æ??夾ã??%s/%sã??ä¸?å?å?¨ã??"
# camel/providers/local/camel-maildir-store.c:96
# camel/providers/local/camel-mh-store.c:90
-#: ../camel/providers/local/camel-spool-store.c:170
+#: ../camel/providers/local/camel-spool-store.c:403
#, c-format
msgid ""
"Could not open folder '%s':\n"
@@ -4611,14 +4677,14 @@ msgstr ""
# camel/providers/local/camel-maildir-store.c:100
# camel/providers/local/camel-mbox-store.c:101
# camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:409
#, c-format
msgid "Folder '%s' does not exist."
msgstr "è³?æ??夾ã??%sã??ä¸?å?å?¨ã??"
# camel/providers/local/camel-maildir-store.c:107
# camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-spool-store.c:183
+#: ../camel/providers/local/camel-spool-store.c:416
#, c-format
msgid ""
"Could not create folder '%s':\n"
@@ -4629,55 +4695,44 @@ msgstr ""
# camel/providers/local/camel-mbox-store.c:119
# camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:426
#, c-format
msgid "'%s' is not a mailbox file."
msgstr "ã??%sã??ä¸?æ?¯ mailbox æª?æ¡?ã??"
-#: ../camel/providers/local/camel-spool-store.c:213
+#: ../camel/providers/local/camel-spool-store.c:462
#, c-format
msgid "Store does not support an INBOX"
msgstr "å?²å?並ä¸?æ?¯æ?´ INBOX"
-# camel/providers/local/camel-local-store.c:183
-#: ../camel/providers/local/camel-spool-store.c:226
+#: ../camel/providers/local/camel-spool-store.c:476
#, c-format
-msgid "Spool mail file %s"
-msgstr "æ??ç¨?é?µä»¶æª?æ¡? %s"
-
-#: ../camel/providers/local/camel-spool-store.c:226
-#, c-format
-msgid "Spool folder tree %s"
-msgstr "æ??ç¨?è³?æ??夾樹ç??çµ?æ§? %s"
+msgid "Spool folders cannot be deleted"
+msgstr "æ??ç¨?è³?æ??夾ä¸?è?½å?ªé?¤"
-#: ../camel/providers/local/camel-spool-store.c:238
+#: ../camel/providers/local/camel-spool-store.c:491
#, c-format
msgid "Spool folders cannot be renamed"
msgstr "æ??ç¨?è³?æ??夾ä¸?è?½é??æ?°å?½å??"
-#: ../camel/providers/local/camel-spool-store.c:251
-#, c-format
-msgid "Spool folders cannot be deleted"
-msgstr "æ??ç¨?è³?æ??夾ä¸?è?½å?ªé?¤"
-
# camel/camel-movemail.c:158
-#: ../camel/providers/local/camel-spool-summary.c:166
-#: ../camel/providers/local/camel-spool-summary.c:178
-#: ../camel/providers/local/camel-spool-summary.c:190
+#: ../camel/providers/local/camel-spool-summary.c:169
+#: ../camel/providers/local/camel-spool-summary.c:181
+#: ../camel/providers/local/camel-spool-summary.c:193
#, c-format
msgid "Could not synchronize temporary folder %s: %s"
msgstr "ç?¡æ³?å??æ¥æ?«å?è³?æ??夾 %sï¼?%s"
# camel/providers/local/camel-maildir-store.c:107
# camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-spool-summary.c:208
+#: ../camel/providers/local/camel-spool-summary.c:211
#, c-format
msgid "Could not synchronize spool folder %s: %s"
msgstr "ç?¡æ³?å??æ¥æ??ç¨?è³?æ??夾%sï¼?%s"
-#: ../camel/providers/local/camel-spool-summary.c:240
-#: ../camel/providers/local/camel-spool-summary.c:259
-#: ../camel/providers/local/camel-spool-summary.c:272
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
#, c-format
msgid ""
"Could not synchronize spool folder %s: %s\n"
@@ -4686,9 +4741,9 @@ msgstr ""
"ç?¡æ³?å??æ¥æ??ç¨?è³?æ??夾 %sï¼?%s\n"
"è³?æ??夾å?¯è?½æ??æ¯?ï¼?è¤?æ?¬å?²å?æ?¼ã??%sã??"
-#: ../camel/providers/nntp/camel-nntp-folder.c:197
-#: ../camel/providers/nntp/camel-nntp-folder.c:271
-#: ../camel/providers/nntp/camel-nntp-folder.c:312
+#: ../camel/providers/nntp/camel-nntp-folder.c:200
+#: ../camel/providers/nntp/camel-nntp-folder.c:279
+#: ../camel/providers/nntp/camel-nntp-folder.c:393
#, c-format
msgid "Internal error: UID in invalid format: %s"
msgstr "å?§é?¨é?¯èª¤ï¼?UID æ ¼å¼?ç?¡æ??ï¼?%s"
@@ -4700,12 +4755,12 @@ msgstr "å?§é?¨é?¯èª¤ï¼?UID æ ¼å¼?ç?¡æ??ï¼?%s"
# camel/providers/local/camel-mh-folder.c:185
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/nntp/camel-nntp-folder.c:234
-#: ../camel/providers/nntp/camel-nntp-folder.c:238
-#: ../camel/providers/pop3/camel-pop3-folder.c:402
-#: ../camel/providers/pop3/camel-pop3-folder.c:630
+#: ../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:706
#, c-format
msgid "Cannot get message %s: %s"
msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼? %s"
@@ -4714,9 +4769,9 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼? %s"
# camel/camel-remote-store.c:399
# camel/camel-remote-store.c:470
# camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/nntp/camel-nntp-folder.c:465
-#: ../camel/providers/nntp/camel-nntp-folder.c:471
-#: ../camel/providers/nntp/camel-nntp-folder.c:518
+#: ../camel/providers/nntp/camel-nntp-folder.c:477
+#: ../camel/providers/nntp/camel-nntp-folder.c:483
+#: ../camel/providers/nntp/camel-nntp-folder.c:530
#, c-format
msgid "Posting failed: %s"
msgstr "張貼失æ??ï¼?%s"
@@ -4725,17 +4780,17 @@ msgstr "張貼失æ??ï¼?%s"
# camel/camel-remote-store.c:399
# camel/camel-remote-store.c:470
# camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/nntp/camel-nntp-folder.c:513
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
msgid "Posting failed: "
msgstr "張貼失æ??ï¼?"
-#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#: ../camel/providers/nntp/camel-nntp-folder.c:554
#, c-format
msgid "You cannot post NNTP messages while working offline!"
msgstr "é?¢ç·?å·¥ä½?æ??ç?¡æ³?張貼 NNTP è¨?æ?¯ï¼?"
# camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/nntp/camel-nntp-folder.c:560
+#: ../camel/providers/nntp/camel-nntp-folder.c:574
#, c-format
msgid "You cannot copy messages from a NNTP folder!"
msgstr "æ?¨ç?¡æ³?å¾? NNTP è³?æ??夾è¤?製è¨?æ?¯ï¼?"
@@ -4766,25 +4821,37 @@ msgid ""
"password."
msgstr "é??å??é?¸é ?å°?æ??使ç?¨ç´?æ??å?ç??å¯?碼é©?è? NNTP 伺æ??å?¨ã??"
+# camel/providers/smtp/camel-smtp-transport.c:218
+#: ../camel/providers/nntp/camel-nntp-store.c:77
+#, c-format
+msgid "Authentication requested but no username provided"
+msgstr "é??è¦?é©?è?ï¼?ä½?æ?ªæ??ä¾?使ç?¨è??å??稱"
+
+# camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/nntp/camel-nntp-store.c:89
+#, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "ç?¡æ³?é©?è?伺æ??å?¨ï¼?%s"
+
# camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/nntp/camel-nntp-store.c:265
+#: ../camel/providers/nntp/camel-nntp-store.c:346
#, c-format
msgid "Could not read greeting from %s: "
msgstr "ç?¡æ³?è®?å?? %s ç??æ¡è¿?è¾ï¼?"
-#: ../camel/providers/nntp/camel-nntp-store.c:278
+#: ../camel/providers/nntp/camel-nntp-store.c:359
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "NNTP 伺æ??å?¨ %s å?³å??é?¯èª¤ä»£ç¢¼ %d ï¼? %s"
# camel/providers/nntp/camel-nntp-store.c:286
-#: ../camel/providers/nntp/camel-nntp-store.c:434
+#: ../camel/providers/nntp/camel-nntp-store.c:527
#, c-format
msgid "USENET News via %s"
msgstr "ç¶?ç?± %s ç?? USENET æ?°è??"
# mail/mail-ops.c:1755
-#: ../camel/providers/nntp/camel-nntp-store.c:927
+#: ../camel/providers/nntp/camel-nntp-store.c:1045
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -4795,7 +4862,7 @@ msgstr ""
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1024
+#: ../camel/providers/nntp/camel-nntp-store.c:1160
#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
@@ -4806,7 +4873,7 @@ msgstr ""
"\n"
"æ²?æ??é¡?ä¼¼ç??æ?°è??群çµ?ã??é?¸å??ç??é ?ç?®å?¯è?½æ?¯ç?¶ä»£è³?æ??夾ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1064
+#: ../camel/providers/nntp/camel-nntp-store.c:1202
#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
@@ -4817,60 +4884,48 @@ msgstr ""
"\n"
"æ?°è??群çµ?ä¸?å?å?¨ï¼?"
-#: ../camel/providers/nntp/camel-nntp-store.c:1094
+#: ../camel/providers/nntp/camel-nntp-store.c:1235
#, c-format
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr "æ?¨ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??建æ§?è³?æ??夾ï¼?æ?¹ä»¥è¨?é?±ã??"
# camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/nntp/camel-nntp-store.c:1106
+#: ../camel/providers/nntp/camel-nntp-store.c:1251
#, c-format
msgid "You cannot rename a folder in a News store."
msgstr "æ?¨ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??é??æ?°å?½å??è³?æ??夾ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1119
+#: ../camel/providers/nntp/camel-nntp-store.c:1268
#, c-format
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr "æ?¨ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??移é?¤è³?æ??夾ï¼?æ?¹ä»¥å??æ¶?è¨?é?±ã??"
-# camel/providers/smtp/camel-smtp-transport.c:218
-#: ../camel/providers/nntp/camel-nntp-store.c:1257
-#, c-format
-msgid "Authentication requested but no username provided"
-msgstr "é??è¦?é©?è?ï¼?ä½?æ?ªæ??ä¾?使ç?¨è??å??稱"
-
-# camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/nntp/camel-nntp-store.c:1269
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "ç?¡æ³?é©?è?伺æ??å?¨ï¼?%s"
-
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/nntp/camel-nntp-store.c:1395
+#: ../camel/providers/nntp/camel-nntp-store.c:1479
msgid "NNTP Command failed: "
msgstr "NNTP æ??令失æ??ï¼?"
# ui/evolution-addressbook.xml.h:17
-#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#: ../camel/providers/nntp/camel-nntp-store.c:1553
#, c-format
msgid "Not connected."
msgstr "æ?ªé?£ç·?ã??"
# mail/mail-ops.c:992
-#: ../camel/providers/nntp/camel-nntp-summary.c:238
-#: ../camel/providers/nntp/camel-nntp-summary.c:340
+#: ../camel/providers/nntp/camel-nntp-summary.c:234
+#: ../camel/providers/nntp/camel-nntp-summary.c:345
#, c-format
msgid "%s: Scanning new messages"
msgstr "%sï¼?æ??æ??æ?°é?µä»¶"
# camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/nntp/camel-nntp-summary.c:249
+#: ../camel/providers/nntp/camel-nntp-summary.c:246
#, c-format
msgid "Unexpected server response from xover: %s"
msgstr "xover å?³ä¾?æ??å¤?ç??伺æ??å?¨å??æ??ï¼?%s"
# camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/nntp/camel-nntp-summary.c:356
+#: ../camel/providers/nntp/camel-nntp-summary.c:362
#, c-format
msgid "Unexpected server response from head: %s"
msgstr "æ¨?é¡?å?³ä¾?æ??å¤?ç??伺æ??å?¨å??æ??ï¼?%s"
@@ -4879,53 +4934,51 @@ msgstr "æ¨?é¡?å?³ä¾?æ??å¤?ç??伺æ??å?¨å??æ??ï¼?%s"
# camel/camel-remote-store.c:399
# camel/camel-remote-store.c:470
# camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/nntp/camel-nntp-summary.c:401
+#: ../camel/providers/nntp/camel-nntp-summary.c:407
#, c-format
msgid "Operation failed: %s"
msgstr "ä½?æ¥å¤±æ??ï¼? %s"
+# camel/providers/pop3/camel-pop3-folder.c:292
+#: ../camel/providers/pop3/camel-pop3-folder.c:277
+#: ../camel/providers/pop3/camel-pop3-folder.c:334
+#, c-format
+msgid "No message with UID %s"
+msgstr "æ²?æ??é?µä»¶å?·æ??é??å?? UID %s"
+
+# camel/providers/pop3/camel-pop3-folder.c:296
+#: ../camel/providers/pop3/camel-pop3-folder.c:342
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "�� POP �件 %d"
+
+# camel/camel-sasl-login.c:127
+#: ../camel/providers/pop3/camel-pop3-folder.c:447
+msgid "Unknown reason"
+msgstr "ä¸?æ??ç??å??å? "
+
# camel/providers/pop3/camel-pop3-folder.c:149
-#: ../camel/providers/pop3/camel-pop3-folder.c:251
+#: ../camel/providers/pop3/camel-pop3-folder.c:486
msgid "Retrieving POP summary"
msgstr "å??å?? POP ç??æ??è¦?"
# camel/providers/local/camel-local-store.c:142
# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/pop3/camel-pop3-folder.c:274
+#: ../camel/providers/pop3/camel-pop3-folder.c:509
#, c-format
msgid "Cannot get POP summary: %s"
msgstr "ä¸?è?½å??å¾? POP æ??è¦?ï¼? %s"
# mail/message-browser.c:199
-#: ../camel/providers/pop3/camel-pop3-folder.c:324
+#: ../camel/providers/pop3/camel-pop3-folder.c:561
msgid "Expunging old messages"
msgstr "æ¸?空è??ç??é?µä»¶"
# mail/message-browser.c:199
-#: ../camel/providers/pop3/camel-pop3-folder.c:332
+#: ../camel/providers/pop3/camel-pop3-folder.c:575
msgid "Expunging deleted messages"
msgstr "æ¸?空å?ªé?¤ç??é?µä»¶"
-# camel/providers/pop3/camel-pop3-folder.c:292
-#: ../camel/providers/pop3/camel-pop3-folder.c:566
-#: ../camel/providers/pop3/camel-pop3-folder.c:596
-#, c-format
-msgid "No message with UID %s"
-msgstr "æ²?æ??é?µä»¶å?·æ??é??å?? UID %s"
-
-# camel/providers/pop3/camel-pop3-folder.c:296
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code. Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:603
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "�� POP �件 %d"
-
-# camel/camel-sasl-login.c:127
-#: ../camel/providers/pop3/camel-pop3-folder.c:707
-msgid "Unknown reason"
-msgstr "ä¸?æ??ç??å??å? "
-
# camel/providers/pop3/camel-pop3-provider.c:37
#: ../camel/providers/pop3/camel-pop3-provider.c:39
msgid "Message storage"
@@ -4937,28 +4990,33 @@ msgid "_Leave messages on server"
msgstr "å?¨ä¼ºæ??å?¨ä¿?ç??é?µä»¶å??份(_L)"
# camel/providers/pop3/camel-pop3-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
#, c-format
msgid "_Delete after %s day(s)"
msgstr "å?ªé?¤ %s 天å¾?ç??é?µä»¶(_D)"
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr "å?ªé?¤å?¨æ?¬å?°ç«¯æ?¶ä»¶å?£æ¸?é?¤ç??(_E)"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
msgid "Disable _support for all POP3 extensions"
msgstr "å??æ¢æ??æ?? P_OP3 延伸å??è?½ç??æ?¯æ?´"
# camel/providers/pop3/camel-pop3-provider.c:48
# mail/mail-config.glade.h:51
-#: ../camel/providers/pop3/camel-pop3-provider.c:53
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
msgid "POP"
msgstr "POP"
# camel/providers/imap/camel-imap-provider.c:65
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:58
msgid "For connecting to and downloading mail from POP servers."
msgstr "ç?¨æ?¼é?£ç·?å?° POP 伺æ??å?¨ä¸¦ä¸?è¼?é?µä»¶ã??"
# camel/providers/pop3/camel-pop3-provider.c:69
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:75
msgid ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
@@ -4967,7 +5025,7 @@ msgstr ""
"æ?¹å¼?ã??"
# camel/providers/pop3/camel-pop3-provider.c:79
-#: ../camel/providers/pop3/camel-pop3-provider.c:82
+#: ../camel/providers/pop3/camel-pop3-provider.c:85
msgid ""
"This option will connect to the POP server using an encrypted password via "
"the APOP protocol. This may not work for all users even on servers that "
@@ -4982,44 +5040,44 @@ msgid ": "
msgstr "ï¼?"
# camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:168
+#: ../camel/providers/pop3/camel-pop3-store.c:181
#, c-format
msgid "Failed to read a valid greeting from POP server %s"
msgstr "ç?¡æ³?å¾? POP 伺æ??å?¨ %s è®?å??æ??æ??ç??å??å??èª?"
# camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/pop3/camel-pop3-store.c:217
-#: ../camel/providers/pop3/camel-pop3-store.c:224
+#: ../camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/pop3/camel-pop3-store.c:230
+#: ../camel/providers/pop3/camel-pop3-store.c:237
#, c-format
msgid "Failed to connect to POP server %s in secure mode: %s"
msgstr "ç?¡æ³?以å®?å?¨æ¨¡å¼?é?£ç·?å?° POP 伺æ??å?¨ %sï¼? %s"
# shell/e-storage.c:477
-#: ../camel/providers/pop3/camel-pop3-store.c:187
+#: ../camel/providers/pop3/camel-pop3-store.c:200
msgid "STLS not supported by server"
msgstr "伺æ??å?¨ä¸?æ?¯æ?´ STLS"
# camel/providers/pop3/camel-pop3-store.c:379
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:205
+#: ../camel/providers/pop3/camel-pop3-store.c:218
#, c-format
msgid "Failed to connect to POP server %s in secure mode%s"
msgstr "ç?¡æ³?以å®?å?¨æ¨¡å¼?é?£ç·?å?° POP 伺æ??å?¨ %s%s"
# camel/camel-sasl-anonymous.c:110
# camel/camel-sasl-plain.c:87
-#: ../camel/providers/pop3/camel-pop3-store.c:218
+#: ../camel/providers/pop3/camel-pop3-store.c:231
msgid "TLS negotiations failed"
msgstr "TLS å??å??失æ??"
-#: ../camel/providers/pop3/camel-pop3-store.c:225
+#: ../camel/providers/pop3/camel-pop3-store.c:238
msgid "TLS is not available in this build"
msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ TLS"
# camel/providers/pop3/camel-pop3-store.c:409
-#: ../camel/providers/pop3/camel-pop3-store.c:300
-#: ../camel/providers/pop3/camel-pop3-store.c:452
+#: ../camel/providers/pop3/camel-pop3-store.c:317
+#: ../camel/providers/pop3/camel-pop3-store.c:472
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -5027,23 +5085,23 @@ msgid ""
msgstr "ç?¡æ³?é?£ç·?å?° POP 伺æ??å?¨ %sï¼?ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?æ©?å?¶ã??"
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:323
+#: ../camel/providers/pop3/camel-pop3-store.c:340
#, c-format
msgid "SASL '%s' Login failed for POP server %s%s"
msgstr "å?¨ POP 伺æ??å?¨ %2$s 以 SASL ã??%1$sã??ç?»å?¥å¤±æ??%3$s"
-#: ../camel/providers/pop3/camel-pop3-store.c:340
+#: ../camel/providers/pop3/camel-pop3-store.c:357
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "ä¸?è?½ç?»å?¥ POP 伺æ??å?¨ %sï¼? SASL é??è¨?å??å®?é?¯èª¤"
# camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:357
+#: ../camel/providers/pop3/camel-pop3-store.c:374
#, c-format
msgid "Failed to authenticate on POP server %s: "
msgstr "ç?¡æ³?é©?è? POP 伺æ??å?¨ %sï¼?"
-#: ../camel/providers/pop3/camel-pop3-store.c:421
+#: ../camel/providers/pop3/camel-pop3-store.c:439
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -5053,7 +5111,7 @@ msgstr ""
"è?¯çµ¡æ?¨ç??系統管ç??è??ã??"
# camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:471
+#: ../camel/providers/pop3/camel-pop3-store.c:492
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -5064,7 +5122,7 @@ msgstr ""
# camel/providers/pop3/camel-pop3-store.c:417
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:484
+#: ../camel/providers/pop3/camel-pop3-store.c:505
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -5075,7 +5133,7 @@ msgstr ""
# camel/providers/pop3/camel-pop3-store.c:417
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:497
+#: ../camel/providers/pop3/camel-pop3-store.c:518
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -5084,31 +5142,31 @@ msgstr ""
"ç?¡æ³?é?£ç·?å?° POP 伺æ??å?¨ %sã??\n"
"å?³é??å¯?碼æ??ç?¼ç??é?¯èª¤%s"
-# camel/providers/pop3/camel-pop3-store.c:322
-#: ../camel/providers/pop3/camel-pop3-store.c:653
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "ç?¡æ³?é?£ç·?å?° POP 伺æ??å?¨ %s"
-
# camel/providers/smtp/camel-smtp-transport.c:534
-#: ../camel/providers/pop3/camel-pop3-store.c:666
+#: ../camel/providers/pop3/camel-pop3-store.c:558
#, c-format
msgid "POP3 server %s"
msgstr "POP3 伺æ??å?¨ %s"
# camel/camel-remote-store.c:195
-#: ../camel/providers/pop3/camel-pop3-store.c:670
+#: ../camel/providers/pop3/camel-pop3-store.c:562
#, c-format
msgid "POP3 server for %s on %s"
msgstr "%s å?¨ %s ç?? POP3 伺æ??å?¨"
+# camel/providers/pop3/camel-pop3-store.c:322
+#: ../camel/providers/pop3/camel-pop3-store.c:694
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "ç?¡æ³?é?£ç·?å?° POP 伺æ??å?¨ %s"
+
# camel/providers/pop3/camel-pop3-store.c:484
-#: ../camel/providers/pop3/camel-pop3-store.c:685
+#: ../camel/providers/pop3/camel-pop3-store.c:721
#, c-format
msgid "No such folder '%s'."
msgstr "æ²?æ??é??å??è³?æ??夾ã??%sã??ã??"
-#: ../camel/providers/pop3/camel-pop3-store.c:709
+#: ../camel/providers/pop3/camel-pop3-store.c:738
#, c-format
msgid "POP3 stores have no folder hierarchy"
msgstr "POP3 å?²å?å??æ²?æ??è³?æ??夾é??層"
@@ -5126,57 +5184,57 @@ msgid ""
"system."
msgstr "å°?é??é??ç??é?µä»¶äº¤çµ¦æ?¬å?°ç«¯ç³»çµ±ä¸?ç??ã??sendmailã??ç¨?å¼?è??ç??ã??"
+# camel/providers/sendmail/camel-sendmail-transport.c:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+# camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "ç¶?ç?± sendmail ç¨?å¼?å?³é??é?µä»¶"
+
# camel/camel-url.c:289
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
#, c-format
msgid "Could not parse recipient list"
msgstr "ç?¡æ³?å??æ??æ?¶ä»¶äººæ¸?å?®"
# camel/providers/sendmail/camel-sendmail-transport.c:107
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
#, c-format
msgid "Could not create pipe to sendmail: %s: mail not sent"
msgstr "ç?¡æ³?建æ§?å°?管å?°ã??sendmailã??ç¨?å¼?ï¼? %sï¼?é?µä»¶ç?¡æ³?å?³é??"
# camel/providers/sendmail/camel-sendmail-transport.c:124
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
#, c-format
msgid "Could not fork sendmail: %s: mail not sent"
msgstr "ç?¡æ³?å?¦å¤?å??å??å??ä¸?å?? sendmail è¡?ç¨?ï¼? %sï¼?é?µä»¶ç?¡æ³?å?³é??"
# camel/providers/sendmail/camel-sendmail-transport.c:150
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
msgid "Could not send message: "
msgstr "ç?¡æ³?å?³é??é?µä»¶ï¼?"
# camel/providers/sendmail/camel-sendmail-transport.c:163
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr "sendmail å??å?³é??é??è¨?æ?¯ %sï¼?é?µä»¶ç?¡æ³?å?³é??"
# camel/providers/sendmail/camel-sendmail-transport.c:170
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr "ç?¡æ³?å?·è¡? %sï¼? é?µä»¶ç?¡æ³?å?³é??ã??"
# camel/providers/sendmail/camel-sendmail-transport.c:175
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr "sendmail ç?±æ?¼ç??æ³? %d é??é??ï¼? é?µä»¶ç?¡æ³?å?³é??ã??"
-# camel/providers/sendmail/camel-sendmail-transport.c:247
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
-msgid "sendmail"
-msgstr "sendmail"
-
-# camel/providers/sendmail/camel-sendmail-transport.c:249
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
-msgid "Mail delivery via the sendmail program"
-msgstr "ç¶?ç?± sendmail ç¨?å¼?å?³é??é?µä»¶"
-
# camel/providers/smtp/camel-smtp-provider.c:38
# mail/mail-config.glade.h:62
#: ../camel/providers/smtp/camel-smtp-provider.c:43
@@ -5188,370 +5246,402 @@ msgstr "SMTP"
msgid "For delivering mail by connecting to a remote mailhub using SMTP."
msgstr "使ç?¨ SMTP é?£ç·?å?°é? 端 mailhub ä¾?å?³é??é?µä»¶ã??"
+# camel/providers/smtp/camel-smtp-transport.c:1043
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+msgid "Welcome response error: "
+msgstr "è¿?æ?¥ç??å??æ??é?¯èª¤ï¼?"
+
+# camel/providers/pop3/camel-pop3-store.c:379
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:277
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "ç?¡æ³?以å®?å?¨æ¨¡å¼?é?£ç·?å?° SMTP 伺æ??å?¨ %sï¼? %s"
+
+# camel/providers/imap/camel-imap-command.c:240
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS æ??令失æ??ï¼?"
+
+# camel/providers/smtp/camel-smtp-transport.c:534
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP 伺æ??å?¨ %s"
+
+# camel/providers/smtp/camel-smtp-transport.c:536
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "ç¶?ç?± %s å?³é?? SMTP é?µä»¶"
+
+# camel/providers/smtp/camel-smtp-transport.c:356
+#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "SMTP 伺æ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?é¡?å?? %sã??"
+
+# camel/providers/smtp/camel-smtp-transport.c:418
+#: ../camel/providers/smtp/camel-smtp-transport.c:488
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"ç?¡æ³?é©?è?ç?»å?¥ SMTP 伺æ??å?¨ã??\n"
+"%s\n"
+"\n"
+
+# camel/providers/smtp/camel-smtp-transport.c:582
+#: ../camel/providers/smtp/camel-smtp-transport.c:606
+#, c-format
+msgid "Cannot send message: service not connected."
+msgstr "ç?¡æ³?å?³é??è¨?æ?¯ï¼?æ??å??æ?ªé?£ç·?ã??"
+
+# camel/providers/smtp/camel-smtp-transport.c:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?å¯?件è??ç??å?°å??ç?¡æ??ã??"
+
+# mail/mail-ops.c:603
+#: ../camel/providers/smtp/camel-smtp-transport.c:617
+msgid "Sending message"
+msgstr "å?³é??é?µä»¶"
+
+# camel/providers/smtp/camel-smtp-transport.c:582
+#: ../camel/providers/smtp/camel-smtp-transport.c:642
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?æ²?æ??å®?義æ?¶ä»¶è??ã??"
+
+# camel/providers/smtp/camel-smtp-transport.c:582
+#: ../camel/providers/smtp/camel-smtp-transport.c:655
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?ä¸?æ??å¤?å??ç?¡æ??ç??æ?¶ä»¶è??"
+
# camel/providers/smtp/camel-smtp-transport.c:168
-#: ../camel/providers/smtp/camel-smtp-transport.c:116
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
msgid "Syntax error, command unrecognized"
msgstr "èª?æ³?é?¯èª¤ï¼?ä¸?èª?è?ç??æ??令"
# camel/providers/smtp/camel-smtp-transport.c:170
-#: ../camel/providers/smtp/camel-smtp-transport.c:118
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
msgid "Syntax error in parameters or arguments"
msgstr "å??æ?¸å?§ç??èª?æ³?é?¯èª¤"
# camel/providers/smtp/camel-smtp-transport.c:172
-#: ../camel/providers/smtp/camel-smtp-transport.c:120
+#: ../camel/providers/smtp/camel-smtp-transport.c:722
msgid "Command not implemented"
msgstr "æ??令æ²?æ??實ä½?"
# camel/providers/smtp/camel-smtp-transport.c:174
-#: ../camel/providers/smtp/camel-smtp-transport.c:122
+#: ../camel/providers/smtp/camel-smtp-transport.c:724
msgid "Command parameter not implemented"
msgstr "æ??令ç??å??æ?¸æ²?æ??實ä½?"
# camel/providers/smtp/camel-smtp-transport.c:176
-#: ../camel/providers/smtp/camel-smtp-transport.c:124
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
msgid "System status, or system help reply"
msgstr "系統ç??æ³?ï¼?æ??è??æ?¯ç³»çµ±ç??æ±?å?©èªªæ??å??æ??"
# camel/providers/smtp/camel-smtp-transport.c:178
-#: ../camel/providers/smtp/camel-smtp-transport.c:126
+#: ../camel/providers/smtp/camel-smtp-transport.c:728
msgid "Help message"
msgstr "æ±?å?©èªªæ??è¨?æ?¯"
# camel/providers/smtp/camel-smtp-transport.c:180
-#: ../camel/providers/smtp/camel-smtp-transport.c:128
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
msgid "Service ready"
msgstr "æ??å??已就ç·?"
# camel/providers/smtp/camel-smtp-transport.c:182
-#: ../camel/providers/smtp/camel-smtp-transport.c:130
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
msgid "Service closing transmission channel"
msgstr "æ¤æ??å??å°?å?³è¼¸é??é??é??é??"
# camel/providers/smtp/camel-smtp-transport.c:184
-#: ../camel/providers/smtp/camel-smtp-transport.c:132
+#: ../camel/providers/smtp/camel-smtp-transport.c:734
msgid "Service not available, closing transmission channel"
msgstr "æ¤æ??å??ä»?æ?ªå?¯ç?¨ï¼?å?³è¼¸é??é??é??é??"
# camel/providers/smtp/camel-smtp-transport.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:134
+#: ../camel/providers/smtp/camel-smtp-transport.c:736
msgid "Requested mail action okay, completed"
msgstr " æ??è¦?æ±?ç??é?µä»¶å??ä½?å·²æ??å??å®?æ??"
# camel/providers/smtp/camel-smtp-transport.c:188
-#: ../camel/providers/smtp/camel-smtp-transport.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:738
msgid "User not local; will forward to <forward-path>"
msgstr "ä¸?æ?¯æ?¬å?°ç«¯ç??使ç?¨è??ï¼?å°?æ??è½?å¯?è?³ <è½?å¯?è·¯å¾?>"
# camel/providers/smtp/camel-smtp-transport.c:190
-#: ../camel/providers/smtp/camel-smtp-transport.c:138
+#: ../camel/providers/smtp/camel-smtp-transport.c:740
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "æ??è¦?æ±?ç??é?µä»¶å??ä½?ç?¡æ³?å?·è¡?ï¼?é?µç®±ä»?æ?ªå?¯ç?¨"
# camel/providers/smtp/camel-smtp-transport.c:192
-#: ../camel/providers/smtp/camel-smtp-transport.c:140
+#: ../camel/providers/smtp/camel-smtp-transport.c:742
msgid "Requested action not taken: mailbox unavailable"
msgstr "æ??è¦?æ±?ç??å??ä½?ç?¡æ³?å?·è¡?ï¼?é?µç®±ä»?æ?ªå?¯ç?¨"
# camel/providers/smtp/camel-smtp-transport.c:194
-#: ../camel/providers/smtp/camel-smtp-transport.c:142
+#: ../camel/providers/smtp/camel-smtp-transport.c:744
msgid "Requested action aborted: error in processing"
msgstr "æ??è¦?æ±?ç??å??ä½?å·²æ?¾æ£?ï¼?æ£å?¨è??ç??æ??ç?¼ç??é?¯èª¤"
# camel/providers/smtp/camel-smtp-transport.c:196
-#: ../camel/providers/smtp/camel-smtp-transport.c:144
+#: ../camel/providers/smtp/camel-smtp-transport.c:746
msgid "User not local; please try <forward-path>"
msgstr "ä¸?æ?¯æ?¬å?°ç«¯ç??使ç?¨è??ï¼?è«?å??試使ç?¨ <è½?å¯?è·¯å¾?>"
# camel/providers/smtp/camel-smtp-transport.c:198
-#: ../camel/providers/smtp/camel-smtp-transport.c:146
+#: ../camel/providers/smtp/camel-smtp-transport.c:748
msgid "Requested action not taken: insufficient system storage"
msgstr "æ??è¦?æ±?ç??å??ä½?ç?¡æ³?å?·è¡?ï¼?系統ç??å?²å?空é??ä¸?足"
# camel/providers/smtp/camel-smtp-transport.c:200
-#: ../camel/providers/smtp/camel-smtp-transport.c:148
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr "æ??è¦?æ±?ç??é?µä»¶å??ä½?å·²æ?¾æ£?ï¼?è¶?å?ºå?¯ä¾?å?²å?空é??ç??é??å?¶"
# camel/providers/smtp/camel-smtp-transport.c:202
-#: ../camel/providers/smtp/camel-smtp-transport.c:150
+#: ../camel/providers/smtp/camel-smtp-transport.c:752
msgid "Requested action not taken: mailbox name not allowed"
msgstr "æ??è¦?æ±?ç??å??ä½?å·²æ?¾æ£?ï¼?ä¸?å??許ç??é?µç®±å??稱"
# camel/providers/smtp/camel-smtp-transport.c:204
-#: ../camel/providers/smtp/camel-smtp-transport.c:152
+#: ../camel/providers/smtp/camel-smtp-transport.c:754
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "è«?é??å§?輸å?¥é?µä»¶ç??è³?æ??ï¼?<CRLF>.<CRLF> çµ?æ??æ?°å¯«é?µä»¶"
# camel/providers/smtp/camel-smtp-transport.c:206
-#: ../camel/providers/smtp/camel-smtp-transport.c:154
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
msgid "Transaction failed"
msgstr "å?·è¡?失æ??"
# camel/providers/smtp/camel-smtp-transport.c:210
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
+#: ../camel/providers/smtp/camel-smtp-transport.c:760
msgid "A password transition is needed"
msgstr "é??è¦?å¯?碼å?³é??"
# camel/providers/smtp/camel-smtp-transport.c:212
-#: ../camel/providers/smtp/camel-smtp-transport.c:160
+#: ../camel/providers/smtp/camel-smtp-transport.c:762
msgid "Authentication mechanism is too weak"
msgstr "é©?è?æ©?å?¶å¤ªå¼±äº?"
# camel/providers/smtp/camel-smtp-transport.c:214
-#: ../camel/providers/smtp/camel-smtp-transport.c:162
+#: ../camel/providers/smtp/camel-smtp-transport.c:764
msgid "Encryption required for requested authentication mechanism"
msgstr "æ??è¦?æ±?ç??é©?è?æ©?å?¶å¿?é ?å? å¯?è??ç??"
# camel/providers/smtp/camel-smtp-transport.c:216
-#: ../camel/providers/smtp/camel-smtp-transport.c:164
+#: ../camel/providers/smtp/camel-smtp-transport.c:766
msgid "Temporary authentication failure"
msgstr "è?¨æ??é©?è?失æ??"
-# camel/providers/smtp/camel-smtp-transport.c:1043
-#: ../camel/providers/smtp/camel-smtp-transport.c:252
-#: ../camel/providers/smtp/camel-smtp-transport.c:258
-msgid "Welcome response error: "
-msgstr "è¿?æ?¥ç??å??æ??é?¯èª¤ï¼?"
-
-# camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/smtp/camel-smtp-transport.c:294
-#: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:338
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "ç?¡æ³?以å®?å?¨æ¨¡å¼?é?£ç·?å?° SMTP 伺æ??å?¨ %sï¼? %s"
-
-# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:302
-#: ../camel/providers/smtp/camel-smtp-transport.c:314
-#: ../camel/providers/smtp/camel-smtp-transport.c:320
-msgid "STARTTLS command failed: "
-msgstr "STARTTLS æ??令失æ??ï¼?"
-
-# camel/providers/smtp/camel-smtp-transport.c:356
-#: ../camel/providers/smtp/camel-smtp-transport.c:450
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP 伺æ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?é¡?å?? %sã??"
-
-# camel/providers/smtp/camel-smtp-transport.c:418
-#: ../camel/providers/smtp/camel-smtp-transport.c:526
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"ç?¡æ³?é©?è?ç?»å?¥ SMTP 伺æ??å?¨ã??\n"
-"%s\n"
-"\n"
-
-# camel/providers/smtp/camel-smtp-transport.c:534
-#: ../camel/providers/smtp/camel-smtp-transport.c:669
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP 伺æ??å?¨ %s"
-
-# camel/providers/smtp/camel-smtp-transport.c:536
-#: ../camel/providers/smtp/camel-smtp-transport.c:671
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "ç¶?ç?± %s å?³é?? SMTP é?µä»¶"
-
-# camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:691
-#, c-format
-msgid "Cannot send message: service not connected."
-msgstr "ç?¡æ³?å?³é??è¨?æ?¯ï¼?æ??å??æ?ªé?£ç·?ã??"
-
-# camel/providers/smtp/camel-smtp-transport.c:568
-#: ../camel/providers/smtp/camel-smtp-transport.c:698
-#, c-format
-msgid "Cannot send message: sender address not valid."
-msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?å¯?件è??ç??å?°å??ç?¡æ??ã??"
-
-# mail/mail-ops.c:603
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
-msgid "Sending message"
-msgstr "å?³é??é?µä»¶"
-
-# camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:718
-#, c-format
-msgid "Cannot send message: no recipients defined."
-msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?æ²?æ??å®?義æ?¶ä»¶è??ã??"
-
-# camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
-#, c-format
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?ä¸?æ??å¤?å??ç?¡æ??ç??æ?¶ä»¶è??"
-
# importers/netscape-importer.c:790
# importers/pine-importer.c:656
-#: ../camel/providers/smtp/camel-smtp-transport.c:966
+#: ../camel/providers/smtp/camel-smtp-transport.c:1023
msgid "SMTP Greeting"
msgstr "SMTP è¿?æ?¥"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:990
-#: ../camel/providers/smtp/camel-smtp-transport.c:1005
-#: ../camel/providers/smtp/camel-smtp-transport.c:1012
+#: ../camel/providers/smtp/camel-smtp-transport.c:1050
+#: ../camel/providers/smtp/camel-smtp-transport.c:1067
+#: ../camel/providers/smtp/camel-smtp-transport.c:1075
msgid "HELO command failed: "
msgstr "HELO æ??令失æ??ï¼?"
# mail/mail-config.glade.h:10
-#: ../camel/providers/smtp/camel-smtp-transport.c:1079
+#: ../camel/providers/smtp/camel-smtp-transport.c:1143
msgid "SMTP Authentication"
msgstr "SMTP é©?è?"
# camel/providers/smtp/camel-smtp-transport.c:728
-#: ../camel/providers/smtp/camel-smtp-transport.c:1086
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
#, c-format
msgid "Error creating SASL authentication object."
msgstr "建æ§? SASL é©?è?ç?©ä»¶æ??ç?¼ç??é?¯èª¤ã??"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1102
-#: ../camel/providers/smtp/camel-smtp-transport.c:1112
-#: ../camel/providers/smtp/camel-smtp-transport.c:1120
+#: ../camel/providers/smtp/camel-smtp-transport.c:1169
+#: ../camel/providers/smtp/camel-smtp-transport.c:1180
+#: ../camel/providers/smtp/camel-smtp-transport.c:1189
msgid "AUTH command failed: "
msgstr "AUTH æ??令失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1219
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#: ../camel/providers/smtp/camel-smtp-transport.c:1238
+#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#: ../camel/providers/smtp/camel-smtp-transport.c:1311
+#: ../camel/providers/smtp/camel-smtp-transport.c:1320
msgid "MAIL FROM command failed: "
msgstr "MAIL FROM æ??令失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1261
+#: ../camel/providers/smtp/camel-smtp-transport.c:1347
msgid "RCPT TO command failed: "
msgstr "RCPT TO æ??令失æ??ï¼?"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1275
-#: ../camel/providers/smtp/camel-smtp-transport.c:1283
+#: ../camel/providers/smtp/camel-smtp-transport.c:1363
+#: ../camel/providers/smtp/camel-smtp-transport.c:1372
#, c-format
msgid "RCPT TO <%s> failed: "
msgstr "RCPT TO <%s> 失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1321
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1340
-#: ../camel/providers/smtp/camel-smtp-transport.c:1397
-#: ../camel/providers/smtp/camel-smtp-transport.c:1413
+#: ../camel/providers/smtp/camel-smtp-transport.c:1414
#: ../camel/providers/smtp/camel-smtp-transport.c:1424
-#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1434
+#: ../camel/providers/smtp/camel-smtp-transport.c:1493
+#: ../camel/providers/smtp/camel-smtp-transport.c:1512
+#: ../camel/providers/smtp/camel-smtp-transport.c:1525
+#: ../camel/providers/smtp/camel-smtp-transport.c:1533
msgid "DATA command failed: "
msgstr "DATA æ??令失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1453
-#: ../camel/providers/smtp/camel-smtp-transport.c:1465
-#: ../camel/providers/smtp/camel-smtp-transport.c:1472
+#: ../camel/providers/smtp/camel-smtp-transport.c:1558
+#: ../camel/providers/smtp/camel-smtp-transport.c:1572
+#: ../camel/providers/smtp/camel-smtp-transport.c:1580
msgid "RSET command failed: "
msgstr "RSET æ??令失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1494
-#: ../camel/providers/smtp/camel-smtp-transport.c:1507
-#: ../camel/providers/smtp/camel-smtp-transport.c:1513
+#: ../camel/providers/smtp/camel-smtp-transport.c:1605
+#: ../camel/providers/smtp/camel-smtp-transport.c:1619
+#: ../camel/providers/smtp/camel-smtp-transport.c:1626
msgid "QUIT command failed: "
msgstr "QUIT æ??令失æ??ï¼?"
+# addressbook/contact-editor/contact-editor.glade.h:2
+#: ../libedataserver/e-categories.c:47
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "�年�念�"
+
+# addressbook/contact-editor/contact-editor.glade.h:20
+#: ../libedataserver/e-categories.c:48
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "ç??æ?¥"
+
# addressbook/contact-editor/e-contact-editor.c:1243
# addressbook/contact-editor/e-contact-editor.c:1310
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:49
+msgctxt "CategoryName"
msgid "Business"
-msgstr "å??å??é?»è©±"
+msgstr "å??å??"
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:50
+msgctxt "CategoryName"
msgid "Competition"
msgstr "競ç?è??"
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:51
+msgctxt "CategoryName"
msgid "Favorites"
msgstr "å??æ??ç??"
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:52
+msgctxt "CategoryName"
msgid "Gifts"
msgstr "禮�"
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:53
+msgctxt "CategoryName"
msgid "Goals/Objectives"
msgstr "��/��"
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:54
+msgctxt "CategoryName"
msgid "Holiday"
msgstr "å??æ?¥"
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:55
+msgctxt "CategoryName"
msgid "Holiday Cards"
msgstr "å??æ?¥é??è«?å?¡"
# ui/evolution-addressbook.xml.h:17
#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:57
+msgctxt "CategoryName"
msgid "Hot Contacts"
msgstr "ç?±é??é?£çµ¡äºº"
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:58
+msgctxt "CategoryName"
msgid "Ideas"
msgstr "å?µæ??"
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:59
+msgctxt "CategoryName"
msgid "International"
msgstr "å??é??ç??"
# ui/evolution-event-editor.xml.h:15
# ui/evolution-task-editor-dialog.xml.h:16
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:60
+msgctxt "CategoryName"
msgid "Key Customer"
msgstr "é??é?µå®¢æ?¶"
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:61
+msgctxt "CategoryName"
msgid "Miscellaneous"
msgstr "é??é ?"
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:62
+msgctxt "CategoryName"
msgid "Personal"
msgstr "å??人"
# calendar/gui/e-meeting-dialog.glade.h:21
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:63
+msgctxt "CategoryName"
msgid "Phone Calls"
msgstr "�話"
# calendar/gui/e-meeting-dialog.glade.h:23
# mail/message-list.c:1081
#. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:65
+msgctxt "CategoryName"
msgid "Status"
msgstr "ç??æ??"
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:66
+msgctxt "CategoryName"
msgid "Strategies"
msgstr "ç?ç?¥"
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:67
+msgctxt "CategoryName"
msgid "Suppliers"
msgstr "ä¾?æ??å??"
# addressbook/backend/ebook/e-card.c:3434
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:68
+msgctxt "CategoryName"
msgid "Time & Expenses"
msgstr "æ??é??è??é??é?·"
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:69
+msgctxt "CategoryName"
msgid "VIP"
msgstr "VIP"
# mail/mail-send-recv.c:287
# mail/mail-send-recv.c:333
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:70
+msgctxt "CategoryName"
msgid "Waiting"
msgstr "æ£å?¨ç?å¾?"
@@ -5739,63 +5829,58 @@ msgstr "æ£ä»¥å?¿å??æ?¹å¼?å?å?? LDAP 伺æ??å?¨"
msgid "Failed to authenticate.\n"
msgstr "é©?è?æ??è?失æ??ã??\n"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: ../libedataserverui/e-categories-dialog.c:134
+msgid "Category Properties"
+msgstr "å??é¡?屬æ?§"
+
+# calendar/gui/e-calendar-table.c:150
+#: ../libedataserverui/e-categories-dialog.c:145
+msgid "Category _Name"
+msgstr "å??é¡?å??稱(_N)"
+
# calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.c:148
+#: ../libedataserverui/e-categories-dialog.c:151
+msgid "Category _Icon"
+msgstr "å??é¡?å??示(_I)"
+
+# calendar/gui/e-calendar-table.c:150
+#: ../libedataserverui/e-categories-dialog.c:192
msgid "Category Icon"
msgstr "å??é¡?å??示"
-#: ../libedataserverui/e-categories-dialog.c:154
+#: ../libedataserverui/e-categories-dialog.c:198
msgid "_No Image"
msgstr "æ²?æ??å??ç??(_N)"
-#: ../libedataserverui/e-categories-dialog.c:371
+#: ../libedataserverui/e-categories-dialog.c:409
#, c-format
msgid ""
"There is already a category '%s' in the configuration. Please use another "
"name"
msgstr "å?¨çµ?æ??ä¸å·²ç¶?æ??å??ç?ºã??%sã??ç??å??é¡?ã??è«?使ç?¨å?¦å¤?ç??å??稱"
-#: ../libedataserverui/e-categories-dialog.c:679
-msgid "Icon"
-msgstr "å??示"
-
-# calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-categories-dialog.c:684
-msgid "Category"
-msgstr "å??é¡?"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: ../libedataserverui/e-categories-dialog.ui.h:1
-msgid "Category Properties"
-msgstr "å??é¡?屬æ?§"
-
-# calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.ui.h:2
-msgid "Category _Icon"
-msgstr "å??é¡?å??示(_I)"
-
-# calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.ui.h:3
-msgid "Category _Name"
-msgstr "å??é¡?å??稱(_N)"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:4
+#: ../libedataserverui/e-categories-dialog.c:664
msgid "Currently _used categories:"
msgstr "ç?®å??使ç?¨ç??å??é¡?(_U):"
# calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.ui.h:5
+#: ../libedataserverui/e-categories-dialog.c:671
msgid "_Available Categories:"
msgstr "å?¯ç?¨ç??å??é¡?(_A):"
-#: ../libedataserverui/e-categories-dialog.ui.h:6
+#: ../libedataserverui/e-categories-dialog.c:714
msgid "_Edit"
msgstr "編輯(_E)"
-# calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.ui.h:7
-msgid "categories"
+#: ../libedataserverui/e-categories-dialog.c:770
+msgid "Icon"
+msgstr "å??示"
+
+# calendar/gui/e-tasks.c:155
+#: ../libedataserverui/e-categories-dialog.c:775
+msgid "Category"
msgstr "å??é¡?"
# calendar/gui/e-calendar-table.c:150
@@ -5804,114 +5889,117 @@ msgstr "å??é¡?"
msgid "Create category \"%s\""
msgstr "建ç«?å??é¡?ã??%sã??"
-#: ../libedataserverui/e-name-selector-dialog.c:324
-msgid "Select Contacts from Address Book"
-msgstr "å¾?é??è¨?é??é?¸å??é?£çµ¡äºº"
+# ui/evolution-addressbook.xml.h:17
+#: ../libedataserverui/e-name-selector-dialog.c:176
+msgid "Show Contacts"
+msgstr "顯示�絡人"
-#: ../libedataserverui/e-name-selector-dialog.c:663
-msgid "_Add"
-msgstr "å? å?¥(_A)"
+#: ../libedataserverui/e-name-selector-dialog.c:198
+msgid "Address B_ook:"
+msgstr "é??è¨?é??(_O):"
-#: ../libedataserverui/e-name-selector-dialog.c:667
-msgid "_Remove"
-msgstr "移�(_R)"
+# calendar/gui/e-tasks.c:155
+#: ../libedataserverui/e-name-selector-dialog.c:206
+msgid "Cate_gory:"
+msgstr "å??é¡?(_G):"
+
+#: ../libedataserverui/e-name-selector-dialog.c:224
+msgid "_Search:"
+msgstr "æ??å°?(_S):"
# calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.c:895
-#: ../libedataserverui/e-name-selector-dialog.ui.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:242
+#: ../libedataserverui/e-name-selector-dialog.c:984
msgid "Any Category"
msgstr "ä»»ä½?å??é¡?"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:1
-msgid "*"
-msgstr "*"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>�絡人(_N)</b>"
-
# ui/evolution-addressbook.xml.h:17
-#: ../libedataserverui/e-name-selector-dialog.ui.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>顯示�絡人</b>"
+#: ../libedataserverui/e-name-selector-dialog.c:244
+msgid "Co_ntacts"
+msgstr "�絡人(_N)"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:4
-msgid "Address B_ook:"
-msgstr "é??è¨?é??(_O):"
+#: ../libedataserverui/e-name-selector-dialog.c:289
+msgid "Search"
+msgstr "æ??å°?"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:5
+#: ../libedataserverui/e-name-selector-dialog.c:292
msgid "Address Book"
msgstr "é??è¨?é??"
-# calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.ui.h:7
-msgid "Cate_gory:"
-msgstr "å??é¡?(_G):"
-
# ui/evolution-addressbook.xml.h:17
-#: ../libedataserverui/e-name-selector-dialog.ui.h:8
+#: ../libedataserverui/e-name-selector-dialog.c:295
msgid "Contacts"
msgstr "�絡人"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:9
-msgid "Search"
-msgstr "æ??å°?"
+#: ../libedataserverui/e-name-selector-dialog.c:415
+msgid "Select Contacts from Address Book"
+msgstr "å¾?é??è¨?é??é?¸å??é?£çµ¡äºº"
-#: ../libedataserverui/e-name-selector-dialog.ui.h:10
-msgid "_Search:"
-msgstr "æ??å°?(_S):"
+#: ../libedataserverui/e-name-selector-dialog.c:754
+msgid "_Add"
+msgstr "å? å?¥(_A)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:758
+msgid "_Remove"
+msgstr "移�(_R)"
+
+# camel/camel-movemail.c:245
+#: ../libedataserverui/e-name-selector-dialog.c:898
+#, 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:2640
+#: ../libedataserverui/e-name-selector-entry.c:2658
#, c-format
msgid "E_xpand %s Inline"
msgstr "å±?é??è¡?å?§ %s"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2655
+#: ../libedataserverui/e-name-selector-entry.c:2673
#, c-format
msgid "Cop_y %s"
msgstr "�製(_Y) %s"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2665
+#: ../libedataserverui/e-name-selector-entry.c:2683
#, c-format
msgid "C_ut %s"
msgstr "��(_U) %s"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2682
+#: ../libedataserverui/e-name-selector-entry.c:2700
#, c-format
msgid "_Edit %s"
msgstr "編輯 %s(_E)"
-#: ../libedataserverui/e-name-selector-list.c:519
+#: ../libedataserverui/e-name-selector-list.c:516
#, c-format
msgid "_Delete %s"
msgstr "��(_D) %s"
-#: ../libedataserverui/e-passwords.c:257
+#: ../libedataserverui/e-passwords.c:127
#, c-format
msgid "Keyring key is unusable: no user or host name"
msgstr "é?°å??å??é??é?°ç?¡æ³?使ç?¨ï¼?æ²?æ??使ç?¨è??æ??主æ©?å??稱"
-#: ../libedataserverui/e-passwords.c:1120
+#: ../libedataserverui/e-passwords.c:701
msgid "You have the Caps Lock key on."
msgstr "æ?¨ç?? Caps Lock æ?¯é??å??ç??ã??"
-#: ../libedataserverui/e-passwords.c:1243
+#: ../libedataserverui/e-passwords.c:824
msgid "_Remember this passphrase"
msgstr "è¨?ä½?é??å??å¯?èª?(_R)"
-#: ../libedataserverui/e-passwords.c:1244
+#: ../libedataserverui/e-passwords.c:825
msgid "_Remember this passphrase for the remainder of this session"
msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??段ç??å¯?èª?(_R)"
-#: ../libedataserverui/e-passwords.c:1249
+#: ../libedataserverui/e-passwords.c:830
msgid "_Remember this password"
msgstr "è¨?ä½?é??å??å¯?碼(_R)"
-#: ../libedataserverui/e-passwords.c:1250
+#: ../libedataserverui/e-passwords.c:831
msgid "_Remember this password for the remainder of this session"
msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??段ç??å¯?碼(_R)"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
