[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: Sat, 21 Aug 2010 12:15:17 +0000 (UTC)
commit 676112e50d86c534a6638fb647244d989e17a1df
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date: Sat Aug 21 20:15:08 2010 +0800
Updated Traditional Chinese translation(Hong Kong and Taiwan)
po/zh_HK.po | 834 ++++++++++++++++++++++++++++++++---------------------------
po/zh_TW.po | 834 ++++++++++++++++++++++++++++++++---------------------------
2 files changed, 918 insertions(+), 750 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 092c11c..cbc2f12 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,10 +6,10 @@
# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005. 2008.
msgid ""
msgstr ""
-"Project-Id-Version: evolution-data-server 2.31.6\n"
+"Project-Id-Version: evolution-data-server 2.31.91\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-20 14:23+0800\n"
-"PO-Revision-Date: 2010-07-20 14:25+0800\n"
+"POT-Creation-Date: 2010-08-21 20:13+0800\n"
+"PO-Revision-Date: 2010-08-21 20:14+0800\n"
"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
"Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
"MIME-Version: 1.0\n"
@@ -31,13 +31,13 @@ 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:4491
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4482
#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
msgid "Searching..."
msgstr "æ??å°?ä¸..."
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2698
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4650
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4641
#, c-format
msgid "Downloading contacts (%d)... "
msgstr "æ£å?¨ä¸?è¼?è?¯çµ¡äºº (%d)..."
@@ -65,47 +65,47 @@ msgstr "使ç?¨é?»å?é?µä»¶å?°å??"
# mail/mail-config.c:1213
# mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1031
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
msgid "Reconnecting to LDAP server..."
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:1156
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
msgid "Invalid DN syntax"
msgstr "ç?¡æ??ç?? DN èª?æ³?"
# mail/mail-config.c:1213
# mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1672
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1663
msgid "Adding contact to LDAP server..."
msgstr "æ£å?¨æ?°å¢?è?¯çµ¡äººè?³ LDAP 伺æ??å?¨..."
# mail/mail-ops.c:1195
# mail/mail-ops.c:1333
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1804
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1795
msgid "Removing contact from LDAP server..."
msgstr "æ£å?¨ç§»é?¤ LDAP 伺æ??å?¨ä¸ç??è?¯çµ¡äºº..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2238
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2229
msgid "Modifying contact from LDAP server..."
msgstr "æ£å?¨ä¿®æ?¹ LDAP 伺æ??å?¨ä¸ç??è?¯çµ¡äºº..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4341
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4332
msgid "Receiving LDAP search results..."
msgstr "æ£å?¨æ?¥æ?¶ LDAP æ??å°?çµ?æ??..."
# executive-summary/component/e-summary.c:940
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4513
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4504
msgid "Error performing search"
msgstr "é?²è¡?æ??å°?æ??ç?¼ç??é?¯èª¤"
#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
#, c-format
msgid "Create resource '%s' failed with http status: %d"
-msgstr ""
+msgstr "é??é??è³?æº?ã??%sã??失æ??ï¼?http ç??æ??ï¼?%d"
-#: ../addressbook/libebook/e-book.c:3001
+#: ../addressbook/libebook/e-book.c:2940
#, c-format
msgid "%s: there was no source for UID '%s' stored in GConf."
msgstr "%sï¼?æ²?æ??å?²å?æ?¼ GConf ä¸ç?? UIDã??%sã??ä¾?æº?ã??"
@@ -349,7 +349,7 @@ msgstr "網� URL"
# calendar/gui/e-calendar-table.c:150
#. Contact categories
#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:671
+#: ../libedataserverui/e-categories-dialog.c:667
msgid "Categories"
msgstr "å??é¡?"
@@ -645,7 +645,7 @@ 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:43
+#: ../libedataserver/e-categories.c:44
msgid "Anniversary"
msgstr "�年�念�"
@@ -736,119 +736,119 @@ msgstr "SIP ä½?å??"
msgid "Unnamed List"
msgstr "æ?ªå?½å??ç??æ¸?å?®"
-#: ../addressbook/libedata-book/e-data-book-factory.c:322
+#: ../addressbook/libedata-book/e-data-book-factory.c:287
#, c-format
msgid "Empty URI"
msgstr "空ç?? URI"
-#: ../addressbook/libedata-book/e-data-book-factory.c:340
-#: ../addressbook/libedata-book/e-data-book-factory.c:377
-#: ../calendar/libedata-cal/e-data-cal-factory.c:333
-#: ../calendar/libedata-cal/e-data-cal-factory.c:345
+#: ../addressbook/libedata-book/e-data-book-factory.c:306
+#: ../addressbook/libedata-book/e-data-book-factory.c:344
+#: ../calendar/libedata-cal/e-data-cal-factory.c:331
+#: ../calendar/libedata-cal/e-data-cal-factory.c:343
#, c-format
msgid "Invalid source"
msgstr "ç?¡æ??ç??ä¾?æº?"
-#: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:113
+#: ../addressbook/libedata-book/e-data-book.c:166
+#: ../calendar/libedata-cal/e-data-cal.c:104
msgid "Success"
msgstr "æ??å??"
# shell/e-shell-view-menu.c:602
# shell/e-shell-view-menu.c:614
-#: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:114
+#: ../addressbook/libedata-book/e-data-book.c:167
+#: ../calendar/libedata-cal/e-data-cal.c:105
msgid "Repository offline"
msgstr "è³?æ??庫é?¢ç·?"
# shell/e-storage.c:475
-#: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libecal/e-cal.c:4118 ../calendar/libedata-cal/e-data-cal.c:115
+#: ../addressbook/libedata-book/e-data-book.c:168
+#: ../calendar/libecal/e-cal.c:3945 ../calendar/libedata-cal/e-data-cal.c:106
msgid "Permission denied"
msgstr "æ¬?é??ä¸?足"
-#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../addressbook/libedata-book/e-data-book.c:169
msgid "Contact not found"
msgstr "����絡人"
-#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../addressbook/libedata-book/e-data-book.c:170
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:190
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../addressbook/libedata-book/e-data-book.c:171
+#: ../calendar/libedata-cal/e-data-cal.c:111
msgid "Authentication Failed"
msgstr "é©?è?失æ??"
# camel/providers/smtp/camel-smtp-transport.c:218
-#: ../addressbook/libedata-book/e-data-book.c:191
-#: ../calendar/libedata-cal/e-data-cal.c:121
+#: ../addressbook/libedata-book/e-data-book.c:172
+#: ../calendar/libedata-cal/e-data-cal.c:112
msgid "Authentication Required"
msgstr "è¦?æ±?é©?è?"
# mail/mail-config.glade.h:1
-#: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:113
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:193
-#: ../calendar/libedata-cal/e-data-cal.c:124
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:115
msgid "Unsupported authentication method"
msgstr "ä¸?æ?¯æ?´ç??é©?è?æ?¹æ³?"
-#: ../addressbook/libedata-book/e-data-book.c:194
-#: ../calendar/libedata-cal/e-data-cal.c:125
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libedata-cal/e-data-cal.c:116
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:195
+#: ../addressbook/libedata-book/e-data-book.c:176
msgid "Address Book does not exist"
msgstr "é??è¨?é??ä¸?å?å?¨"
-#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../addressbook/libedata-book/e-data-book.c:177
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:197
-#: ../calendar/libedata-cal/e-data-cal.c:128
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:119
msgid "Not available in offline mode"
msgstr "�����模��使�"
-#: ../addressbook/libedata-book/e-data-book.c:198
-#: ../calendar/libedata-cal/e-data-cal.c:129
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:120
msgid "Search size limit exceeded"
msgstr "è¶?é??æ??å°?大å°?é??å?¶"
-#: ../addressbook/libedata-book/e-data-book.c:199
-#: ../calendar/libedata-cal/e-data-cal.c:130
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:121
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:200
-#: ../calendar/libedata-cal/e-data-cal.c:131
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:122
msgid "Invalid query"
msgstr "ç?¡æ??ç??æ?¥è©¢"
-#: ../addressbook/libedata-book/e-data-book.c:201
-#: ../calendar/libedata-cal/e-data-cal.c:132
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:123
msgid "Query refused"
msgstr "æ?¥è©¢è¢«æ??çµ?"
# calendar/gui/e-itip-control.c:883
-#: ../addressbook/libedata-book/e-data-book.c:202
-#: ../calendar/libedata-cal/e-data-cal.c:133
+#: ../addressbook/libedata-book/e-data-book.c:183
+#: ../calendar/libedata-cal/e-data-cal.c:124
msgid "Could not cancel"
msgstr "ç?¡æ³?å??æ¶?"
@@ -856,61 +856,59 @@ 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:204
-#: ../calendar/libedata-cal/e-data-cal.c:135
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:126
msgid "Invalid server version"
msgstr "ç?¡æ??ç??伺æ??å?¨ç??æ?¬"
# camel/providers/imap/camel-imap-provider.c:54
-#: ../addressbook/libedata-book/e-data-book.c:205
+#: ../addressbook/libedata-book/e-data-book.c:186
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:206
-#: ../calendar/libecal/e-cal.c:4102 ../calendar/libedata-cal/e-data-cal.c:136
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libecal/e-cal.c:3929 ../calendar/libedata-cal/e-data-cal.c:127
msgid "Invalid argument"
msgstr "ç?¡æ??ç??å??æ?¸"
# shell/e-storage.c:477
-#: ../addressbook/libedata-book/e-data-book.c:207
-#: ../calendar/libecal/e-cal.c:4140 ../calendar/libedata-cal/e-data-cal.c:137
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libecal/e-cal.c:3967 ../calendar/libedata-cal/e-data-cal.c:128
msgid "Not supported"
msgstr "���"
# addressbook/gui/widgets/e-addressbook-view.c:718
-#: ../addressbook/libedata-book/e-data-book.c:216
-#: ../calendar/libedata-cal/e-data-cal.c:145
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libedata-cal/e-data-cal.c:136
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:374
-#, fuzzy, c-format
-#| msgid "Cannot open book"
+#: ../addressbook/libedata-book/e-data-book.c:307
+#, c-format
msgid "Cannot open book: %s"
-msgstr "ä¸?è?½é??å??æ?¸ç±?"
+msgstr "ä¸?è?½é??å??æ?¸ç±?ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:394
-#, fuzzy, c-format
-#| msgid "Cannot remove book"
+#: ../addressbook/libedata-book/e-data-book.c:329
+#, c-format
msgid "Cannot remove book: %s"
-msgstr "��移���"
+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:428
+#: ../addressbook/libedata-book/e-data-book.c:346
+#: ../addressbook/libedata-book/e-data-book.c:365
#, 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:443
+#: ../addressbook/libedata-book/e-data-book.c:380
#, c-format
msgid "Empty query: %s"
msgstr "空ç??æ?¥è©¢ï¼?%s"
@@ -918,36 +916,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:457
+#: ../addressbook/libedata-book/e-data-book.c:396
#, 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:492
+#: ../addressbook/libedata-book/e-data-book.c:433
#, 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:507
-#: ../addressbook/libedata-book/e-data-book.c:524
+#: ../addressbook/libedata-book/e-data-book.c:448
+#: ../addressbook/libedata-book/e-data-book.c:467
#, 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:542
-#: ../addressbook/libedata-book/e-data-book.c:559
+#: ../addressbook/libedata-book/e-data-book.c:485
+#: ../addressbook/libedata-book/e-data-book.c:504
#, 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:596
+#: ../addressbook/libedata-book/e-data-book.c:543
#, c-format
msgid "Cannot remove contacts: %s"
msgstr "��移��絡人�%s"
@@ -960,7 +958,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:626
+#: ../addressbook/libedata-book/e-data-book.c:580
#, c-format
msgid "Cannot get supported fields: %s"
msgstr "ä¸?è?½å??å¾?æ?¯æ?´ç??æ¬?ä½?ï¼?%s"
@@ -973,7 +971,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:639
+#: ../addressbook/libedata-book/e-data-book.c:595
#, c-format
msgid "Cannot get required fields: %s"
msgstr "ä¸?è?½å??å¾?è¦?æ±?ç??æ¬?ä½?ï¼?%s"
@@ -981,7 +979,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:652
+#: ../addressbook/libedata-book/e-data-book.c:610
#, c-format
msgid "Cannot get supported auth methods: %s"
msgstr "ä¸?è?½å??å¾?æ?¯æ?´ç??é©?è?æ?¹æ³?ï¼?%s"
@@ -989,7 +987,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:677
+#: ../addressbook/libedata-book/e-data-book.c:636
+#: ../addressbook/libedata-book/e-data-book.c:647
#, c-format
msgid "Invalid query: %s"
msgstr "ç?¡æ??ç??æ?¥è©¢ï¼?%s"
@@ -1002,35 +1001,36 @@ 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:708
+#: ../addressbook/libedata-book/e-data-book.c:683
#, c-format
msgid "Cannot get changes: %s"
msgstr "ä¸?è?½å??å¾?æ?´æ?¹ï¼?%s"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:501
-#, fuzzy, c-format
-#| msgid ""
-#| "Unexpected GnuPG status message encountered:\n"
-#| "\n"
-#| "%s"
+# camel/camel-remote-store.c:337
+# camel/camel-remote-store.c:399
+# camel/camel-remote-store.c:470
+# camel/providers/imap/camel-imap-command.c:287
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:722
+#, c-format
+msgid "Cancel operation failed: %s"
+msgstr "å??æ¶?æ??ä½?失æ??ï¼?%s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:498
+#, c-format
msgid "Unexpected HTTP status code %d returned"
-msgstr ""
-"é??å?°é??é ?æ??ç?? GnuPG ç??æ??è¨?æ?¯ï¼?\n"
-"\n"
-"%s"
+msgstr "å?³å??æ?ªé ?æ??ç?? HTTP ç??æ??碼 %d"
# 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:4114
-#, fuzzy
-#| msgid "Calendar does not exist"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4094
msgid "Calendar doesn't support Free/Busy"
-msgstr "è¡?äº?æ??ä¸?å?å?¨"
+msgstr "è¡?äº?æ??ä¸?æ?¯æ?´ç©ºé??/å¿?ç¢?"
# addressbook/contact-editor/contact-editor.glade.h:20
#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
-#: ../libedataserver/e-categories.c:44
+#: ../libedataserver/e-categories.c:45
msgid "Birthday"
msgstr "ç??æ?¥"
@@ -1055,43 +1055,43 @@ msgstr "ç?¡æ³?å?²å?è¡?äº?æ??è³?æ??ï¼?URI ç??æ ¼å¼?ä¸?æ£ç¢ºã??"
msgid "Cannot save calendar data"
msgstr "ä¸?è?½å?²å?è¡?äº?æ??è³?æ??"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1118
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1121
#: ../camel/providers/groupwise/camel-groupwise-folder.c:2224
msgid "Reply Requested: by "
msgstr "è¦?æ±?å??è¦?ï¼?æ ¹æ??"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1123
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1126
#: ../camel/providers/groupwise/camel-groupwise-folder.c:2229
msgid "Reply Requested: When convenient"
msgstr "è¦?æ±?å??è¦?ï¼?ç?¶æ??空æ??"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:296
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:295
#, c-format
msgid "Loading %s items"
msgstr "è¼?å?¥ %s å??é ?ç?®"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
# ui/evolution-calendar.xml.h:3
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:927
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:926
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:991
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:989
msgid "Invalid server URI"
msgstr "ç?¡æ??ç??伺æ??å?¨ URI"
# camel/providers/local/camel-mbox-store.c:110
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1095
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1382
-#: ../calendar/backends/http/e-cal-backend-http.c:671
-#: ../calendar/backends/weather/e-cal-backend-weather.c:484
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1082
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1343
+#: ../calendar/backends/http/e-cal-backend-http.c:659
+#: ../calendar/backends/weather/e-cal-backend-weather.c:487
msgid "Could not create cache file"
msgstr "ç?¡æ³?建ç«?å¿«å??æª?æ¡?"
# camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1108
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1095
msgid "Could not create thread for populating cache"
msgstr "ç?¡æ³?建ç«?移æ¤?å¿«å??ç??å?·è¡?ç·?"
@@ -1349,7 +1349,8 @@ msgid "Undefined"
msgstr "æ?ªæ??å®?"
# camel/camel-smime-context.c:194
-#: ../calendar/libecal/e-cal.c:1233 ../libedataserverui/e-book-auth-util.c:206
+#: ../calendar/libecal/e-cal.c:1128 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:435
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "輸å?¥ %s (使ç?¨è?? %s) ç??å¯?碼 "
@@ -1359,60 +1360,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:1247
+#: ../calendar/libecal/e-cal.c:1142
#, c-format
msgid "Enter password for %s to enable proxy for user %s"
msgstr "輸å?¥ %s ç??å¯?碼以便使ç?¨è?? %s è?½ä½¿ç?¨ä»£ç??伺æ??å?¨"
-#: ../calendar/libecal/e-cal.c:4104
+#: ../calendar/libecal/e-cal.c:3931
msgid "Backend is busy"
msgstr "å¾?端å¿?ç¢?ä¸"
# shell/e-shell-view-menu.c:602
# shell/e-shell-view-menu.c:614
-#: ../calendar/libecal/e-cal.c:4106
+#: ../calendar/libecal/e-cal.c:3933
msgid "Repository is offline"
msgstr "å??庫已é?¢ç·?"
# camel/providers/imap/camel-imap-store.c:803
# mail/mail-local.c:334
-#: ../calendar/libecal/e-cal.c:4108
+#: ../calendar/libecal/e-cal.c:3935
msgid "No such calendar"
msgstr "ç?¡æ¤è¡?äº?æ??"
-#: ../calendar/libecal/e-cal.c:4110 ../calendar/libedata-cal/e-data-cal.c:117
+#: ../calendar/libecal/e-cal.c:3937 ../calendar/libedata-cal/e-data-cal.c:108
#: ../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:4112 ../calendar/libedata-cal/e-data-cal.c:118
+#: ../calendar/libecal/e-cal.c:3939 ../calendar/libedata-cal/e-data-cal.c:109
#: ../servers/groupwise/e-gw-connection.c:229
msgid "Invalid object"
msgstr "ç?¡æ??ç??ç?©ä»¶"
# addressbook/conduit/address-conduit.c:214
-#: ../calendar/libecal/e-cal.c:4114
+#: ../calendar/libecal/e-cal.c:3941
msgid "URI not loaded"
msgstr "URI ���"
-#: ../calendar/libecal/e-cal.c:4116
+#: ../calendar/libecal/e-cal.c:3943
msgid "URI already loaded"
msgstr "URI 已��"
# camel/providers/imap/camel-imap-command.c:241
# shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4120 ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:3947 ../servers/groupwise/e-gw-connection.c:237
msgid "Unknown User"
msgstr "ä¸?æ??ç??使ç?¨è??"
-#: ../calendar/libecal/e-cal.c:4122 ../calendar/libedata-cal/e-data-cal.c:119
+#: ../calendar/libecal/e-cal.c:3949 ../calendar/libedata-cal/e-data-cal.c:110
msgid "Object ID already exists"
msgstr "ç?©ä»¶ ID å·²å?å?¨"
# shell/e-storage.c:477
-#: ../calendar/libecal/e-cal.c:4124
+#: ../calendar/libecal/e-cal.c:3951
msgid "Protocol not supported"
msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
@@ -1420,18 +1421,18 @@ 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:4126
+#: ../calendar/libecal/e-cal.c:3953
msgid "Operation has been canceled"
msgstr "æ??ä½?å·²å??æ¶?"
# calendar/gui/e-itip-control.c:883
-#: ../calendar/libecal/e-cal.c:4128
+#: ../calendar/libecal/e-cal.c:3955
msgid "Could not cancel operation"
msgstr "ç?¡æ³?å??æ¶?æ??ä½?"
# camel/camel-sasl-anonymous.c:110
# camel/camel-sasl-plain.c:87
-#: ../calendar/libecal/e-cal.c:4130
+#: ../calendar/libecal/e-cal.c:3957
#: ../camel/providers/groupwise/camel-groupwise-folder.c:1434
#: ../camel/providers/groupwise/camel-groupwise-folder.c:1452
#: ../camel/providers/groupwise/camel-groupwise-store.c:618
@@ -1443,28 +1444,28 @@ msgid "Authentication failed"
msgstr "é©?è?失æ??"
# camel/providers/smtp/camel-smtp-transport.c:218
-#: ../calendar/libecal/e-cal.c:4132
+#: ../calendar/libecal/e-cal.c:3959
#: ../camel/providers/smtp/camel-smtp-transport.c:166
msgid "Authentication required"
msgstr "è¦?æ±?é©?è?"
-#: ../calendar/libecal/e-cal.c:4134
+#: ../calendar/libecal/e-cal.c:3961
msgid "A DBUS exception has occurred"
msgstr "ç?¼ç?? DBUS ä¾?å¤?"
# camel/providers/imap/camel-imap-command.c:241
# shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4136
+#: ../calendar/libecal/e-cal.c:3963
#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
#: ../camel/providers/imap/camel-imap-command.c:457
-#: ../camel/providers/imap/camel-imap-store.c:626
-#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../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:4138
+#: ../calendar/libecal/e-cal.c:3965
msgid "No error"
msgstr "æ²?æ??é?¯èª¤"
@@ -1562,186 +1563,186 @@ 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:116
+#: ../calendar/libedata-cal/e-data-cal.c:107
msgid "Invalid range"
msgstr "ç?¡æ??ç??ç¯?å??"
# mail/mail-config.glade.h:1
-#: ../calendar/libedata-cal/e-data-cal.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:114
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:126
+#: ../calendar/libedata-cal/e-data-cal.c:117
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:127
+#: ../calendar/libedata-cal/e-data-cal.c:118
msgid "UnknownUser"
msgstr "ä¸?æ??ç??使ç?¨è??"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:595
+#: ../calendar/libedata-cal/e-data-cal.c:589
#, 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:615
+#: ../calendar/libedata-cal/e-data-cal.c:609
#, 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:635
+#: ../calendar/libedata-cal/e-data-cal.c:629
#, 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:655
+#: ../calendar/libedata-cal/e-data-cal.c:649
#, 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:674
+#: ../calendar/libedata-cal/e-data-cal.c:668
#, 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:695
+#: ../calendar/libedata-cal/e-data-cal.c:689
#, 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:714
+#: ../calendar/libedata-cal/e-data-cal.c:708
#, 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:735
+#: ../calendar/libedata-cal/e-data-cal.c:729
#, 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:759
+#: ../calendar/libedata-cal/e-data-cal.c:753
#, 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:785
+#: ../calendar/libedata-cal/e-data-cal.c:779
#, 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:806
+#: ../calendar/libedata-cal/e-data-cal.c:800
#, 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:825
+#: ../calendar/libedata-cal/e-data-cal.c:819
#, 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:846
+#: ../calendar/libedata-cal/e-data-cal.c:840
#, 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:883
+#: ../calendar/libedata-cal/e-data-cal.c:865
#, 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:903
+#: ../calendar/libedata-cal/e-data-cal.c:885
#, 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:923
+#: ../calendar/libedata-cal/e-data-cal.c:905
#, 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:963
+#: ../calendar/libedata-cal/e-data-cal.c:933
#, 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:987
+#: ../calendar/libedata-cal/e-data-cal.c:959
#, 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:1007
+#: ../calendar/libedata-cal/e-data-cal.c:979
#, 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:1027
+#: ../calendar/libedata-cal/e-data-cal.c:999
#, 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:1046
+#: ../calendar/libedata-cal/e-data-cal.c:1018
#, 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:1069
+#: ../calendar/libedata-cal/e-data-cal.c:1041
#, 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:1121
+#: ../calendar/libedata-cal/e-data-cal.c:1072
#, c-format
msgid "Cannot retrieve calendar free/busy list: %s"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??空é??/å¿?ç¢?æ¸?å?®ï¼?%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:355
+#: ../calendar/libedata-cal/e-data-cal-factory.c:353
#, c-format
msgid "Invalid URI"
msgstr "ç?¡æ??ç?? URI"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:370
+#: ../calendar/libedata-cal/e-data-cal-factory.c:371
#, 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:420
+#: ../calendar/libedata-cal/e-data-cal-factory.c:421
#, c-format
msgid "Could not instantiate backend"
msgstr "ç?¡æ³?實é«?å??å¾?端ç¨?å¼?"
@@ -1872,10 +1873,10 @@ msgstr "è¤?製è³?æ??夾å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥"
# camel/camel-disco-store.c:271
#: ../camel/camel-disco-store.c:395
#: ../camel/providers/groupwise/camel-groupwise-store.c:230
-#: ../camel/providers/imap/camel-imap-store.c:895
-#: ../camel/providers/imap/camel-imap-store.c:1739
-#: ../camel/providers/imap/camel-imap-store.c:2197
-#: ../camel/providers/imap/camel-imap-store.c:3041
+#: ../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-store.c:185
#: ../camel/providers/imapx/camel-imapx-store.c:709
#: ../camel/providers/imapx/camel-imapx-store.c:772
@@ -1895,13 +1896,14 @@ msgstr "ä½ å¿?é ?æ?¼ç¶²ä¸?å·¥ä½?æ??è?½å®?æ??æ¤æ??ä½?"
#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
#: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
-#: ../camel/providers/imapx/camel-imapx-server.c:4677
-#: ../camel/providers/imapx/camel-imapx-server.c:4694
+#: ../camel/camel-tcp-stream-raw.c:250
+#: ../camel/providers/imapx/camel-imapx-server.c:4639
+#: ../camel/providers/imapx/camel-imapx-server.c:4656
#: ../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:487
+#: ../camel/providers/pop3/camel-pop3-store.c:466
#: ../libedataserverui/e-book-auth-util.c:229
#, c-format
msgid "Cancelled"
@@ -2557,76 +2559,76 @@ msgstr "伺æ??å?¨å??æ??å??å?«ä¸?å®?æ?´ç??æ??æ¬?è³?æ??"
msgid "Server response does not match"
msgstr "伺æ??å?¨å??æ??ä¸?符"
-#: ../camel/camel-sasl-gssapi.c:82
+#: ../camel/camel-sasl-gssapi.c:80
msgid "GSSAPI"
msgstr "GSSAPI"
# camel/camel-sasl-kerberos4.c:42
-#: ../camel/camel-sasl-gssapi.c:84
+#: ../camel/camel-sasl-gssapi.c:82
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr "é??å??é?¸é ?å°?æ??使ç?¨ Kerberos 5 é©?è?é?£ç·?è?³ä¼ºæ??å?¨ã??"
-#: ../camel/camel-sasl-gssapi.c:121
+#: ../camel/camel-sasl-gssapi.c:119
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
msgstr "æ??ä¾?ç??è?件ä¸?æ?¯æ?´æ??å®?ç??æ©?å?¶ï¼?æ??è??æ?¯å?·è¡?ç?¡æ³?辨è?ã??"
-#: ../camel/camel-sasl-gssapi.c:126
+#: ../camel/camel-sasl-gssapi.c:124
msgid "The provided target_name parameter was ill-formed."
msgstr "æ??ä¾?ç?? target_name å??æ?¸æ ¼å¼?é?¯èª¤ã??"
-#: ../camel/camel-sasl-gssapi.c:129
+#: ../camel/camel-sasl-gssapi.c:127
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
msgstr "æ??ä¾?ç?? target_name å??æ?¸å??å?«ç?¡æ??æ??ä¸?æ?¯æ?´ç??å??稱é¡?å??ã??"
-#: ../camel/camel-sasl-gssapi.c:133
+#: ../camel/camel-sasl-gssapi.c:131
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:138
+#: ../camel/camel-sasl-gssapi.c:136
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
msgstr "input_token å??å?«ç?¡æ??ç??簽署ï¼?æ??è??ç?¡æ³?確èª?ç??簽署ã??"
-#: ../camel/camel-sasl-gssapi.c:142
+#: ../camel/camel-sasl-gssapi.c:140
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:147
+#: ../camel/camel-sasl-gssapi.c:145
msgid "The supplied context handle did not refer to a valid context."
msgstr "æ??ä¾?ç??網絡ä½?ç½®è?å?¥æ??æ¨?æ?ªå??ç?§æ??æ??ç??網絡ä½?ç½®ã??"
-#: ../camel/camel-sasl-gssapi.c:150
+#: ../camel/camel-sasl-gssapi.c:148
msgid "The consistency checks performed on the input_token failed."
msgstr "å?¨ input_token å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
-#: ../camel/camel-sasl-gssapi.c:153
+#: ../camel/camel-sasl-gssapi.c:151
msgid "The consistency checks performed on the credential failed."
msgstr "å?¨è?件å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
-#: ../camel/camel-sasl-gssapi.c:156
+#: ../camel/camel-sasl-gssapi.c:154
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:162 ../camel/camel-sasl-gssapi.c:300
-#: ../camel/camel-sasl-gssapi.c:344 ../camel/camel-sasl-gssapi.c:361
-#: ../camel/providers/smtp/camel-smtp-transport.c:1192
+#: ../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:1171
#, c-format
msgid "Bad authentication response from server."
msgstr "ä¾?è?ªä¼ºæ??å?¨ç??ä¸?è?¯è¨±å?¯å??æ??ã??"
# mail/mail-config.glade.h:1
-#: ../camel/camel-sasl-gssapi.c:373
+#: ../camel/camel-sasl-gssapi.c:369
#, c-format
msgid "Unsupported security layer."
msgstr "ä¸?æ?¯æ?´ç??é¡?å??"
@@ -2711,7 +2713,7 @@ msgid "URL '%s' needs a path component"
msgstr "URLã??%sã??é??è¦? path å??件"
# camel/camel-session.c:479
-#: ../camel/camel-session.c:263
+#: ../camel/camel-session.c:261
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -2721,7 +2723,7 @@ msgstr ""
"%s"
# camel/providers/pop3/camel-pop3-store.c:361
-#: ../camel/camel-session.c:760
+#: ../camel/camel-session.c:758
#, c-format
msgid "Please enter the %s password for %s on host %s."
msgstr "è«?輸å?¥ %2$s æ?¼ä¸»æ©? %3$s ç?? %1$s å¯?碼ã??"
@@ -2997,7 +2999,86 @@ msgstr "å??æ?¶ç?"
msgid "Junk"
msgstr "å??å?¾é?µä»¶"
-#: ../camel/camel-tcp-stream-ssl.c:786
+#: ../camel/camel-tcp-stream-raw.c:809
+#, 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:815
+#, c-format
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "æ?¾ä¸?å?°å??é?©ç??é©?è?é¡?å??ï¼?代碼 0x%x"
+
+#: ../camel/camel-tcp-stream-raw.c:827
+msgid "General SOCKS server failure"
+msgstr "ä¸?è?¬æ?§ SOCKS 伺æ??å?¨å¤±æ??"
+
+#: ../camel/camel-tcp-stream-raw.c:828
+msgid "SOCKS server's rules do not allow connection"
+msgstr "SOCKS 伺æ??å?¨ç??è¦?å??ä¸?å??許é?£ç·?"
+
+#: ../camel/camel-tcp-stream-raw.c:829
+msgid "Network is unreachable from SOCKS server"
+msgstr "網絡ç?¡æ³?é??é?? SOCKS 伺æ??å?¨å?°é??"
+
+#: ../camel/camel-tcp-stream-raw.c:830
+msgid "Host is unreachable from SOCKS server"
+msgstr "主æ©?ç?¡æ³?é??é?? SOCKS 伺æ??å?¨å?°é??"
+
+# camel/camel-remote-store.c:252
+#: ../camel/camel-tcp-stream-raw.c:831
+msgid "Connection refused"
+msgstr "é?£ç·?被æ??çµ?"
+
+#: ../camel/camel-tcp-stream-raw.c:832
+#, fuzzy
+msgid "Time-to-live expired"
+msgstr "è·³å¾?æ??å®?æ??é??"
+
+# shell/e-storage.c:477
+#: ../camel/camel-tcp-stream-raw.c:833
+msgid "Command not supported by SOCKS server"
+msgstr "SOCKS 伺æ??å?¨ä¸?æ?¯æ?´æ??令"
+
+# shell/e-storage.c:477
+#: ../camel/camel-tcp-stream-raw.c:834
+msgid "Address type not supported by SOCKS server"
+msgstr "SOCKS 伺æ??å?¨ä¸?æ?¯æ?´ä½?å??é¡?å??"
+
+# camel/providers/local/camel-mbox-summary.c:879
+#: ../camel/camel-tcp-stream-raw.c:835
+msgid "Unknown error from SOCKS server"
+msgstr "ä¾?è?ª SOCKS 伺æ??å?¨ç??ä¸?æ??é?¯èª¤"
+
+#: ../camel/camel-tcp-stream-raw.c:865
+#, 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:882
+#, c-format
+msgid "Incomplete reply from SOCKS server"
+msgstr "ä¾?è?ª SOCKS 伺æ??å?¨ç??ä¸?å®?æ?´å??è¦?"
+
+#: ../camel/camel-tcp-stream-raw.c:897
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "主æ©?å??稱太é?·ï¼?æ??å¤? 255 å?符ï¼?"
+
+# camel/camel-sasl-kerberos4.c:218
+# camel/providers/imap/camel-imap-store.c:433
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:929 ../camel/camel-tcp-stream-raw.c:939
+#, c-format
+msgid "Invalid reply from proxy server"
+msgstr "å¾?代ç??伺æ??å?¨å?³å??ç?¡æ??ç??å??è¦?"
+
+#: ../camel/camel-tcp-stream-ssl.c:457
#, c-format
msgid ""
"Issuer: %s\n"
@@ -3010,18 +3091,18 @@ msgstr ""
"æ??ç´?æª?: %s\n"
"簽署: %s"
-#: ../camel/camel-tcp-stream-ssl.c:792
+#: ../camel/camel-tcp-stream-ssl.c:463
msgid "GOOD"
msgstr "�好"
-#: ../camel/camel-tcp-stream-ssl.c:792
+#: ../camel/camel-tcp-stream-ssl.c:463
msgid "BAD"
msgstr "��"
# camel/camel-tcp-stream-openssl.c:428
# camel/camel-tcp-stream-ssl.c:364
#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:796
+#: ../camel/camel-tcp-stream-ssl.c:467
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -3036,7 +3117,7 @@ msgstr ""
"\n"
"ä½ æ?³è¦?æ?¥å??å??ï¼?"
-#: ../camel/camel-tcp-stream-ssl.c:840
+#: ../camel/camel-tcp-stream-ssl.c:511
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -3045,7 +3126,7 @@ msgstr ""
"è?æ?¸å??é¡?ï¼? %s\n"
"ç?¼ç?§è??ï¼? %s"
-#: ../camel/camel-tcp-stream-ssl.c:892
+#: ../camel/camel-tcp-stream-ssl.c:563
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -3054,7 +3135,7 @@ msgstr ""
"ä¸?æ£ç¢ºç??è?æ?¸ç¶²å??ï¼? %s\n"
"ç?¼ç?§è??ï¼? %s"
-#: ../camel/camel-tcp-stream-ssl.c:910
+#: ../camel/camel-tcp-stream-ssl.c:581
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -3063,7 +3144,7 @@ msgstr ""
"è?æ?¸å·²é?¾æ??ï¼? %s\n"
"ç?¼ç?§è??ï¼? %s"
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:598
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -3172,7 +3253,7 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼?"
# 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:2644
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2645
#, c-format
msgid "This message is not available in offline mode."
msgstr "é??å°?é?µä»¶ç?¡æ³?å?¨é?¢ç·?模å¼?ä¸?使ç?¨ã??"
@@ -3202,18 +3283,18 @@ msgstr "檢æ?¥å?ªé?¤ç??é?µä»¶ %s"
#: ../camel/providers/groupwise/camel-groupwise-folder.c:1637
#: ../camel/providers/groupwise/camel-groupwise-store.c:654
#: ../camel/providers/groupwise/camel-groupwise-store.c:779
-#: ../camel/providers/imap/camel-imap-folder.c:3806
-#: ../camel/providers/imap/camel-imap-folder.c:3884
-#: ../camel/providers/imapx/camel-imapx-server.c:3720
-#: ../camel/providers/imapx/camel-imapx-server.c:3844
+#: ../camel/providers/imap/camel-imap-folder.c:3814
+#: ../camel/providers/imap/camel-imap-folder.c:3892
+#: ../camel/providers/imapx/camel-imapx-server.c:3704
+#: ../camel/providers/imapx/camel-imapx-server.c:3828
#, 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:2474
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2524
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2475
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2525
#, c-format
msgid "Cannot append message to folder '%s': %s"
msgstr "ä¸?è?½å°?é?µä»¶å?²å?è?³è³?æ??夾ã??%sã??ï¼?%s"
@@ -3225,7 +3306,7 @@ msgstr "ä¸?è?½å°?é?µä»¶å?²å?è?³è³?æ??夾ã??%sã??ï¼?%s"
# camel/providers/local/camel-mh-folder.c:185
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2510
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2511
#, c-format
msgid "Cannot create message: %s"
msgstr "��建��件� %s"
@@ -3338,8 +3419,8 @@ 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:1207
-#: ../camel/providers/imapx/camel-imapx-server.c:2974
+#: ../camel/providers/imap/camel-imap-store.c:1188
+#: ../camel/providers/imapx/camel-imapx-server.c:2958
#, c-format
msgid "You did not enter a password."
msgstr "ä½ æ²?æ??輸å?¥å¯?碼ã??"
@@ -3351,8 +3432,8 @@ 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:1776
-#: ../camel/providers/imap/camel-imap-store.c:1971
+#: ../camel/providers/imap/camel-imap-store.c:1757
+#: ../camel/providers/imap/camel-imap-store.c:1952
#: ../camel/providers/imapx/camel-imapx-store.c:410
#, c-format
msgid "No such folder %s"
@@ -3372,8 +3453,8 @@ msgid "Cannot create a special system folder"
msgstr "ä¸?è?½å»ºç«?ç?¹æ®?ç??系統è³?æ??夾"
#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
-#: ../camel/providers/imap/camel-imap-store.c:1854
-#: ../camel/providers/imap/camel-imap-store.c:2276
+#: ../camel/providers/imap/camel-imap-store.c:1835
+#: ../camel/providers/imap/camel-imap-store.c:2257
#: ../camel/providers/imapx/camel-imapx-store.c:873
#, c-format
msgid "The parent folder is not allowed to contain subfolders"
@@ -3513,7 +3594,7 @@ msgstr "ç?¡æ³?建ç«?ç?®é?? %sï¼?%s"
# mail/mail-ops.c:1649
#: ../camel/providers/imap/camel-imap-folder.c:960
-#: ../camel/providers/imapx/camel-imapx-server.c:3759
+#: ../camel/providers/imapx/camel-imapx-server.c:3743
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "æ??æ?? %s ä¸æ?´æ?¹é??ç??é?µä»¶"
@@ -3531,7 +3612,7 @@ msgstr "ç?¡æ³?å??å??é?µä»¶ï¼?"
# 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:4956
+#: ../camel/providers/imapx/camel-imapx-server.c:4918
#, c-format
msgid "Cannot get message with message ID %s: %s"
msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
@@ -3540,32 +3621,32 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
# 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:4957
+#: ../camel/providers/imapx/camel-imapx-server.c:4919
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:3337
-#: ../camel/providers/imap/camel-imap-folder.c:4203
+#: ../camel/providers/imap/camel-imap-folder.c:3341
+#: ../camel/providers/imap/camel-imap-folder.c:4211
#: ../camel/providers/nntp/camel-nntp-folder.c:326
#, c-format
msgid "This message is not currently available"
msgstr "é??å°?é?µä»¶ç?®å??ä»?æ?ªå?¯ç?¨"
-#: ../camel/providers/imap/camel-imap-folder.c:4013
+#: ../camel/providers/imap/camel-imap-folder.c:4021
#, c-format
msgid "Incomplete server response: no information provided for message %d"
msgstr "ä¸?å®?æ?´ç??伺æ??å?¨å??æ??ï¼?æ?ªæ??ä¾?ä»»ä½?è³?è¨?給è¨?æ?¯ %d"
-#: ../camel/providers/imap/camel-imap-folder.c:4023
+#: ../camel/providers/imap/camel-imap-folder.c:4031
#, 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:4243
+#: ../camel/providers/imap/camel-imap-folder.c:4251
#, c-format
msgid "Could not find message body in FETCH response."
msgstr "å?¨ FETCH ç??å??æ??å?§æ?¾ä¸?å?°é?µä»¶ç??å?§æ??ã??"
@@ -3704,7 +3785,7 @@ 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:446
+#: ../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
@@ -3712,7 +3793,7 @@ msgstr "%s ç?? IMAP æ??å??æ?¼ %s"
msgid "Could not connect to %s: %s"
msgstr "����� %s�%s"
-#: ../camel/providers/imap/camel-imap-store.c:447
+#: ../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
@@ -3721,61 +3802,61 @@ msgstr "SSL ��使�"
# camel/camel-remote-store.c:255
# camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:465
+#: ../camel/providers/imap/camel-imap-store.c:466
#: ../camel/providers/nntp/camel-nntp-store.c:252
#, 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:571
-#: ../camel/providers/imap/camel-imap-store.c:591
-#: ../camel/providers/imap/camel-imap-store.c:598
-#: ../camel/providers/imap/camel-imap-store.c:625
-#: ../camel/providers/imapx/camel-imapx-server.c:2827
-#: ../camel/providers/imapx/camel-imapx-server.c:2863
+#: ../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:2811
+#: ../camel/providers/imapx/camel-imapx-server.c:2847
#, 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:572
-#: ../camel/providers/imapx/camel-imapx-server.c:2828
+#: ../camel/providers/imap/camel-imap-store.c:573
+#: ../camel/providers/imapx/camel-imapx-server.c:2812
#: ../camel/providers/smtp/camel-smtp-transport.c:295
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:592
-#: ../camel/providers/imapx/camel-imapx-server.c:2864
+#: ../camel/providers/imap/camel-imap-store.c:593
+#: ../camel/providers/imapx/camel-imapx-server.c:2848
msgid "SSL negotiations failed"
msgstr "SSL å??å??失æ??"
-#: ../camel/providers/imap/camel-imap-store.c:599
+#: ../camel/providers/imap/camel-imap-store.c:600
#: ../camel/providers/smtp/camel-smtp-transport.c:339
msgid "SSL is not available in this build"
msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ SSL"
# camel/camel-remote-store.c:252
-#: ../camel/providers/imap/camel-imap-store.c:747
-#: ../camel/providers/imapx/camel-imapx-server.c:2647
+#: ../camel/providers/imap/camel-imap-store.c:748
+#: ../camel/providers/imapx/camel-imapx-server.c:2648
#, 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:752
-#: ../camel/providers/imapx/camel-imapx-server.c:2652
+#: ../camel/providers/imap/camel-imap-store.c:753
+#: ../camel/providers/imapx/camel-imapx-server.c:2653
#, 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:945
-#: ../camel/providers/imap/camel-imap-store.c:2369
+#: ../camel/providers/imap/camel-imap-store.c:926
+#: ../camel/providers/imap/camel-imap-store.c:2350
#: ../camel/providers/imapx/camel-imapx-store.c:457
#: ../camel/providers/imapx/camel-imapx-store.c:1054
#: ../camel/providers/local/camel-maildir-folder.c:90
@@ -3788,24 +3869,24 @@ msgid "Inbox"
msgstr "�件�"
# camel/providers/imap/camel-imap-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1148
-#: ../camel/providers/imapx/camel-imapx-server.c:2930
+#: ../camel/providers/imap/camel-imap-store.c:1129
+#: ../camel/providers/imapx/camel-imapx-server.c:2914
#, 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:1160
-#: ../camel/providers/imapx/camel-imapx-server.c:2942
-#: ../camel/providers/smtp/camel-smtp-transport.c:483
+#: ../camel/providers/imap/camel-imap-store.c:1141
+#: ../camel/providers/imapx/camel-imapx-server.c:2926
+#: ../camel/providers/smtp/camel-smtp-transport.c:462
#, 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:1239
-#: ../camel/providers/imapx/camel-imapx-server.c:3012
+#: ../camel/providers/imap/camel-imap-store.c:1220
+#: ../camel/providers/imapx/camel-imapx-server.c:2996
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3816,8 +3897,8 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/imap/camel-imap-store.c:1790
-#: ../camel/providers/imap/camel-imap-store.c:2212
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2193
#: ../camel/providers/imapx/camel-imapx-store.c:852
#, c-format
msgid ""
@@ -3826,7 +3907,7 @@ 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:1906
+#: ../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
@@ -3835,20 +3916,20 @@ msgid "Cannot create folder '%s': folder exists."
msgstr "ä¸?è?½å»ºç«?è³?æ??夾ã??%sã??ï¼?è³?æ??夾已å?å?¨ã??"
# camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/providers/imap/camel-imap-store.c:2225
+#: ../camel/providers/imap/camel-imap-store.c:2206
#: ../camel/providers/imapx/camel-imapx-store.c:863
#, c-format
msgid "Unknown parent folder: %s"
msgstr "ä¸?æ??ç??æ¯?è³?æ??夾ï¼? %s"
# camel/camel-remote-store.c:476
-#: ../camel/providers/imap/camel-imap-store.c:3081
+#: ../camel/providers/imap/camel-imap-store.c:3062
#, c-format
msgid "Server unexpectedly disconnected"
msgstr "伺æ??å?¨çª?ç?¶ä¸æ?·é?£ç·?"
# camel/camel-remote-store.c:476
-#: ../camel/providers/imap/camel-imap-store.c:3084
+#: ../camel/providers/imap/camel-imap-store.c:3065
msgid "Server unexpectedly disconnected: "
msgstr "伺æ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼?"
@@ -3897,14 +3978,14 @@ msgid "Error writing to cache stream: "
msgstr "寫å?¥å¿«å??串æµ?æ??ç?¼ç??é?¯èª¤ï¼?"
# camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/imapx/camel-imapx-server.c:2007
+#: ../camel/providers/imapx/camel-imapx-server.c:2008
#, 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:2755
+#: ../camel/providers/imapx/camel-imapx-server.c:2739
#, c-format
msgid "Could not connect to %s (port %s): "
msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼?"
@@ -3913,7 +3994,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:3184
+#: ../camel/providers/imapx/camel-imapx-server.c:3168
msgid "Closing tmp stream failed: "
msgstr "ç?¡æ³?é??é?? tmp 串æµ?ï¼?"
@@ -3924,7 +4005,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:5080
+#: ../camel/providers/imapx/camel-imapx-server.c:5042
#, c-format
msgid "Cannot create spool file: %s"
msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?%s"
@@ -3936,14 +4017,14 @@ 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:5095
+#: ../camel/providers/imapx/camel-imapx-server.c:5057
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:426
-#: ../camel/providers/nntp/camel-nntp-store.c:1529
+#: ../camel/providers/nntp/camel-nntp-store.c:1510
#, c-format
msgid "No such folder: %s"
msgstr "æ²?æ??é??å??è³?æ??夾ï¼? %s"
@@ -3984,7 +4065,7 @@ 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:683
+#: ../camel/providers/local/camel-local-folder.c:686
#, c-format
msgid ""
"Cannot get message %s from folder %s\n"
@@ -4232,8 +4313,8 @@ msgstr "檢���件"
# 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:669
-#: ../camel/providers/local/camel-mbox-summary.c:799
+#: ../camel/providers/local/camel-mbox-summary.c:679
+#: ../camel/providers/local/camel-mbox-summary.c:809
#: ../camel/providers/local/camel-spool-summary.c:130
msgid "Storing folder"
msgstr "å?²å?è³?æ??夾"
@@ -4352,27 +4433,28 @@ 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:524
-msgid "Fatal mail parser error near position %"
-msgstr "ç?¼ç??å?´é??ç??é?µä»¶å??æ??é?¯èª¤ï¼?é? è¿?ä½?ç½® %"
+#: ../camel/providers/local/camel-mbox-summary.c:533
+#, 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:605
+#: ../camel/providers/local/camel-mbox-summary.c:615
#, 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:676
-#: ../camel/providers/local/camel-mbox-summary.c:806
+#: ../camel/providers/local/camel-mbox-summary.c:686
+#: ../camel/providers/local/camel-mbox-summary.c:816
#: ../camel/providers/local/camel-spool-summary.c:137
#, 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:690
+#: ../camel/providers/local/camel-mbox-summary.c:700
#: ../camel/providers/local/camel-spool-summary.c:152
#, c-format
msgid "Cannot open temporary mailbox: %s"
@@ -4380,27 +4462,27 @@ msgstr "ä¸?è?½é??å??æ?«å? mailboxï¼?%s"
# camel/providers/local/camel-mbox-summary.c:635
# camel/providers/local/camel-mbox-summary.c:804
-#: ../camel/providers/local/camel-mbox-summary.c:705
-#: ../camel/providers/local/camel-mbox-summary.c:923
+#: ../camel/providers/local/camel-mbox-summary.c:715
+#: ../camel/providers/local/camel-mbox-summary.c:933
#, 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:716
+#: ../camel/providers/local/camel-mbox-summary.c:726
#, 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:733
+#: ../camel/providers/local/camel-mbox-summary.c:743
#, 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:819
-#: ../camel/providers/local/camel-mbox-summary.c:1061
+#: ../camel/providers/local/camel-mbox-summary.c:829
+#: ../camel/providers/local/camel-mbox-summary.c:1071
#, c-format
msgid "Could not store folder: %s"
msgstr "ç?¡æ³?å?²å?è³?æ??夾ï¼?%s "
@@ -4409,30 +4491,30 @@ msgstr "ç?¡æ³?å?²å?è³?æ??夾ï¼?%s "
# camel/providers/local/camel-mbox-summary.c:557
# camel/providers/local/camel-mbox-summary.c:746
# camel/providers/local/camel-mbox-summary.c:754
-#: ../camel/providers/local/camel-mbox-summary.c:860
-#: ../camel/providers/local/camel-mbox-summary.c:869
-#: ../camel/providers/local/camel-mbox-summary.c:1094
-#: ../camel/providers/local/camel-mbox-summary.c:1103
+#: ../camel/providers/local/camel-mbox-summary.c:870
+#: ../camel/providers/local/camel-mbox-summary.c:879
+#: ../camel/providers/local/camel-mbox-summary.c:1104
+#: ../camel/providers/local/camel-mbox-summary.c:1113
#, 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:1020
+#: ../camel/providers/local/camel-mbox-summary.c:1030
#: ../camel/providers/local/camel-spool-summary.c:337
#, c-format
msgid "Unknown error: %s"
msgstr "ä¸?æ??ç??é?¯èª¤ï¼? %s"
# camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1173
-#: ../camel/providers/local/camel-mbox-summary.c:1203
+#: ../camel/providers/local/camel-mbox-summary.c:1183
+#: ../camel/providers/local/camel-mbox-summary.c:1213
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "寫å?¥æ?«å?é?µç®±å¤±æ??ï¼? %s"
# camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1192
+#: ../camel/providers/local/camel-mbox-summary.c:1202
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "寫å?¥æ?«å?é?µç®±å¤±æ??ï¼? %sï¼? %s"
@@ -4664,13 +4746,13 @@ 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:453
+#: ../camel/providers/nntp/camel-nntp-store.c:434
#, c-format
msgid "USENET News via %s"
msgstr "ç¶?ç?± %s ç?? USENET æ?°è??"
# mail/mail-ops.c:1755
-#: ../camel/providers/nntp/camel-nntp-store.c:946
+#: ../camel/providers/nntp/camel-nntp-store.c:927
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -4681,7 +4763,7 @@ msgstr ""
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1043
+#: ../camel/providers/nntp/camel-nntp-store.c:1024
#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
@@ -4692,7 +4774,7 @@ msgstr ""
"\n"
"æ²?æ??é¡?ä¼¼ç??æ?°è??ç¾£çµ?ã??é?¸å??ç??é ?ç?®å?¯è?½æ?¯ç?¶ä»£è³?æ??夾ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1083
+#: ../camel/providers/nntp/camel-nntp-store.c:1064
#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
@@ -4703,41 +4785,41 @@ msgstr ""
"\n"
"æ?°è??ç¾£çµ?ä¸?å?å?¨ï¼?"
-#: ../camel/providers/nntp/camel-nntp-store.c:1113
+#: ../camel/providers/nntp/camel-nntp-store.c:1094
#, 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:1125
+#: ../camel/providers/nntp/camel-nntp-store.c:1106
#, c-format
msgid "You cannot rename a folder in a News store."
msgstr "ä½ ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??é??æ?°å?½å??è³?æ??夾ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1138
+#: ../camel/providers/nntp/camel-nntp-store.c:1119
#, 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:1276
+#: ../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:1288
+#: ../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:1414
+#: ../camel/providers/nntp/camel-nntp-store.c:1395
msgid "NNTP Command failed: "
msgstr "NNTP æ??令失æ??ï¼?"
# ui/evolution-addressbook.xml.h:17
-#: ../camel/providers/nntp/camel-nntp-store.c:1472
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
#, c-format
msgid "Not connected."
msgstr "æ?ªé?£ç·?ã??"
@@ -4900,8 +4982,8 @@ 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:321
-#: ../camel/providers/pop3/camel-pop3-store.c:473
+#: ../camel/providers/pop3/camel-pop3-store.c:300
+#: ../camel/providers/pop3/camel-pop3-store.c:452
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -4909,23 +4991,23 @@ msgid ""
msgstr "ç?¡æ³?é?£ç·?å?° POP 伺æ??å?¨ %sï¼?ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?æ©?å?¶ã??"
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:344
+#: ../camel/providers/pop3/camel-pop3-store.c:323
#, 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:361
+#: ../camel/providers/pop3/camel-pop3-store.c:340
#, 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:378
+#: ../camel/providers/pop3/camel-pop3-store.c:357
#, c-format
msgid "Failed to authenticate on POP server %s: "
msgstr "ç?¡æ³?é©?è? POP 伺æ??å?¨ %sï¼?"
-#: ../camel/providers/pop3/camel-pop3-store.c:442
+#: ../camel/providers/pop3/camel-pop3-store.c:421
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4933,7 +5015,7 @@ msgid ""
msgstr "ç?¡æ³?é?£ç·?è?³ POP 伺æ??å?¨ %sï¼?\tæ?¶å?°ç?¡æ??ç?? APOP IDã??æ?¨æ¸¬å?¯è?½æ?¯ä½¿ç?¨è??å??å??æ?»æ??ã??è«?è?¯çµ¡ä½ ç??系統管ç??è??ã??"
# camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:492
+#: ../camel/providers/pop3/camel-pop3-store.c:471
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4944,7 +5026,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:505
+#: ../camel/providers/pop3/camel-pop3-store.c:484
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4955,7 +5037,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:518
+#: ../camel/providers/pop3/camel-pop3-store.c:497
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4965,30 +5047,30 @@ msgstr ""
"å?³é??å¯?碼æ??ç?¼ç??é?¯èª¤%s"
# camel/providers/pop3/camel-pop3-store.c:322
-#: ../camel/providers/pop3/camel-pop3-store.c:674
+#: ../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:687
+#: ../camel/providers/pop3/camel-pop3-store.c:666
#, c-format
msgid "POP3 server %s"
msgstr "POP3 伺æ??å?¨ %s"
# camel/camel-remote-store.c:195
-#: ../camel/providers/pop3/camel-pop3-store.c:691
+#: ../camel/providers/pop3/camel-pop3-store.c:670
#, c-format
msgid "POP3 server for %s on %s"
msgstr "%s å?¨ %s ç?? POP3 伺æ??å?¨"
# camel/providers/pop3/camel-pop3-store.c:484
-#: ../camel/providers/pop3/camel-pop3-store.c:706
+#: ../camel/providers/pop3/camel-pop3-store.c:685
#, c-format
msgid "No such folder '%s'."
msgstr "æ²?æ??é??å??è³?æ??夾ã??%sã??ã??"
-#: ../camel/providers/pop3/camel-pop3-store.c:730
+#: ../camel/providers/pop3/camel-pop3-store.c:709
#, c-format
msgid "POP3 stores have no folder hierarchy"
msgstr "POP3 å?²å?å??æ²?æ??è³?æ??夾é??層"
@@ -5210,13 +5292,13 @@ msgid "STARTTLS command failed: "
msgstr "STARTTLS æ??令失æ??ï¼?"
# camel/providers/smtp/camel-smtp-transport.c:356
-#: ../camel/providers/smtp/camel-smtp-transport.c:471
+#: ../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:547
+#: ../camel/providers/smtp/camel-smtp-transport.c:526
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -5228,210 +5310,210 @@ msgstr ""
"\n"
# camel/providers/smtp/camel-smtp-transport.c:534
-#: ../camel/providers/smtp/camel-smtp-transport.c:685
+#: ../camel/providers/smtp/camel-smtp-transport.c:664
#, c-format
msgid "SMTP server %s"
msgstr "SMTP 伺æ??å?¨ %s"
# camel/providers/smtp/camel-smtp-transport.c:536
-#: ../camel/providers/smtp/camel-smtp-transport.c:687
+#: ../camel/providers/smtp/camel-smtp-transport.c:666
#, 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:707
+#: ../camel/providers/smtp/camel-smtp-transport.c:686
#, 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:714
+#: ../camel/providers/smtp/camel-smtp-transport.c:693
#, c-format
msgid "Cannot send message: sender address not valid."
msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?å¯?件è??ç??å?°å??ç?¡æ??ã??"
# mail/mail-ops.c:603
-#: ../camel/providers/smtp/camel-smtp-transport.c:718
+#: ../camel/providers/smtp/camel-smtp-transport.c:697
msgid "Sending message"
msgstr "å?³é??é?µä»¶"
# camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:734
+#: ../camel/providers/smtp/camel-smtp-transport.c:713
#, 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:746
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
#, 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:982
+#: ../camel/providers/smtp/camel-smtp-transport.c:961
msgid "SMTP Greeting"
msgstr "SMTP è¿?æ?¥"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1006
-#: ../camel/providers/smtp/camel-smtp-transport.c:1021
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
+#: ../camel/providers/smtp/camel-smtp-transport.c:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:1000
+#: ../camel/providers/smtp/camel-smtp-transport.c:1007
msgid "HELO command failed: "
msgstr "HELO æ??令失æ??ï¼?"
# mail/mail-config.glade.h:10
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
msgid "SMTP Authentication"
msgstr "SMTP é©?è?"
# camel/providers/smtp/camel-smtp-transport.c:728
-#: ../camel/providers/smtp/camel-smtp-transport.c:1102
+#: ../camel/providers/smtp/camel-smtp-transport.c:1081
#, 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:1118
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
-#: ../camel/providers/smtp/camel-smtp-transport.c:1136
+#: ../camel/providers/smtp/camel-smtp-transport.c:1097
+#: ../camel/providers/smtp/camel-smtp-transport.c:1107
+#: ../camel/providers/smtp/camel-smtp-transport.c:1115
msgid "AUTH command failed: "
msgstr "AUTH æ??令失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1233
-#: ../camel/providers/smtp/camel-smtp-transport.c:1245
-#: ../camel/providers/smtp/camel-smtp-transport.c:1252
+#: ../camel/providers/smtp/camel-smtp-transport.c:1212
+#: ../camel/providers/smtp/camel-smtp-transport.c:1224
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
msgid "MAIL FROM command failed: "
msgstr "MAIL FROM æ??令失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1275
+#: ../camel/providers/smtp/camel-smtp-transport.c:1254
msgid "RCPT TO command failed: "
msgstr "RCPT TO æ??令失æ??ï¼?"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1289
-#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#: ../camel/providers/smtp/camel-smtp-transport.c:1268
+#: ../camel/providers/smtp/camel-smtp-transport.c:1276
#, 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:1335
-#: ../camel/providers/smtp/camel-smtp-transport.c:1344
-#: ../camel/providers/smtp/camel-smtp-transport.c:1354
-#: ../camel/providers/smtp/camel-smtp-transport.c:1411
-#: ../camel/providers/smtp/camel-smtp-transport.c:1427
-#: ../camel/providers/smtp/camel-smtp-transport.c:1438
-#: ../camel/providers/smtp/camel-smtp-transport.c:1445
+#: ../camel/providers/smtp/camel-smtp-transport.c:1314
+#: ../camel/providers/smtp/camel-smtp-transport.c:1323
+#: ../camel/providers/smtp/camel-smtp-transport.c:1333
+#: ../camel/providers/smtp/camel-smtp-transport.c:1390
+#: ../camel/providers/smtp/camel-smtp-transport.c:1406
+#: ../camel/providers/smtp/camel-smtp-transport.c:1417
+#: ../camel/providers/smtp/camel-smtp-transport.c:1424
msgid "DATA command failed: "
msgstr "DATA æ??令失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1467
-#: ../camel/providers/smtp/camel-smtp-transport.c:1479
-#: ../camel/providers/smtp/camel-smtp-transport.c:1486
+#: ../camel/providers/smtp/camel-smtp-transport.c:1446
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1465
msgid "RSET command failed: "
msgstr "RSET æ??令失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1508
-#: ../camel/providers/smtp/camel-smtp-transport.c:1521
-#: ../camel/providers/smtp/camel-smtp-transport.c:1527
+#: ../camel/providers/smtp/camel-smtp-transport.c:1487
+#: ../camel/providers/smtp/camel-smtp-transport.c:1500
+#: ../camel/providers/smtp/camel-smtp-transport.c:1506
msgid "QUIT command failed: "
msgstr "QUIT æ??令失æ??ï¼?"
# addressbook/contact-editor/e-contact-editor.c:1243
# addressbook/contact-editor/e-contact-editor.c:1310
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:46
msgid "Business"
msgstr "å??å??é?»è©±"
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:47
msgid "Competition"
msgstr "競ç?è??"
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:48
msgid "Favorites"
msgstr "å??æ??ç??"
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:49
msgid "Gifts"
msgstr "禮�"
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:50
msgid "Goals/Objectives"
msgstr "��/��"
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:51
msgid "Holiday"
msgstr "å??æ?¥"
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:52
msgid "Holiday Cards"
msgstr "å??æ?¥é??è«?å?¡"
# ui/evolution-addressbook.xml.h:17
#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:54
msgid "Hot Contacts"
msgstr "ç?±é??è?¯çµ¡äºº"
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:55
msgid "Ideas"
msgstr "å?µæ??"
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:56
msgid "International"
msgstr "å??é??ç??"
# ui/evolution-event-editor.xml.h:15
# ui/evolution-task-editor-dialog.xml.h:16
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:57
msgid "Key Customer"
msgstr "é??é?µå®¢æ?¶"
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:58
msgid "Miscellaneous"
msgstr "é??é ?"
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:59
msgid "Personal"
msgstr "å??人"
# calendar/gui/e-meeting-dialog.glade.h:21
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:60
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:61
+#: ../libedataserver/e-categories.c:62
msgid "Status"
msgstr "ç??æ??"
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:63
msgid "Strategies"
msgstr "ç?ç?¥"
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:64
msgid "Suppliers"
msgstr "ä¾?æ??å??"
# addressbook/backend/ebook/e-card.c:3434
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:65
msgid "Time & Expenses"
msgstr "æ??é??è??é??é?·"
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:66
msgid "VIP"
msgstr "VIP"
# mail/mail-send-recv.c:287
# mail/mail-send-recv.c:333
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:67
msgid "Waiting"
msgstr "æ£å?¨ç?å¾?"
@@ -5610,10 +5692,12 @@ msgid "%I %p"
msgstr "%I %p"
#: ../libedataserverui/e-book-auth-util.c:93
+#: ../libedataserverui/e-book-auth-util.c:665
msgid "Accessing LDAP Server anonymously"
msgstr "æ£ä»¥å?¿å??æ?¹å¼?å?å?? LDAP 伺æ??å?¨"
#: ../libedataserverui/e-book-auth-util.c:199
+#: ../libedataserverui/e-book-auth-util.c:430
msgid "Failed to authenticate.\n"
msgstr "é©?è?è?æ?¸å¤±æ??ã??\n"
@@ -5626,19 +5710,19 @@ msgstr "å??é¡?å??示"
msgid "_No Image"
msgstr "æ²?æ??å??ç??(_N)"
-#: ../libedataserverui/e-categories-dialog.c:372
+#: ../libedataserverui/e-categories-dialog.c:368
#, c-format
msgid ""
"There is already a category '%s' in the configuration. Please use another "
"name"
msgstr "å?¨çµ?æ??ä¸å·²ç¶?æ??å??ç?ºã??%sã??ç??å??é¡?ã??è«?使ç?¨å?¦å¤?ç??å??稱"
-#: ../libedataserverui/e-categories-dialog.c:680
+#: ../libedataserverui/e-categories-dialog.c:676
msgid "Icon"
msgstr "å??示"
# calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-categories-dialog.c:685
+#: ../libedataserverui/e-categories-dialog.c:681
msgid "Category"
msgstr "å??é¡?"
@@ -5695,7 +5779,7 @@ msgid "_Remove"
msgstr "移�(_R)"
# calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.c:858
+#: ../libedataserverui/e-name-selector-dialog.c:890
#: ../libedataserverui/e-name-selector-dialog.ui.h:6
msgid "Any Category"
msgstr "ä»»ä½?å??é¡?"
@@ -5740,25 +5824,25 @@ msgid "_Search:"
msgstr "æ??å°?(_S):"
#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2559
+#: ../libedataserverui/e-name-selector-entry.c:2617
#, c-format
msgid "E_xpand %s Inline"
msgstr "å±?é??è¡?å?§ %s"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2574
+#: ../libedataserverui/e-name-selector-entry.c:2632
#, c-format
msgid "Cop_y %s"
msgstr "�製(_Y) %s"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2584
+#: ../libedataserverui/e-name-selector-entry.c:2642
#, c-format
msgid "C_ut %s"
msgstr "��(_U) %s"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2601
+#: ../libedataserverui/e-name-selector-entry.c:2659
#, c-format
msgid "_Edit %s"
msgstr "編輯 %s(_E)"
@@ -5773,23 +5857,23 @@ msgstr "��(_D) %s"
msgid "Keyring key is unusable: no user or host name"
msgstr "å¯?碼å??å??å¯?碼å??ç?¡æ³?使ç?¨ï¼?æ²?æ??使ç?¨è??æ??主æ©?å??稱"
-#: ../libedataserverui/e-passwords.c:1116
+#: ../libedataserverui/e-passwords.c:1120
msgid "You have the Caps Lock key on."
msgstr "ä½ ç?? Caps Lock æ?¯é??å??ç??ã??"
-#: ../libedataserverui/e-passwords.c:1238
+#: ../libedataserverui/e-passwords.c:1241
msgid "_Remember this passphrase"
msgstr "è¨?ä½?é??å??å¯?èª?(_R)"
-#: ../libedataserverui/e-passwords.c:1239
+#: ../libedataserverui/e-passwords.c:1242
msgid "_Remember this passphrase for the remainder of this session"
msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??段ç??å¯?èª?(_R)"
-#: ../libedataserverui/e-passwords.c:1244
+#: ../libedataserverui/e-passwords.c:1247
msgid "_Remember this password"
msgstr "è¨?ä½?é??å??å¯?碼(_R)"
-#: ../libedataserverui/e-passwords.c:1245
+#: ../libedataserverui/e-passwords.c:1248
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 034d420..30717f8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,10 +6,10 @@
# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005. 2008.
msgid ""
msgstr ""
-"Project-Id-Version: evolution-data-server 2.31.6\n"
+"Project-Id-Version: evolution-data-server 2.31.91\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-20 14:23+0800\n"
-"PO-Revision-Date: 2010-07-16 09:49+0800\n"
+"POT-Creation-Date: 2010-08-21 20:13+0800\n"
+"PO-Revision-Date: 2010-08-20 09:00+0800\n"
"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
"Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
"MIME-Version: 1.0\n"
@@ -31,13 +31,13 @@ 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:4491
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4482
#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
msgid "Searching..."
msgstr "æ??å°?ä¸..."
#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2698
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4650
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4641
#, c-format
msgid "Downloading contacts (%d)... "
msgstr "æ£å?¨ä¸?è¼?é?£çµ¡äºº (%d)..."
@@ -65,47 +65,47 @@ msgstr "使ç?¨é?»å?é?µä»¶å?°å??"
# mail/mail-config.c:1213
# mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1031
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
msgid "Reconnecting to LDAP server..."
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:1156
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
msgid "Invalid DN syntax"
msgstr "ç?¡æ??ç?? DN èª?æ³?"
# mail/mail-config.c:1213
# mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1672
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1663
msgid "Adding contact to LDAP server..."
msgstr "æ£å?¨æ?°å¢?é?£çµ¡äººè?³ LDAP 伺æ??å?¨..."
# mail/mail-ops.c:1195
# mail/mail-ops.c:1333
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1804
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1795
msgid "Removing contact from LDAP server..."
msgstr "æ£å?¨ç§»é?¤ LDAP 伺æ??å?¨ä¸ç??é?£çµ¡äºº..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2238
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2229
msgid "Modifying contact from LDAP server..."
msgstr "æ£å?¨ä¿®æ?¹ LDAP 伺æ??å?¨ä¸ç??é?£çµ¡äºº..."
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4341
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4332
msgid "Receiving LDAP search results..."
msgstr "æ£å?¨æ?¥æ?¶ LDAP æ??å°?çµ?æ??..."
# executive-summary/component/e-summary.c:940
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4513
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4504
msgid "Error performing search"
msgstr "é?²è¡?æ??å°?æ??ç?¼ç??é?¯èª¤"
#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
#, c-format
msgid "Create resource '%s' failed with http status: %d"
-msgstr ""
+msgstr "é??é??è³?æº?ã??%sã??失æ??ï¼?http ç??æ??ï¼?%d"
-#: ../addressbook/libebook/e-book.c:3001
+#: ../addressbook/libebook/e-book.c:2940
#, c-format
msgid "%s: there was no source for UID '%s' stored in GConf."
msgstr "%sï¼?æ²?æ??å?²å?æ?¼ GConf ä¸ç?? UIDã??%sã??ä¾?æº?ã??"
@@ -349,7 +349,7 @@ msgstr "網� URL"
# calendar/gui/e-calendar-table.c:150
#. Contact categories
#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:671
+#: ../libedataserverui/e-categories-dialog.c:667
msgid "Categories"
msgstr "å??é¡?"
@@ -645,7 +645,7 @@ 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:43
+#: ../libedataserver/e-categories.c:44
msgid "Anniversary"
msgstr "�年�念�"
@@ -736,119 +736,119 @@ msgstr "SIP ä½?å??"
msgid "Unnamed List"
msgstr "æ?ªå?½å??ç??æ¸?å?®"
-#: ../addressbook/libedata-book/e-data-book-factory.c:322
+#: ../addressbook/libedata-book/e-data-book-factory.c:287
#, c-format
msgid "Empty URI"
msgstr "空ç?? URI"
-#: ../addressbook/libedata-book/e-data-book-factory.c:340
-#: ../addressbook/libedata-book/e-data-book-factory.c:377
-#: ../calendar/libedata-cal/e-data-cal-factory.c:333
-#: ../calendar/libedata-cal/e-data-cal-factory.c:345
+#: ../addressbook/libedata-book/e-data-book-factory.c:306
+#: ../addressbook/libedata-book/e-data-book-factory.c:344
+#: ../calendar/libedata-cal/e-data-cal-factory.c:331
+#: ../calendar/libedata-cal/e-data-cal-factory.c:343
#, c-format
msgid "Invalid source"
msgstr "ç?¡æ??ç??ä¾?æº?"
-#: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:113
+#: ../addressbook/libedata-book/e-data-book.c:166
+#: ../calendar/libedata-cal/e-data-cal.c:104
msgid "Success"
msgstr "æ??å??"
# shell/e-shell-view-menu.c:602
# shell/e-shell-view-menu.c:614
-#: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:114
+#: ../addressbook/libedata-book/e-data-book.c:167
+#: ../calendar/libedata-cal/e-data-cal.c:105
msgid "Repository offline"
msgstr "è³?æ??庫é?¢ç·?"
# shell/e-storage.c:475
-#: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libecal/e-cal.c:4118 ../calendar/libedata-cal/e-data-cal.c:115
+#: ../addressbook/libedata-book/e-data-book.c:168
+#: ../calendar/libecal/e-cal.c:3945 ../calendar/libedata-cal/e-data-cal.c:106
msgid "Permission denied"
msgstr "æ¬?é??ä¸?足"
-#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../addressbook/libedata-book/e-data-book.c:169
msgid "Contact not found"
msgstr "����絡人"
-#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../addressbook/libedata-book/e-data-book.c:170
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:190
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../addressbook/libedata-book/e-data-book.c:171
+#: ../calendar/libedata-cal/e-data-cal.c:111
msgid "Authentication Failed"
msgstr "é©?è?失æ??"
# camel/providers/smtp/camel-smtp-transport.c:218
-#: ../addressbook/libedata-book/e-data-book.c:191
-#: ../calendar/libedata-cal/e-data-cal.c:121
+#: ../addressbook/libedata-book/e-data-book.c:172
+#: ../calendar/libedata-cal/e-data-cal.c:112
msgid "Authentication Required"
msgstr "è¦?æ±?é©?è?"
# mail/mail-config.glade.h:1
-#: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:113
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:193
-#: ../calendar/libedata-cal/e-data-cal.c:124
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:115
msgid "Unsupported authentication method"
msgstr "ä¸?æ?¯æ?´ç??é©?è?æ?¹æ³?"
-#: ../addressbook/libedata-book/e-data-book.c:194
-#: ../calendar/libedata-cal/e-data-cal.c:125
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libedata-cal/e-data-cal.c:116
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:195
+#: ../addressbook/libedata-book/e-data-book.c:176
msgid "Address Book does not exist"
msgstr "é??è¨?é??ä¸?å?å?¨"
-#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../addressbook/libedata-book/e-data-book.c:177
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:197
-#: ../calendar/libedata-cal/e-data-cal.c:128
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:119
msgid "Not available in offline mode"
msgstr "�����模��使�"
-#: ../addressbook/libedata-book/e-data-book.c:198
-#: ../calendar/libedata-cal/e-data-cal.c:129
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:120
msgid "Search size limit exceeded"
msgstr "è¶?é??æ??å°?大å°?é??å?¶"
-#: ../addressbook/libedata-book/e-data-book.c:199
-#: ../calendar/libedata-cal/e-data-cal.c:130
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:121
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:200
-#: ../calendar/libedata-cal/e-data-cal.c:131
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:122
msgid "Invalid query"
msgstr "ç?¡æ??ç??æ?¥è©¢"
-#: ../addressbook/libedata-book/e-data-book.c:201
-#: ../calendar/libedata-cal/e-data-cal.c:132
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:123
msgid "Query refused"
msgstr "æ?¥è©¢è¢«æ??çµ?"
# calendar/gui/e-itip-control.c:883
-#: ../addressbook/libedata-book/e-data-book.c:202
-#: ../calendar/libedata-cal/e-data-cal.c:133
+#: ../addressbook/libedata-book/e-data-book.c:183
+#: ../calendar/libedata-cal/e-data-cal.c:124
msgid "Could not cancel"
msgstr "ç?¡æ³?å??æ¶?"
@@ -856,61 +856,59 @@ 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:204
-#: ../calendar/libedata-cal/e-data-cal.c:135
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:126
msgid "Invalid server version"
msgstr "ç?¡æ??ç??伺æ??å?¨ç??æ?¬"
# camel/providers/imap/camel-imap-provider.c:54
-#: ../addressbook/libedata-book/e-data-book.c:205
+#: ../addressbook/libedata-book/e-data-book.c:186
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:206
-#: ../calendar/libecal/e-cal.c:4102 ../calendar/libedata-cal/e-data-cal.c:136
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libecal/e-cal.c:3929 ../calendar/libedata-cal/e-data-cal.c:127
msgid "Invalid argument"
msgstr "ç?¡æ??ç??å??æ?¸"
# shell/e-storage.c:477
-#: ../addressbook/libedata-book/e-data-book.c:207
-#: ../calendar/libecal/e-cal.c:4140 ../calendar/libedata-cal/e-data-cal.c:137
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libecal/e-cal.c:3967 ../calendar/libedata-cal/e-data-cal.c:128
msgid "Not supported"
msgstr "���"
# addressbook/gui/widgets/e-addressbook-view.c:718
-#: ../addressbook/libedata-book/e-data-book.c:216
-#: ../calendar/libedata-cal/e-data-cal.c:145
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libedata-cal/e-data-cal.c:136
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:374
-#, fuzzy, c-format
-#| msgid "Cannot open book"
+#: ../addressbook/libedata-book/e-data-book.c:307
+#, c-format
msgid "Cannot open book: %s"
-msgstr "ä¸?è?½é??å??æ?¸ç±?"
+msgstr "ä¸?è?½é??å??æ?¸ç±?ï¼?%s"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:394
-#, fuzzy, c-format
-#| msgid "Cannot remove book"
+#: ../addressbook/libedata-book/e-data-book.c:329
+#, c-format
msgid "Cannot remove book: %s"
-msgstr "��移���"
+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:428
+#: ../addressbook/libedata-book/e-data-book.c:346
+#: ../addressbook/libedata-book/e-data-book.c:365
#, 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:443
+#: ../addressbook/libedata-book/e-data-book.c:380
#, c-format
msgid "Empty query: %s"
msgstr "空ç??æ?¥è©¢ï¼?%s"
@@ -918,36 +916,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:457
+#: ../addressbook/libedata-book/e-data-book.c:396
#, 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:492
+#: ../addressbook/libedata-book/e-data-book.c:433
#, 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:507
-#: ../addressbook/libedata-book/e-data-book.c:524
+#: ../addressbook/libedata-book/e-data-book.c:448
+#: ../addressbook/libedata-book/e-data-book.c:467
#, 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:542
-#: ../addressbook/libedata-book/e-data-book.c:559
+#: ../addressbook/libedata-book/e-data-book.c:485
+#: ../addressbook/libedata-book/e-data-book.c:504
#, 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:596
+#: ../addressbook/libedata-book/e-data-book.c:543
#, c-format
msgid "Cannot remove contacts: %s"
msgstr "��移��絡人�%s"
@@ -960,7 +958,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:626
+#: ../addressbook/libedata-book/e-data-book.c:580
#, c-format
msgid "Cannot get supported fields: %s"
msgstr "ä¸?è?½å??å¾?æ?¯æ?´ç??æ¬?ä½?ï¼?%s"
@@ -973,7 +971,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:639
+#: ../addressbook/libedata-book/e-data-book.c:595
#, c-format
msgid "Cannot get required fields: %s"
msgstr "ä¸?è?½å??å¾?è¦?æ±?ç??æ¬?ä½?ï¼?%s"
@@ -981,7 +979,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:652
+#: ../addressbook/libedata-book/e-data-book.c:610
#, c-format
msgid "Cannot get supported auth methods: %s"
msgstr "ä¸?è?½å??å¾?æ?¯æ?´ç??é©?è?æ?¹æ³?ï¼?%s"
@@ -989,7 +987,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:677
+#: ../addressbook/libedata-book/e-data-book.c:636
+#: ../addressbook/libedata-book/e-data-book.c:647
#, c-format
msgid "Invalid query: %s"
msgstr "ç?¡æ??ç??æ?¥è©¢ï¼?%s"
@@ -1002,35 +1001,36 @@ 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:708
+#: ../addressbook/libedata-book/e-data-book.c:683
#, c-format
msgid "Cannot get changes: %s"
msgstr "ä¸?è?½å??å¾?è®?æ?´ï¼?%s"
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:501
-#, fuzzy, c-format
-#| msgid ""
-#| "Unexpected GnuPG status message encountered:\n"
-#| "\n"
-#| "%s"
+# camel/camel-remote-store.c:337
+# camel/camel-remote-store.c:399
+# camel/camel-remote-store.c:470
+# camel/providers/imap/camel-imap-command.c:287
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:722
+#, c-format
+msgid "Cancel operation failed: %s"
+msgstr "å??æ¶?æ??ä½?失æ??ï¼?%s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:498
+#, c-format
msgid "Unexpected HTTP status code %d returned"
-msgstr ""
-"é??å?°é??é ?æ??ç?? GnuPG ç??æ??è¨?æ?¯ï¼?\n"
-"\n"
-"%s"
+msgstr "å?³å??æ?ªé ?æ??ç?? HTTP ç??æ??碼 %d"
# 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:4114
-#, fuzzy
-#| msgid "Calendar does not exist"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4094
msgid "Calendar doesn't support Free/Busy"
-msgstr "è¡?äº?æ??ä¸?å?å?¨"
+msgstr "è¡?äº?æ??ä¸?æ?¯æ?´ç©ºé??/å¿?ç¢?"
# addressbook/contact-editor/contact-editor.glade.h:20
#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
-#: ../libedataserver/e-categories.c:44
+#: ../libedataserver/e-categories.c:45
msgid "Birthday"
msgstr "ç??æ?¥"
@@ -1055,43 +1055,43 @@ msgstr "ç?¡æ³?å?²å?è¡?äº?æ??è³?æ??ï¼?URI ç??æ ¼å¼?ä¸?æ£ç¢ºã??"
msgid "Cannot save calendar data"
msgstr "ä¸?è?½å?²å?è¡?äº?æ??è³?æ??"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1118
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1121
#: ../camel/providers/groupwise/camel-groupwise-folder.c:2224
msgid "Reply Requested: by "
msgstr "è¦?æ±?å??è¦?ï¼?ä¾?"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1123
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1126
#: ../camel/providers/groupwise/camel-groupwise-folder.c:2229
msgid "Reply Requested: When convenient"
msgstr "è¦?æ±?å??è¦?ï¼?ç?¶æ??空æ??"
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:296
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:295
#, c-format
msgid "Loading %s items"
msgstr "è¼?å?¥ %s å??é ?ç?®"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
# ui/evolution-calendar.xml.h:3
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:927
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:926
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:991
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:989
msgid "Invalid server URI"
msgstr "ç?¡æ??ç??伺æ??å?¨ URI"
# camel/providers/local/camel-mbox-store.c:110
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1095
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1382
-#: ../calendar/backends/http/e-cal-backend-http.c:671
-#: ../calendar/backends/weather/e-cal-backend-weather.c:484
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1082
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1343
+#: ../calendar/backends/http/e-cal-backend-http.c:659
+#: ../calendar/backends/weather/e-cal-backend-weather.c:487
msgid "Could not create cache file"
msgstr "ç?¡æ³?建æ§?å¿«å??æª?æ¡?"
# camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1108
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1095
msgid "Could not create thread for populating cache"
msgstr "ç?¡æ³?建æ§?移æ¤?å¿«å??ç??å?·è¡?ç·?"
@@ -1349,7 +1349,8 @@ msgid "Undefined"
msgstr "æ?ªæ??å®?"
# camel/camel-smime-context.c:194
-#: ../calendar/libecal/e-cal.c:1233 ../libedataserverui/e-book-auth-util.c:206
+#: ../calendar/libecal/e-cal.c:1128 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:435
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "輸å?¥ %s (使ç?¨è?? %s) ç??å¯?碼 "
@@ -1359,60 +1360,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:1247
+#: ../calendar/libecal/e-cal.c:1142
#, c-format
msgid "Enter password for %s to enable proxy for user %s"
msgstr "輸å?¥ %s ç??å¯?碼以便使ç?¨è?? %s è?½ä½¿ç?¨ä»£ç??伺æ??å?¨"
-#: ../calendar/libecal/e-cal.c:4104
+#: ../calendar/libecal/e-cal.c:3931
msgid "Backend is busy"
msgstr "å¾?端å¿?ç¢?ä¸"
# shell/e-shell-view-menu.c:602
# shell/e-shell-view-menu.c:614
-#: ../calendar/libecal/e-cal.c:4106
+#: ../calendar/libecal/e-cal.c:3933
msgid "Repository is offline"
msgstr "å??庫已é?¢ç·?"
# camel/providers/imap/camel-imap-store.c:803
# mail/mail-local.c:334
-#: ../calendar/libecal/e-cal.c:4108
+#: ../calendar/libecal/e-cal.c:3935
msgid "No such calendar"
msgstr "ç?¡æ¤è¡?äº?æ??"
-#: ../calendar/libecal/e-cal.c:4110 ../calendar/libedata-cal/e-data-cal.c:117
+#: ../calendar/libecal/e-cal.c:3937 ../calendar/libedata-cal/e-data-cal.c:108
#: ../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:4112 ../calendar/libedata-cal/e-data-cal.c:118
+#: ../calendar/libecal/e-cal.c:3939 ../calendar/libedata-cal/e-data-cal.c:109
#: ../servers/groupwise/e-gw-connection.c:229
msgid "Invalid object"
msgstr "ç?¡æ??ç??ç?©ä»¶"
# addressbook/conduit/address-conduit.c:214
-#: ../calendar/libecal/e-cal.c:4114
+#: ../calendar/libecal/e-cal.c:3941
msgid "URI not loaded"
msgstr "URI ���"
-#: ../calendar/libecal/e-cal.c:4116
+#: ../calendar/libecal/e-cal.c:3943
msgid "URI already loaded"
msgstr "URI 已��"
# camel/providers/imap/camel-imap-command.c:241
# shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4120 ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:3947 ../servers/groupwise/e-gw-connection.c:237
msgid "Unknown User"
msgstr "ä¸?æ??ç??使ç?¨è??"
-#: ../calendar/libecal/e-cal.c:4122 ../calendar/libedata-cal/e-data-cal.c:119
+#: ../calendar/libecal/e-cal.c:3949 ../calendar/libedata-cal/e-data-cal.c:110
msgid "Object ID already exists"
msgstr "ç?©ä»¶ ID å·²å?å?¨"
# shell/e-storage.c:477
-#: ../calendar/libecal/e-cal.c:4124
+#: ../calendar/libecal/e-cal.c:3951
msgid "Protocol not supported"
msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
@@ -1420,18 +1421,18 @@ 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:4126
+#: ../calendar/libecal/e-cal.c:3953
msgid "Operation has been canceled"
msgstr "æ??ä½?å·²å??æ¶?"
# calendar/gui/e-itip-control.c:883
-#: ../calendar/libecal/e-cal.c:4128
+#: ../calendar/libecal/e-cal.c:3955
msgid "Could not cancel operation"
msgstr "ç?¡æ³?å??æ¶?æ??ä½?"
# camel/camel-sasl-anonymous.c:110
# camel/camel-sasl-plain.c:87
-#: ../calendar/libecal/e-cal.c:4130
+#: ../calendar/libecal/e-cal.c:3957
#: ../camel/providers/groupwise/camel-groupwise-folder.c:1434
#: ../camel/providers/groupwise/camel-groupwise-folder.c:1452
#: ../camel/providers/groupwise/camel-groupwise-store.c:618
@@ -1443,28 +1444,28 @@ msgid "Authentication failed"
msgstr "é©?è?失æ??"
# camel/providers/smtp/camel-smtp-transport.c:218
-#: ../calendar/libecal/e-cal.c:4132
+#: ../calendar/libecal/e-cal.c:3959
#: ../camel/providers/smtp/camel-smtp-transport.c:166
msgid "Authentication required"
msgstr "è¦?æ±?é©?è?"
-#: ../calendar/libecal/e-cal.c:4134
+#: ../calendar/libecal/e-cal.c:3961
msgid "A DBUS exception has occurred"
msgstr "ç?¼ç?? DBUS ä¾?å¤?"
# camel/providers/imap/camel-imap-command.c:241
# shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4136
+#: ../calendar/libecal/e-cal.c:3963
#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
#: ../camel/providers/imap/camel-imap-command.c:457
-#: ../camel/providers/imap/camel-imap-store.c:626
-#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../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:4138
+#: ../calendar/libecal/e-cal.c:3965
msgid "No error"
msgstr "æ²?æ??é?¯èª¤"
@@ -1564,186 +1565,186 @@ 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:116
+#: ../calendar/libedata-cal/e-data-cal.c:107
msgid "Invalid range"
msgstr "ç?¡æ??ç??ç¯?å??"
# mail/mail-config.glade.h:1
-#: ../calendar/libedata-cal/e-data-cal.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:114
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:126
+#: ../calendar/libedata-cal/e-data-cal.c:117
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:127
+#: ../calendar/libedata-cal/e-data-cal.c:118
msgid "UnknownUser"
msgstr "ä¸?æ??ç??使ç?¨è??"
#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:595
+#: ../calendar/libedata-cal/e-data-cal.c:589
#, 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:615
+#: ../calendar/libedata-cal/e-data-cal.c:609
#, 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:635
+#: ../calendar/libedata-cal/e-data-cal.c:629
#, 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:655
+#: ../calendar/libedata-cal/e-data-cal.c:649
#, 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:674
+#: ../calendar/libedata-cal/e-data-cal.c:668
#, 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:695
+#: ../calendar/libedata-cal/e-data-cal.c:689
#, 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:714
+#: ../calendar/libedata-cal/e-data-cal.c:708
#, 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:735
+#: ../calendar/libedata-cal/e-data-cal.c:729
#, 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:759
+#: ../calendar/libedata-cal/e-data-cal.c:753
#, 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:785
+#: ../calendar/libedata-cal/e-data-cal.c:779
#, 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:806
+#: ../calendar/libedata-cal/e-data-cal.c:800
#, 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:825
+#: ../calendar/libedata-cal/e-data-cal.c:819
#, 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:846
+#: ../calendar/libedata-cal/e-data-cal.c:840
#, 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:883
+#: ../calendar/libedata-cal/e-data-cal.c:865
#, 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:903
+#: ../calendar/libedata-cal/e-data-cal.c:885
#, 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:923
+#: ../calendar/libedata-cal/e-data-cal.c:905
#, 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:963
+#: ../calendar/libedata-cal/e-data-cal.c:933
#, 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:987
+#: ../calendar/libedata-cal/e-data-cal.c:959
#, 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:1007
+#: ../calendar/libedata-cal/e-data-cal.c:979
#, 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:1027
+#: ../calendar/libedata-cal/e-data-cal.c:999
#, 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:1046
+#: ../calendar/libedata-cal/e-data-cal.c:1018
#, 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:1069
+#: ../calendar/libedata-cal/e-data-cal.c:1041
#, 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:1121
+#: ../calendar/libedata-cal/e-data-cal.c:1072
#, c-format
msgid "Cannot retrieve calendar free/busy list: %s"
-msgstr "ä¸?è?½å??å¾?è¡?äº?æ??空é??/å¿?ç¢?æ¸?å?®ï¼?%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:355
+#: ../calendar/libedata-cal/e-data-cal-factory.c:353
#, c-format
msgid "Invalid URI"
msgstr "ç?¡æ??ç?? URI"
-#: ../calendar/libedata-cal/e-data-cal-factory.c:370
+#: ../calendar/libedata-cal/e-data-cal-factory.c:371
#, 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:420
+#: ../calendar/libedata-cal/e-data-cal-factory.c:421
#, c-format
msgid "Could not instantiate backend"
msgstr "ç?¡æ³?實é«?å??å¾?端ç¨?å¼?"
@@ -1874,10 +1875,10 @@ msgstr "è¤?製è³?æ??夾å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥"
# camel/camel-disco-store.c:271
#: ../camel/camel-disco-store.c:395
#: ../camel/providers/groupwise/camel-groupwise-store.c:230
-#: ../camel/providers/imap/camel-imap-store.c:895
-#: ../camel/providers/imap/camel-imap-store.c:1739
-#: ../camel/providers/imap/camel-imap-store.c:2197
-#: ../camel/providers/imap/camel-imap-store.c:3041
+#: ../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-store.c:185
#: ../camel/providers/imapx/camel-imapx-store.c:709
#: ../camel/providers/imapx/camel-imapx-store.c:772
@@ -1897,13 +1898,14 @@ msgstr "æ?¨å¿?é ?æ?¼ç·?ä¸?å·¥ä½?æ??è?½å®?æ??æ¤æ??ä½?"
#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
#: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
-#: ../camel/providers/imapx/camel-imapx-server.c:4677
-#: ../camel/providers/imapx/camel-imapx-server.c:4694
+#: ../camel/camel-tcp-stream-raw.c:250
+#: ../camel/providers/imapx/camel-imapx-server.c:4639
+#: ../camel/providers/imapx/camel-imapx-server.c:4656
#: ../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:487
+#: ../camel/providers/pop3/camel-pop3-store.c:466
#: ../libedataserverui/e-book-auth-util.c:229
#, c-format
msgid "Cancelled"
@@ -2563,77 +2565,77 @@ msgstr "伺æ??å?¨å??æ??å??å?«ä¸?å®?æ?´ç??æ??æ¬?è³?æ??"
msgid "Server response does not match"
msgstr "伺æ??å?¨å??æ??ä¸?符"
-#: ../camel/camel-sasl-gssapi.c:82
+#: ../camel/camel-sasl-gssapi.c:80
msgid "GSSAPI"
msgstr "GSSAPI"
# camel/camel-sasl-kerberos4.c:42
-#: ../camel/camel-sasl-gssapi.c:84
+#: ../camel/camel-sasl-gssapi.c:82
msgid "This option will connect to the server using Kerberos 5 authentication."
msgstr "é??å??é?¸é ?å°?æ??使ç?¨ Kerberos 5 é©?è?é?£ç·?è?³ä¼ºæ??å?¨ã??"
-#: ../camel/camel-sasl-gssapi.c:121
+#: ../camel/camel-sasl-gssapi.c:119
msgid ""
"The specified mechanism is not supported by the provided credential, or is "
"unrecognized by the implementation."
msgstr "æ??ä¾?ç??è?件ä¸?æ?¯æ?´æ??å®?ç??æ©?å?¶ï¼?æ??è??æ?¯å?·è¡?ç?¡æ³?辨è?ã??"
-#: ../camel/camel-sasl-gssapi.c:126
+#: ../camel/camel-sasl-gssapi.c:124
msgid "The provided target_name parameter was ill-formed."
msgstr "æ??ä¾?ç?? target_name å??æ?¸æ ¼å¼?é?¯èª¤ã??"
-#: ../camel/camel-sasl-gssapi.c:129
+#: ../camel/camel-sasl-gssapi.c:127
msgid ""
"The provided target_name parameter contained an invalid or unsupported type "
"of name."
msgstr "æ??ä¾?ç?? target_name å??æ?¸å??å?«ç?¡æ??æ??ä¸?æ?¯æ?´ç??å??稱é¡?å??ã??"
-#: ../camel/camel-sasl-gssapi.c:133
+#: ../camel/camel-sasl-gssapi.c:131
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:138
+#: ../camel/camel-sasl-gssapi.c:136
msgid ""
"The input_token contains an invalid signature, or a signature that could not "
"be verified."
msgstr "input_token å??å?«ç?¡æ??ç??ç°½ç« ï¼?æ??è??ç?¡æ³?確èª?ç??ç°½ç« ã??"
-#: ../camel/camel-sasl-gssapi.c:142
+#: ../camel/camel-sasl-gssapi.c:140
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:147
+#: ../camel/camel-sasl-gssapi.c:145
msgid "The supplied context handle did not refer to a valid context."
msgstr "æ??ä¾?ç??網路ä½?ç½®è?å?¥æ??æ¨?æ?ªå??ç?§æ??æ??ç??網路ä½?ç½®ã??"
-#: ../camel/camel-sasl-gssapi.c:150
+#: ../camel/camel-sasl-gssapi.c:148
msgid "The consistency checks performed on the input_token failed."
msgstr "å?¨ input_token å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
-#: ../camel/camel-sasl-gssapi.c:153
+#: ../camel/camel-sasl-gssapi.c:151
msgid "The consistency checks performed on the credential failed."
msgstr "å?¨è?件å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
-#: ../camel/camel-sasl-gssapi.c:156
+#: ../camel/camel-sasl-gssapi.c:154
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:162 ../camel/camel-sasl-gssapi.c:300
-#: ../camel/camel-sasl-gssapi.c:344 ../camel/camel-sasl-gssapi.c:361
-#: ../camel/providers/smtp/camel-smtp-transport.c:1192
+#: ../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:1171
#, c-format
msgid "Bad authentication response from server."
msgstr "ä¾?è?ªä¼ºæ??å?¨ç??ä¸?è?¯è¨±å?¯å??æ??ã??"
# mail/mail-config.glade.h:1
-#: ../camel/camel-sasl-gssapi.c:373
+#: ../camel/camel-sasl-gssapi.c:369
#, c-format
msgid "Unsupported security layer."
msgstr "ä¸?æ?¯æ?´ç??é¡?å??"
@@ -2718,7 +2720,7 @@ msgid "URL '%s' needs a path component"
msgstr "URLã??%sã??é??è¦? path å??件"
# camel/camel-session.c:479
-#: ../camel/camel-session.c:263
+#: ../camel/camel-session.c:261
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -2728,7 +2730,7 @@ msgstr ""
"%s"
# camel/providers/pop3/camel-pop3-store.c:361
-#: ../camel/camel-session.c:760
+#: ../camel/camel-session.c:758
#, c-format
msgid "Please enter the %s password for %s on host %s."
msgstr "è«?輸å?¥ %2$s æ?¼ä¸»æ©? %3$s ç?? %1$s å¯?碼ã??"
@@ -3004,7 +3006,86 @@ msgstr "å??æ?¶ç?"
msgid "Junk"
msgstr "å??å?¾é?µä»¶"
-#: ../camel/camel-tcp-stream-ssl.c:786
+#: ../camel/camel-tcp-stream-raw.c:809
+#, 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:815
+#, c-format
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "æ?¾ä¸?å?°å??é?©ç??é©?è?é¡?å??ï¼?代碼 0x%x"
+
+#: ../camel/camel-tcp-stream-raw.c:827
+msgid "General SOCKS server failure"
+msgstr "ä¸?è?¬æ?§ SOCKS 伺æ??å?¨å¤±æ??"
+
+#: ../camel/camel-tcp-stream-raw.c:828
+msgid "SOCKS server's rules do not allow connection"
+msgstr "SOCKS 伺æ??å?¨ç??è¦?å??ä¸?å??許é?£ç·?"
+
+#: ../camel/camel-tcp-stream-raw.c:829
+msgid "Network is unreachable from SOCKS server"
+msgstr "網路ç?¡æ³?é??é?? SOCKS 伺æ??å?¨å?°é??"
+
+#: ../camel/camel-tcp-stream-raw.c:830
+msgid "Host is unreachable from SOCKS server"
+msgstr "主æ©?ç?¡æ³?é??é?? SOCKS 伺æ??å?¨å?°é??"
+
+# camel/camel-remote-store.c:252
+#: ../camel/camel-tcp-stream-raw.c:831
+msgid "Connection refused"
+msgstr "é?£ç·?被æ??çµ?"
+
+#: ../camel/camel-tcp-stream-raw.c:832
+#, fuzzy
+msgid "Time-to-live expired"
+msgstr "è·³å¾?æ??å®?æ??é??"
+
+# shell/e-storage.c:477
+#: ../camel/camel-tcp-stream-raw.c:833
+msgid "Command not supported by SOCKS server"
+msgstr "SOCKS 伺æ??å?¨ä¸?æ?¯æ?´æ??令"
+
+# shell/e-storage.c:477
+#: ../camel/camel-tcp-stream-raw.c:834
+msgid "Address type not supported by SOCKS server"
+msgstr "SOCKS 伺æ??å?¨ä¸?æ?¯æ?´ä½?å??é¡?å??"
+
+# camel/providers/local/camel-mbox-summary.c:879
+#: ../camel/camel-tcp-stream-raw.c:835
+msgid "Unknown error from SOCKS server"
+msgstr "ä¾?è?ª SOCKS 伺æ??å?¨ç??ä¸?æ??é?¯èª¤"
+
+#: ../camel/camel-tcp-stream-raw.c:865
+#, 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:882
+#, c-format
+msgid "Incomplete reply from SOCKS server"
+msgstr "ä¾?è?ª SOCKS 伺æ??å?¨ç??ä¸?å®?æ?´å??è¦?"
+
+#: ../camel/camel-tcp-stream-raw.c:897
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "主æ©?å??稱太é?·ï¼?æ??å¤? 255 å?å??ï¼?"
+
+# camel/camel-sasl-kerberos4.c:218
+# camel/providers/imap/camel-imap-store.c:433
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:929 ../camel/camel-tcp-stream-raw.c:939
+#, c-format
+msgid "Invalid reply from proxy server"
+msgstr "å¾?代ç??伺æ??å?¨å?³å??ç?¡æ??ç??å??è¦?"
+
+#: ../camel/camel-tcp-stream-ssl.c:457
#, c-format
msgid ""
"Issuer: %s\n"
@@ -3017,18 +3098,18 @@ msgstr ""
"æ??ç´?æª?: %s\n"
"ç°½ç« : %s"
-#: ../camel/camel-tcp-stream-ssl.c:792
+#: ../camel/camel-tcp-stream-ssl.c:463
msgid "GOOD"
msgstr "�好"
-#: ../camel/camel-tcp-stream-ssl.c:792
+#: ../camel/camel-tcp-stream-ssl.c:463
msgid "BAD"
msgstr "��"
# camel/camel-tcp-stream-openssl.c:428
# camel/camel-tcp-stream-ssl.c:364
#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:796
+#: ../camel/camel-tcp-stream-ssl.c:467
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -3043,7 +3124,7 @@ msgstr ""
"\n"
"æ?¨æ?³è¦?æ?¥å??å??ï¼?"
-#: ../camel/camel-tcp-stream-ssl.c:840
+#: ../camel/camel-tcp-stream-ssl.c:511
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -3052,7 +3133,7 @@ msgstr ""
"æ??è?å??é¡?ï¼? %s\n"
"ç?¼ç?§è??ï¼? %s"
-#: ../camel/camel-tcp-stream-ssl.c:892
+#: ../camel/camel-tcp-stream-ssl.c:563
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -3061,7 +3142,7 @@ msgstr ""
"ä¸?æ£ç¢ºç??æ??è?網å??ï¼? %s\n"
"ç?¼ç?§è??ï¼? %s"
-#: ../camel/camel-tcp-stream-ssl.c:910
+#: ../camel/camel-tcp-stream-ssl.c:581
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -3070,7 +3151,7 @@ msgstr ""
"æ??è?å·²é?¾æ??ï¼? %s\n"
"ç?¼ç?§è??ï¼? %s"
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:598
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -3179,7 +3260,7 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼?"
# 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:2644
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2645
#, c-format
msgid "This message is not available in offline mode."
msgstr "é??å°?é?µä»¶ç?¡æ³?å?¨é?¢ç·?模å¼?ä¸?使ç?¨ã??"
@@ -3209,18 +3290,18 @@ msgstr "檢æ?¥å?ªé?¤ç??é?µä»¶ %s"
#: ../camel/providers/groupwise/camel-groupwise-folder.c:1637
#: ../camel/providers/groupwise/camel-groupwise-store.c:654
#: ../camel/providers/groupwise/camel-groupwise-store.c:779
-#: ../camel/providers/imap/camel-imap-folder.c:3806
-#: ../camel/providers/imap/camel-imap-folder.c:3884
-#: ../camel/providers/imapx/camel-imapx-server.c:3720
-#: ../camel/providers/imapx/camel-imapx-server.c:3844
+#: ../camel/providers/imap/camel-imap-folder.c:3814
+#: ../camel/providers/imap/camel-imap-folder.c:3892
+#: ../camel/providers/imapx/camel-imapx-server.c:3704
+#: ../camel/providers/imapx/camel-imapx-server.c:3828
#, 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:2474
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2524
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2475
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2525
#, c-format
msgid "Cannot append message to folder '%s': %s"
msgstr "ä¸?è?½å°?é?µä»¶å?²å?è?³è³?æ??夾ã??%sã??ï¼?%s"
@@ -3232,7 +3313,7 @@ msgstr "ä¸?è?½å°?é?µä»¶å?²å?è?³è³?æ??夾ã??%sã??ï¼?%s"
# camel/providers/local/camel-mh-folder.c:185
# camel/providers/local/camel-mh-folder.c:194
# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2510
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2511
#, c-format
msgid "Cannot create message: %s"
msgstr "��建��件� %s"
@@ -3345,8 +3426,8 @@ 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:1207
-#: ../camel/providers/imapx/camel-imapx-server.c:2974
+#: ../camel/providers/imap/camel-imap-store.c:1188
+#: ../camel/providers/imapx/camel-imapx-server.c:2958
#, c-format
msgid "You did not enter a password."
msgstr "æ?¨æ²?æ??輸å?¥å¯?碼ã??"
@@ -3358,8 +3439,8 @@ 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:1776
-#: ../camel/providers/imap/camel-imap-store.c:1971
+#: ../camel/providers/imap/camel-imap-store.c:1757
+#: ../camel/providers/imap/camel-imap-store.c:1952
#: ../camel/providers/imapx/camel-imapx-store.c:410
#, c-format
msgid "No such folder %s"
@@ -3379,8 +3460,8 @@ msgid "Cannot create a special system folder"
msgstr "ä¸?è?½å»ºç«?ç?¹æ®?ç??系統è³?æ??夾"
#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
-#: ../camel/providers/imap/camel-imap-store.c:1854
-#: ../camel/providers/imap/camel-imap-store.c:2276
+#: ../camel/providers/imap/camel-imap-store.c:1835
+#: ../camel/providers/imap/camel-imap-store.c:2257
#: ../camel/providers/imapx/camel-imapx-store.c:873
#, c-format
msgid "The parent folder is not allowed to contain subfolders"
@@ -3522,7 +3603,7 @@ msgstr "ç?¡æ³?建ç«?ç?®é?? %sï¼?%s"
# mail/mail-ops.c:1649
#: ../camel/providers/imap/camel-imap-folder.c:960
-#: ../camel/providers/imapx/camel-imapx-server.c:3759
+#: ../camel/providers/imapx/camel-imapx-server.c:3743
#, c-format
msgid "Scanning for changed messages in %s"
msgstr "æ??æ?? %s ä¸è®?æ?´é??ç??é?µä»¶"
@@ -3540,7 +3621,7 @@ msgstr "ç?¡æ³?å??å??é?µä»¶ï¼?"
# 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:4956
+#: ../camel/providers/imapx/camel-imapx-server.c:4918
#, c-format
msgid "Cannot get message with message ID %s: %s"
msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
@@ -3549,32 +3630,32 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
# 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:4957
+#: ../camel/providers/imapx/camel-imapx-server.c:4919
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:3337
-#: ../camel/providers/imap/camel-imap-folder.c:4203
+#: ../camel/providers/imap/camel-imap-folder.c:3341
+#: ../camel/providers/imap/camel-imap-folder.c:4211
#: ../camel/providers/nntp/camel-nntp-folder.c:326
#, c-format
msgid "This message is not currently available"
msgstr "é??å°?é?µä»¶ç?®å??ä»?æ?ªå?¯ç?¨"
-#: ../camel/providers/imap/camel-imap-folder.c:4013
+#: ../camel/providers/imap/camel-imap-folder.c:4021
#, c-format
msgid "Incomplete server response: no information provided for message %d"
msgstr "ä¸?å®?æ?´ç??伺æ??å?¨å??æ??ï¼?æ?ªæ??ä¾?ä»»ä½?è³?è¨?給è¨?æ?¯ %d"
-#: ../camel/providers/imap/camel-imap-folder.c:4023
+#: ../camel/providers/imap/camel-imap-folder.c:4031
#, 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:4243
+#: ../camel/providers/imap/camel-imap-folder.c:4251
#, c-format
msgid "Could not find message body in FETCH response."
msgstr "å?¨ FETCH ç??å??æ??å?§æ?¾ä¸?å?°é?µä»¶ç??å?§æ??ã??"
@@ -3713,7 +3794,7 @@ 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:446
+#: ../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
@@ -3721,7 +3802,7 @@ msgstr "%s ç?? IMAP æ??å??æ?¼ %s"
msgid "Could not connect to %s: %s"
msgstr "����� %s�%s"
-#: ../camel/providers/imap/camel-imap-store.c:447
+#: ../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
@@ -3730,61 +3811,61 @@ msgstr "SSL ��使�"
# camel/camel-remote-store.c:255
# camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:465
+#: ../camel/providers/imap/camel-imap-store.c:466
#: ../camel/providers/nntp/camel-nntp-store.c:252
#, 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:571
-#: ../camel/providers/imap/camel-imap-store.c:591
-#: ../camel/providers/imap/camel-imap-store.c:598
-#: ../camel/providers/imap/camel-imap-store.c:625
-#: ../camel/providers/imapx/camel-imapx-server.c:2827
-#: ../camel/providers/imapx/camel-imapx-server.c:2863
+#: ../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:2811
+#: ../camel/providers/imapx/camel-imapx-server.c:2847
#, 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:572
-#: ../camel/providers/imapx/camel-imapx-server.c:2828
+#: ../camel/providers/imap/camel-imap-store.c:573
+#: ../camel/providers/imapx/camel-imapx-server.c:2812
#: ../camel/providers/smtp/camel-smtp-transport.c:295
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:592
-#: ../camel/providers/imapx/camel-imapx-server.c:2864
+#: ../camel/providers/imap/camel-imap-store.c:593
+#: ../camel/providers/imapx/camel-imapx-server.c:2848
msgid "SSL negotiations failed"
msgstr "SSL å??å??失æ??"
-#: ../camel/providers/imap/camel-imap-store.c:599
+#: ../camel/providers/imap/camel-imap-store.c:600
#: ../camel/providers/smtp/camel-smtp-transport.c:339
msgid "SSL is not available in this build"
msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ SSL"
# camel/camel-remote-store.c:252
-#: ../camel/providers/imap/camel-imap-store.c:747
-#: ../camel/providers/imapx/camel-imapx-server.c:2647
+#: ../camel/providers/imap/camel-imap-store.c:748
+#: ../camel/providers/imapx/camel-imapx-server.c:2648
#, 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:752
-#: ../camel/providers/imapx/camel-imapx-server.c:2652
+#: ../camel/providers/imap/camel-imap-store.c:753
+#: ../camel/providers/imapx/camel-imapx-server.c:2653
#, 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:945
-#: ../camel/providers/imap/camel-imap-store.c:2369
+#: ../camel/providers/imap/camel-imap-store.c:926
+#: ../camel/providers/imap/camel-imap-store.c:2350
#: ../camel/providers/imapx/camel-imapx-store.c:457
#: ../camel/providers/imapx/camel-imapx-store.c:1054
#: ../camel/providers/local/camel-maildir-folder.c:90
@@ -3797,24 +3878,24 @@ msgid "Inbox"
msgstr "�件�"
# camel/providers/imap/camel-imap-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1148
-#: ../camel/providers/imapx/camel-imapx-server.c:2930
+#: ../camel/providers/imap/camel-imap-store.c:1129
+#: ../camel/providers/imapx/camel-imapx-server.c:2914
#, 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:1160
-#: ../camel/providers/imapx/camel-imapx-server.c:2942
-#: ../camel/providers/smtp/camel-smtp-transport.c:483
+#: ../camel/providers/imap/camel-imap-store.c:1141
+#: ../camel/providers/imapx/camel-imapx-server.c:2926
+#: ../camel/providers/smtp/camel-smtp-transport.c:462
#, 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:1239
-#: ../camel/providers/imapx/camel-imapx-server.c:3012
+#: ../camel/providers/imap/camel-imap-store.c:1220
+#: ../camel/providers/imapx/camel-imapx-server.c:2996
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3825,8 +3906,8 @@ msgstr ""
"%s\n"
"\n"
-#: ../camel/providers/imap/camel-imap-store.c:1790
-#: ../camel/providers/imap/camel-imap-store.c:2212
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2193
#: ../camel/providers/imapx/camel-imapx-store.c:852
#, c-format
msgid ""
@@ -3835,7 +3916,7 @@ 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:1906
+#: ../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
@@ -3844,20 +3925,20 @@ msgid "Cannot create folder '%s': folder exists."
msgstr "ä¸?è?½å»ºç«?è³?æ??夾ã??%sã??ï¼?è³?æ??夾已å?å?¨ã??"
# camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/providers/imap/camel-imap-store.c:2225
+#: ../camel/providers/imap/camel-imap-store.c:2206
#: ../camel/providers/imapx/camel-imapx-store.c:863
#, c-format
msgid "Unknown parent folder: %s"
msgstr "ä¸?æ??ç??æ¯?è³?æ??夾ï¼? %s"
# camel/camel-remote-store.c:476
-#: ../camel/providers/imap/camel-imap-store.c:3081
+#: ../camel/providers/imap/camel-imap-store.c:3062
#, c-format
msgid "Server unexpectedly disconnected"
msgstr "伺æ??å?¨çª?ç?¶ä¸æ?·é?£ç·?"
# camel/camel-remote-store.c:476
-#: ../camel/providers/imap/camel-imap-store.c:3084
+#: ../camel/providers/imap/camel-imap-store.c:3065
msgid "Server unexpectedly disconnected: "
msgstr "伺æ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼?"
@@ -3906,14 +3987,14 @@ msgid "Error writing to cache stream: "
msgstr "寫å?¥å¿«å??串æµ?æ??ç?¼ç??é?¯èª¤ï¼?"
# camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/imapx/camel-imapx-server.c:2007
+#: ../camel/providers/imapx/camel-imapx-server.c:2008
#, 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:2755
+#: ../camel/providers/imapx/camel-imapx-server.c:2739
#, c-format
msgid "Could not connect to %s (port %s): "
msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼?"
@@ -3922,7 +4003,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:3184
+#: ../camel/providers/imapx/camel-imapx-server.c:3168
msgid "Closing tmp stream failed: "
msgstr "ç?¡æ³?é??é?? tmp 串æµ?ï¼?"
@@ -3933,7 +4014,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:5080
+#: ../camel/providers/imapx/camel-imapx-server.c:5042
#, c-format
msgid "Cannot create spool file: %s"
msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?%s"
@@ -3945,14 +4026,14 @@ 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:5095
+#: ../camel/providers/imapx/camel-imapx-server.c:5057
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:426
-#: ../camel/providers/nntp/camel-nntp-store.c:1529
+#: ../camel/providers/nntp/camel-nntp-store.c:1510
#, c-format
msgid "No such folder: %s"
msgstr "æ²?æ??é??å??è³?æ??夾ï¼? %s"
@@ -3993,7 +4074,7 @@ 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:683
+#: ../camel/providers/local/camel-local-folder.c:686
#, c-format
msgid ""
"Cannot get message %s from folder %s\n"
@@ -4242,8 +4323,8 @@ msgstr "檢���件"
# 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:669
-#: ../camel/providers/local/camel-mbox-summary.c:799
+#: ../camel/providers/local/camel-mbox-summary.c:679
+#: ../camel/providers/local/camel-mbox-summary.c:809
#: ../camel/providers/local/camel-spool-summary.c:130
msgid "Storing folder"
msgstr "å?²å?è³?æ??夾"
@@ -4362,27 +4443,28 @@ 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:524
-msgid "Fatal mail parser error near position %"
-msgstr "ç?¼ç??å?´é??ç??é?µä»¶å??æ??é?¯èª¤ï¼?é? è¿?ä½?ç½® %"
+#: ../camel/providers/local/camel-mbox-summary.c:533
+#, 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:605
+#: ../camel/providers/local/camel-mbox-summary.c:615
#, 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:676
-#: ../camel/providers/local/camel-mbox-summary.c:806
+#: ../camel/providers/local/camel-mbox-summary.c:686
+#: ../camel/providers/local/camel-mbox-summary.c:816
#: ../camel/providers/local/camel-spool-summary.c:137
#, 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:690
+#: ../camel/providers/local/camel-mbox-summary.c:700
#: ../camel/providers/local/camel-spool-summary.c:152
#, c-format
msgid "Cannot open temporary mailbox: %s"
@@ -4390,27 +4472,27 @@ msgstr "ä¸?è?½é??å??æ?«å? mailboxï¼?%s"
# camel/providers/local/camel-mbox-summary.c:635
# camel/providers/local/camel-mbox-summary.c:804
-#: ../camel/providers/local/camel-mbox-summary.c:705
-#: ../camel/providers/local/camel-mbox-summary.c:923
+#: ../camel/providers/local/camel-mbox-summary.c:715
+#: ../camel/providers/local/camel-mbox-summary.c:933
#, 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:716
+#: ../camel/providers/local/camel-mbox-summary.c:726
#, 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:733
+#: ../camel/providers/local/camel-mbox-summary.c:743
#, 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:819
-#: ../camel/providers/local/camel-mbox-summary.c:1061
+#: ../camel/providers/local/camel-mbox-summary.c:829
+#: ../camel/providers/local/camel-mbox-summary.c:1071
#, c-format
msgid "Could not store folder: %s"
msgstr "ç?¡æ³?å?²å?è³?æ??夾ï¼?%s "
@@ -4419,30 +4501,30 @@ msgstr "ç?¡æ³?å?²å?è³?æ??夾ï¼?%s "
# camel/providers/local/camel-mbox-summary.c:557
# camel/providers/local/camel-mbox-summary.c:746
# camel/providers/local/camel-mbox-summary.c:754
-#: ../camel/providers/local/camel-mbox-summary.c:860
-#: ../camel/providers/local/camel-mbox-summary.c:869
-#: ../camel/providers/local/camel-mbox-summary.c:1094
-#: ../camel/providers/local/camel-mbox-summary.c:1103
+#: ../camel/providers/local/camel-mbox-summary.c:870
+#: ../camel/providers/local/camel-mbox-summary.c:879
+#: ../camel/providers/local/camel-mbox-summary.c:1104
+#: ../camel/providers/local/camel-mbox-summary.c:1113
#, 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:1020
+#: ../camel/providers/local/camel-mbox-summary.c:1030
#: ../camel/providers/local/camel-spool-summary.c:337
#, c-format
msgid "Unknown error: %s"
msgstr "ä¸?æ??ç??é?¯èª¤ï¼? %s"
# camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1173
-#: ../camel/providers/local/camel-mbox-summary.c:1203
+#: ../camel/providers/local/camel-mbox-summary.c:1183
+#: ../camel/providers/local/camel-mbox-summary.c:1213
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr "寫å?¥æ?«å?é?µç®±å¤±æ??ï¼? %s"
# camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1192
+#: ../camel/providers/local/camel-mbox-summary.c:1202
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr "寫å?¥æ?«å?é?µç®±å¤±æ??ï¼? %sï¼? %s"
@@ -4674,13 +4756,13 @@ 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:453
+#: ../camel/providers/nntp/camel-nntp-store.c:434
#, c-format
msgid "USENET News via %s"
msgstr "ç¶?ç?± %s ç?? USENET æ?°è??"
# mail/mail-ops.c:1755
-#: ../camel/providers/nntp/camel-nntp-store.c:946
+#: ../camel/providers/nntp/camel-nntp-store.c:927
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -4691,7 +4773,7 @@ msgstr ""
"\n"
"%s"
-#: ../camel/providers/nntp/camel-nntp-store.c:1043
+#: ../camel/providers/nntp/camel-nntp-store.c:1024
#, c-format
msgid ""
"You cannot subscribe to this newsgroup:\n"
@@ -4702,7 +4784,7 @@ msgstr ""
"\n"
"æ²?æ??é¡?ä¼¼ç??æ?°è??群çµ?ã??é?¸å??ç??é ?ç?®å?¯è?½æ?¯ç?¶ä»£è³?æ??夾ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1083
+#: ../camel/providers/nntp/camel-nntp-store.c:1064
#, c-format
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
@@ -4713,41 +4795,41 @@ msgstr ""
"\n"
"æ?°è??群çµ?ä¸?å?å?¨ï¼?"
-#: ../camel/providers/nntp/camel-nntp-store.c:1113
+#: ../camel/providers/nntp/camel-nntp-store.c:1094
#, 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:1125
+#: ../camel/providers/nntp/camel-nntp-store.c:1106
#, c-format
msgid "You cannot rename a folder in a News store."
msgstr "æ?¨ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??é??æ?°å?½å??è³?æ??夾ã??"
-#: ../camel/providers/nntp/camel-nntp-store.c:1138
+#: ../camel/providers/nntp/camel-nntp-store.c:1119
#, 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:1276
+#: ../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:1288
+#: ../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:1414
+#: ../camel/providers/nntp/camel-nntp-store.c:1395
msgid "NNTP Command failed: "
msgstr "NNTP æ??令失æ??ï¼?"
# ui/evolution-addressbook.xml.h:17
-#: ../camel/providers/nntp/camel-nntp-store.c:1472
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
#, c-format
msgid "Not connected."
msgstr "æ?ªé?£ç·?ã??"
@@ -4914,8 +4996,8 @@ 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:321
-#: ../camel/providers/pop3/camel-pop3-store.c:473
+#: ../camel/providers/pop3/camel-pop3-store.c:300
+#: ../camel/providers/pop3/camel-pop3-store.c:452
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -4923,23 +5005,23 @@ msgid ""
msgstr "ç?¡æ³?é?£ç·?å?° POP 伺æ??å?¨ %sï¼?ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?æ©?å?¶ã??"
#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:344
+#: ../camel/providers/pop3/camel-pop3-store.c:323
#, 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:361
+#: ../camel/providers/pop3/camel-pop3-store.c:340
#, 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:378
+#: ../camel/providers/pop3/camel-pop3-store.c:357
#, c-format
msgid "Failed to authenticate on POP server %s: "
msgstr "ç?¡æ³?é©?è? POP 伺æ??å?¨ %sï¼?"
-#: ../camel/providers/pop3/camel-pop3-store.c:442
+#: ../camel/providers/pop3/camel-pop3-store.c:421
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4949,7 +5031,7 @@ msgstr ""
"è?¯çµ¡æ?¨ç??系統管ç??è??ã??"
# camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:492
+#: ../camel/providers/pop3/camel-pop3-store.c:471
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4960,7 +5042,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:505
+#: ../camel/providers/pop3/camel-pop3-store.c:484
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4971,7 +5053,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:518
+#: ../camel/providers/pop3/camel-pop3-store.c:497
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -4981,30 +5063,30 @@ msgstr ""
"å?³é??å¯?碼æ??ç?¼ç??é?¯èª¤%s"
# camel/providers/pop3/camel-pop3-store.c:322
-#: ../camel/providers/pop3/camel-pop3-store.c:674
+#: ../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:687
+#: ../camel/providers/pop3/camel-pop3-store.c:666
#, c-format
msgid "POP3 server %s"
msgstr "POP3 伺æ??å?¨ %s"
# camel/camel-remote-store.c:195
-#: ../camel/providers/pop3/camel-pop3-store.c:691
+#: ../camel/providers/pop3/camel-pop3-store.c:670
#, c-format
msgid "POP3 server for %s on %s"
msgstr "%s å?¨ %s ç?? POP3 伺æ??å?¨"
# camel/providers/pop3/camel-pop3-store.c:484
-#: ../camel/providers/pop3/camel-pop3-store.c:706
+#: ../camel/providers/pop3/camel-pop3-store.c:685
#, c-format
msgid "No such folder '%s'."
msgstr "æ²?æ??é??å??è³?æ??夾ã??%sã??ã??"
-#: ../camel/providers/pop3/camel-pop3-store.c:730
+#: ../camel/providers/pop3/camel-pop3-store.c:709
#, c-format
msgid "POP3 stores have no folder hierarchy"
msgstr "POP3 å?²å?å??æ²?æ??è³?æ??夾é??層"
@@ -5226,13 +5308,13 @@ msgid "STARTTLS command failed: "
msgstr "STARTTLS æ??令失æ??ï¼?"
# camel/providers/smtp/camel-smtp-transport.c:356
-#: ../camel/providers/smtp/camel-smtp-transport.c:471
+#: ../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:547
+#: ../camel/providers/smtp/camel-smtp-transport.c:526
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -5244,210 +5326,210 @@ msgstr ""
"\n"
# camel/providers/smtp/camel-smtp-transport.c:534
-#: ../camel/providers/smtp/camel-smtp-transport.c:685
+#: ../camel/providers/smtp/camel-smtp-transport.c:664
#, c-format
msgid "SMTP server %s"
msgstr "SMTP 伺æ??å?¨ %s"
# camel/providers/smtp/camel-smtp-transport.c:536
-#: ../camel/providers/smtp/camel-smtp-transport.c:687
+#: ../camel/providers/smtp/camel-smtp-transport.c:666
#, 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:707
+#: ../camel/providers/smtp/camel-smtp-transport.c:686
#, 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:714
+#: ../camel/providers/smtp/camel-smtp-transport.c:693
#, c-format
msgid "Cannot send message: sender address not valid."
msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?å¯?件è??ç??å?°å??ç?¡æ??ã??"
# mail/mail-ops.c:603
-#: ../camel/providers/smtp/camel-smtp-transport.c:718
+#: ../camel/providers/smtp/camel-smtp-transport.c:697
msgid "Sending message"
msgstr "å?³é??é?µä»¶"
# camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:734
+#: ../camel/providers/smtp/camel-smtp-transport.c:713
#, 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:746
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
#, 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:982
+#: ../camel/providers/smtp/camel-smtp-transport.c:961
msgid "SMTP Greeting"
msgstr "SMTP è¿?æ?¥"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1006
-#: ../camel/providers/smtp/camel-smtp-transport.c:1021
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
+#: ../camel/providers/smtp/camel-smtp-transport.c:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:1000
+#: ../camel/providers/smtp/camel-smtp-transport.c:1007
msgid "HELO command failed: "
msgstr "HELO æ??令失æ??ï¼?"
# mail/mail-config.glade.h:10
-#: ../camel/providers/smtp/camel-smtp-transport.c:1095
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
msgid "SMTP Authentication"
msgstr "SMTP é©?è?"
# camel/providers/smtp/camel-smtp-transport.c:728
-#: ../camel/providers/smtp/camel-smtp-transport.c:1102
+#: ../camel/providers/smtp/camel-smtp-transport.c:1081
#, 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:1118
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
-#: ../camel/providers/smtp/camel-smtp-transport.c:1136
+#: ../camel/providers/smtp/camel-smtp-transport.c:1097
+#: ../camel/providers/smtp/camel-smtp-transport.c:1107
+#: ../camel/providers/smtp/camel-smtp-transport.c:1115
msgid "AUTH command failed: "
msgstr "AUTH æ??令失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1233
-#: ../camel/providers/smtp/camel-smtp-transport.c:1245
-#: ../camel/providers/smtp/camel-smtp-transport.c:1252
+#: ../camel/providers/smtp/camel-smtp-transport.c:1212
+#: ../camel/providers/smtp/camel-smtp-transport.c:1224
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
msgid "MAIL FROM command failed: "
msgstr "MAIL FROM æ??令失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1275
+#: ../camel/providers/smtp/camel-smtp-transport.c:1254
msgid "RCPT TO command failed: "
msgstr "RCPT TO æ??令失æ??ï¼?"
-#: ../camel/providers/smtp/camel-smtp-transport.c:1289
-#: ../camel/providers/smtp/camel-smtp-transport.c:1297
+#: ../camel/providers/smtp/camel-smtp-transport.c:1268
+#: ../camel/providers/smtp/camel-smtp-transport.c:1276
#, 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:1335
-#: ../camel/providers/smtp/camel-smtp-transport.c:1344
-#: ../camel/providers/smtp/camel-smtp-transport.c:1354
-#: ../camel/providers/smtp/camel-smtp-transport.c:1411
-#: ../camel/providers/smtp/camel-smtp-transport.c:1427
-#: ../camel/providers/smtp/camel-smtp-transport.c:1438
-#: ../camel/providers/smtp/camel-smtp-transport.c:1445
+#: ../camel/providers/smtp/camel-smtp-transport.c:1314
+#: ../camel/providers/smtp/camel-smtp-transport.c:1323
+#: ../camel/providers/smtp/camel-smtp-transport.c:1333
+#: ../camel/providers/smtp/camel-smtp-transport.c:1390
+#: ../camel/providers/smtp/camel-smtp-transport.c:1406
+#: ../camel/providers/smtp/camel-smtp-transport.c:1417
+#: ../camel/providers/smtp/camel-smtp-transport.c:1424
msgid "DATA command failed: "
msgstr "DATA æ??令失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1467
-#: ../camel/providers/smtp/camel-smtp-transport.c:1479
-#: ../camel/providers/smtp/camel-smtp-transport.c:1486
+#: ../camel/providers/smtp/camel-smtp-transport.c:1446
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1465
msgid "RSET command failed: "
msgstr "RSET æ??令失æ??ï¼?"
# camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1508
-#: ../camel/providers/smtp/camel-smtp-transport.c:1521
-#: ../camel/providers/smtp/camel-smtp-transport.c:1527
+#: ../camel/providers/smtp/camel-smtp-transport.c:1487
+#: ../camel/providers/smtp/camel-smtp-transport.c:1500
+#: ../camel/providers/smtp/camel-smtp-transport.c:1506
msgid "QUIT command failed: "
msgstr "QUIT æ??令失æ??ï¼?"
# addressbook/contact-editor/e-contact-editor.c:1243
# addressbook/contact-editor/e-contact-editor.c:1310
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:46
msgid "Business"
msgstr "å??å??é?»è©±"
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:47
msgid "Competition"
msgstr "競ç?è??"
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:48
msgid "Favorites"
msgstr "å??æ??ç??"
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:49
msgid "Gifts"
msgstr "禮�"
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:50
msgid "Goals/Objectives"
msgstr "��/��"
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:51
msgid "Holiday"
msgstr "å??æ?¥"
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:52
msgid "Holiday Cards"
msgstr "å??æ?¥é??è«?å?¡"
# ui/evolution-addressbook.xml.h:17
#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:54
msgid "Hot Contacts"
msgstr "ç?±é??é?£çµ¡äºº"
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:55
msgid "Ideas"
msgstr "å?µæ??"
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:56
msgid "International"
msgstr "å??é??ç??"
# ui/evolution-event-editor.xml.h:15
# ui/evolution-task-editor-dialog.xml.h:16
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:57
msgid "Key Customer"
msgstr "é??é?µå®¢æ?¶"
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:58
msgid "Miscellaneous"
msgstr "é??é ?"
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:59
msgid "Personal"
msgstr "å??人"
# calendar/gui/e-meeting-dialog.glade.h:21
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:60
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:61
+#: ../libedataserver/e-categories.c:62
msgid "Status"
msgstr "ç??æ??"
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:63
msgid "Strategies"
msgstr "ç?ç?¥"
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:64
msgid "Suppliers"
msgstr "ä¾?æ??å??"
# addressbook/backend/ebook/e-card.c:3434
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:65
msgid "Time & Expenses"
msgstr "æ??é??è??é??é?·"
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:66
msgid "VIP"
msgstr "VIP"
# mail/mail-send-recv.c:287
# mail/mail-send-recv.c:333
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:67
msgid "Waiting"
msgstr "æ£å?¨ç?å¾?"
@@ -5626,10 +5708,12 @@ msgid "%I %p"
msgstr "%I %p"
#: ../libedataserverui/e-book-auth-util.c:93
+#: ../libedataserverui/e-book-auth-util.c:665
msgid "Accessing LDAP Server anonymously"
msgstr "æ£ä»¥å?¿å??æ?¹å¼?å?å?? LDAP 伺æ??å?¨"
#: ../libedataserverui/e-book-auth-util.c:199
+#: ../libedataserverui/e-book-auth-util.c:430
msgid "Failed to authenticate.\n"
msgstr "é©?è?æ??è?失æ??ã??\n"
@@ -5642,19 +5726,19 @@ msgstr "å??é¡?å??示"
msgid "_No Image"
msgstr "æ²?æ??å??ç??(_N)"
-#: ../libedataserverui/e-categories-dialog.c:372
+#: ../libedataserverui/e-categories-dialog.c:368
#, c-format
msgid ""
"There is already a category '%s' in the configuration. Please use another "
"name"
msgstr "å?¨çµ?æ??ä¸å·²ç¶?æ??å??ç?ºã??%sã??ç??å??é¡?ã??è«?使ç?¨å?¦å¤?ç??å??稱"
-#: ../libedataserverui/e-categories-dialog.c:680
+#: ../libedataserverui/e-categories-dialog.c:676
msgid "Icon"
msgstr "å??示"
# calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-categories-dialog.c:685
+#: ../libedataserverui/e-categories-dialog.c:681
msgid "Category"
msgstr "å??é¡?"
@@ -5711,7 +5795,7 @@ msgid "_Remove"
msgstr "移�(_R)"
# calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.c:858
+#: ../libedataserverui/e-name-selector-dialog.c:890
#: ../libedataserverui/e-name-selector-dialog.ui.h:6
msgid "Any Category"
msgstr "ä»»ä½?å??é¡?"
@@ -5756,25 +5840,25 @@ msgid "_Search:"
msgstr "æ??å°?(_S):"
#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2559
+#: ../libedataserverui/e-name-selector-entry.c:2617
#, c-format
msgid "E_xpand %s Inline"
msgstr "å±?é??è¡?å?§ %s"
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2574
+#: ../libedataserverui/e-name-selector-entry.c:2632
#, c-format
msgid "Cop_y %s"
msgstr "�製(_Y) %s"
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2584
+#: ../libedataserverui/e-name-selector-entry.c:2642
#, c-format
msgid "C_ut %s"
msgstr "��(_U) %s"
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2601
+#: ../libedataserverui/e-name-selector-entry.c:2659
#, c-format
msgid "_Edit %s"
msgstr "編輯 %s(_E)"
@@ -5789,23 +5873,23 @@ msgstr "��(_D) %s"
msgid "Keyring key is unusable: no user or host name"
msgstr "é?°å??å??é??é?°ç?¡æ³?使ç?¨ï¼?æ²?æ??使ç?¨è??æ??主æ©?å??稱"
-#: ../libedataserverui/e-passwords.c:1116
+#: ../libedataserverui/e-passwords.c:1120
msgid "You have the Caps Lock key on."
msgstr "æ?¨ç?? Caps Lock æ?¯é??å??ç??ã??"
-#: ../libedataserverui/e-passwords.c:1238
+#: ../libedataserverui/e-passwords.c:1241
msgid "_Remember this passphrase"
msgstr "è¨?ä½?é??å??å¯?èª?(_R)"
-#: ../libedataserverui/e-passwords.c:1239
+#: ../libedataserverui/e-passwords.c:1242
msgid "_Remember this passphrase for the remainder of this session"
msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??段ç??å¯?èª?(_R)"
-#: ../libedataserverui/e-passwords.c:1244
+#: ../libedataserverui/e-passwords.c:1247
msgid "_Remember this password"
msgstr "è¨?ä½?é??å??å¯?碼(_R)"
-#: ../libedataserverui/e-passwords.c:1245
+#: ../libedataserverui/e-passwords.c:1248
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]
