[evolution-data-server] Updated Japanese translation.

From: Takayuki Kusano <kusano src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Updated Japanese translation.
Date: Sun, 12 Sep 2010 14:12:40 +0000 (UTC)
commit 300fb49008025ba1d38d5c51c6f5ab80e33046ee
Author: Kiyotaka NISHIBORI <nl nishibori kiyotaka gmail com>
Date:   Sun Sep 12 23:12:28 2010 +0900

    Updated Japanese translation.

 po/ja.po | 4925 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 2625 insertions(+), 2300 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index a695318..710fe09 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,191 +1,116 @@
 # evolution-data-server ja.po.
-# Copyright (C) 2000-2009 Free Software Foundation, Inc.
+# Copyright (C) 2000-2010 Free Software Foundation, Inc.
 # Akira TAGOH <tagoh gnome gr jp>, 2000-2001.
 # Yukihiro Nakai <nakai gnome gr jp>, 2001.
 # Takuo KITAME <kitame debian org>, 2001.
 # Takeshi AIHANA <takeshi aihana gmail com>, 2001-2009.
 # Satoru SATOH <ss gnome gr jp>, 2006.
-# Takayuki KUSANO <AE5T-KSN asahi-net or jp>, 2009.
+# Takayuki KUSANO <AE5T-KSN asahi-net or jp>, 2009, 2010.
+# Kiyotaka NISHIBORI <nl nishibori kiyotaka gmail com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution-data-server&component=general\n"
-"POT-Creation-Date: 2009-09-16 22:53+0900\n"
-"PO-Revision-Date: 2009-09-16 22:54+0900\n"
-"Last-Translator: Takayuki KUSANO <AE5T-KSN asahi-net or jp>\n"
+"product=evolution-data-server&component=Misc.\n"
+"POT-Creation-Date: 2010-09-12 10:34+0000\n"
+"PO-Revision-Date: 2010-09-12 22:08+0900\n"
+"Last-Translator: Kiyotaka NISHIBORI <nl nishibori kiyotaka gmail com>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2329
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../addressbook/backends/file/e-book-backend-file.c:570
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
 msgstr "èªã?¿è¾¼ã?¿ä¸..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2260
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2282
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2327
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/file/e-book-backend-file.c:573
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4482
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "æ¤?ç´¢ä¸..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2695
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4641
 #, c-format
 msgid "Downloading contacts (%d)... "
-msgstr "é?£çµ¡å?? (%då??) ã?®ã??ã?¦ã?³ã?ã?¼ã??ä¸..."
+msgstr "é?£çµ¡å?? (%d å??ç?®) ã??ã??ã?¦ã?³ã?ã?¼ã??ä¸... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2844
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3072
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3030
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3077
 #, c-format
 msgid "Updating contacts cache (%d)... "
-msgstr "é?£çµ¡å??ã?®ã?ã?£ã??ã?·ã?¥æ??å ± (%då??) ã?®æ?´æ?°ä¸..."
+msgstr "é?£çµ¡å??ã?®ã?ã?£ã??ã?·ã?¥æ??å ± (%d å??ç?®) ã??æ?´æ?°ä¸... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:788
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+msgid "Not connected"
+msgstr "æ?¥ç¶?ã??ã?¦ã??ã?¾ã??ã??"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
 msgid "Using Distinguished Name (DN)"
 msgstr "è?å?¥å?? (DN) ã??ä½¿ç?¨ã??ã??"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
 msgid "Using Email Address"
 msgstr "E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã??ä½¿ç?¨ã??ã??"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP ã?µã?¼ã??ã?¸å??æ?¥ç¶?ä¸..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+msgid "Invalid DN syntax"
+msgstr "ç?¡å?¹ã?ªè?å?¥å?? (DN)"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1663
 msgid "Adding contact to LDAP server..."
-msgstr "LDAP ã?µã?¼ã??ã?¸é?£çµ¡å??ã?®è¿½å? ä¸..."
+msgstr "LDAP ã?µã?¼ã??ã?¸é?£çµ¡å??ã??è¿½å? ä¸..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1795
 msgid "Removing contact from LDAP server..."
-msgstr "LDP ã?µã?¼ã??ã??ã??é?£çµ¡å??ã?®å??é?¤ä¸..."
+msgstr "LDAP ã?µã?¼ã??ã??ã??é?£çµ¡å??ã??å??é?¤ä¸..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2229
 msgid "Modifying contact from LDAP server..."
-msgstr "LDAP ã?µã?¼ã??ã?«ã??ã??é?£çµ¡å??ã?®ä¿®æ£ä¸..."
+msgstr "LDAP ã?µã?¼ã??ã?«ã??ã??é?£çµ¡å??ã??ä¿®æ£ä¸..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4332
 msgid "Receiving LDAP search results..."
-msgstr "LDAP ã?µã?¼ã??æ¤?ç´¢çµ?æ??ã?®å??å¾?ä¸..."
+msgstr "LDAP ã?µã?¼ã??æ¤?ç´¢çµ?æ??ã??å??å¾?ä¸..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4504
 msgid "Error performing search"
 msgstr "æ¤?ç´¢ä¸ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
 
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: ../addressbook/libebook/e-book.c:287 ../addressbook/libebook/e-book.c:291
-#: ../addressbook/libebook/e-book.c:495 ../addressbook/libebook/e-book.c:499
-#: ../addressbook/libebook/e-book.c:637 ../addressbook/libebook/e-book.c:641
-#: ../addressbook/libebook/e-book.c:727 ../addressbook/libebook/e-book.c:731
-#: ../addressbook/libebook/e-book.c:1024 ../addressbook/libebook/e-book.c:1029
-#: ../addressbook/libebook/e-book.c:1206 ../addressbook/libebook/e-book.c:1210
-#: ../addressbook/libebook/e-book.c:1365 ../addressbook/libebook/e-book.c:1369
-#: ../addressbook/libebook/e-book.c:1570 ../addressbook/libebook/e-book.c:1574
-#: ../addressbook/libebook/e-book.c:1813 ../addressbook/libebook/e-book.c:1817
-#: ../addressbook/libebook/e-book.c:2050 ../addressbook/libebook/e-book.c:2054
-#: ../addressbook/libebook/e-book.c:2257 ../addressbook/libebook/e-book.c:2261
-#: ../addressbook/libebook/e-book.c:3445
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "\"%2$s\" ã?®å??ã?«ã??ã??ã??ã??ã?¯ã?® \"%1$s\""
-
-#: ../addressbook/libebook/e-book.c:300 ../addressbook/libebook/e-book.c:508
-#: ../addressbook/libebook/e-book.c:650 ../addressbook/libebook/e-book.c:740
-#: ../addressbook/libebook/e-book.c:1039 ../addressbook/libebook/e-book.c:1220
-#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1583
-#: ../addressbook/libebook/e-book.c:1826 ../addressbook/libebook/e-book.c:2064
-#: ../addressbook/libebook/e-book.c:2270 ../addressbook/libebook/e-book.c:2679
-#: ../addressbook/libebook/e-book.c:2877
-#, c-format
-msgid "book busy"
-msgstr "ã??ã??ã?¯ã?¯å?¦ç??ä¸ã?§ã??"
-
-#: ../addressbook/libebook/e-book.c:331 ../addressbook/libebook/e-book.c:335
-#: ../addressbook/libebook/e-book.c:539 ../addressbook/libebook/e-book.c:543
-#: ../addressbook/libebook/e-book.c:677 ../addressbook/libebook/e-book.c:681
-#: ../addressbook/libebook/e-book.c:767 ../addressbook/libebook/e-book.c:771
-#: ../addressbook/libebook/e-book.c:1066 ../addressbook/libebook/e-book.c:1069
-#: ../addressbook/libebook/e-book.c:1250 ../addressbook/libebook/e-book.c:1253
-#: ../addressbook/libebook/e-book.c:1406 ../addressbook/libebook/e-book.c:1410
-#: ../addressbook/libebook/e-book.c:1619 ../addressbook/libebook/e-book.c:1623
-#: ../addressbook/libebook/e-book.c:1873 ../addressbook/libebook/e-book.c:1877
-#: ../addressbook/libebook/e-book.c:2094 ../addressbook/libebook/e-book.c:2098
-#: ../addressbook/libebook/e-book.c:2296 ../addressbook/libebook/e-book.c:2300
-#: ../addressbook/libebook/e-book.c:2531 ../addressbook/libebook/e-book.c:2705
-#: ../addressbook/libebook/e-book.c:2709 ../addressbook/libebook/e-book.c:2903
-#: ../addressbook/libebook/e-book.c:2907 ../addressbook/libebook/e-book.c:3454
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "\"%s\" å?¼ã?³å?ºã??ã??è¡?ã??é??ã?« CORBA ä¾?å¤?ã??ç?ºç??ã??ã?¾ã??ã??"
-
-#: ../addressbook/libebook/e-book.c:2520
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: ç?¾å?¨å®?è¡?ä¸ã?®æ??ä½?ã?¯ã??ã??ã?¾ã??ã??"
-
-#: ../addressbook/libebook/e-book.c:2549 ../addressbook/libebook/e-book.c:2594
-#: ../addressbook/libebook/e-book.c:2633
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%s: ã?ã?£ã?³ã?»ã?«ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../addressbook/libebook/e-book.c:2665 ../addressbook/libebook/e-book.c:2669
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "\"%2$s\" ã?®æ¬¡ã?«ã??ã??ã??ã??ã?¯ã?® \"%1$s\""
-
-#: ../addressbook/libebook/e-book.c:2733
-#, c-format
-msgid "%s: canceled"
-msgstr "%s: ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
-
-#: ../addressbook/libebook/e-book.c:3310
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%s: ã?½ã?¼ã?¹ã??æ£ã??ã??ã??ã??ã?¾ã??ã??"
-
-#: ../addressbook/libebook/e-book.c:3318 ../addressbook/libebook/e-book.c:3383
-#, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: URI '%s' ã?«å¯¾ã??ã??ã??ã?¡ã?¯ã??ã?ªã??å?©ç?¨ã?§ã??ã?¾ã??ã??"
-
-#: ../addressbook/libebook/e-book.c:3329
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: EBookListener ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../addressbook/libebook/e-book.c:3595
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
 #, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: GConf ã?«ã?»ã?«ã??é?£çµ¡å?? UID ã??ã??ã??ã?¾ã??ã??ã?§ã??ã??"
+msgid "Create resource '%s' failed with HTTP status: %d"
+msgstr "ã?ªã?½ã?¼ã?¹ '%s' ã?®ä½?æ??ã?«å¤±æ??ã??ã?¾ã??ã?? (HTTP ã?¹ã??ã?¼ã?¿ã?¹: %d)"
 
-#: ../addressbook/libebook/e-book.c:3727
+#: ../addressbook/libebook/e-book.c:2995
 #, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
+msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: GConf ã?« UID '%s' ã?®ã?½ã?¼ã?¹ã??ã??ã??ã?¾ã??ã??ã??"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
 msgstr "é??è¤?ã??ã?ªã?? ID"
 
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
 msgid "File Under"
 msgstr "FILE UNDER"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:118
 msgid "Book URI"
 msgstr "ã?¢ã??ã?¬ã?¹å¸³ã?® URI"
 
@@ -193,995 +118,1180 @@ msgstr "ã?¢ã??ã?¬ã?¹å¸³ã?® URI"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:122
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Full Name"
 msgstr "æ°?å??"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "å??"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "å§?"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "ã??ã? å??"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
-msgstr "E-ã?¡â??ã?« 1"
+msgstr "E-ã?¡ã?¼ã?« 1"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
-msgstr "E-ã?¡â??ã?« 2"
+msgstr "E-ã?¡ã?¼ã?« 2"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
-msgstr "E-ã?¡â??ã?«3"
+msgstr "E-ã?¡ã?¼ã?« 3"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
-msgstr "E-ã?¡â??ã?« 4"
+msgstr "E-ã?¡ã?¼ã?« 4"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "ã?¡ã?¼ã?«ã?»ã?¯ã?©ã?¤ã?¢ã?³ã??"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "è?ªå®?ã?®ä½?æ??ã?©ã??ã?«"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "å?¤å??å??ã?®ä½?æ??ã?©ã??ã?«"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "ã??ã?®ä»?ã?®ä½?æ??ã?©ã??ã?«"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "ã?¢ã?·ã?¹ã?¿ã?³ã??ã?®é?»è©±ç?ªå?·"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "ä»?äº?ã?®é?»è©±ç?ªå?·"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
 msgstr "ä»?äº?ã?®é?»è©±ç?ªå?· 2"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "ä»?äº?ã?® FAX ç?ªå?·"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
 msgstr "å¾?æ??å??ã?®é?»è©±ç?ªå?·"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "è»?è¼?é?»è©±ã?®ç?ªå?·"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "ä¼?ç¤¾ã?®é?»è©±ç?ªå?·"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "è?ªå®?ã?®é?»è©±ç?ªå?·"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
 msgstr "è?ªå®?ã?®é?»è©±ç?ªå?· 2"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "è?ªå®?ã?® FAX ç?ªå?·"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "æ?ºå¸¯é?»è©±ã?®ç?ªå?·"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "ã??ã?®ä»?ã?®é?»è©±ç?ªå?·"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "ã??ã?®ä»?ã?® FAX ç?ªå?·"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "ã??ã?±ã??ã?«ã?®ç?ªå?·"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "é?»è©±ç?ªå?·"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "ã?©ã?¸ã?ª"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "ã??ã?¬ã??ã?¯ã?¹"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "TTY"
 msgstr "ã??ã?¬ã?¿ã?¤ã??ã?©ã?¤ã?¿ã?¼"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "çµ?ç¹?"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "çµ?ç¹?"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "äº?å??æ??"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Title"
 msgstr "æ?¬ç§° (å??ã?¤ã??)"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Role"
 msgstr "å½¹å?²"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "ã??ã??ã?¼ã?¸ã?£"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "ã?¢ã?·ã?¹ã?¿ã?³ã??"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "ã??ã?¼ã? ã??ã?¼ã?¸ã?® URL"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "ã??ã?ã?°ã?® URL"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:609
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:667
 msgid "Categories"
 msgstr "ã?«ã??ã?´ã?ª"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "ã?«ã?¬ã?³ã??ã?® URI"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "äº?å®?ã?®æ??ç?¡ã?® URL"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
 msgstr "ICS ã?«ã?¬ã?³ã??"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "ã??ã??ã?ªä¼?è°ç?¨ã?® URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "é??å?¶è??ã?®å??å??"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "ã??ã?¼ã??"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:191
 msgid "AIM Home Screen Name 1"
 msgstr "è?ªå®?ã?® AIM ã?¹ã?¯ã?ªã?¼ã?³å?? 1"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
 msgid "AIM Home Screen Name 2"
 msgstr "è?ªå®?ã?® AIM ã?¹ã?¯ã?ªã?¼ã?³å?? 2"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
 msgid "AIM Home Screen Name 3"
 msgstr "è?ªå®?ã?® AIM ã?¹ã?¯ã?ªã?¼ã?³å?? 3"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 1"
 msgstr "å?¤å??å??ã?® AIM ã?¹ã?¯ã?ªã?¼ã?³å?? 1"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Work Screen Name 2"
 msgstr "å?¤å??å??ã?® AIM ã?¹ã?¯ã?ªã?¼ã?³å?? 2"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Work Screen Name 3"
 msgstr "å?¤å??å??ã?® AIM ã?¹ã?¯ã?ªã?¼ã?³å?? 3"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
 msgid "GroupWise Home Screen Name 1"
 msgstr "è?ªå®?ã?® GroupWise ã?¹ã?¯ã?ªã?¼ã?³å?? 1"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
 msgid "GroupWise Home Screen Name 2"
 msgstr "è?ªå®?ã?® GroupWise ã?¹ã?¯ã?ªã?¼ã?³å?? 2"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:199
 msgid "GroupWise Home Screen Name 3"
 msgstr "è?ªå®?ã?® GroupWise ã?¹ã?¯ã?ªã?¼ã?³å?? 3"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Work Screen Name 1"
 msgstr "å?¤å??å??ã?® GroupWise ã?¹ã?¯ã?ªã?¼ã?³å?? 1"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Work Screen Name 2"
 msgstr "å?¤å??å??ã?® GroupWise ã?¹ã?¯ã?ªã?¼ã?³å?? 2"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Work Screen Name 3"
 msgstr "å?¤å??å??ã?® GroupWise ã?¹ã?¯ã?ªã?¼ã?³å?? 3"
 
-#: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
+#: ../addressbook/libebook/e-contact.c:203
+msgid "Jabber Home ID 1"
 msgstr "è?ªå®?ã?® Jabber ID 1"
 
-#: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
+#: ../addressbook/libebook/e-contact.c:204
+msgid "Jabber Home ID 2"
 msgstr "è?ªå®?ã?® Jabber ID 2"
 
-#: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
+#: ../addressbook/libebook/e-contact.c:205
+msgid "Jabber Home ID 3"
 msgstr "è?ªå®?ã?® Jabber ID 3"
 
-#: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
+#: ../addressbook/libebook/e-contact.c:206
+msgid "Jabber Work ID 1"
 msgstr "å?¤å??å??ã?® Jabber ID 1"
 
-#: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
+#: ../addressbook/libebook/e-contact.c:207
+msgid "Jabber Work ID 2"
 msgstr "å?¤å??å??ã?® Jabber ID 2"
 
-#: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
+#: ../addressbook/libebook/e-contact.c:208
+msgid "Jabber Work ID 3"
 msgstr "å?¤å??å??ã?® Jabber ID 3"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 1"
 msgstr "è?ªå®?ã?® Yahoo! ã?¹ã?¯ã?ªã?¼ã?³å?? 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Home Screen Name 2"
 msgstr "è?ªå®?ã?® Yahoo! ã?¹ã?¯ã?ªã?¼ã?³å?? 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Home Screen Name 3"
 msgstr "è?ªå®?ã?® Yahoo! ã?¹ã?¯ã?ªã?¼ã?³å?? 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 1"
 msgstr "å?¤å??å??ã?® Yahoo! ã?¹ã?¯ã?ªã?¼ã?³å?? 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Work Screen Name 2"
 msgstr "å?¤å??å??ã?® Yahoo! ã?¹ã?¯ã?ªã?¼ã?³å?? 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Work Screen Name 3"
 msgstr "å?¤å??å??ã?® Yahoo! ã?¹ã?¯ã?ªã?¼ã?³å?? 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
 msgid "MSN Home Screen Name 1"
 msgstr "è?ªå®?ã?® MSN ã?¹ã?¯ã?ªã?¼ã?³å?? 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
 msgid "MSN Home Screen Name 2"
 msgstr "è?ªå®?ã?® MSN ã?¹ã?¯ã?ªã?¼ã?³å?? 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
 msgid "MSN Home Screen Name 3"
 msgstr "è?ªå®?ã?® MSN ã?¹ã?¯ã?ªã?¼ã?³å?? 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Work Screen Name 1"
 msgstr "å?¤å??å??ã?® MSN ã?¹ã?¯ã?ªã?¼ã?³å?? 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Work Screen Name 2"
 msgstr "å?¤å??å??ã?® MSN ã?¹ã?¯ã?ªã?¼ã?³å?? 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Work Screen Name 3"
 msgstr "å?¤å??å??ã?® MSN ã?¹ã?¯ã?ªã?¼ã?³å?? 3"
 
-#: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
+#: ../addressbook/libebook/e-contact.c:221
+msgid "ICQ Home ID 1"
 msgstr "è?ªå®?ã?® ICQ ID 1"
 
-#: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
+#: ../addressbook/libebook/e-contact.c:222
+msgid "ICQ Home ID 2"
 msgstr "è?ªå®?ã?® ICQ ID 2"
 
-#: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
+#: ../addressbook/libebook/e-contact.c:223
+msgid "ICQ Home ID 3"
 msgstr "è?ªå®?ã?® ICQ ID 3"
 
-#: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
+#: ../addressbook/libebook/e-contact.c:224
+msgid "ICQ Work ID 1"
 msgstr "å?¤å??å??ã?® ICQ ID 1"
 
-#: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
+#: ../addressbook/libebook/e-contact.c:225
+msgid "ICQ Work ID 2"
 msgstr "å?¤å??å??ã?® ICQ ID 2"
 
-#: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
+#: ../addressbook/libebook/e-contact.c:226
+msgid "ICQ Work ID 3"
 msgstr "å?¤å??å??ã?® ICQ ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "Last Revision"
 msgstr "æ??çµ?æ?´æ?°æ?¥æ??"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "Name or Org"
 msgstr "å??å??ã?¾ã??ã?¯çµ?ç¹?"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "ä½?æ??ã?®ä¸?è¦§"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "è?ªå®?ã?®ä½?æ??"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "å?¤å??å??ã?®ä½?æ??"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "ã??ã?®ä»?ã?®ä½?æ??"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
 msgstr "ã?«ã??ã?´ã?ªã?®ä¸?è¦§"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr "å??ç??"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Logo"
 msgstr "ã?ã?´"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Name"
 msgstr "å??å??"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
 msgstr "E-ã?¡ã?¼ã?«ä¸?è¦§"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:249
 msgid "AIM Screen Name List"
 msgstr "AIM ã?¹ã?¯ã?ªã?¼ã?³å??ã?®ä¸?è¦§"
 
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
+#: ../addressbook/libebook/e-contact.c:250
+msgid "GroupWise ID List"
 msgstr "GroupWise ID ã?®ä¸?è¦§"
 
-#: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
+#: ../addressbook/libebook/e-contact.c:251
+msgid "Jabber ID List"
 msgstr "Jabber ID ã?®ä¸?è¦§"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! ã?¹ã?¯ã?ªã?¼ã?³å??ã?®ä¸?è¦§"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:253
 msgid "MSN Screen Name List"
 msgstr "MSN ã?¹ã?¯ã?ªã?¼ã?³å??ã?®ä¸?è¦§"
 
-#: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
+#: ../addressbook/libebook/e-contact.c:254
+msgid "ICQ ID List"
 msgstr "ICQ ã?® ID ä¸?è¦§ã?§ã??"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
 msgstr "HTML å½¢å¼?ã?®ã?¡â??ã?«ã??å¸?æ??ã??ã??"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
 msgstr "ä¸?è¦§"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
 msgstr "ä½?æ??ã??è¡¨ç¤ºã??ã??ä¸?è¦§ã?§ã??"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "èª?ç??æ?¥"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:45
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: ../libedataserver/e-categories.c:44
 msgid "Anniversary"
 msgstr "è¨?å¿µæ?¥"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:265
 msgid "X.509 Certificate"
 msgstr "X.509 èª?è¨¼"
 
-#: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
+#: ../addressbook/libebook/e-contact.c:267
+msgid "Gadu-Gadu Home ID 1"
 msgstr "è?ªå®?ã?® Gadu-Gadu ID 1"
 
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
+#: ../addressbook/libebook/e-contact.c:268
+msgid "Gadu-Gadu Home ID 2"
 msgstr "è?ªå®?ã?® Gadu-Gadu ID 2"
 
-#: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
+#: ../addressbook/libebook/e-contact.c:269
+msgid "Gadu-Gadu Home ID 3"
 msgstr "è?ªå®?ã?® Gadu-Gadu ID 3"
 
-#: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
+#: ../addressbook/libebook/e-contact.c:270
+msgid "Gadu-Gadu Work ID 1"
 msgstr "å?¤å??å??ã?® Gadu-Gadu ID 1"
 
-#: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
+#: ../addressbook/libebook/e-contact.c:271
+msgid "Gadu-Gadu Work ID 2"
 msgstr "å?¤å??å??ã?® Gadu-Gadu ID 2"
 
-#: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
+#: ../addressbook/libebook/e-contact.c:272
+msgid "Gadu-Gadu Work ID 3"
 msgstr "å?¤å??å??ã?® Gadu-Gadu ID 3"
 
-#: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
+#: ../addressbook/libebook/e-contact.c:273
+msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID ã?®ä¸?è¦§"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr "å?°ç??æ??å ±"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "é?»è©±"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
 msgstr "è?ªå®?ã?® Skype å?? 1"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
 msgstr "è?ªå®?ã?® Skype å?? 2"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
 msgstr "è?ªå®?ã?® Skype å?? 3"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
 msgstr "å?¤å??å??ã?® Skype å?? 1"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
 msgstr "å?¤å??å??ã?® Skype å?? 2"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
 msgstr "å?¤å??å??ã?® Skype å?? 3"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
 msgstr "Skype å??ã?®ä¸?è¦§"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
-msgstr "SIP ã?®ä½?æ??"
+msgstr "SIP ã?¢ã??ã?¬ã?¹"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1517
+#: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "å??å??ã?ªã??ã?®ä¸?è¦§"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:46
+#: ../addressbook/libedata-book/e-data-book-factory.c:287
+#, c-format
+msgid "Empty URI"
+msgstr "ç©ºã?® URI"
+
+#: ../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:171
+#: ../calendar/libedata-cal/e-data-cal.c:109
+msgid "Success"
+msgstr "æ??å??ã??ã?¾ã??ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:172
+#: ../calendar/libedata-cal/e-data-cal.c:110
+msgid "Repository offline"
+msgstr "ã?ªã??ã?¸ã??ã?ªã?¯ã?ªã??ã?©ã?¤ã?³ã?§ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libecal/e-cal.c:4065 ../calendar/libedata-cal/e-data-cal.c:111
+msgid "Permission denied"
+msgstr "æ¨©é??ã??ã??ã??ã?¾ã??ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:174
+msgid "Contact not found"
+msgstr "é?£çµ¡å??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:175
+msgid "Contact ID already exists"
+msgstr "é?£çµ¡å?? ID ã??æ?¢ã?«å?å?¨ã??ã?¦ã??ã?¾ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:176
+#: ../calendar/libedata-cal/e-data-cal.c:116
+msgid "Authentication Failed"
+msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:177
+#: ../calendar/libedata-cal/e-data-cal.c:117
+msgid "Authentication Required"
+msgstr "èª?è¨¼ã??å¿?è¦?ã?§ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:118
+msgid "Unsupported field"
+msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??é ?ç?®ã?§ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "Unsupported authentication method"
+msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??èª?è¨¼æ?¹æ³?ã?§ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "TLS not available"
+msgstr "TLS ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:181
+msgid "Address book does not exist"
+msgstr "ã?¢ã??ã?¬ã?¹å¸³ã??ã??ã??ã?¾ã??ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:182
+msgid "Book removed"
+msgstr "ã??ã?¼ã?¿ã??ã??ã?¯ã?¯å??é?¤ã??ã??ã?¾ã??ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:183
+#: ../calendar/libedata-cal/e-data-cal.c:124
+msgid "Not available in offline mode"
+msgstr "ã?ªã??ã?©ã?¤ã?³ã?¢ã?¼ã??ã?§ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:184
+#: ../calendar/libedata-cal/e-data-cal.c:125
+msgid "Search size limit exceeded"
+msgstr "æ¤?ç´¢ã?µã?¤ã?ºã??ä¸?é??ã??è¶?ã??ã?¾ã??ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Search time limit exceeded"
+msgstr "æ¤?ç´¢æ??é??ã?®ä¸?é??ã??è¶?ã??ã?¾ã??ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Invalid query"
+msgstr "å??ã??å??ã??ã??ã?®å??å®¹ã??ç?¡å?¹ã?§ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:128
+msgid "Query refused"
+msgstr "å??ã??å??ã??ã??ã??æ??å?¦ã??ã?¾ã??ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:129
+msgid "Could not cancel"
+msgstr "ã?ã?£ã?³ã?»ã?«ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:131
+msgid "Invalid server version"
+msgstr "ã?µã?¼ã??ã?»ã??ã?¼ã?¸ã?§ã?³ã??ç?¡å?¹ã?§ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:191
+msgid "No space"
+msgstr "ã?¹ã??ã?¼ã?¹ã??ã??ã??ã?¾ã??ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libecal/e-cal.c:4049 ../calendar/libedata-cal/e-data-cal.c:132
+msgid "Invalid argument"
+msgstr "ç?¡å?¹ã?ªå¼?æ?°"
+
+#: ../addressbook/libedata-book/e-data-book.c:193
+#: ../calendar/libecal/e-cal.c:4087 ../calendar/libedata-cal/e-data-cal.c:133
+msgid "Not supported"
+msgstr "ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?¾ã??ã??"
+
+#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../calendar/libedata-cal/e-data-cal.c:141
+msgid "Other error"
+msgstr "ã??ã?®ä»?ã?®ã?¨ã?©ã?¼"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:322
+#, c-format
+msgid "Cannot open book: %s"
+msgstr "ã??ã?¼ã?¿ã??ã??ã?¯ã??é??ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:344
+#, c-format
+msgid "Cannot remove book: %s"
+msgstr "ã??ã?¼ã?¿ã??ã??ã?¯ã??å??é?¤ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:361
+#: ../addressbook/libedata-book/e-data-book.c:380
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "é?£çµ¡å??ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:395
+#, c-format
+msgid "Empty query: %s"
+msgstr "å??ã??å??ã??ã??å??å®¹ã??ç©ºã?§ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:411
+#, c-format
+msgid "Cannot get contact list: %s"
+msgstr "é?£çµ¡å??ã?®ä¸?è¦§ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:448
+#, c-format
+msgid "Cannot authenticate user: %s"
+msgstr "ã?¦ã?¼ã?¶ã?¼èª?è¨¼ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:463
+#: ../addressbook/libedata-book/e-data-book.c:482
+#, c-format
+msgid "Cannot add contact: %s"
+msgstr "é?£çµ¡å??ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:500
+#: ../addressbook/libedata-book/e-data-book.c:519
+#, c-format
+msgid "Cannot modify contact: %s"
+msgstr "é?£çµ¡å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:558
+#, c-format
+msgid "Cannot remove contacts: %s"
+msgstr "é?£çµ¡å??ã??å??é?¤ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:595
+#, c-format
+msgid "Cannot get supported fields: %s"
+msgstr "å¯¾å¿?ã??ã??é ?ç?®ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:610
+#, c-format
+msgid "Cannot get required fields: %s"
+msgstr "è¦?æ±?ã??ã??ã??é ?ç?®ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:625
+#, c-format
+msgid "Cannot get supported authentication methods: %s"
+msgstr "å¯¾å¿?ã??ã??èª?è¨¼æ?¹æ³?ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:651
+#: ../addressbook/libedata-book/e-data-book.c:662
+#, c-format
+msgid "Invalid query: %s"
+msgstr "å??ã??å??ã??ã??å??å®¹ã??ç?¡å?¹ã?§ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:698
+#, c-format
+msgid "Cannot get changes: %s"
+msgstr "å¤?æ?´ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:738
+#, c-format
+msgid "Cancel operation failed: %s"
+msgstr "æ??ä½?ã?®ã?ã?£ã?³ã?»ã?«ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:530
+#, c-format
+msgid "Unexpected HTTP status code %d returned"
+msgstr "äº?æ?³å¤?ã?® HTTP ã?¹ã??ã?¼ã?¿ã?¹ã?³ã?¼ã?? %d ã??è¿?ã??ã??ã?¾ã??ã??"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4142
+msgid "Calendar doesn't support Free/Busy"
+msgstr "ã?«ã?¬ã?³ã??ã?¯äº?å®?ã?®æ??ç?¡ã?«å¯¾å¿?ã??ã?¾ã??ã??"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
+#: ../libedataserver/e-categories.c:45
 msgid "Birthday"
 msgstr "èª?ç??æ?¥"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:748
 #, c-format
 msgid "Birthday: %s"
 msgstr "èª?ç??æ?¥: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:772
 #, c-format
 msgid "Anniversary: %s"
 msgstr "è¨?å¿µæ?¥: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:234
+#: ../calendar/backends/file/e-cal-backend-file.c:251
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "ã?«ã?¬ã?³ã??ã?®ã??ã?¼ã?¿ã??ä¿?å?ã?§ã??ã?¾ã??ã??: URI ã??é??é??ã?£ã?¦ã??ã?¾ã??ã??"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
-#: ../calendar/backends/file/e-cal-backend-file.c:247
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
 msgid "Cannot save calendar data"
 msgstr "ã?«ã?¬ã?³ã??ã?®ã??ã?¼ã?¿ã??ä¿?å?ã?§ã??ã?¾ã??ã??"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
-msgid "Could not create thread for getting deltas"
-msgstr "å·®å??ã??å??å¾?ã??ã??ã??ã??ã?®ã?¹ã?¬ã??ã??ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:376
-#: ../calendar/backends/google/e-cal-backend-google.c:1189
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1080
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1381
-#: ../calendar/backends/http/e-cal-backend-http.c:659
-#: ../calendar/backends/weather/e-cal-backend-weather.c:486
-msgid "Could not create cache file"
-msgstr "ã?ã?£ã??ã?·ã?¥ã?»ã??ã?¡ã?¤ã?«ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1093
-msgid "Could not create thread for populating cache"
-msgstr "ã?ã?£ã??ã?·ã?¥ã??ç??æ??ã??ã??ã??ã??ã?®ã?¹ã?¬ã??ã??ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2251
 msgid "Reply Requested: by "
 msgstr "è¿?ä¿¡è¦?æ±?: by "
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2256
 msgid "Reply Requested: When convenient"
 msgstr "è¿?ä¿¡è¦?æ±?: When convenient"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:330
 #, c-format
 msgid "Loading %s items"
 msgstr "\"%s\" ã?¢ã?¤ã??ã? ã?®èªã?¿è¾¼ã?¿"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:959
 msgid "Calendar"
 msgstr "ã?«ã?¬ã?³ã??"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1022
 msgid "Invalid server URI"
 msgstr "ç?¡å?¹ã?ªã?µã?¼ã?? URI ã?§ã??"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:995
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1098
-#: ../calendar/libecal/e-cal.c:5117
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1291
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1327
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
-#: ../camel/providers/groupwise/camel-groupwise-store.c:598
-#: ../camel/providers/groupwise/camel-groupwise-store.c:773
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
-msgid "Authentication failed"
-msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1123
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1383
+#: ../calendar/backends/http/e-cal-backend-http.c:690
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
+msgid "Could not create cache file"
+msgstr "ã?ã?£ã??ã?·ã?¥ã?»ã??ã?¡ã?¤ã?«ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:316
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1135
+msgid "Could not create thread for populating cache"
+msgstr "ã?ã?£ã??ã?·ã?¥ã??ç??æ??ã??ã??ã??ã??ã?®ã?¹ã?¬ã??ã??ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:359
 msgid "Redirected to Invalid URI"
 msgstr "URI ã?¸ã?®ã?ªã??ã?¤ã?¬ã?¯ã??ã??ç?¡å?¹ã?§ã??"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:339
+#: ../calendar/backends/http/e-cal-backend-http.c:382
 msgid "Bad file format."
 msgstr "ã??ã?¡ã?¤ã?«ã?®ã??ã?©â??ã??ã??ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??ã??"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:346
+#: ../calendar/backends/http/e-cal-backend-http.c:389
 msgid "Not a calendar."
 msgstr "ã?«ã?¬ã?³ã??ã?§ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:150
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
 msgid "Could not retrieve weather data"
 msgstr "å¤©æ°?ã?®ã??ã?¼ã?¿ã??å??å¾?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Fog"
 msgstr "å¤©æ°?: é?§"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-msgid "Weather: Cloudy"
-msgstr "å¤©æ°?: æ??ã??"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Cloudy Night"
 msgstr "å¤©æ°?: æ??ã?®ã??ã??å¤?ç©º"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+msgid "Weather: Cloudy"
+msgstr "å¤©æ°?: æ??ã??"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Overcast"
 msgstr "å¤©æ°?: æ?¬æ??ã??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Showers"
 msgstr "å¤©æ°?: é?¨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Snow"
 msgstr "å¤©æ°?: é?ª"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Sunny"
-msgstr "å¤©æ°?: æ??ã??ã??å¿«æ?´"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Clear Night"
 msgstr "å¤©æ°?: æ¾?ã??ã? å¤?ç©º"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+msgid "Weather: Sunny"
+msgstr "å¤©æ°?: æ??ã??ã??å¿«æ?´"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
 msgid "Weather: Thunderstorms"
 msgstr "å¤©æ°?: é?·é?¨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:400
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
 msgid "Forecast"
 msgstr "å¤©æ°?äº?å ±"
 
-#: ../calendar/libecal/e-cal-component.c:1320
+#: ../calendar/libecal/e-cal-component.c:1286
 msgid "Untitled appointment"
 msgstr "ã?¿ã?¤ã??ã?«ã?ªã??ã?®äº?å®?"
 
-#: ../calendar/libecal/e-cal-recur.c:3945
+#: ../calendar/libecal/e-cal-recur.c:3979
 msgid "1st"
 msgstr "1æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3946
+#: ../calendar/libecal/e-cal-recur.c:3980
 msgid "2nd"
 msgstr "2æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3947
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "3rd"
 msgstr "3æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3948
+#: ../calendar/libecal/e-cal-recur.c:3982
 msgid "4th"
 msgstr "4æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3949
+#: ../calendar/libecal/e-cal-recur.c:3983
 msgid "5th"
 msgstr "5æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3950
+#: ../calendar/libecal/e-cal-recur.c:3984
 msgid "6th"
 msgstr "6æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "7th"
 msgstr "7æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "8th"
 msgstr "8æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "9th"
 msgstr "9æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "10th"
 msgstr "10æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "11th"
 msgstr "11æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "12th"
 msgstr "12æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "13th"
 msgstr "13æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "14th"
 msgstr "14æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "15th"
 msgstr "15æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "16th"
 msgstr "16æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "17th"
 msgstr "17æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "18th"
 msgstr "18æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "19th"
 msgstr "19æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "20th"
 msgstr "20æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "21st"
 msgstr "21æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "22nd"
 msgstr "22æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "23rd"
 msgstr "23æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "24th"
 msgstr "24æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "25th"
 msgstr "25æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "26th"
 msgstr "26æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "27th"
 msgstr "27æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "28th"
 msgstr "28æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "29th"
 msgstr "29æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "30th"
 msgstr "30æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "31st"
 msgstr "31æ?¥"
 
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:712
+#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
 msgid "High"
 msgstr "é«?ã??"
 
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:714
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
 msgid "Normal"
 msgstr "æ?®é??"
 
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:716
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
 msgid "Low"
 msgstr "ä½?ã??"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:710
+#: ../calendar/libecal/e-cal-util.c:703
 msgid "Undefined"
 msgstr "æ?ªå®?ç¾©"
 
-#: ../calendar/libecal/e-cal.c:1693 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1227 ../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) ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ä¸?ã??ã??"
+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:1707
+#: ../calendar/libecal/e-cal.c:1241
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
-msgstr "%s ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã?¦ã?¼ã?¶ %s ã?®ã??ã?ã?ã?·ã??æ??å?¹ã?«ã??ã?¦ä¸?ã??ã??"
-
-#: ../calendar/libecal/e-cal.c:5089
-msgid "Invalid argument"
-msgstr "ç?¡å?¹ã?ªå¼?æ?°"
+msgstr "%s ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã?¦ã?¼ã?¶ %s ã?®ã??ã?ã?ã?·ã??æ??å?¹ã?«ã??ã?¦ã??ã? ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5091
+#: ../calendar/libecal/e-cal.c:4051
 msgid "Backend is busy"
 msgstr "ã??ã??ã?¯ã?¨ã?³ã??ã??å?¦ç??ä¸ã?§ã??"
 
-#: ../calendar/libecal/e-cal.c:5093
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4053
 msgid "Repository is offline"
 msgstr "ã?ªã??ã?¸ã??ã?ªã?¯ã?ªã??ã?©ã?¤ã?³ã?§ã??"
 
-#: ../calendar/libecal/e-cal.c:5095
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4055
 msgid "No such calendar"
 msgstr "ã??ã?®ã??ã??ã?ªã?«ã?¬ã?³ã??ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5097
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../calendar/libecal/e-cal.c:4057 ../calendar/libedata-cal/e-data-cal.c:113
+#: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5099
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../calendar/libecal/e-cal.c:4059 ../calendar/libedata-cal/e-data-cal.c:114
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "ç?¡å?¹ã?ªã?ªã??ã?¸ã?§ã?¯ã??ã?§ã??"
 
-#: ../calendar/libecal/e-cal.c:5101
+#: ../calendar/libecal/e-cal.c:4061
 msgid "URI not loaded"
 msgstr "URI ã??èªã?¿è¾¼ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5103
+#: ../calendar/libecal/e-cal.c:4063
 msgid "URI already loaded"
 msgstr "URL ã?¯æ?¢ã?«èªã?¿è¾¼ã?¿æ¸?ã?¿ã?§ã??"
 
-#: ../calendar/libecal/e-cal.c:5105
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Permission denied"
-msgstr "æ¨©é??ã??ã??ã??ã?¾ã??ã??"
-
-#: ../calendar/libecal/e-cal.c:5107
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:4067 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "ã?¦ã?¼ã?¶ã??ç?¹å®?ã?§ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5109
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4069 ../calendar/libedata-cal/e-data-cal.c:115
 msgid "Object ID already exists"
 msgstr "æ?¢ã?«ã?ªã??ã?¸ã?§ã?¯ã?? ID ã??å?å?¨ã??ã?¦ã??ã?¾ã??"
 
-#: ../calendar/libecal/e-cal.c:5111
+#: ../calendar/libecal/e-cal.c:4071
 msgid "Protocol not supported"
 msgstr "ã??ã?ã??ã?³ã?«ã?¯ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5113
+#: ../calendar/libecal/e-cal.c:4073
 msgid "Operation has been canceled"
 msgstr "æ??ä½?ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5115
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4075
 msgid "Could not cancel operation"
 msgstr "æ??ä½?ã??ã?ã?£ã?³ã?»ã?«ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5119
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../calendar/libecal/e-cal.c:4077
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1466
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1484
+#: ../camel/providers/groupwise/camel-groupwise-store.c:618
+#: ../camel/providers/groupwise/camel-groupwise-store.c:793
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
+#, c-format
+msgid "Authentication failed"
+msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??"
+
+#: ../calendar/libecal/e-cal.c:4079
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
 msgid "Authentication required"
 msgstr "èª?è¨¼ã??å¿?è¦?ã?¨ã??ã?¦ã??ã?¾ã??"
 
-#: ../calendar/libecal/e-cal.c:5121
-msgid "A CORBA exception has occurred"
-msgstr "CORBA ä¾?å¤?ã??ç?ºç??ã??ã?¾ã??ã??"
-
-#: ../calendar/libecal/e-cal.c:5123
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/imap/camel-imap-command.c:432
-#: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1547
-#: ../camel/providers/imap4/camel-imap4-engine.c:1585
-#: ../camel/providers/imap4/camel-imap4-engine.c:1629
-#: ../camel/providers/imap4/camel-imap4-engine.c:1684
-#: ../camel/providers/imap4/camel-imap4-store.c:311
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:552
-#: ../camel/providers/pop3/camel-pop3-store.c:559
-#: ../camel/providers/pop3/camel-pop3-store.c:565
-#: ../servers/exchange/storage/e-storage.c:587
-#: ../servers/groupwise/e-gw-connection.c:241
+#: ../calendar/libecal/e-cal.c:4081
+msgid "A D-Bus exception has occurred"
+msgstr "D-Bus ä¾?å¤?ã??ç?ºç??ã??ã?¾ã??ã??"
+
+#: ../calendar/libecal/e-cal.c:4083
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
+#: ../camel/providers/imap/camel-imap-command.c:457
+#: ../camel/providers/imap/camel-imap-store.c:627
+#: ../camel/providers/pop3/camel-pop3-store.c:474
+#: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "ã?¨ã?©ã?¼ã??ç?¹å®?ã?§ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5125
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:555
+#: ../calendar/libecal/e-cal.c:4085
 msgid "No error"
 msgstr "ã?¨ã?©ã?¼ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" ã?¯å¼?æ?°ã??å¿?è¦?ã?¨ã??ã?¾ã??ã??"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" ã?¯å¼?æ?°ã??ä¸?ã?¤å¿?è¦?ã?¨ã??ã?¾ã??"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" ã?¯æ??å??ã?®å¼?æ?°ã?¨ã??ã?¦æ??å?å??ã??å¿?è¦?ã?¨ã??ã?¾ã??"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr ""
 "\"%s\" ã?¯æ??å??ã?®å¼?æ?°ã?¨ã??ã?¦ \"ISO 8601 æ?¥ä»?/æ??å?»\" ã?®æ??å?å??ã??å¿?è¦?ã?¨ã??ã?¾ã??"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" ã?¯å¼?æ?°ã??äº?ã?¤å¿?è¦?ã?¨ã??ã?¾ã??"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" ã?¯æ??å??ã?®å¼?æ?°ã?¨ã??ã?¦ time_t å??ã?®å?¤ã??å¿?è¦?ã?¨ã??ã?¾ã??"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\" ã?¯äº?ç?ªç?®ã?®å¼?æ?°ã?¨ã??ã?¦æ?´æ?°å?¤ã??å¿?è¦?ã?¨ã??ã?¾ã??"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" ã?¯äº?ç?ªç?®ã?®å¼?æ?°ã?¨ã??ã?¦ time_t å??ã?®å?¤ã??å¿?è¦?ã?¨ã??ã?¾ã??"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" ã?¯äº?ç?ªç?®ã?®å¼?æ?°ã?¨ã??ã?¦æ??å?å??ã??å¿?è¦?ã?¨ã??ã?¾ã??"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1192,117 +1302,256 @@ msgstr ""
 "\"location\"ã??\"attendee\"ã??\"organizer\"ã??\"classification\" ã?®ã??ã??ã??ã??ä¸?ã?¤"
 "ã??å¿?è¦?ã?§ã??"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" ã?¯å°?ã?ªã??ã?¨ã??å¼?æ?°ã??ä¸?ã?¤å¿?è¦?ã?¨ã??ã?¾ã??"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
 msgstr ""
-"\"%s\" ã?¯å?¨ã?¦ã?¾ã??ã?¯ä¸?ã?¤ã??æ??å?å??ã?§ã??è«?ç??å?¤ FAULSE (#f) ã??ä¸?ã?¤ã? ã??å¿?è¦?ã?¨ã??ã?¾ã??"
+"\"%s\" ã?¯ã??ã?¹ã?¦ã?¾ã??ã?¯ä¸?ã?¤ã??æ??å?å??ã?§ã??è«?ç??å?¤ FAULSE (#f) ã??ä¸?ã?¤ã? ã??å¿?è¦?ã?¨ã??ã?¾"
+"ã??"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-data-cal.c:112
 msgid "Invalid range"
 msgstr "æ??å?¹ç¯?å?²ã??ç?¡å?¹ã?§ã??"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??é ?ç?®ã?§ã??"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:119
 msgid "Unsupported method"
 msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??æ?¹æ³?ã?§ã??"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??èª?è¨¼æ?¹æ³?ã?§ã??"
+#: ../calendar/libedata-cal/e-data-cal.c:122
+msgid "Calendar does not exist"
+msgstr "ã?«ã?¬ã?³ã??ã??å?å?¨ã??ã?¾ã??ã??"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "TLS ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
+#: ../calendar/libedata-cal/e-data-cal.c:123
+msgid "Unknown user"
+msgstr "ã?¦ã?¼ã?¶ã??ç?¹å®?ã?§ã??ã?¾ã??ã??"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?«å??ã??æ?¿ã??ã??ã??ã?¾ã??ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:608
+#, c-format
+msgid "Cannot retrieve calendar address: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?®ã?¢ã??ã?¬ã?¹ã??å??å¾©ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "æ¤?ç´¢ã?µã?¤ã?ºã??ä¸?é??ã??è¶?ã??ã?¾ã??ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:628
+#, c-format
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?®ã?¢ã?©ã?¼ã? ã??é??ä¿¡ã??ã?? E-ã?¡ã?¼ã?«ã?¢ã??ã?¬ã?¹ã??å??å¾©ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "æ¤?ç´¢æ??é??ã?®ä¸?é??ã??è¶?ã??ã?¾ã??ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:648
+#, c-format
+msgid "Cannot retrieve calendar's LDAP attribute: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?® LDAP å±?æ?§ã??å??å¾©ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "å??ã??å??ã??ã??ã?®å??å®¹ã??ç?¡å?¹ã?§ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:668
+#, c-format
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?®äº?å®?æ??å ±ã??å??å¾©ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "å??ã??å??ã??ã??ã??æ??å?¦ã??ã?¾ã??ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:687
+#, c-format
+msgid "Cannot open calendar: %s"
+msgstr "ã?«ã?¬ã?³ã??ã??é??ã??ã?¾ã??ã??: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "ã?µã?¼ã??ã?»ã??ã?¼ã?¸ã?§ã?³ã??ç?¡å?¹ã?§ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:708
+#, c-format
+msgid "Cannot refresh calendar: %s"
+msgstr "ã?«ã?¬ã?³ã??ã??æ?´æ?°ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:727
+#, c-format
+msgid "Cannot remove calendar: %s"
+msgstr "ã?«ã?¬ã?³ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:748
+#, c-format
+msgid "Cannot create calendar object: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:772
+#, c-format
+msgid "Cannot modify calendar object: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?ªã??ã?¸ã?§ã?¯ã??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-cipher-context.c:102
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:798
+#, c-format
+msgid "Cannot remove calendar object: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?ªã??ã?¸ã?§ã?¯ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:819
+#, c-format
+msgid "Cannot receive calendar objects: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?ªã??ã?¸ã?§ã?¯ã??ã??å??ä¿¡ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:838
+#, c-format
+msgid "Cannot discard calendar alarm: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?®ã?¢ã?©ã?¼ã? ã??ç ´æ£?ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:859
+#, c-format
+msgid "Cannot send calendar objects: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?ªã??ã?¸ã?§ã?¯ã??ã??é??ä¿¡ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:884
+#, c-format
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?¸ã?®æ?¢å®?ã?®ã??ã?¹ã??å??å¾©ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:904
+#, c-format
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?¸ã?®ã??ã?¹ã??å??å¾©ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:924
+#, c-format
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ä¸?è¦§ã??å??å¾©ã?§ã??ã?¾ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:952
+#, c-format
+msgid "Could not retrieve attachment list: %s"
+msgstr "æ·»ä»?ã??ã?¡ã?¤ã?«ã?®ä¸?è¦§ã??å??å¾©ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:978
+#, c-format
+msgid "Could not complete calendar query: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?®æ¤?ç´¢ã??å®?äº?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:998
+#, c-format
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?®ã?¿ã?¤ã? ã?¾ã?¼ã?³ã??å??å¾©ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1018
+#, c-format
+msgid "Could not add calendar time zone: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?®ã?¿ã?¤ã? ã?¾ã?¼ã?³ã??è¿½å? ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1037
+#, c-format
+msgid "Could not set default calendar time zone: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?®æ?¢å®?ã?®ã?¿ã?¤ã? ã?¾ã?¼ã?³ã??è¨å®?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1060
+#, c-format
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?®å¤?æ?´ã??å??å¾©ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1091
+#, c-format
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "ã?«ã?¬ã?³ã??ã?®äº?å®?ã?®æ??ç?¡ã?®ä¸?è¦§ã??å??å¾©ã?§ã??ã?¾ã??ã??: %s"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:353
+#, c-format
+msgid "Invalid URI"
+msgstr "ç?¡å?¹ã?ª URI ã?§ã??"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:371
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "'%2$s' ã?® '%1$s' ã?®ã??ã??ã?¯ã?¨ã?³ã??ã??ã??ã??ã?¾ã??ã??"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:421
+#, c-format
+msgid "Could not instantiate backend"
+msgstr "ã??ã??ã?¯ã?¨ã?³ã??ã?®ã?¤ã?³ã?¹ã?¿ã?³ã?¹ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#: ../camel/camel-cipher-context.c:75
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "ã??ã?®æ??å?·ã?¯ç½²å??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/camel-cipher-context.c:128
+#: ../camel/camel-cipher-context.c:110
 msgid "Signing message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®ç½²å??ä¸"
 
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:131
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "ã??ã?®æ??å?·ã?¯å¦¥å½?æ?§ã?®æ¤?è¨¼ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/camel-cipher-context.c:171
+#: ../camel/camel-cipher-context.c:164
 msgid "Verifying message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®æ¤?è¨¼ä¸"
 
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:188
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "ã??ã?®æ??å?·å??ã?¯ç¬¦å?·å??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/camel-cipher-context.c:215
+#: ../camel/camel-cipher-context.c:223
 msgid "Encrypting message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??æ??å?·å??ã??ã?¦ã??ã?¾ã??"
 
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:246
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "ã??ã?®æ??å?·ã?¯å¾©å?·å??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/camel-cipher-context.c:254
+#: ../camel/camel-cipher-context.c:276
 msgid "Decrypting message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®æ??å?·ã??è§£é?¤ã??ã?¦ã??ã?¾ã??"
 
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:297
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "ã??ã?®æ??å?·ã?§é?µã??ã?¤ã?³ã??ã?¼ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:341
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "ã??ã?®æ??å?·ã?§é?µã??ã?¨ã?ã?¹ã??ã?¼ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-data-cache.c:181
+#, c-format
 msgid "Unable to create cache path"
 msgstr "ã?ã?£ã??ã?·ã?¥ã??ã?¡ã?¤ã?«ã??ç??æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-data-cache.c:402
+#: ../camel/camel-data-cache.c:494
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ã?ã?£ã??ã?·ã?¥ã?»ã?¨ã?³ã??ã?ªã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s: %s"
 
-#: ../camel/camel-db.c:412
+#: ../camel/camel-data-wrapper.c:89
+#, c-format
+msgid "No stream available"
+msgstr "å?©ç?¨ã?§ã??ã??ã?¹ã??ã?ªã?¼ã? ã??ã??ã??ã?¾ã??ã??"
+
+#: ../camel/camel-db.c:464
+#, c-format
 msgid "Insufficient memory"
 msgstr "ã?¡ã?¢ã?ªã??è¶³ã??ã?¾ã??ã??"
 
-#: ../camel/camel-disco-diary.c:197
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1313,8 +1562,8 @@ msgstr ""
 "ã??ã??ã??ã?¯ã?¼ã?¯ã?«å??æ?¥ç¶?ã??ã?¦ã??ã??ã??ã?®ã?µã?¼ã??ã?«å¯¾ã??ã??\n"
 "ã??ã??ä»¥é??ã?®æ??ä½?ã?¯å??ç?¾ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/camel-disco-diary.c:258
+#: ../camel/providers/imap/camel-imap-journal.c:298
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1325,120 +1574,149 @@ msgstr ""
 "%s\n"
 "ã??ã?®ã??ã?©ã?«ã??ã?«å¯¾ã??ã??å¤?æ?´ã??å??ã?³å??æ??ã??ã??ã??ã??ã?¨ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:299
 msgid "Resynchronizing with server"
 msgstr "ã?µã?¼ã??ã?®å??å??æ??ä¸"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
-msgid "Copy folder content locally for offline operation"
-msgstr "ã??ã?©ã?«ã??ã?®å??å®¹ã??ã?ã?¼ã?«ã?«ã?¸ã?³ã??ã?¼ã??ã?? (ã?ªã??ã?©ã?¤ã?³ç?¨)"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
 msgid "Downloading new messages for offline mode"
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?®æ?°ç??ã?¡ã?¼ã?«ã?®ã??ã?¦ã?³ã?ã?¼ã??ä¸"
 
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:379
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?«å??ã??æ?¿ã??ã??æº?å??ä¸: %s"
 
-#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:223
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:3014
+#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
+msgid "Copy folder content locally for offline operation"
+msgstr "ã??ã?©ã?«ã??ã?®å??å®¹ã??ã?ã?¼ã?«ã?«ã?¸ã?³ã??ã?¼ã??ã?? (ã?ªã??ã?©ã?¤ã?³ç?¨)"
+
+#: ../camel/camel-disco-store.c:398
+#: ../camel/providers/groupwise/camel-groupwise-store.c:230
+#: ../camel/providers/imap/camel-imap-store.c:876
+#: ../camel/providers/imap/camel-imap-store.c:1720
+#: ../camel/providers/imap/camel-imap-store.c:2178
+#: ../camel/providers/imap/camel-imap-store.c:3022
+#: ../camel/providers/imapx/camel-imapx-folder.c:165
+#: ../camel/providers/imapx/camel-imapx-folder.c:196
+#: ../camel/providers/imapx/camel-imapx-folder.c:225
+#: ../camel/providers/imapx/camel-imapx-folder.c:282
+#: ../camel/providers/imapx/camel-imapx-folder.c:325
+#: ../camel/providers/imapx/camel-imapx-folder.c:357
+#: ../camel/providers/imapx/camel-imapx-folder.c:388
+#: ../camel/providers/imapx/camel-imapx-store.c:194
+#: ../camel/providers/imapx/camel-imapx-store.c:716
+#: ../camel/providers/imapx/camel-imapx-store.c:779
+#: ../camel/providers/imapx/camel-imapx-store.c:838
+#, c-format
 msgid "You must be working online to complete this operation"
-msgstr "ã??ã?®å??ä½?ã??å®?äº?ã??ã??ã??ã??ã?«ã?ªã?³ã?©ã?¤ã?³ã?§ä½?æ¥ã??ã?¦ä¸?ã??ã??"
+msgstr "ã??ã?®å??ä½?ã??å®?äº?ã??ã??ã??ã??ã?«ã?ªã?³ã?©ã?¤ã?³ã?§ä½?æ¥ã??ã?¦ã??ã? ã??ã??"
+
+#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
+#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
+#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
+#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
+#: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4657
+#: ../camel/providers/imapx/camel-imapx-server.c:4674
+#: ../camel/providers/nntp/camel-nntp-summary.c:396
+#: ../camel/providers/pop3/camel-pop3-folder.c:269
+#: ../camel/providers/pop3/camel-pop3-folder.c:625
+#: ../camel/providers/pop3/camel-pop3-folder.c:690
+#: ../camel/providers/pop3/camel-pop3-store.c:466
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "ã?ã?£ã?³ã?»ã?«æ¸?ã?¿"
 
-#: ../camel/camel-exception.c:260
-msgid "No description available"
-msgstr "èª¬æ??ã?ªã??"
+#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
+#: ../camel/camel-file-utils.c:791
+#, c-format
+msgid "Canceled"
+msgstr "ã?ã?£ã?³ã?»ã?«æ¸?ã?¿"
 
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "å?ã??ã?ã?»ã?¹ '%s' ã?®ç??æ??ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:853
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s ã??ã??å??ä¿¡ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?»ã?¹ã??ã?ªã?¼ã? ã??æ£ã??ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
+#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
 msgid "Syncing folders"
 msgstr "ã??ã?©ã?«ã??ã?®å??æ??ä¸"
 
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ã??ã?£ã?«ã?¿ã?®æ§?æ??è§£æ??ä¸ã?«ã?¨ã?©ã?¼: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ã??ã?£ã?«ã?¿å®?è¡?ä¸ã?«ã?¨ã?©ã?¼: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1240
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã??é??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1251
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã??å?¦ç??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ %d ã?®å??å¾?ä¸ (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1245
-msgid "Cannot open message"
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ã??ã?¾ã??ã??"
-
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
 #, c-format
 msgid "Failed on message %d"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ %d ã?§å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
 msgid "Syncing folder"
 msgstr "ã??ã?©ã?«ã??ã?®å??æ??ä¸"
 
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
 msgid "Complete"
 msgstr "å®?äº?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ %d / %d ã?®å??å¾?ä¸"
 
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ %d / %d ã?§å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®å??å¾?ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
 msgstr "(system-flag) ã?«å¯¾ã??ã??ç?¡å?¹ã?ªå¼?æ?°"
 
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
 msgstr "(user-tag) ã?«å¯¾ã??ã??ç?¡å?¹ã?ªå¼?æ?°"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ã??ã?£ã?«ã?¿æ¤?ç´¢å®?è¡?ä¸ã?«ã?¨ã?©ã?¼: %s: %s"
 
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1447,8 +1725,8 @@ msgstr ""
 "æ£è¦?è¡¨ç?¾ã?®æ§?æ??ã??è§£æ??ã?§ã??ã?¾ã??ã??: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1457,72 +1735,71 @@ msgstr ""
 "æ£è¦?è¡¨ç?¾ã?§ã?®æ¤?ç´¢ã??å®?è¡?ä¸ã?«ã?¨ã?©ã?¼: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ã?«ã?¯è«?ç??çµ?æ??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:938
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ã?¯ %s ã?®ä¸ã?«å?«ã??ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ã?«ã?¯æ¤?ç´¢ã?®ç¨®é¡?ã??è¡¨ã??æ??å?å??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:978
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ã?¯é??å??ã?®çµ?æ??ã??æ??å¾?ã??ã?¾ã??"
 
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:987
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ã?«ã?¯ã??ã?©ã?«ã??ã?®çµ?ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-folder.c:683
+#: ../camel/camel-folder.c:125
 #, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??æ??ä½?: %s ã?«å¯¾ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®è¿½å? "
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "'%s' ã?«ã??ã??æ?°ã??ã??ã?¹ã??ã? ã?»ã?¡ã??ã?»ã?¼ã?¸ã?®å¦ç¿?ä¸"
 
-#: ../camel/camel-folder.c:1388
+#: ../camel/camel-folder.c:147
 #, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??æ??ä½?: %s ã?«å¯¾ã??ã?¦å¼?ã??ä½¿ã?£ã??æ¤?ç´¢"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "'%s' ã?«ã??ã??æ?°ã??ã??ã??ã? ã?»ã?¡ã??ã?»ã?¼ã?¸ã?®å¦ç¿?ä¸"
 
-#: ../camel/camel-folder.c:1429
+#: ../camel/camel-folder.c:171
 #, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??æ??ä½?: %s ã?«å¯¾ã??ã?¦å¼?ã??ä½¿ã?£ã??ã?«ã?¦ã?³ã??"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "'%s' ã?«ã??ã??æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®ã??ã?£ã?«ã?¿ã?ªã?³ã?°ä¸"
 
-#: ../camel/camel-folder.c:1468
-#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??æ??ä½?: %s ã?«å¯¾ã??ã?¦ UID ã??ä½¿ã?£ã??æ¤?ç´¢"
-
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:688
+#: ../camel/providers/local/camel-maildir-folder.c:366
 msgid "Moving messages"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®ç§»å??ä¸"
 
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:690
 msgid "Copying messages"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®ã?³ã??ã?¼ä¸"
 
-#: ../camel/camel-folder.c:1922
-msgid "Learning junk"
-msgstr "ã?¸ã?£ã?³ã?¯ã?»ã?¡ã?¼ã?«ã?®å¦ç¿?ä¸"
-
-#: ../camel/camel-folder.c:1939
-msgid "Learning non-junk"
-msgstr "ã?¸ã?£ã?³ã?¯ã?§ã?¯ã?ªã??ã?¡ã?¼ã?«ã?®å¦ç¿?ä¸"
+#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
+#: ../camel/camel-gpg-context.c:1330
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "GPG ã?®å®?è¡?ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-folder.c:1958
-msgid "Filtering new message(s)"
-msgstr "æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®ã??ã?£ã?«ã?¿ã?ªã?³ã?°ä¸"
+#: ../camel/camel-gpg-context.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:114
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Unknown"
+msgstr "ä¸?æ??"
 
-#: ../camel/camel-gpg-context.c:751
+#: ../camel/camel-gpg-context.c:770
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1533,15 +1810,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:766
+#: ../camel/camel-gpg-context.c:787
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "GnuPG ã?®ã?¦ã?¼ã?¶ ID ã??ã?³ã??ã?®è§£æ??ã?«å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:804
+#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "GnuPG ã?®ã??ã?¹ã?¯ã?¼ã??è¦?æ±?ã?®è§£æ??ã?«å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-gpg-context.c:824
+#: ../camel/camel-gpg-context.c:848
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1550,7 +1829,7 @@ msgstr ""
 "ã??ä½¿ã??ã?®ã?¹ã??ã?¼ã??ã?«ã?¼ã??ã?®ã?ã?¼ã??è§£é?¤ã??ã??ã?«ã?¯\n"
 "PIN ã??å¿?è¦?ã?§ã??: \"%s\""
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:852
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1559,145 +1838,115 @@ msgstr ""
 "æ¬¡ã?®ã?¦ã?¼ã?¶ã?®ã?ã?¼ã??è§£é?¤ã??ã??ã?«ã?¯ã??ã?¹ã?¯ã?¼ã??ã??å¿?è¦?ã?§ã??:\n"
 " \"%s\""
 
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "'%s' ã?«å¯¾ã??ã?¦ GnuPG ã??ã??æ?³å®?å¤?ã?®è¦?æ±?ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-gpg-context.c:858 ../camel/camel-gpg-context.c:1067
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
-msgid "Canceled."
-msgstr "ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
-
-#: ../camel/camel-gpg-context.c:872
+#: ../camel/camel-gpg-context.c:905
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "ç§?å¯?é?µã?®è§£é?¤ã?«å¤±æ??ã??ã?¾ã??ã??: æ??å®?ã??ã??ä¸?ã?¤ã?®ã??ã?¹ã?¯ã?¼ã??ã??ã??ã??ã??ã??ã?§ã??ã??"
 
-#: ../camel/camel-gpg-context.c:880
+#: ../camel/camel-gpg-context.c:917
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-gpg-context.c:943
+#: ../camel/camel-gpg-context.c:1048
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "æ??å?·å??ã?«å¤±æ??ã??ã?¾ã??ã??: æ£ã??ã??å®?å??ã??æ??å®?ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1212 ../camel/camel-gpg-context.c:1337
-#: ../camel/camel-gpg-context.c:1859 ../camel/camel-gpg-context.c:1904
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "GPG ã?®å®?è¡?ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
+#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+msgid "Could not generate signing data: "
+msgstr "ç½²å??ã??ã?¼ã?¿ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: "
 
-#: ../camel/camel-gpg-context.c:1305 ../camel/camel-smime-context.c:602
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "ç½²å??ã??ã?¼ã?¿ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
-
-#: ../camel/camel-gpg-context.c:1352 ../camel/camel-gpg-context.c:1553
-#: ../camel/camel-gpg-context.c:1569 ../camel/camel-gpg-context.c:1649
-#: ../camel/camel-gpg-context.c:1664 ../camel/camel-gpg-context.c:1780
-#: ../camel/camel-gpg-context.c:1795 ../camel/camel-gpg-context.c:1875
-#: ../camel/camel-gpg-context.c:1920
+#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
+#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
+#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
 msgid "Failed to execute gpg."
-msgstr "GPG ã?®å®?è¡?ã?«å¤±æ??ã??ã?¾ã??ã??"
-
-#: ../camel/camel-gpg-context.c:1371
-msgid "This is a digitally signed message part"
-msgstr "ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ã?«ã?¯ã??ã?¸ã?¿ã?«ç½²å??ã??ã??ã??é?¨å??ã??ã??ã??ã?¾ã??"
+msgstr "GPG ã?®å®?è¡?ã?«å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-gpg-context.c:1457 ../camel/camel-gpg-context.c:1463
-#: ../camel/camel-gpg-context.c:1469 ../camel/camel-gpg-context.c:1484
-#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
+#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
+#: ../camel/camel-smime-context.c:966
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ç½²å??ã?®æ?´å??æ?§ã??ç¢ºèª?ã?§ã??ã?¾ã??ã??: ã?¡ã??ã?»ã?¼ã?¸ã?®æ?¸å¼?ã??æ£ã??ã??ã??ã??ã?¾ã??"
 "ã??"
 
-#: ../camel/camel-gpg-context.c:1523
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr ""
-"ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ã?®æ?´å??æ?§ã??ç¢ºèª?ã?§ã??ã?¾ã??ã??: ä½?æ¥ç?¨ã??ã?¡ã?¤ã?«ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??"
-"ã??: %s"
+#: ../camel/camel-gpg-context.c:1695
+msgid "Cannot verify message signature: "
+msgstr "ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ç½²å??ã?®æ?´å??æ?§ã??ç¢ºèª?ã?§ã??ã?¾ã??ã??: "
 
-#: ../camel/camel-gpg-context.c:1632
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "æ??å?·å??ã??ã??ã??ã?¼ã?¿ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
+#: ../camel/camel-gpg-context.c:1814
+msgid "Could not generate encrypting data: "
+msgstr "æ??å?·å??ã??ã??ã??ã??ã?¼ã?¿ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: "
 
-#: ../camel/camel-gpg-context.c:1682
+#: ../camel/camel-gpg-context.c:1866
 msgid "This is a digitally encrypted message part"
 msgstr "ã??ã??ã?¯ã??ã?¸ã?¿ã?«ç½²å??ã??ã??ã??é?¨å??ã?§ã??"
 
-#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1743
-#: ../camel/camel-gpg-context.c:1762
+#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
+#: ../camel/camel-gpg-context.c:1954
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??è§£èªã?§ã??ã?¾ã??ã??: ã?¡ã??ã?»ã?¼ã?¸ã?®æ?¸å¼?ã??æ£ã??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-gpg-context.c:1752
+#: ../camel/camel-gpg-context.c:1942
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME å??ã?®æ??å?·è§£èªã?«å¤±æ??ã??ã?¾ã??ã??: ã??ã?ã??ã?³ã?«ã?»ã?¨ã?©ã?¼"
 
-#: ../camel/camel-gpg-context.c:1817 ../camel/camel-smime-context.c:1186
+#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
 msgid "Encrypted content"
 msgstr "æ??å?·å??ã??ã??å??å®¹"
 
-#: ../camel/camel-gpg-context.c:1836
-msgid "Unable to parse message content"
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®å??å®¹ã??è§£æ??ã?§ã??ã?¾ã??ã??"
-
-#: ../camel/camel-gpg-context.c:1860 ../camel/camel-gpg-context.c:1905
-#: ../camel/camel-tcp-stream-openssl.c:627
-#: ../camel/providers/imap4/camel-imap4-utils.c:614
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
-msgid "Unknown"
-msgstr "ä¸?æ??"
-
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "ã?ã??ã?ã?³ã?°ã?»ã??ã?«ã??ã?¼ã?»ã??ã?¤ã??ã??æ§?ç¯?ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "ã?ã??ã?ã?³ã?°ã?»ã??ã?«ã??ã?¼ã?®ã??ã?ã?»ã?¹ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "'%s' ã??ã?ã??ã?¯ã?§ã??ã?¾ã??ã??ã?§ã??ã??: lock-helper ã?®ã??ã?ã??ã?³ã?«ã?»ã?¨ã?©ã?¼ã?§ã??"
 
-#: ../camel/camel-lock-client.c:216
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "'%s' ã??ã?ã??ã?¯ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s ã?®ã?ã??ã?¯ã?»ã??ã?¡ã?¤ã?«ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr ""
-"%s ã?®ã?ã??ã?¯ã?»ã??ã?¡ã?¤ã?«ã??å??å¾?ä¸ã?«ã?¿ã?¤ã? ã?¢ã?¦ã??ã??ã?¾ã??ã??ã??å¾?ã?§ã??ã??ç?´ã??ã?¦ä¸?ã??ã??ã??"
+"%s ã?®ã?ã??ã?¯ã?»ã??ã?¡ã?¤ã?«ã?®å??å¾?ä¸ã?«ã?¿ã?¤ã? ã?¢ã?¦ã??ã??ã?¾ã??ã??ã??å¾?ã?§ã??ã??ç?´ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2) ã??ä½¿ã?£ã??ã?ã??ã?¯ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) ã??ä½¿ã?£ã??ã?ã??ã?¯ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "ã?¡ã?¼ã?«ã?»ã??ã?¡ã?¤ã?« %s ã??ã??ã?§ã??ã?¯ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
@@ -1707,145 +1956,146 @@ msgstr "ã?¡ã?¼ã?«ã?»ã??ã?¡ã?¤ã?« %s ã??ã??ã?§ã??ã?¯ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 msgid "Could not open mail file %s: %s"
 msgstr "ã?¡ã?¼ã?«ã?»ã??ã?¡ã?¤ã?« %s ã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "ã?¡ã?¼ã?«ã?»ã??ã?¡ã?¤ã?« %s ã?®ã??ã?³ã??ã?©ã?ªã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "ä½?æ¥ã??ã?¡ã?¤ã?« %s ã?¸ã?¡ã?¼ã?«ã?®ä¿?å?ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "ã??ã?¤ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "fork(2) ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail ã??ã?ã?°ã?©ã? ã?¯å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(ç?¹å®?ã?§ã??ã?ªã??ã?¨ã?©ã?¼)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "ã?¡ã?¼ã?«ã?»ã??ã?¡ã?¤ã?«ã?®èªã?¿è¾¼ã?¿ä¸ã?«ã?¨ã?©ã?¼: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "ã?¡ã?¼ã?«ä½?æ¥ã??ã?¡ã?¤ã?«ã?®æ?¸ã??è¾¼ã?¿ä¸ã?«ã?¨ã?©ã?¼: %s"
 
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "ã?¡ã?¼ã?«ä½?æ¥ã??ã?¡ã?¤ã?«ã?®ã?³ã??ã?¼ä¸ã?«ã?¨ã?©ã?¼: %s"
 
-#: ../camel/camel-multipart-signed.c:592
-msgid "parse error"
-msgstr "è§£æ??ã?¨ã?©ã?¼"
+#: ../camel/camel-multipart-signed.c:285
+#, c-format
+msgid "No content available"
+msgstr "å?©ç?¨ã?§ã??ã??ã?³ã?³ã??ã?³ã??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:806
-#: ../camel/providers/pop3/camel-pop3-store.c:446
-#: ../camel/providers/pop3/camel-pop3-store.c:546
-msgid "Canceled"
-msgstr "ã?ã?£ã?³ã?»ã?«æ¸?ã?¿"
+#: ../camel/camel-multipart-signed.c:293
+#, c-format
+msgid "No signature available"
+msgstr "å?©ç?¨ã?§ã??ã??ç½²å??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-net-utils.c:522
-msgid "cannot create thread"
-msgstr "ã?¹ã?¬ã??ã??ã??ç??æ??ã?§ã??ã?¾ã??ã??"
+#: ../camel/camel-multipart-signed.c:612
+#, c-format
+msgid "parse error"
+msgstr "è§£æ??ã?¨ã?©ã?¼"
 
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:693
 #, c-format
 msgid "Resolving: %s"
 msgstr "è§£æ±ºä¸: %s"
 
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:715
 msgid "Host lookup failed"
 msgstr "ã??ã?¹ã??ã?®æ¤?ç´¢ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:719
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "ã??ã?¹ã??ã?®æ¤?ç´¢ã?«å¤±æ??ã??ã?¾ã??ã??: %s: %s"
 
-#: ../camel/camel-net-utils.c:810
+#: ../camel/camel-net-utils.c:842
 msgid "Resolving address"
 msgstr "ã?¢ã??ã?¬ã?¹ã?®è§£æ±ºä¸"
 
-#: ../camel/camel-net-utils.c:830
+#: ../camel/camel-net-utils.c:862
 msgid "Name lookup failed"
 msgstr "å??å??ã?®æ¤?ç´¢ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-net-utils.c:833
+#: ../camel/camel-net-utils.c:867
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "å??å??ã?®æ¤?ç´¢ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:169
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ã??ã?©ã?«ã?? '%s' ã?«ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??å??æ??ã??ã?¦ä¿?å?ä¸"
 
-#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "ã??ã?©ã?«ã?? '%s' ã?®ã?ªã??ã?©ã?¤ã?³ã?»ã?¸ã?£ã?¼ã??ã?«ã?«æ?¸ã??è¾¼ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
 msgstr "ä»®æ?³ã??ã?©ã?«ã??ã?»ã?¡ã?¼ã?«ã?»ã??ã?ã??ã?¤ã??"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "ã??ã?®ä»?ã?®ã??ã?©ã?«ã??ã?»ã?»ã??ã??ã?®ã?¯ã?¨ã?ªã?¨ã??ã?¦ã?¡ã?¼ã?«ã??èªã??"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:188
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "%s ã??èªã?¿è¾¼ã??ã?¾ã??ã??ã?§ã??ã??: ã??ã?®ã?·ã?¹ã??ã? ã?§ã?¯ã?¢ã?¸ã?¥ã?¼ã?«ã?®èªã?¿è¾¼ã?¿ã??ã?µã??ã?¼ã??ã??ã?¦"
 "ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:197
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s ã??èªã?¿è¾¼ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:206
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ã??èªã?¿è¾¼ã??ã?¾ã??ã??ã?§ã??ã??: ã?¢ã?¸ã?¥ã?¼ã?«ã?®ã?³ã?¼ã??ã??å??æ??å??ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:207
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "'%s' ã?¨ã??ã??ã??ã?ã??ã?³ã?«ã??å?©ç?¨ã?§ã??ã??ã??ã?ã??ã?¤ã??ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-anonymous.c:36
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "å?¿å??"
 
-#: ../camel/camel-sasl-anonymous.c:38
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯å?¿å??ã?ã?°ã?¤ã?³ã??ä½¿ã?£ã?¦ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:69
+#, c-format
 msgid "Authentication failed."
 msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:80
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1854,7 +2104,7 @@ msgstr ""
 "ç?¡å?¹ã?ª E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã?®ã??ã?¬ã?¼ã?¹æ??å ±:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:94
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1863,7 +2113,7 @@ msgstr ""
 "ç?¡å?¹ã?§ä¸?å?¯è§£ã?ªã??ã?¬ã?¼ã?¹æ??å ±:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:108
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1872,11 +2122,11 @@ msgstr ""
 "ç?¡å?¹ã?ªã??ã?¬ã?¼ã?¹æ??å ±:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:45
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:47
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -1884,11 +2134,11 @@ msgstr ""
 "ã?µã?¼ã??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã??å ´å??ã??ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã?? CRAM-"
 "MD5 èª?è¨¼ã??ä½¿ã?£ã?¦ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -1896,41 +2146,47 @@ msgstr ""
 "ã?µã?¼ã??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã??å ´å??ã??ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã?? DIGEST-"
 "MD5 ã??ä½¿ã?£ã?¦ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-digest-md5.c:844
+#: ../camel/camel-sasl-digest-md5.c:818
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ã?µã?¼ã??è¦?æ±?ã??é?·ã??ã??ã?¾ã?? (2048 octet ä»¥ä¸?ã?§ã??)"
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:829
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "ç?¡å?¹ã?§ã??\n"
 
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:837
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr ""
 "ã?µã?¼ã??è¦?æ±?ã?«ã??ã??ã??ã?ª \"ä¿?è·å??è³ª (QOP: Quality of Protection)\" ã?®ã??ã?¼ã?¯ã?³ã??å?«"
 "ã?¾ã??ã?¦ã??ã?¾ã??"
 
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:869
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ã?µã?¼ã??ã?®å¿?ç?ã?«èª?è¨¼ã??ã?¼ã?¿ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:890
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ã?µã?¼ã??ã?®å¿?ç?ã?«ä¸?å®?å?¨ã?ªèª?è¨¼ã??ã?¼ã?¿ã??ã??ã??ã?¾ã??"
 
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:903
+#, c-format
 msgid "Server response does not match"
 msgstr "ã?µã?¼ã??ã?®å¿?ç?ã??ä¸?è?´ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:63
+#: ../camel/camel-sasl-gssapi.c:80
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:65
+#: ../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:159
+#: ../camel/camel-sasl-gssapi.c:119
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -1938,11 +2194,11 @@ msgstr ""
 "æ??å®?ã??ã??ã?¡ã?«ã??ã?ºã? ã??æ??ä¾?ã??ã??ã??è¨¼æ??æ?¸ã?§ã?¯ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?ªã??ã??ã??ã??ã?®å®?è£?ã?§èª?"
 "è?ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:124
 msgid "The provided target_name parameter was ill-formed."
 msgstr "æ??å®?ã??ã??å¼?æ?° target_name ã?®å½¢å¼?ã??é??é??ã?£ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:167
+#: ../camel/camel-sasl-gssapi.c:127
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -1950,7 +2206,7 @@ msgstr ""
 "æ??å®?ã??ã??å¼?æ?°ã?® target_name ã?«ç?¡å?¹ã?ªã??ã??ã??ã??ã?¯ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??ç¨®é¡?ã?®å??å??ã??ã??"
 "ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:171
+#: ../camel/camel-sasl-gssapi.c:131
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -1958,14 +2214,14 @@ msgstr ""
 "input_token ã?«å¼?æ?° input_chan_bindigs ã??ä»?ã??ã?¦æ??å®?ã??ã??ã??å?¥ã?®ã??ã?£ã?³ã??ã?«ã?®ã??ã?³"
 "ã??ã?£ã?³ã?°ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../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:180
+#: ../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."
@@ -1973,68 +2229,53 @@ msgstr ""
 "æ??å®?ã??ã??è¨¼æ??æ?¸ã?§ã?³ã?³ã??ã?ã?¹ã??ã?®å??æ??å??ã?¯ã?§ã??ã?ªã??ã??ã??ã?¾ã??ã?¯è¨¼æ??æ?¸ã?®ã??ã?³ã??ã?«ã??ä»»"
 "æ??ã?®è¨¼æ??æ?¸ã??å??ç?§ã??ã?¦ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:145
 msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 "æ??å®?ã??ã??ã?³ã?³ã??ã?ã?¹ã??ã?®ã??ã?³ã??ã?«ã??æ£ã??ã??ã?³ã?³ã??ã?ã?¹ã??ã??å??ç?§ã??ã?¦ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:188
+#: ../camel/camel-sasl-gssapi.c:148
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token ã?§å®?æ?½ã??ã??æ?´å??æ?§ã?®ã??ã?§ã??ã?¯ã??å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:191
+#: ../camel/camel-sasl-gssapi.c:151
 msgid "The consistency checks performed on the credential failed."
 msgstr "è¨¼æ??æ?¸ã?§å®?æ?½ã??ã??æ?´å??æ?§ã?®ã??ã?§ã??ã?¯ã??å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:154
 msgid "The referenced credentials have expired."
 msgstr "å??ç?§ã??ã?¦ã??ã??è¨¼æ??æ?¸ã?®æ??é??ã??é??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
-#: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
-#: ../camel/camel-sasl-kerberos4.c:230
-#: ../camel/providers/imap/camel-imap-store.c:1274
+#: ../camel/camel-sasl-gssapi.c:160 ../camel/camel-sasl-gssapi.c:296
+#: ../camel/camel-sasl-gssapi.c:340 ../camel/camel-sasl-gssapi.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#, c-format
 msgid "Bad authentication response from server."
 msgstr "ã?µã?¼ã??ã??ã??é??é??ã?£ã??èª?è¨¼å¿?ç?ã??ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:309
+#: ../camel/camel-sasl-gssapi.c:369
+#, c-format
 msgid "Unsupported security layer."
 msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??ã?»ã?ã?¥ã?ªã??ã?£ã?»ã?¬ã?¤ã?¤ã?§ã??ã??"
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ Kerberos 4 èª?è¨¼ã??ä½¿ã?£ã?¦ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã?¾ã??"
-
-#: ../camel/camel-sasl-kerberos4.c:173
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kerberos ã??ã?±ã??ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??ã?§ã??ã??:\n"
-"%s"
-
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:39
 msgid "Login"
 msgstr "ã?ã?°ã?¤ã?³"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
 msgid "This option will connect to the server using a simple password."
 msgstr "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ç°¡å??ã?ªã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã?¾ã??"
 
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:94
+#, c-format
 msgid "Unknown authentication state."
 msgstr "ç?¹å®?ã?§ã??ã?ªã??èª?è¨¼ç?¶æ??ã?§ã??"
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:41
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:43
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2042,51 +2283,53 @@ msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ NTLM/ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã??ã??ã?¹ã?¯ã?¼ã??èª?è¨¼ã??ä½¿ã?£ã?¦ Windows "
 "ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:43
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
-msgstr "SMTP ã?®å??ã?« POP"
+msgstr "POP before SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ SMTP æ?¥ç¶?ã??è©¦ã??å??ã?« POP æ?¥ç¶?ã?®èª?è¨¼ã??è¡?ã??ã?¾ã??"
+msgstr "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ SMTP æ?¥ç¶?ã??ç¢ºç«?ã??ã??å??ã?« POP æ?¥ç¶?ã?®èª?è¨¼ã??è¡?ã??ã?¾ã??"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:82
 msgid "POP Source URI"
 msgstr "POP ã?½ã?¼ã?¹ URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr "ä¸?æ??ã?ªè»¢é??ã??å?©ç?¨ã??ã?¦ SMTP èª?è¨¼ã?®å??ã?« POP"
+#: ../camel/camel-sasl-popb4smtp.c:89
+#, c-format
+msgid "POP Before SMTP authentication using an unknown transport"
+msgstr "ä¸?æ??ã?ªè»¢é??ã??å?©ç?¨ã??ã?? POP Before SMTP èª?è¨¼ã?§ã??"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "POP ã?§ã?ªã??ã?½ã?¼ã?¹ã??å?©ç?¨ã??ã?¦ SMTP èª?è¨¼ã?®å??ã?« POP"
+#: ../camel/camel-sasl-popb4smtp.c:97
+#, c-format
+msgid "POP Before SMTP authentication using a non-POP source"
+msgstr "POP ã?½ã?¼ã?¹ã??å?©ç?¨ã??ã?ªã?? POP Before SMTP ã?§ã??"
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "æ£è¦?è¡¨ç?¾ã?®ç·¨é??ã?«å¤±æ??: %s: %s"
 
-#: ../camel/camel-service.c:265
+#: ../camel/camel-service.c:88
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' ã?¯ã?¦ã?¼ã?¶å??ã?³ã?³ã??ã?¼ã??ã?³ã??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:92
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' ã?¯ã??ã?¹ã??ã?»ã?³ã?³ã??ã?¼ã??ã?³ã??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:96
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' ã?¯ã??ã?¹ã?»ã?³ã?³ã??ã?¼ã??ã?³ã??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-session.c:307
+#: ../camel/camel-session.c:261
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2095,370 +2338,301 @@ msgstr ""
 "ã??ã?©ã?«ã?? %s ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??:\n"
 "%s"
 
-#: ../camel/camel-session.c:479
+#: ../camel/camel-session.c:758
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
-msgstr "%s%s %s ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ä¸?ã??ã??ã??"
+msgstr "%s%s %s ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../camel/camel-session.c:817
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Camel ã?®ã?»ã??ã?·ã?§ã?³ã?§ã?¯ã?¡ã??ã?»ã?¼ã?¸ã?®è»¢é??ã?¯ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
-
-#: ../camel/camel-smime-context.c:444 ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' ã?®è¨¼æ??æ?¸ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
 msgstr "CMS ã?¡ã??ã?»ã?¼ã?¸ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
 msgstr "CMS ç½²å??ã??ã?¼ã?¿ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:387
 msgid "Cannot attach CMS signed data"
 msgstr "CMS ç½²å??ã??ã?¼ã?¿ã??æ·»ä»?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:394
 msgid "Cannot attach CMS data"
 msgstr "CMS ã??ã?¼ã?¿ã??æ·»ä»?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:400
 msgid "Cannot create CMS Signer information"
 msgstr "CMS ç½²å??è??ã?®æ??å ±ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:406
 msgid "Cannot find certificate chain"
 msgstr "èª?è¨¼ã??ã?§ã?¤ã?³ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:412
 msgid "Cannot add CMS Signing time"
 msgstr "CMS ç½²å??æ??å?»ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ã?®æ??å?·å??è¨¼æ??æ?¸ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "å±?æ?§ SMIMEEncKeyPrefs ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:463
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "å±?æ?§ MS SMIMEEncKeyPrefs ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot add encryption certificate"
 msgstr "æ??å?·å??è¨¼æ??æ?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot add CMS Signer information"
 msgstr "CMS ç½²å??è??æ??å ±ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:613 ../camel/camel-smime-context.c:1065
-msgid "Cannot create encoder context"
-msgstr "ã?¨ã?³ã?³ã?¼ã??ã?®ã?³ã?³ã??ã?ã?¹ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
-
-#: ../camel/camel-smime-context.c:619
-msgid "Failed to add data to CMS encoder"
-msgstr "CMS ã?¨ã?³ã?³ã?¼ã??ã?¸ã?®ã??ã?¼ã?¿ã?®è¿½å? ã??å¤±æ??ã??ã?¾ã??ã??"
-
-#: ../camel/camel-smime-context.c:624 ../camel/camel-smime-context.c:1082
-msgid "Failed to encode data"
-msgstr "ã??ã?¼ã?¿ã?®ã?¨ã?³ã?³ã?¼ã??ã?«å¤±æ??ã??ã?¾ã??ã??"
-
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:506
 msgid "Unverified"
 msgstr "æ?ªæ¤?è¨¼"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "è?¯ã??ç½²å??"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr "æ?ªã??ç½²å??"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:512
 msgid "Content tampered with or altered in transit"
 msgstr "ã??ã?¼ã?¿ã?®è»¢é??ä¸ã?«ä¸?å½?ã?«æ?¹ç«?ã??ã??ã??å??å®¹ã?§ã??"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:514
 msgid "Signing certificate not found"
 msgstr "ç½²å??ä»?ã??è¨¼æ??æ?¸ã??ã?¿ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
 msgstr "ç½²å??ä»?ã??è¨¼æ??æ?¸ã?¯ä¿¡é ¼ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "ç½²å??ã?¢ã?«ã?´ã?ªã?ºã? ã??ä¸?æ??ã?§ã??"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
 msgstr "ç½²å??ã?¢ã?«ã?´ã?ªã?ºã? ã?¯æ?ªã?µã??ã?¼ã??ã?§ã??"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "ã??ã??ã??ã?ªç½²å??ã?§ã??"
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:524
 msgid "Processing error"
 msgstr "å?¦ç??ã?¨ã?©ã?¼ã?§ã??"
 
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "ç½²å??ã?®ä¸ã?«ç½²å??ã??ã??ã??ã?¼ã?¿ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "EnvelopedData ã??ã??ã?®ã??ã?¤ã?¸ã?§ã?¹ã??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "ã??ã?¤ã?¸ã?§ã?¹ã??ã??è¨?ç®?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?»ã??ã?¤ã?¸ã?§ã?¹ã??ã??ã?»ã??ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "è¨¼æ??æ?¸ã?®ã?¤ã?³ã??ã?¼ã??ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®ã?¿èª?è¨¼ã??ã?¾ã??ã??ã??å¦¥å½?æ?§ã??æ¤?è¨¼ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?¨ã?¤ã?³ã??ã?¼ã??æ¸?ã?§æ¤?è¨¼æ¸?ã?¿ã?®è¨¼æ??æ?¸ã?®ã?¿èª?è¨¼ã??ã?¾ã??"
 
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "è¨¼æ??æ?¸ã?®ã??ã?¤ã?¸ã?§ã?¹ã??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ç½²å??è??: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
+msgid "Cannot create encoder context"
+msgstr "ã?¨ã?³ã?³ã?¼ã??ã?®ã?³ã?³ã??ã?ã?¹ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
+
+#: ../camel/camel-smime-context.c:838
+msgid "Failed to add data to CMS encoder"
+msgstr "CMS ã?¨ã?³ã?³ã?¼ã??ã?¸ã?®ã??ã?¼ã?¿ã?®è¿½å? ã??å¤±æ??ã??ã?¾ã??ã??"
+
+#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
+msgid "Failed to encode data"
+msgstr "ã??ã?¼ã?¿ã?®ã?¨ã?³ã?³ã?¼ã??ã?«å¤±æ??ã??ã?¾ã??ã??"
+
+#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
 msgid "Decoder failed"
 msgstr "ã??ã?³ã?¼ã??ã?®ã?¨ã?©ã?¼ã?§ã??"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1049
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "å?±é??ã?ªã??ã?«ã?¯æ??å?·å??ã?¢ã?«ã?´ã?ªã?ºã? ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1057
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "æ??å?·å??ã??ã?«ã?¯é?µã?®ã?¹ã?ã??ã??ã??ç¢ºä¿?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot create CMS Message"
 msgstr "CMS ã?¡ã??ã?»ã?¼ã?¸ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1074
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS Enveloped ã??ã?¼ã?¿ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1080
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS Enveloped ã??ã?¼ã?¿ã??æ·»ä»?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1086
 msgid "Cannot attach CMS data object"
 msgstr "CMS ã??ã?¼ã?¿ã?»ã?ªã??ã?¸ã?§ã?¯ã??ã??æ·»ä»?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS å??é ?æ??å ±ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1100
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS å??é ?æ??å ±ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1125
 msgid "Failed to add data to encoder"
 msgstr "ã??ã?¼ã?¿ã?®ã?¨ã?³ã?³ã?¼ã??ã?¸ã?®è¿½å? ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1227
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME å¾©å?·å??: æ??å?·å??ã??ã??ã??å??å®¹ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1200
-msgid "import keys: unimplemented"
-msgstr "é?µã?®ã?¤ã?³ã??ã?¼ã??: æ?ªã? å®?è£?ã??ã??ã?¦ã??ã?¾ã??ã??"
-
-#: ../camel/camel-smime-context.c:1208
-msgid "export keys: unimplemented"
-msgstr "é?µã?®ã?¨ã?ã?¹ã??ã?¼ã??: æ?ªã? å®?è£?ã??ã??ã?¦ã??ã?¾ã??ã??"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: ã??ã??ã?§ã?¯ç?¡å?¹ã?ªæ??ä½?ã?§ã??"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:444
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: æ?¢ã?«å?å?¨ã??ã?¦ã??ã?¾ã??"
 
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: ã??ã??ã?§ã?¯ç?¡å?¹ã?ªæ??ä½?ã?§ã??"
-
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:543
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s: ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??"
 
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
+#: ../camel/providers/local/camel-maildir-store.c:224
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: %s: ç?¡å?¹ã?ªæ??ä½?ã?§ã??"
 
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ã??ã?©ã?«ã??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: %s: ç?¡å?¹ã?ªæ??ä½?ã?§ã??"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-store.c:1129 ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ã?´ã??ç®±"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:1132 ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ã?¸ã?£ã?³ã?¯"
 
-#: ../camel/camel-tcp-stream-openssl.c:564
-msgid "Unable to get issuer's certificate"
-msgstr "ç?ºè¡?è??ã?®è¨¼æ??æ?¸ã??å??å¾?ã?§ã??ã?¾ã??ã??"
-
-#: ../camel/camel-tcp-stream-openssl.c:566
-msgid "Unable to get Certificate Revocation List"
-msgstr "èª?è¨¼å??ã??æ¶?ã??ä¸?è¦§ã??å??å¾?ã?§ã??ã?¾ã??ã??"
-
-#: ../camel/camel-tcp-stream-openssl.c:568
-msgid "Unable to decrypt certificate signature"
-msgstr "è¨¼æ??æ?¸ã?®ç½²å??ã??è§£èªã?§ã??ã?¾ã??ã??"
-
-#: ../camel/camel-tcp-stream-openssl.c:570
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "èª?è¨¼å??ã??æ¶?ã??ä¸?è¦§ã?®ç½²å??ã?®è§£èªã??ã?§ã??ã?¾ã??ã??"
-
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to decode issuer's public key"
-msgstr "ç?ºè¡?è??ã?®ã??ã??ã?ªã??ã?¯ã?»ã?ã?¼ã??è§£èªã?§ã??ã?¾ã??ã??"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Certificate signature failure"
-msgstr "è¨¼æ??æ?¸ã?®ç½²å??ã?«å¤±æ??ã??ã?¾ã??ã??"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Certificate Revocation List signature failure"
-msgstr "èª?è¨¼å??ã??æ¶?ã??ä¸?è¦§ã?®ç½²å??ã?«å¤±æ??ã??ã?¾ã??ã??"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Certificate not yet valid"
-msgstr "èª?è¨¼ã??ã?¾ã? æ£ã??ã??ã??ã??ã?¾ã??ã??"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Certificate has expired"
-msgstr "è¨¼æ??æ?¸ã?®æ??å?¹æ??é??ã??å»¶ã?³ã?¾ã??ã??"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate Revocation List (CRL) not yet valid"
-msgstr "è¨¼æ??æ?¸å¤±å?¹ã?ªã?¹ã?? (CRL) ã?¯ã?¾ã? ç?¡å?¹ã?§ã??"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List (CRL) has expired"
-msgstr "è¨¼æ??æ?¸å¤±å?¹ã?ªã?¹ã?? (CRL) ã??æ??é??å??ã??ã?§ã??"
-
-#: ../camel/camel-tcp-stream-openssl.c:589
-msgid "Error in Certificate Revocation List (CRL)"
-msgstr "è¨¼æ??æ?¸å¤±å?¹ã?ªã?¹ã?? (CRL) ã?«ã?¨ã?©ã?¼"
-
-#: ../camel/camel-tcp-stream-openssl.c:591
-msgid "Out of memory"
-msgstr "ã?¡ã?¢ã?ªã??è¶³ã??ã?¾ã??ã??"
-
-#: ../camel/camel-tcp-stream-openssl.c:593
-msgid "Zero-depth self-signed certificate"
-msgstr "Zero-depth self-signed èª?è¨¼"
-
-#: ../camel/camel-tcp-stream-openssl.c:595
-msgid "Self-signed certificate in chain"
-msgstr "ã??ã?§ã?¼ã?³ã?®ä¸ã?«ã??ã?? Self-signed èª?è¨¼"
+#: ../camel/camel-tcp-stream-raw.c:814
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr "ã??ã?ã?ã?·ã??ã?¹ã??ã?¯ SOCKS 5 ã??ã?µã??ã?¼ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Unable to get issuer's certificate locally"
-msgstr "ç?ºè¡?è??ã?®èª?è¨¼ã??ã?ã?¼ã?«ã?«ã?§å??å¾?ã?§ã??ã?¾ã??ã??"
+#: ../camel/camel-tcp-stream-raw.c:820
+#, c-format
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "é?©å??ã??ã??èª?è¨¼å½¢å¼?ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã??: ã?³ã?¼ã?? 0x%x"
 
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Unable to verify leaf signature"
-msgstr "Leaf ç½²å??ã??æ¤?è¨¼ã?§ã??ã?¾ã??ã??"
+#: ../camel/camel-tcp-stream-raw.c:832
+msgid "General SOCKS server failure"
+msgstr "SOCKS ã?µã?¼ã??ã?®ä¸?è?¬ç??ã?ªå¤±æ??ã?§ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Certificate chain too long"
-msgstr "èª?è¨¼ã??ã?§ã?¼ã?³ã??é?·ã??ã??ã?¾ã??"
+#: ../camel/camel-tcp-stream-raw.c:833
+msgid "SOCKS server's rules do not allow connection"
+msgstr "SOCKS ã?µã?¼ã??ã?®ã?«ã?¼ã?«è¨å®?ã?«ã??ã??æ?¥ç¶?ã??è¨±å?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Certificate Revoked"
-msgstr "ç?¡å?¹ã?«ã?ªã?£ã??è¨¼æ??æ?¸ã?§ã??"
+#: ../camel/camel-tcp-stream-raw.c:834
+msgid "Network is unreachable from SOCKS server"
+msgstr "SOCKS ã?µã?¼ã??ã??ã??ã??ã??ã??ã?¯ã?¼ã?¯ã?«å?°é??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Invalid Certificate Authority (CA)"
-msgstr "èª?è¨¼å±? (CA) ã??ç?¡å?¹ã?§ã??"
+#: ../camel/camel-tcp-stream-raw.c:835
+msgid "Host is unreachable from SOCKS server"
+msgstr "SOCKS ã?µã?¼ã??ã??ã??ã??ã?¹ã??ã?«å?°é??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Path length exceeded"
-msgstr "ã??ã?¹ã?¯ã?¼ã??ã??é?·ã??ã??ã?¾ã??"
+#: ../camel/camel-tcp-stream-raw.c:836
+msgid "Connection refused"
+msgstr "æ?¥ç¶?ã??æ??å?¦ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Invalid purpose"
-msgstr "ç?®ç??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+#: ../camel/camel-tcp-stream-raw.c:837
+msgid "Time-to-live expired"
+msgstr "Time-to-live ã?®æ??é??ã??å??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate untrusted"
-msgstr "ä¿¡é ¼ã??ã??ã?¦ã??ã?ªã??è¨¼æ??æ?¸ã?§ã??"
+#: ../camel/camel-tcp-stream-raw.c:838
+msgid "Command not supported by SOCKS server"
+msgstr "SOCKSã?µã?¼ã??ã?§ã?µã??ã?¼ã??ã??ã??ã?ªã??ã?³ã??ã?³ã??ã?§ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Certificate rejected"
-msgstr "æ??å?¦ã??ã??ã??è¨¼æ??æ?¸ã?§ã??"
+#: ../camel/camel-tcp-stream-raw.c:839
+msgid "Address type not supported by SOCKS server"
+msgstr "SOCKSã?µã?¼ã??ã?§ã?µã??ã?¼ã??ã??ã??ã?ªã??ã?¢ã??ã?¬ã?¹å½¢å¼?ã?§ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:616
-msgid "Subject/Issuer mismatch"
-msgstr "ã?¿ã?¤ã??ã?«/ç?ºè¡?è??ã??ä¸?è?´ã??ã?¾ã??ã??"
+#: ../camel/camel-tcp-stream-raw.c:840
+msgid "Unknown error from SOCKS server"
+msgstr "SOCKSã?µã?¼ã??ã??ã??ã?®ä¸?æ??ã?ªã?¨ã?©ã?¼ã?§ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:618
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID ã??ä¸?è?´ã??ã?¾ã??ã??"
+#: ../camel/camel-tcp-stream-raw.c:870
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr "SOCKS ã?µã?¼ã??ã??ã??ä¸?æ??ã?ªã?¢ã??ã?¬ã?¹å½¢å¼?ã??å??å¾?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:620
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/ç?ºè¡?è??ã?®ã?·ã?ªã?¢ã?«ç?ªå?·ã??ä¸?è?´ã??ã?¾ã??ã??"
+#: ../camel/camel-tcp-stream-raw.c:887
+#, c-format
+msgid "Incomplete reply from SOCKS server"
+msgstr "SOCKS ã?µã?¼ã??ã??ã??ã?®å¿?ç?ã??ä¸?å®?å?¨ã?§ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:622
-msgid "Key usage does not support certificate signing"
-msgstr "ã?ã?¼ã?®å?©ç?¨æ?¹æ³?ã??èª?è¨¼ç½²å??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
+#: ../camel/camel-tcp-stream-raw.c:902
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "ã??ã?¹ã??å??ã??é?·ã??ã??ã?¾ã?? (255 æ??å?ä»¥ä¸?ã?§ã?ªã??ã??ã?°ã??ã??ã?¾ã??ã??)"
 
-#: ../camel/camel-tcp-stream-openssl.c:625
-msgid "Error in application verification"
-msgstr "ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?®æ¤?è¨¼ã?§ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:934 ../camel/camel-tcp-stream-raw.c:944
+#, c-format
+msgid "Invalid reply from proxy server"
+msgstr "ã??ã?ã?ã?·ã?µã?¼ã??ã??ã??ã?®å¿?ç?ã??ç?¡å?¹ã?§ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:873
+#: ../camel/camel-tcp-stream-ssl.c:457
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2471,35 +2645,16 @@ msgstr ""
 "æ??ç´?:              %s\n"
 "ç½²å??:              %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:463
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:463
 msgid "BAD"
 msgstr "BAD"
 
-#: ../camel/camel-tcp-stream-openssl.c:700
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"%s ã??ã??ã??ã??ã??ã?ªè¨¼æ??æ?¸ã?§ã??:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"å??è«¾ã??ã?¦ã?¿ã?¾ã??ã??ï¼?"
-
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:883
+#: ../camel/camel-tcp-stream-ssl.c:467
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2512,9 +2667,9 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"å??è«¾ã??ã?¦ã?¿ã?¾ã??ã??ï¼?"
+"å??è«¾ã??ã?¦ã?¿ã?¾ã??ã???"
 
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:511
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2523,7 +2678,7 @@ msgstr ""
 "èª?è¨¼å??é¡?: %s\n"
 "ç?ºè¡?è??: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:979
+#: ../camel/camel-tcp-stream-ssl.c:563
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2532,7 +2687,7 @@ msgstr ""
 "ã??ã??ã??ã?ªèª?è¨¼ã??ã?¡ã?¤ã?³: %s\n"
 "ç?ºè¡?è??: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:997
+#: ../camel/camel-tcp-stream-ssl.c:581
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2541,7 +2696,7 @@ msgstr ""
 "è¨¼æ??æ?¸ã?®æ??å?¹æ??é??å??ã??: %s\n"
 "ç?ºè¡?è??: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1014
+#: ../camel/camel-tcp-stream-ssl.c:598
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2550,49 +2705,50 @@ msgstr ""
 "è¨¼æ??æ?¸å??ã??æ¶?ã??ä¸?è¦§ã?®æ??é??å??ã??: %s\n"
 "ç?ºè¡?è??: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:314
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "'%s' ã?¨ã??ã?? URL ã??è§£æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/camel-vee-folder.c:580
+#: ../camel/camel-vee-folder.c:1045
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "'%s' ã?®æ ¼ç´?ä¸ã?«ã?¨ã?©ã?¼: %s"
+msgid "Error storing '%s': "
+msgstr "'%s' ã?®æ ¼ç´?ä¸ã?«ã?¨ã?©ã?¼: "
 
-#: ../camel/camel-vee-folder.c:657
+#: ../camel/camel-vee-folder.c:1118
 #, c-format
 msgid "No such message %s in %s"
-msgstr "%2$s ã?«ã?¯ %1$s ã?¨ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?¯ã??ã??ã?¾ã??ã??ã??"
+msgstr "%2$s ã?«ã?¡ã??ã?»ã?¼ã?¸ %1$s ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-vee-folder.c:816 ../camel/camel-vee-folder.c:822
+#: ../camel/camel-vee-folder.c:1134 ../camel/camel-vee-folder.c:1149
+#, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®ä»®æ?³ã??ã?©ã?«ã??ã?¸ã?®ã?³ã??ã?¼ã?¾ã??ã?¯ç§»å??ã??ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:417
 msgid "Unmatched"
 msgstr "è©²å½?ã??ã?ªã??ã??ã?®"
 
-#: ../camel/camel-vee-store.c:400
-#, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: %s: ã??ã?®ã??ã??ã?ªã??ã?©ã?«ã??ã?¯ã??ã??ã?¾ã??ã??"
-
-#: ../camel/camel-vee-store.c:422
+#: ../camel/camel-vee-store.c:223
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "ã??ã?©ã?«ã??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: %s: ã??ã?®ã??ã??ã?ªã??ã?©ã?«ã??ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vee-store.c:289
+#, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: %s: ã??ã?®ã??ã??ã?ªã??ã?©ã?«ã??ã?¯ã??ã??ã?¾ã??ã??"
+
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "ã?´ã??ç®±ã??ã?©ã?«ã??ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ã?¸ã?£ã?³ã?¯ã?»ã??ã?©ã?«ã??ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2601,238 +2757,232 @@ msgstr ""
 "ã?¡ã??ã?»ã?¼ã?¸ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s\n"
 "  %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:278
-#: ../camel/providers/local/camel-maildir-folder.c:310
-#: ../camel/providers/local/camel-mbox-folder.c:363
-#: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:245
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
+#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:268
+#: ../camel/providers/local/camel-maildir-folder.c:380
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/local/camel-mh-folder.c:215
 msgid "No such message"
 msgstr "ã??ã?®ã??ã??ã?ªã?¡ã??ã?»ã?¼ã?¸ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "ã?¦ã?¼ã?¶ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
-#: ../camel/providers/imap4/camel-imap4-folder.c:819
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:252
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:158
+#: ../camel/providers/nntp/camel-nntp-folder.c:244
+#: ../camel/providers/nntp/camel-nntp-folder.c:337
+#: ../camel/providers/pop3/camel-pop3-folder.c:714
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ %s ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
+msgid "Cannot get message %s: "
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ %s ã??å??å¾?ã?§ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2463
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2672
+#, c-format
 msgid "This message is not available in offline mode."
 msgstr "ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ã?¯ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:194
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:201
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1966
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2017
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:203
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2190
+#, c-format
 msgid "Could not get message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??å¾?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
-#: ../camel/providers/imap/camel-imap-folder.c:296
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1070
+#: ../camel/providers/imap/camel-imap-folder.c:376
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s ã?®ã?µã??ã?ªã??ã?ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1144
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "å??é?¤ã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ %s ã?®ã??ã?§ã??ã?¯ä¸"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
-msgid "Trash Folder Full. Please Empty."
-msgstr "ã?´ã??ç®±ã??ã?©ã?«ã??ã??æº?æ?¯ã?§ã??ã??ç©ºã?«ã??ã?¦ä¸?ã??ã??ã??"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
-#: ../camel/providers/groupwise/camel-groupwise-store.c:633
-#: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3421
-#: ../camel/providers/imap/camel-imap-folder.c:3497
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1670
+#: ../camel/providers/groupwise/camel-groupwise-store.c:654
+#: ../camel/providers/groupwise/camel-groupwise-store.c:779
+#: ../camel/providers/imap/camel-imap-folder.c:3814
+#: ../camel/providers/imap/camel-imap-folder.c:3892
+#: ../camel/providers/imapx/camel-imapx-server.c:3723
+#: ../camel/providers/imapx/camel-imapx-server.c:3847
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "%s ã?«ã??ã??æ?°ç??ã?¡ã??ã?»ã?¼ã?¸ã?®ã?µã??ã?ªæ??å ±ã?®å??æ??ä¸"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2317
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2502
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2552
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2538
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "ã??ã?©ã?«ã??ã?®ã?³ã?³ã??ã?? %s ã??å??å¾?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr ""
 "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: ã?ã?£ã??ã?·ã?¥ã??å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+msgid "Cannot append message in offline mode: "
+msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
 msgstr "æ?°ç??ã?¡ã?¼ã?«ã?®ã??ã?§ã??ã?¯"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
-#: ../camel/providers/hula/camel-hula-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:40
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:47
 msgid "C_heck for new messages in all folders"
-msgstr "å?¨ã?¦ã?®ã??ã?©ã?«ã??ã?®æ?°ç??ã?¡ã?¼ã?«ã??ã??ã?§ã??ã?¯ã??ã??(_H)"
+msgstr "ã??ã?¹ã?¦ã?®ã??ã?©ã?«ã??ã?®æ?°ç??ã?¡ã?¼ã?«ã??ã??ã?§ã??ã?¯ã??ã??(_H)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:51
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "ã?ªã??ã?·ã?§ã?³"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "ã??ã?®ã?µã?¼ã??ã?® Inbox ã?«ã??ã??æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?¸ã??ã?£ã?«ã?¿ã??é?©ç?¨ã??ã??(_A)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
 msgstr "æ?°ç??ã?¡ã?¼ã?«ã??ã?¹ã??ã? ã??ã?©ã??ã??ã??ã?§ã??ã?¯ã??ã??(_U)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:79
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "å??ä¿¡ç®±ã?«ã??ã??ã?¡ã?¼ã?«ã? ã??ã?¹ã??ã? ã??ã?©ã??ã??ã??ã?§ã??ã?¯ã??ã??(_B)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
 msgstr "ã?ã?¼ã?«ã?«ã?®ã?¢ã?«ã?¦ã?³ã??ã??è?ªå??ç??ã?«å??æ??ã??ã??(_A)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
 msgstr "SOAP ã?®è¨å®?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "ã??ã?¹ã??ã?»ã?ªã??ã?£ã?¹ã?»ã?¨ã?¼ã?¸ã?§ã?³ã??ã?® SOAP ã??ã?¼ã??(_P):"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "For accessing Novell GroupWise servers"
 msgstr "Novell GroupWise ã?µã?¼ã??ã?¸ã?®ã?¢ã?¯ã?»ã?¹ç?¨ã?§ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
-#: ../camel/providers/hula/camel-hula-provider.c:93
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:105
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:70
 msgid "Password"
 msgstr "ã??ã?¹ã?¯ã?¼ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
 msgid ""
 "This option will connect to the GroupWise server using a plaintext password."
 msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã?¬ã?¤ã?³ã?»ã??ã?ã?¹ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ IMAP ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã?¾"
 "ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
+#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#, c-format
 msgid "Host or user not available in url"
 msgstr "ã??ã?¹ã??å??ã?¾ã??ã?¯ã?¦ã?¼ã?¶å??ã?¯ URI ã?§æ??å®?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1358
+#: ../camel/providers/groupwise/camel-groupwise-store.c:207
+#: ../camel/providers/imap/camel-imap-store.c:1188
+#: ../camel/providers/imapx/camel-imapx-server.c:2974
+#, c-format
 msgid "You did not enter a password."
 msgstr "ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
 msgid "Some features may not work correctly with your current server version"
 msgstr ""
 "ã??ä½¿ã??ã?®ã?µã?¼ã??ã?®ã??ã?¼ã?¸ã?§ã?³ã?§ã?¯ã??ã??ã??ã?¤ã??ã?®æ©?è?½ã??æ£ã??ã??å??ä½?ã??ã?ªã??ã??ã??ã??ã??ã?¾ã??"
 "ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:540
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/groupwise/camel-groupwise-store.c:550
+#: ../camel/providers/imap/camel-imap-store.c:1757
+#: ../camel/providers/imap/camel-imap-store.c:1952
+#: ../camel/providers/imapx/camel-imapx-store.c:417
 #, c-format
 msgid "No such folder %s"
 msgstr "ã??ã?®ã??ã??ã?ªã??ã?©ã?«ã?? %s ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ GroupWise ã??ã?©ã?«ã??ã??ç??æ??ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1196
+#, c-format
+msgid "Cannot create a special system folder"
+msgstr "ç?¹å?¥ã?ªã?·ã?¹ã??ã? ã??ã?©ã?«ã??ã??ä½?æ??ã??ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??"
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
+#: ../camel/providers/imap/camel-imap-store.c:1835
+#: ../camel/providers/imap/camel-imap-store.c:2257
+#: ../camel/providers/imapx/camel-imapx-store.c:880
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "è¦ªã??ã?©ã?«ã??ã?«ã?¯è¤?æ?°ã?®ã?µã??ã??ã?©ã?«ã??ã??å?«ã??ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "GroupWise ã??ã?©ã?«ã??ã?® '%s' ã?? '%s' ã?¨ã??ã??å??å??ã?«å¤?æ?´ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise ã?®ã?µã?¼ã?? %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "%s ã?® %s ã?«ã??ã?? GroupWise ã?®ã?µã?¼ã??ã?¹"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "%s çµ?ç?±ã?§ GroupWise ã?®ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
 msgid "Sending Message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®é??ä¿¡"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
+#, c-format
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: ã??ã??ã?§ã?¯ç?¡å?¹ã?ªæ??ä½?ã?§ã??"
+
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#, c-format
 msgid ""
 "You have exceeded this account's storage limit. Your messages are queued in "
 "your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
@@ -2840,97 +2990,38 @@ msgid ""
 msgstr ""
 "ã??ã?®ã?¢ã?«ã?¦ã?³ã??ã?§å?©ç?¨ã?§ã??ã??ã??ã?£ã?¹ã?¯å®¹é??ã??è¶?ã??ã?¾ã??ã??ã??é??ä¿¡ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?¯é??ä¿¡"
 "ç®±ã?«ä¿?å?ã??ã??ã?¾ã??ã??ã?¾ã??ã?¯ã?¡ã?¼ã?«ã??å??é?¤ã??ã??ã??ã?¢ã?¼ã?«ã?¤ã??ã?«ã?¾ã?¨ã??ã??ç?ã??ã?¦ã??ã??ã??[é??"
-"å??ä¿¡] ã??ã?¿ã?³ã??æ?¼ã??ã?¦ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã?¦ä¸?ã??ã??ã??\n"
+"å??ä¿¡] ã??ã?¿ã?³ã??æ?¼ã??ã?¦ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã?¦ã??ã? ã??ã??ã??\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
 #, c-format
 msgid "Could not send message: %s"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "æ?°ç??ã?¡ã?¼ã?«ã?®ã??ã?§ã??ã?¯"
-
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Connection to Server"
-msgstr "ã?µã?¼ã??ã?¸æ?¥ç¶?"
-
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã??é??ã?«ã?«ã?¹ã?¿ã? ã?»ã?³ã??ã?³ã??ã??ä½¿ç?¨ã??ã??(_U)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
-msgstr "ã?³ã??ã?³ã??:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "ã??ã?©ã?«ã??"
-
-#: ../camel/providers/hula/camel-hula-provider.c:62
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
-msgid "_Show only subscribed folders"
-msgstr "è³¼èªã??ã?¦ã??ã??ã??ã?©ã?«ã??ã? ã??è¡¨ç¤ºã??ã??(_S)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:64
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
-msgid "O_verride server-supplied folder namespace"
-msgstr "ã?µã?¼ã??ã??æ??ä¾?ã??ã??ã??ã?©ã?«ã??ã?®ã??ã?¼ã? ã?¹ã??ã?¼ã?¹ã??ä¸?æ?¸ã??ã??ã??(_V)"
-
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "ã??ã?¼ã? ã?¹ã??ã?¼ã?¹"
-
-#: ../camel/providers/hula/camel-hula-provider.c:76
-msgid "Hula"
-msgstr "Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "For accessing Hula servers"
-msgstr "Hula ã?µã?¼ã??ã?¸ã?®ã?¢ã?¯ã?»ã?¹ç?¨ã?§ã??"
-
-#: ../camel/providers/hula/camel-hula-provider.c:95
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr ""
-"ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã?¬ã?¤ã?³ã?»ã??ã?ã?¹ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ Hula ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã?¾"
-"ã??"
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../camel/providers/imap/camel-imap-command.c:190
+#: ../camel/providers/imap/camel-imap-command.c:288
+#, c-format
 msgid "No output stream"
 msgstr "å?ºå??ã?¹ã??ã?ªã?¼ã? ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:296
+#, c-format
 msgid "No input stream"
 msgstr "å?¥å??ã?¹ã??ã?ªã?¼ã? ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-command.c:229
-#: ../camel/providers/imap/camel-imap-command.c:278
-#: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3051
+#: ../camel/providers/imap/camel-imap-command.c:245
+#, c-format
 msgid "Operation cancelled"
 msgstr "å?¦ç??ã??ã?ã?£ã?³ã?»ã?«ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3056
+#: ../camel/providers/imap/camel-imap-command.c:353
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "çª?ç?¶ã?µã?¼ã??ã??æ?¥ç¶?ã??å??ã??ã?¾ã??ã??: %s"
 
 #. for imap ALERT codes, account user host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:352
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2939,247 +3030,279 @@ msgstr ""
 "IMAP ã?µã?¼ã?? %s %s ã??ã??ã?®è¦å??:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:421
+#: ../camel/providers/imap/camel-imap-command.c:444
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP ã?µã?¼ã??ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:431
+#: ../camel/providers/imap/camel-imap-command.c:456
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:506
+#: ../camel/providers/imap/camel-imap-command.c:532
+#, c-format
 msgid "Server response ended too soon."
 msgstr "ã?µã?¼ã??ã?¬ã?¹ã??ã?³ã?¹ã?¯ã??ã?£ã??ã?ªã??çµ?ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-command.c:712
+#: ../camel/providers/imap/camel-imap-command.c:740
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ã?µã?¼ã??ã?®å¿?ç?ã?¯ %s æ??å ±ã??å?«ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-command.c:748
+#: ../camel/providers/imap/camel-imap-command.c:778
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ã?µã?¼ã??ã??ã??æ?³å®?å¤?ã?® OK å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:91
+#: ../camel/providers/imap/camel-imap-folder.c:281
 msgid "Always check for new mail in this folder"
 msgstr "å¸¸ã?«ã??ã?®ã??ã?©ã?«ã??ã?«ã??ã??æ?°ç??ã?¡ã?¼ã?«ã??ã??ã?§ã??ã?¯ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:277
+#: ../camel/providers/imap/camel-imap-folder.c:353
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ã??ã?©ã?«ã?? %s ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:919
+#: ../camel/providers/imap/camel-imap-folder.c:960
+#: ../camel/providers/imapx/camel-imapx-server.c:3763
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s ã?«ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®è§£æ??ä¸"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1987
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "APPEND ã?³ã??ã?³ã??ã?®å¾?ã?«æ?³å®?å¤?ã?®å¿?ç?ã?¹ã??ã?¼ã?¿ã?¹ã??ã??ã??ã?¾ã??: '%s'"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2002
-msgid "No response on continuation after APPEND command"
-msgstr "APPEND ã?³ã??ã?³ã??ã?«ç¶?ã??å¿?ç?ã??ã??ã??ã?¾ã??ã??"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2047
-msgid "Unknown error occurred during APPEND command!"
-msgstr "APPEND ã?³ã??ã?³ã??ã?®ç?ºè¡?ä¸ã?«å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ï¼?"
+#: ../camel/providers/imap/camel-imap-folder.c:3231
+msgid "Unable to retrieve message: "
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??å¾©ã?§ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:3266
+#: ../camel/providers/imapx/camel-imapx-server.c:4940
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "%s ã?¨ã??ã?? ID ã?®ã?¡ã??ã?»ã?¼ã?¸ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2914
+#: ../camel/providers/imap/camel-imap-folder.c:3267
+#: ../camel/providers/imapx/camel-imapx-server.c:4941
 msgid "No such message available."
 msgstr "ã??ã?®ã??ã??ã?ªã?¡ã??ã?»ã?¼ã?¸ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2975
-#: ../camel/providers/imap/camel-imap-folder.c:3808
-#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../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:3624
+#: ../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:3632
+#: ../camel/providers/imap/camel-imap-folder.c:4031
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ä¸?å®?å?¨ã?ªã?µã?¼ã??ã?®å¿?ç?: ã?¡ã??ã?»ã?¼ã?¸ %d ã?® UID ã??æ??ä¾?ã??ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3846
+#: ../camel/providers/imap/camel-imap-folder.c:4251
+#, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH å¿?ç?ã?«ã?¡ã??ã?»ã?¼ã?¸æ?¬ä½?ã??ã??ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "ã?ã?£ã??ã?·ã?¥ã?»ã??ã?©ã?«ã??ã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+msgid "Could not open cache directory: "
+msgstr "ã?ã?£ã??ã?·ã?¥ã?»ã??ã?©ã?«ã??ã??é??ã??ã?¾ã??ã??ã?§ã??ã??: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:330
-#: ../camel/providers/imap/camel-imap-message-cache.c:387
-#: ../camel/providers/imap/camel-imap-message-cache.c:418
-#: ../camel/providers/imap/camel-imap-message-cache.c:450
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "%s ã?¨ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??ã?ã?£ã??ã?·ã?¥ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
+#: ../camel/providers/imap/camel-imap-message-cache.c:388
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "%s ã??ã?ã?£ã??ã?·ã?¥ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
+msgid "Failed to cache message %s: "
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ %s ã?®ã?ã?£ã??ã?·ã?¥ã?«å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imap/camel-imap-message-cache.c:525
+#, c-format
+msgid "Failed to cache %s: "
+msgstr "%s ã?®ã?ã?£ã??ã?·ã?¥ã?«å¤±æ??ã??ã?¾ã??ã??: "
+
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:41
+msgid "Checking for New Mail"
+msgstr "æ?°ç??ã?¡ã?¼ã?«ã?®ã??ã?§ã??ã?¯"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "è³¼èªã??ã?¦ã??ã??ã??ã?©ã?«ã??ã?®æ?°ç??ã?¡ã?¼ã?«ã??ã??ã?§ã??ã?¯ã??ã??(_E)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-msgid "Namespace:"
-msgstr "ã??ã?¼ã? ã?¹ã??ã?¼ã?¹:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
+msgid "Connection to Server"
+msgstr "ã?µã?¼ã??ã?¸æ?¥ç¶?"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:55
+msgid "_Use custom command to connect to server"
+msgstr "ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã??é??ã?«ã?«ã?¹ã?¿ã? ã?»ã?³ã??ã?³ã??ã??ä½¿ç?¨ã??ã??(_U)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:52
+msgid "Co_mmand:"
+msgstr "ã?³ã??ã?³ã??(_M):"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "ã??ã?©ã?«ã??"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
+msgid "_Show only subscribed folders"
+msgstr "è³¼èªã??ã?¦ã??ã??ã??ã?©ã?«ã??ã? ã??è¡¨ç¤ºã??ã??(_S)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
+msgid "O_verride server-supplied folder namespace"
+msgstr "ã?µã?¼ã??ã??æ??ä¾?ã??ã??ã??ã?©ã?«ã??ã?®ã??ã?¼ã? ã?¹ã??ã?¼ã?¹ã??ä¸?æ?¸ã??ã??ã??(_V)"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+msgid "Names_pace:"
+msgstr "ã??ã?¼ã? ã?¹ã??ã?¼ã?¹(_P):"
+
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "ã??ã?®ã?µã?¼ã??ã?®å??ä¿¡ç®±ã?«ã??ã??æ?°ç??ã?¡ã?¼ã?«ã?«ã??ã?£ã?«ã?¿ã??é?©ç?¨ã??ã??(_A)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:77
 msgid "Check new messages for Jun_k contents"
 msgstr "æ?°ç??ã?¡ã?¼ã?«ã??ã?¹ã??ã? ã??ã?©ã??ã??ã??ã?§ã??ã?¯ã??ã??(_K)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:81
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "ã?ªã?¢ã?¼ã??ã?¨ã?ã?¼ã?«ã?«ã?®ã?¡ã?¼ã?«ã??è?ªå??ç??ã?«å??æ??ã??ã??(_Z)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:91
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP ã?µã?¼ã??ã?®ã?¡ã?¼ã?«ã??èªã??ã? ã??å¤§å??ã?ªã?¡ã?¼ã?«ã??ä¿?å?ã??ã?¾ã??"
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:107
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã?¬ã?¤ã?³ã?»ã??ã?ã?¹ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ IMAP ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã?¾"
 "ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:210
+#: ../camel/providers/imap/camel-imap-store.c:310
+#: ../camel/providers/imapx/camel-imapx-store.c:229
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP ã?µã?¼ã?? %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:212
+#: ../camel/providers/imap/camel-imap-store.c:312
+#: ../camel/providers/imapx/camel-imapx-store.c:231
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s ã?® %s ã?«ã??ã?? IMAP ã?µã?¼ã??ã?¹"
 
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:247
-#: ../camel/providers/imap4/camel-imap4-store.c:262
-#: ../camel/providers/nntp/camel-nntp-store.c:182
-#: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:170
-#: ../camel/providers/pop3/camel-pop3-store.c:184
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:274
+#: ../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
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "%s ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:248
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:171
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
+#: ../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
 msgid "SSL unavailable"
 msgstr "SSL ã?¯ç?¡å?¹ã?§ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
-msgid "Connection cancelled"
-msgstr "æ?¥ç¶?ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
+#: ../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/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:310
-#: ../camel/providers/imap4/camel-imap4-store.c:325
-#: ../camel/providers/imap4/camel-imap4-store.c:334
+#: ../camel/providers/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:2827
+#: ../camel/providers/imapx/camel-imapx-server.c:2863
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã??ã?¢ã?¼ã??ã?§ IMAP ã?µã?¼ã?? %s ã?¸ã?®æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:573
+#: ../camel/providers/imapx/camel-imapx-server.c:2828
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 msgid "STARTTLS not supported"
 msgstr "STARTTLS æ?¡å¼µã?¯ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:593
+#: ../camel/providers/imapx/camel-imapx-server.c:2864
 msgid "SSL negotiations failed"
 msgstr "SSL æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:335
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../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/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:748
+#: ../camel/providers/imapx/camel-imapx-server.c:2664
+#, c-format
+msgid "Connection cancelled"
+msgstr "æ?¥ç¶?ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
+
+#: ../camel/providers/imap/camel-imap-store.c:753
+#: ../camel/providers/imapx/camel-imapx-server.c:2669
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ã?³ã??ã?³ã?? \"%s\" ã?§æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
-#: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/local/camel-maildir-folder.c:80
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:463
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
+#: ../camel/providers/imap/camel-imap-store.c:926
+#: ../camel/providers/imap/camel-imap-store.c:2350
+#: ../camel/providers/imapx/camel-imapx-store.c:464
+#: ../camel/providers/imapx/camel-imapx-store.c:1061
+#: ../camel/providers/local/camel-maildir-folder.c:90
+#: ../camel/providers/local/camel-maildir-store.c:225
+#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/providers/local/camel-maildir-store.c:562
+#: ../camel/providers/local/camel-maildir-store.c:575
+#: ../camel/providers/local/camel-spool-store.c:508
 msgid "Inbox"
 msgstr "å??ä¿¡ç®±"
 
-#: ../camel/providers/imap/camel-imap-store.c:1305
+#: ../camel/providers/imap/camel-imap-store.c:1129
+#: ../camel/providers/imapx/camel-imapx-server.c:2930
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ã?µã?¼ã??ã?® %s ã?§ã?¯ %s ã?¨ã??ã??èª?è¨¼ã?¿ã?¤ã??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:1315
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:1141
+#: ../camel/providers/imapx/camel-imapx-server.c:2942
+#: ../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:1389
+#: ../camel/providers/imap/camel-imap-store.c:1220
+#: ../camel/providers/imapx/camel-imapx-server.c:3012
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3190,423 +3313,160 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:954
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2193
+#: ../camel/providers/imapx/camel-imapx-store.c:859
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "\"%s\" ã?¨ã??ã??ã??ã?©ã?«ã??å??ã?« \"%c\" ã?¨ã??ã??æ??å?ã??å?«ã??ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:1978
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
+#: ../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
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: æ?¢ã?«å?å?¨ã??ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:2253
+#: ../camel/providers/imap/camel-imap-store.c:2206
+#: ../camel/providers/imapx/camel-imapx-store.c:870
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "è¦ªã??ã?©ã?«ã??ã??ç?¹å®?ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3053
+#: ../camel/providers/imap/camel-imap-store.c:3062
+#, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "çª?ç?¶ã?µã?¼ã??ã??æ?¥ç¶?ã??å??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:572
-#: ../camel/providers/imap4/camel-imap4-command.c:579
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "%s ã?¨ã??ã?? IMAP ã?µã?¼ã??ã?¸ã?®ã?³ã??ã?³ã??é??ä¿¡ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "IMAP ã?µã?¼ã??ã?® %s ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "IMAP ã?µã?¼ã??ã?® %s ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??é?¸æ??ã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã?? ã??é?¸æ??ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1414
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "%s ã?¨ã??ã?? IMAP ã?µã?¼ã??ã?¸ã?®ã?³ã??ã?³ã??é??ä¿¡ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1416
-msgid "service unavailable"
-msgstr "ã?µã?¼ã??ã?¹ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1546
-#: ../camel/providers/imap4/camel-imap4-engine.c:1584
-#: ../camel/providers/imap4/camel-imap4-engine.c:1628
-#: ../camel/providers/imap4/camel-imap4-engine.c:1683
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "çª?ç?¶ IMAP4 ã?µã?¼ã??ã?® %s ã??æ?¥ç¶?ã??å??ã??ã?¾ã??ã??: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:87
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr ""
-"ã??ã?£ã?«ã?¿ã?®ã?«ã?¼ã?«ã??ä»®æ?³ã??ã?©ã?«ã??ã?®ã?«ã?¼ã?«ã?«å¿?è¦?ã?ªã?¡ã?¼ã?ªã?³ã?°ã?»ã?ªã?¹ã??ã?®æ¤?å?ºã??æ??å?¹"
-"ã?«ã??ã??"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:88
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "ï¼¸ç§?é??èªã?¾ã??ã?ªã??ã?£ã??ã?ã?£ã??ã?·ã?¥æ¸?ã?®ã?¡ã??ã?»ã?¼ã?¸ã??ç?¡å?¹ã?«ã??ã?¾ã??"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Expire cached messages older than X seconds"
-msgstr "ï¼¸ç§?ã??ã??å?¤ã??ã?ã?£ã??ã?·ã?¥æ¸?ã?®ã?¡ã??ã?»ã?¼ã?¸ã??ç?¡å?¹ã?«ã??ã?¾ã??"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?«ã?¢ã?¯ã?»ã?¹ã?§ã??ã?¾ã??ã??: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?¨ã??ã?©ã?°ã??å??æ??ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?¨ã??ã?©ã?°ã??å??æ??ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??æ?¹æ¶?ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??æ?¹æ¶?ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr ""
-"%s ã?? '%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: ã??ã?®ã??ã??ã?ªã?¡ã??ã?»ã?¼ã?¸ã?¯ã??ã??ã?¾ã??ã??"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "%s ã?? '%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:940
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr ""
-"'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: ã??ã?©ã?«ã??ã?¯èªã?¿è¾¼ã?¿å°?ç?¨ã?§ã??"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr ""
-"'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1182
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "'%s' ã??ã?? '%s' ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ç§»å??ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1186
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "'%s' ã??ã?? '%s' ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "'%s' ã??ã?? '%s' ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ç§»å??ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1198
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr ""
-"'%s' ã??ã?? '%s' ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "æ?°ç??ã?¡ã?¼ã?«ã?«ã?¹ã??ã? ã??å?«ã?¾ã??ã?¦ã??ã??ã??ã??ã?§ã??ã?¯ã??ã??(_J)"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "å??ä¿¡ç®±ã?«ã??ã??ã?¡ã?¼ã?«ã? ã??ã?¹ã??ã? ã??ã?©ã??ã??ã??ã?§ã??ã?¯ã??ã??(_G)"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "IMAP ã?µã?¼ã??ã?«ã??ã??ã?¡ã?¼ã?«ã??èªã??ã? ã??ä¿?å?ã??ã?¾ã??"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã?¬ã?¤ã?³ã?»ã??ã?ã?¹ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ IMAPv4rev1 ã?µã?¼ã??ã?«æ?¥"
-"ç¶?ã??ã?¾ã??"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:194
-#: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:181
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
-msgid "Connection canceled"
-msgstr "æ?¥ç¶?ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:296
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã??ã?¢ã?¼ã??ã?§ IMAP ã?µã?¼ã?? %s ã?¸ã?®æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??: ã?µã?¼ã??"
-"å?´ã?§ STARTTLS ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??ã?®ã??å??å? ã?§ã??"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-msgid "TLS negotiations failed"
-msgstr "TLS æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:411
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "IMAP ã?µã?¼ã?? %s ã?«å¯¾ã??ã?¦èª?è¨¼æ?¹å¼? %s ã??ä½¿ã?£ã?¦èª?è¨¼ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:534
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "IMAP ã?µã?¼ã?? %s ã?§ %s ã??ä½¿ã?£ã??èª?è¨¼ã??è¡?ã??ã?¾ã??ã??"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:697
-#: ../camel/providers/imap4/camel-imap4-store.c:964
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ IMAP ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã??"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "'%s' ã?? IMAP ã?µã?¼ã??ã?® %s ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "'%s' ã?® LIST æ??å ±ã?? IMAP ã?µã?¼ã??ã?® %s ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:897
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: ç?¹å?¥ã?ªã??ã?©ã?«ã??ã?§ã??"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ IMAP ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??ã??"
+#: ../camel/providers/imap/camel-imap-store.c:3065
+msgid "Server unexpectedly disconnected: "
+msgstr "çª?ç?¶ã?µã?¼ã??ã??ã??å??æ?ã??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
+#: ../camel/providers/imapx/camel-imapx-folder.c:75
 #, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
+msgid "Could not create folder summary for %s"
+msgstr "%s ã?®ã??ã?©ã?«ã??ã?µã??ã?ªã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
+#: ../camel/providers/imapx/camel-imapx-folder.c:83
 #, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+msgid "Could not create cache for %s: "
+msgstr "%s ã?®ã?ã?£ã??ã?·ã?¥ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "'%s' ã??ã?? '%s' ã?«å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: ç?¹å?¥ã?ªã??ã?©ã?«ã??ã?§ã??"
+#: ../camel/providers/imapx/camel-imapx-provider.c:43
+msgid "Use _Quick Resync if the server supports it"
+msgstr "ã?µã?¼ã??ã??ã?µã??ã?¼ã??ã??ã??ã?¨ã??ã?¯ Quick Rysync ã??ä½¿ç?¨ã??ã??(_Q)"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ IMAP ã?®ã??ã?©ã?«ã??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??ã??"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "'%s' ã??ã?? '%s' ã?«å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "'%s' ã??ã?? '%s' ã?«å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
-
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1572
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "%s ã?? '%s' ã?¨ã??ã??ã??ã?¿ã?¼ã?³ã?§ IMAP ã?µã?¼ã??ã?® %s ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:45
+msgid "Use I_dle if the server supports it"
+msgstr "ã?µã?¼ã??ã??ã?µã??ã?¼ã??ã??ã??ã?¨ã??ã?¯ Idle ã??ä½¿ç?¨ã??ã??(_D)"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ IMAP ã??ã?©ã?«ã??ã??è³¼èªã?§ã??ã?¾ã??ã??ã??"
+#: ../camel/providers/imapx/camel-imapx-provider.c:57
+msgid "Command:"
+msgstr "ã?³ã??ã?³ã??:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??è³¼èªã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
+msgid "Numbe_r of cached connections to use"
+msgstr "ã?ã?£ã??ã?·ã?¥æ?¥ç¶?ã?®æ?°(_R)"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??è³¼èªã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+#: ../camel/providers/imapx/camel-imapx-provider.c:70
+msgid "Namespace:"
+msgstr "ã??ã?¼ã? ã?¹ã??ã?¼ã?¹:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ IMAP ã??ã?©ã?«ã??ã?®è³¼èªã??å??æ¢ã?§ã??ã?¾ã??ã??ã??"
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?®è³¼èªã??å??æ¢ã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
+#: ../camel/providers/imapx/camel-imapx-server.c:1366
+msgid "Error writing to cache stream: "
+msgstr "ã?ã?£ã??ã?·ã?¥ã?¹ã??ã?ªã?¼ã? ã?«æ?¸ã??è¾¼ã?¿ä¸ã?«ã?¨ã?©ã?¼: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
+#: ../camel/providers/imapx/camel-imapx-server.c:2021
 #, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?®è³¼èªã??å??æ¢ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+msgid "Not authenticated"
+msgstr "èª?è¨¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "å¤?æ?´ã?¡ã??ã?»ã?¼ã?¸ã?®è§£æ??ä¸"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
 #, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "IMAP ã?µã?¼ã?? %s ã?®ç?¶æ??ã??ç??ç?¾ã??ã?¦ã??ã?¾ã??"
+msgid "Could not connect to %s (port %s): "
+msgstr "%s (ã??ã?¼ã?? %s) ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: "
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®ã?¨ã?³ã??ã?ã?¼ã??ã?®å??å¾?ä¸"
+#: ../camel/providers/imapx/camel-imapx-server.c:3184
+msgid "Closing tmp stream failed: "
+msgstr "ä½?æ¥ç?¨ã?¹ã??ã?ªã?¼ã? ã?®ã?¯ã?ã?¼ã?ºã?«å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
+#: ../camel/providers/imapx/camel-imapx-server.c:5065
 #, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "IMAP ã?µã?¼ã?? %s ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: "
+msgid "Cannot create spool file: %s"
+msgstr "ã?¹ã??ã?¼ã?«ã??ã?¡ã?¤ã?«ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "ã??ã?¼ã?¿ã?ªã??"
+#: ../camel/providers/imapx/camel-imapx-server.c:5081
+msgid "Cannot create spool file: "
+msgstr "ã?¹ã??ã?¼ã?«ã??ã?¡ã?¤ã?«ã??ä½?æ??ã?§ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
+#: ../camel/providers/imapx/camel-imapx-store.c:433
+#: ../camel/providers/nntp/camel-nntp-store.c:1510
 #, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "çª?ç?¶ IMAP ã?µã?¼ã?? %s ã??æ?¥ç¶?ã??å??ã??ã?¾ã??ã??: %s"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
-msgid "Message storage"
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®æ ¼ç´?"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-"IMAP 4(.1) ã?¯ã?©ã?¤ã?¢ã?³ã?? (é??ç?ºç??)\n"
-"ã??ã??ã?¯æ?ªã??ã?¹ã??/æ?ªã?µã??ã?¼ã??ã?®ã?³ã?¼ã??ã?ªã?®ã?§ã??ä»£ã??ã??ã?«æ¨?æº? IMAP ã??ä½¿ç?¨ã??ã?¦ä¸?ã??"
-"ã??ã??\n"
-"\n"
-" !!! é??è¦?ã?ªã?¡ã?¼ã?«ã?«ã?¯å?©ç?¨ã??ã?ªã??ã?§ä¸?ã??ã??  !!!\n"
+msgid "No such folder: %s"
+msgstr "ã??ã?®ã??ã??ã?ªã??ã?©ã?«ã??ã?¯ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-stream.c:68
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "%s (ã??ã?¼ã?? %s) ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
+msgid "Source stream returned no data"
+msgstr "ã?½ã?¼ã?¹ã?¹ã??ã?ªã?¼ã? ã?¯ã??ã?¼ã?¿ã??è¿?ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:348
+#: ../camel/providers/imapx/camel-imapx-stream.c:77
 #, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "%s ã?® POP ã?µã?¼ã??ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../camel/providers/local/camel-local-folder.c:178
-msgid "Index message body data"
-msgstr "ã?¡ã?¼ã?«æ?¬æ??ã?®ã?¤ã?³ã??ã??ã?¯ã?¹ã??ä½?æ??ã??ã??"
+msgid "Source stream unavailable"
+msgstr "ã?½ã?¼ã?¹ã?¹ã??ã?ªã?¼ã? ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
+#: ../camel/providers/local/camel-local-folder.c:199
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:399
-#: ../camel/providers/local/camel-local-folder.c:402
+#: ../camel/providers/local/camel-local-folder.c:209
+#: ../camel/providers/local/camel-local-folder.c:218
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "mailbox: %s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
+#: ../camel/providers/local/camel-local-folder.c:227
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:272
+msgid "Index message body data"
+msgstr "ã?¡ã?¼ã?«æ?¬æ??ã?®ã?¤ã?³ã??ã??ã?¯ã?¹ã??ä½?æ??ã??ã??"
+
+#: ../camel/providers/local/camel-local-folder.c:686
+#, c-format
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"ã?¡ã??ã?»ã?¼ã?¸ %s ã??ã??ã?©ã?«ã?? %s ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??\n"
+"  %s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "'.folders' ã??ã?µã??ã?ªã?»ã??ã?¡ã?¤ã?«ã?¨ã??ã?¦ä½¿ç?¨ã??ã?? (exmh)(_U)"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "MH å½¢å¼?ã?®ã?¡ã?¼ã?«ã?»ã??ã?©ã?«ã??"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
 msgstr "ã?ã?¼ã?«ã?«ã?»ã?¡ã?¼ã?«ã?? MH å½¢å¼?ã?®ã?¡ã?¼ã?«ã?»ã??ã?©ã?«ã??ã?®ä¸ã?«ä¿?å?ã??ã?¾ã??"
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid "Local delivery"
 msgstr "ã?ã?¼ã?«ã?«ã?®é??ä¿¡"
 
-#: ../camel/providers/local/camel-local-provider.c:74
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3614,29 +3474,29 @@ msgstr ""
 "ã?ã?¼ã?«ã?«ã?»ã?¡ã?¼ã?«ã??å??é??ã??ã?¦æ¨?æº? mbox å½¢å¼?ã?®ã?¹ã??ã?¼ã?«ã??ã?? Evolution ã??ç®¡ç??ã??ã??"
 "ã??ã?©ã?«ã??ã?«ç§»å??ã??ã?¾ã??"
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
 msgstr "å??ä¿¡ç®±ã?«ã??ã??æ?°ç??ã?¡ã?¼ã?«ã?«ã??ã?£ã?«ã?¿ã??é?©ç?¨ã??ã??(_A)"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
 msgstr "Maildir å½¢å¼?ã?®ã?¡ã?¼ã?«ã?»ã??ã?©ã?«ã??"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
 msgid "For storing local mail in maildir directories."
 msgstr "ã?ã?¼ã?«ã?«ã?»ã?¡ã?¼ã?«ã?? Maildir å½¢å¼?ã?®ã??ã?©ã?«ã??ã?«ä¿?å?ã??ã?¾ã??"
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "ã?¹ã??ã?¼ã?¿ã?¹ã?»ã??ã??ã??ã?? Elm/Pine/Mutt å½¢å¼?ã?§æ ¼ç´?ã??ã??(_S)"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
 msgstr "æ¨?æº?ç??ã?ª UNIX ã?® mbox å½¢å¼?ã?®ã?¹ã??ã?¼ã?«ã?»ã??ã?¡ã?¤ã?«"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3645,145 +3505,133 @@ msgstr ""
 "ã??æ ¼ç´?ã??ã?¾ã??\n"
 "(Elmã??Pineã??Mutt å½¢å¼?ã?®ã??ã?©ã?«ã??ã?®èªã?¿è¾¼ã?¿ã?«ã??å¯¾å¿?)"
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
 msgstr "æ¨?æº?ç??ã?ª UNIX ã?® mbox å½¢å¼?ã?®ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??"
 
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:128
+#: ../camel/providers/local/camel-local-store.c:149
+#: ../camel/providers/local/camel-local-store.c:284
+#: ../camel/providers/local/camel-mbox-store.c:371
+#: ../camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "ä¿?å?ã??ã??ã?«ã?¼ã?? %s ã?¯çµ¶å¯¾ã??ã?¹ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "ä¿?å?ã??ã??ã?«ã?¼ã?? %s ã?¯é??å¸¸ã?®ã??ã?©ã?«ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../camel/providers/local/camel-local-store.c:169
+#: ../camel/providers/local/camel-local-store.c:179
+#: ../camel/providers/local/camel-local-store.c:297
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:193
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr "ã?ã?¼ã?«ã?«ã?¸ã?®ä¿?å?ã?§ã?¯ inbox ã??æ??ã?¦ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-local-store.c:247
+#: ../camel/providers/local/camel-local-store.c:250
 #, c-format
 msgid "Local mail file %s"
 msgstr "ã?ã?¼ã?«ã?«ã?»ã?¡ã?¼ã?«ã?®ã??ã?¡ã?¤ã?« %s"
 
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:358
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ã??ã?©ã?«ã??ã?? %s ã??ã?? %s ã?¸å??å??å¤?æ?´ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-local-store.c:410
+#: ../camel/providers/local/camel-local-store.c:431
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' ã?®å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-local-store.c:461
+#: ../camel/providers/local/camel-mbox-store.c:304
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã?¤ã?³ã??ã??ã?¯ã?¹ã?»ã??ã?¡ã?¤ã?«ã??å??é?¤ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../camel/providers/local/camel-local-store.c:489
+#: ../camel/providers/local/camel-mbox-store.c:333
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã?¡ã?¿ã?»ã??ã?¡ã?¤ã?«ã??å??é?¤ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:537
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??ã?µã??ã?ªã?¸è¿½å? ã?§ã??ã?¾ã??ã??: å??å? ã?¯ä¸?æ??ã?§ã??"
 
-#: ../camel/providers/local/camel-maildir-folder.c:244
-msgid "Maildir append message canceled"
-msgstr "Maildir å½¢å¼?ã?®ã?¡ã??ã?»ã?¼ã?¸è¿½å? ã??å??ã??æ¶?ã??ã??ã?¾ã??ã??"
-
-#: ../camel/providers/local/camel-maildir-folder.c:247
+#: ../camel/providers/local/camel-maildir-folder.c:195
 #, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Maildir å½¢å¼?ã?®ã??ã?©ã?«ã??ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s: %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "Maildir å½¢å¼?ã?®ã??ã?©ã?«ã??ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:277
-#: ../camel/providers/local/camel-maildir-folder.c:309
-#: ../camel/providers/local/camel-maildir-folder.c:323
-#: ../camel/providers/local/camel-maildir-folder.c:331
-#: ../camel/providers/local/camel-mbox-folder.c:362
-#: ../camel/providers/local/camel-mbox-folder.c:413
-#: ../camel/providers/local/camel-mbox-folder.c:434
-#: ../camel/providers/local/camel-mbox-folder.c:465
-#: ../camel/providers/local/camel-mbox-folder.c:473
-#: ../camel/providers/local/camel-mh-folder.c:244
-#: ../camel/providers/local/camel-mh-folder.c:255
-#: ../camel/providers/local/camel-mh-folder.c:263
+#: ../camel/providers/local/camel-maildir-folder.c:283
+#: ../camel/providers/local/camel-maildir-folder.c:291
+#: ../camel/providers/local/camel-mbox-folder.c:440
+#: ../camel/providers/local/camel-mh-folder.c:227
+#: ../camel/providers/local/camel-mh-folder.c:235
 #, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"ã?¡ã??ã?»ã?¼ã?¸ %s ã??ã??ã?©ã?«ã?? %s ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??\n"
-"  %s"
+msgid "Cannot get message %s from folder %s: "
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ %s ã??ã??ã?©ã?«ã?? %s ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:332
-msgid "Invalid message contents"
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®å??å®¹ã?¯ç?¡å?¹ã?§ã??"
+#: ../camel/providers/local/camel-maildir-folder.c:399
+#, c-format
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "æ??å®?ã?®ã??ã?©ã?«ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è»¢é??ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-maildir-store.c:136
+#: ../camel/providers/local/camel-maildir-store.c:167
+#: ../camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/local/camel-mbox-store.c:175
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:151
+#: ../camel/providers/local/camel-mbox-store.c:127
+#: ../camel/providers/local/camel-mh-store.c:215
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
+#: ../camel/providers/local/camel-maildir-store.c:157
+#: ../camel/providers/local/camel-mbox-store.c:137
 #: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:184
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: maildir ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-maildir-store.c:282
+#: ../camel/providers/local/camel-mh-store.c:287
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:244
 msgid "not a maildir directory"
 msgstr "maildir å½¢å¼?ã?®ã??ã?©ã?«ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:330
-#: ../camel/providers/local/camel-spool-store.c:344
+#: ../camel/providers/local/camel-maildir-store.c:482
+#: ../camel/providers/local/camel-spool-store.c:364
+#: ../camel/providers/local/camel-spool-store.c:380
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ã?¹ã?ã?£ã?³ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:437
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-summary.c:435
+#: ../camel/providers/local/camel-maildir-summary.c:558
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir ã??ã?©ã?«ã??ã?®ã??ã?¹ã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s: %s"
@@ -3792,60 +3640,52 @@ msgstr "maildir ã??ã?©ã?«ã??ã?®ã??ã?¹ã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s: %s"
 msgid "Checking folder consistency"
 msgstr "ã??ã?©ã?«ã??ã?®æ?´å??æ?§ã?®ç¢ºèª?ä¸"
 
-#: ../camel/providers/local/camel-maildir-summary.c:658
+#: ../camel/providers/local/camel-maildir-summary.c:641
 msgid "Checking for new messages"
 msgstr "æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®ã??ã?§ã??ã?¯"
 
-#: ../camel/providers/local/camel-maildir-summary.c:748
-#: ../camel/providers/local/camel-mbox-summary.c:526
-#: ../camel/providers/local/camel-mbox-summary.c:722
-#: ../camel/providers/local/camel-mbox-summary.c:842
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:732
+#: ../camel/providers/local/camel-mbox-summary.c:465
+#: ../camel/providers/local/camel-mbox-summary.c:679
+#: ../camel/providers/local/camel-mbox-summary.c:809
+#: ../camel/providers/local/camel-spool-summary.c:130
 msgid "Storing folder"
 msgstr "ã??ã?©ã?«ã??ã?«æ ¼ç´?ã??ã??"
 
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:124
+#: ../camel/providers/local/camel-spool-folder.c:125
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s ã?®ã??ã?©ã?«ã??ã?»ã?ã??ã?¯ã??ç??æ??ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:231
+#: ../camel/providers/local/camel-mbox-folder.c:194
 #, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "mailbox ã??é??ã??ã?¾ã??ã??: %s: %s\n"
-
-#: ../camel/providers/local/camel-mbox-folder.c:297
-msgid "Mail append canceled"
-msgstr "ã?¡ã?¼ã?«ã?®è¿½å? ã??ã?ã?£ã?³ã?»ã?«ã??ã??ã?¾ã??ã??"
+msgid "Cannot open mailbox: %s: "
+msgstr "mailbox ã??é??ã??ã?¾ã??ã??: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:300
+#: ../camel/providers/local/camel-mbox-folder.c:260
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "mbox ã??ã?¡ã?¤ã?«ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "mbox ã??ã?¡ã?¤ã?«ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:466
+#: ../camel/providers/local/camel-mbox-folder.c:433
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ã??ã?©ã?«ã??ã?§å??å¾©ã?§ã??ã?ªã??ã?¨ã?©ã?¼ã??ç?ºç??ã??ã??ã??ã??ã?§ã??"
 
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:264
-msgid "Message construction failed."
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®æ§?ç¯?ã?«å¤±æ??ã??ã?¾ã??ã??ã??"
-
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mbox-store.c:149
+#: ../camel/providers/local/camel-mbox-store.c:379
+#, c-format
 msgid "Cannot create a folder by this name."
 msgstr "ã??ã?®ã??ã??ã?ªå??å??ã?§ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: é??å¸¸ã?®ã??ã?¡ã?¤ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:218
+#: ../camel/providers/local/camel-mbox-store.c:231
+#: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3854,164 +3694,170 @@ msgstr ""
 "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??ã?§ã??ã??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:241
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' ã?¯é??å¸¸ã?®ã??ã?¡ã?¤ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:250
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?¯ç©ºã?§ã?¯ã?ªã??ã?®ã?§å??é?¤ã??ã?¾ã??ã??"
 
 #: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
+#: ../camel/providers/local/camel-mbox-store.c:290
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã?µã??ã?ªã?»ã??ã?¡ã?¤ã?«ã??å??é?¤ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
+#: ../camel/providers/local/camel-mbox-store.c:395
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:411
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:394
+#: ../camel/providers/local/camel-mbox-store.c:413
 msgid "Folder already exists"
 msgstr "æ?¢ã?«ã??ã?©ã?«ã??ã??ã??ã??ã?¾ã??"
 
-#: ../camel/providers/local/camel-mbox-store.c:485
+#: ../camel/providers/local/camel-mbox-store.c:507
+#, c-format
 msgid "The new folder name is illegal."
 msgstr "æ?°ã??ã??ã??ã?©ã?«ã??ã?®å??å??ã?¯æ£ã??ã??ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:522
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "'%s' ã?®å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??ã?§ã??ã??: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:605
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s' ã??ã?? %s ã?¸å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:532
+#: ../camel/providers/local/camel-mbox-summary.c:473
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ã??ã?©ã?«ã??ã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:582
+#: ../camel/providers/local/camel-mbox-summary.c:533
 #, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "%ld ä»?è¿?ã?®ã??ã?©ã?«ã?? %s ã?§è?´å?½ç??ã?ªã?¡ã?¼ã?«æ§?æ??è§£æ??ã?¨ã?©ã?¼ã?§ã??"
+msgid "Fatal mail parser error near position %s in folder %s"
+msgstr "ã??ã?©ã?«ã?? %2$s ã?® %1$s ä»?è¿?ã?§è?´å?½ç??ã?ªã?¡ã?¼ã?«æ§?æ??è§£æ??ã?¨ã?©ã?¼ã?§ã??"
 
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#: ../camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ã??ã?©ã?«ã??ã??ã??ã?§ã??ã?¯ã?§ã??ã?¾ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../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:739
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:700
+#: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ä½?æ¥ç?¨ã?® mailbox ã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:956
+#: ../camel/providers/local/camel-mbox-summary.c:715
+#: ../camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "å??ã?®ã??ã?©ã?«ã?? %s ã??é??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:761
+#: ../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:776
+#: ../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:858
-#: ../camel/providers/local/camel-mbox-summary.c:1083
+#: ../camel/providers/local/camel-mbox-summary.c:829
+#: ../camel/providers/local/camel-mbox-summary.c:1070
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ã??ã?©ã?«ã??ã??ä¿?å?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:897
-#: ../camel/providers/local/camel-mbox-summary.c:905
-#: ../camel/providers/local/camel-mbox-summary.c:1113
-#: ../camel/providers/local/camel-mbox-summary.c:1121
+#: ../camel/providers/local/camel-mbox-summary.c:869
+#: ../camel/providers/local/camel-mbox-summary.c:1102
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+"MBOX ã??ã?¡ã?¤ã?«ã??å£?ã??ã?¦ã??ã?¾ã?? (å·®å?ºäººã?®è¡?ã??å¾?ã??ã?¯ã??ã?§ã??ã??ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??)ã??"
+"ä¿®æ£ã??ã?¦ã??ã? ã??ã??ã??"
+
+#: ../camel/providers/local/camel-mbox-summary.c:878
+#: ../camel/providers/local/camel-mbox-summary.c:1111
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ã?µã??ã?ªã?¨ã??ã?©ã?«ã??ã??ä¸?è?´ã??ã?¾ã??ã??ã?§ã??ã?? (å??æ??ã??ã?¦ã??)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1046
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1029
+#: ../camel/providers/local/camel-spool-summary.c:337
 #, c-format
 msgid "Unknown error: %s"
 msgstr "å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1189
-#: ../camel/providers/local/camel-mbox-summary.c:1215
+#: ../camel/providers/local/camel-mbox-summary.c:1181
+#: ../camel/providers/local/camel-mbox-summary.c:1211
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ä½?æ¥ç?¨ã?® mailbox ã?«æ?¸ã??è¾¼ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1206
+#: ../camel/providers/local/camel-mbox-summary.c:1200
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ä½?æ¥ç?¨ã?® mailbox ã?«æ?¸ã??è¾¼ã??ã?¾ã??ã??ã?§ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:184
-msgid "MH append message canceled"
-msgstr "MH å½¢å¼?ã?®ã?¡ã??ã?»ã?¼ã?¸è¿½å? ã??ã?ã?£ã?³ã?»ã?«ã??ã??ã?¾ã??ã??"
-
-#: ../camel/providers/local/camel-mh-folder.c:187
+#: ../camel/providers/local/camel-mh-folder.c:165
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "MH å½¢å¼?ã??ã?©ã?«ã??ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "MH å½¢å¼?ã??ã?©ã?«ã??ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:234
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:248
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: ã??ã?©ã?«ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-mh-summary.c:240
+#: ../camel/providers/local/camel-mh-summary.c:228
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH ã??ã?©ã?«ã??ã?®ã??ã?¹ã??é??ã??ã?¾ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:134
+#: ../camel/providers/local/camel-spool-store.c:118
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "'%s' ã?¨ã??ã??ã?¹ã??ã?¼ã?«ã??é??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:146
+#: ../camel/providers/local/camel-spool-store.c:132
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "'%s' ã?¨ã??ã??ã?¹ã??ã?¼ã?«ã?¯é??å¸¸ã?®ã??ã?¡ã?¤ã?«ã?¾ã??ã?¯ã??ã?©ã?«ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:165
+#: ../camel/providers/local/camel-spool-store.c:158
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "'%s/%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:175
+#: ../camel/providers/local/camel-spool-store.c:170
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4020,12 +3866,12 @@ msgstr ""
 "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??é??ã??ã?¾ã??ã??ã?§ã??ã??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:179
+#: ../camel/providers/local/camel-spool-store.c:176
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:184
+#: ../camel/providers/local/camel-spool-store.c:183
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4034,97 +3880,115 @@ msgstr ""
 "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:192
+#: ../camel/providers/local/camel-spool-store.c:193
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' ã?¯ã?¡ã?¼ã?«ã??ã??ã?¯ã?¹ã?»ã??ã?¡ã?¤ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:209
+#: ../camel/providers/local/camel-spool-store.c:213
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "å??ä¿¡ç®±ã?¸ã?®æ ¼ç´?ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool mail file %s"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã?¡ã?¼ã?«ã?»ã??ã?¡ã?¤ã?« %s"
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã?»ã??ã?ªã?¼ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:229
+#: ../camel/providers/local/camel-spool-store.c:238
+#, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã?®å??å??ã?¯å¤?æ?´ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:237
+#: ../camel/providers/local/camel-spool-store.c:251
+#, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã?¯å??é?¤ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:166
+#: ../camel/providers/local/camel-spool-summary.c:178
 #: ../camel/providers/local/camel-spool-summary.c:190
-#: ../camel/providers/local/camel-spool-summary.c:200
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
+msgid "Could not synchronize temporary folder %s: %s"
 msgstr "ä½?æ¥ç?¨ã??ã?©ã?«ã?? %s ã??å??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:216
+#: ../camel/providers/local/camel-spool-summary.c:208
 #, c-format
-msgid "Could not sync spool folder %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã?? %s ã??å??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:246
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:240
+#: ../camel/providers/local/camel-spool-summary.c:259
+#: ../camel/providers/local/camel-spool-summary.c:272
 #, c-format
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
 "%s ã?¨ã??ã??ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã?¨å??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s\n"
 "ã??ã?©ã?«ã??ã??å£?ã??ã?¦ã??ã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??ã??ã??ã?®ã?³ã??ã?¼ã?? '%s' ã?«ä¿?å?ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:194
-#: ../camel/providers/nntp/camel-nntp-folder.c:226
+#: ../camel/providers/nntp/camel-nntp-folder.c:197
+#: ../camel/providers/nntp/camel-nntp-folder.c:271
+#: ../camel/providers/nntp/camel-nntp-folder.c:312
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "å??é?¨ã?¨ã?©ã?¼: UID ã?®æ?¸å¼?ã??ç?¡å?¹ã?§ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:367
-#: ../camel/providers/nntp/camel-nntp-folder.c:370
-#: ../camel/providers/nntp/camel-nntp-folder.c:412
-#: ../camel/providers/nntp/camel-nntp-folder.c:414
+#: ../camel/providers/nntp/camel-nntp-folder.c:234
+#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/pop3/camel-pop3-folder.c:402
+#: ../camel/providers/pop3/camel-pop3-folder.c:630
+#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ %s ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:465
+#: ../camel/providers/nntp/camel-nntp-folder.c:471
+#: ../camel/providers/nntp/camel-nntp-folder.c:518
 #, c-format
 msgid "Posting failed: %s"
 msgstr "æ??ç¨¿ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:432
+#: ../camel/providers/nntp/camel-nntp-folder.c:513
+msgid "Posting failed: "
+msgstr "æ??ç¨¿ã?«å¤±æ??ã??ã?¾ã??ã??: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
-msgstr "ã?ªã??ã?©ã?¤ã?³ç?¶æ??ã?®é??ã?¯ NNTP ã?¡ã??ã?»ã?¼ã?¸ã??æ??ç¨¿ã?§ã??ã?¾ã??ã??ï¼?"
+msgstr "ã?ªã??ã?©ã?¤ã?³ç?¶æ??ã?®é??ã?¯ NNTP ã?¡ã??ã?»ã?¼ã?¸ã??æ??ç¨¿ã?§ã??ã?¾ã??ã??!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:443
+#: ../camel/providers/nntp/camel-nntp-folder.c:560
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
-msgstr "NNTP ã??ã?©ã?«ã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®ã?³ã??ã?¼ã?¯ã?§ã??ã?¾ã??ã??ï¼?"
+msgstr "NNTP ã??ã?©ã?«ã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®ã?³ã??ã?¼ã?¯ã?§ã??ã?¾ã??ã??!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "ã??ã?©ã?«ã??å??ã??ç?ã??è¡¨è¨?ã??ã?? (ä¾?: \"comp.os.linux\" => \"c.o.linux\")(_S)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "é?¢é?£ã??ã??ã??ã?©ã?«ã??å??ã??è³¼èªã??ã?¤ã?¢ã?ã?°ã?«è¡¨ç¤ºã??ã??(_D)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "USENET ã??ã?¥ã?¼ã?¹"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "USENET ã?®ã??ã?¥ã?¼ã?¹ã?°ã?«ã?¼ã??ã??è³¼èªã??ã??ã??æ??ç¨¿ã??ã?¾ã??"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4132,22 +3996,22 @@ msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã?¬ã?¤ã?³ã?»ã??ã?ã?¹ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ NNTP ã?µã?¼ã??ã?§èª?è¨¼ã??ã?¾"
 "ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:265
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "%s ã??ã??ã?®æ?¨æ?¶ã??èªã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
+msgid "Could not read greeting from %s: "
+msgstr "%s ã??ã??ã?®æ?¨æ?¶ã??èªã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:278
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP ã?µã?¼ã?? %s ã??ã?¨ã?©ã?¼ã?³ã?¼ã?? %d ã??è¿?ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+#: ../camel/providers/nntp/camel-nntp-store.c:434
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s çµ?ç?±ã?® USENET ã??ã?¥ã?¼ã?¹"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:927
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4158,7 +4022,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1024
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4169,7 +4034,8 @@ msgstr ""
 "ã??ã?®ã??ã??ã?ªã??ã?¥ã?¼ã?¹ã?°ã?«ã?¼ã??ã?¯ã??ã??ã?¾ã??ã??ã??é?¸æ??ã??ã??ã?¢ã?¤ã??ã? ã?¯è¦ªã??ã?©ã?«ã??ã?®ã??ã?®ã??"
 "ã??ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1064
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4177,126 +4043,125 @@ msgid ""
 msgstr ""
 "ã??ã?®ã??ã?¥ã?¼ã?¹ã?°ã?«ã?¼ã??ã?®è³¼èªã??å??æ¢ã?§ã??ã?¾ã??ã??:\n"
 "\n"
-"ã??ã?¥ã?¼ã?¹ã?°ã?«ã?¼ã??ã??ã??ã??ã?¾ã??ã??ï¼?"
+"ã??ã?¥ã?¼ã?¹ã?°ã?«ã?¼ã??ã??ã??ã??ã?¾ã??ã??!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../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/nntp/camel-nntp-store.c:978
+#: ../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:986
+#: ../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/nntp/camel-nntp-store.c:1180
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
+#, c-format
 msgid "Authentication requested but no username provided"
 msgstr "èª?è¨¼ã??å¿?è¦?ã?¨ã??ã?¦ã??ã?¾ã??ã??ã??ã?¦ã?¼ã?¶å??ã??æ??å®?ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1269
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "ã?µã?¼ã??ã?®èª?è¨¼ã??è¡?ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1395
+msgid "NNTP Command failed: "
+msgstr "NNTP ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#, c-format
 msgid "Not connected."
 msgstr "æ?¥ç¶?ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
-#, c-format
-msgid "No such folder: %s"
-msgstr "ã??ã?®ã??ã??ã?ªã??ã?©ã?«ã??ã?¯ã??ã??ã?¾ã??ã??: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:238
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®è§£æ??ä¸"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#: ../camel/providers/nntp/camel-nntp-summary.c:356
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "head ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr "ã?ã?£ã?³ã?»ã?«ã??å?©ç?¨ã??ã??"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
 #, c-format
 msgid "Operation failed: %s"
 msgstr "æ??ä½?ã??å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:251
 msgid "Retrieving POP summary"
 msgstr "POP ã?µã??ã?ªã?®å??å¾?ä¸"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "POP ã?µã??ã?ªã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:324
 msgid "Expunging old messages"
 msgstr "å??é?¤æ¸?ã?¿ã?¡ã??ã?»ã?¼ã?¸ã?®æ?¹æ¶?ä¸"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:332
 msgid "Expunging deleted messages"
 msgstr "å??é?¤æ¸?ã?¿ã?®ã?¡ã??ã?»ã?¼ã?¸ã?®æ?¹æ¶?ä¸"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
+#: ../camel/providers/pop3/camel-pop3-folder.c:566
+#: ../camel/providers/pop3/camel-pop3-folder.c:596
 #, c-format
 msgid "No message with UID %s"
 msgstr "UID %s ã?®ã?¡ã??ã?»ã?¼ã?¸ã?¯ã??ã??ã?¾ã??ã??"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
+#: ../camel/providers/pop3/camel-pop3-folder.c:603
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ %d ã?? POP ã?§å??å¾?ä¸"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:707
 msgid "Unknown reason"
 msgstr "å??å? ä¸?æ??"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Message storage"
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®æ ¼ç´?"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "ã?µã?¼ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã??æ®?ã??(_L)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "%s æ?¥å¾?ã?«å??é?¤ã??ã??(_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "Disable _support for all POP3 extensions"
-msgstr "å?¨ã?¦ã?® POP3 æ?¡å¼µã?µã??ã?¼ã??ã??ç?¡å?¹ã?«ã??ã??(_S)"
+msgstr "ã??ã?¹ã?¦ã?® POP3 æ?¡å¼µã?µã??ã?¼ã??ã??ç?¡å?¹ã?«ã??ã??(_S)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:59
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "POP ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã??ã??ã?¡ã?¼ã?«ã??èªã??ã? ã??ã??ã?¾ã??"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:76
+#: ../camel/providers/pop3/camel-pop3-provider.c:72
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4304,45 +4169,54 @@ msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã?¬ã?¤ã?³ã?»ã??ã?ã?¹ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ POP ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã?¾"
 "ã??ã??ã??ã??ã?¯å¤?ã??ã?® POP ã?µã?¼ã??ã?§ã?µã??ã?¼ã??ã??ã??ã??ã?ªã??ã?·ã?§ã?³ã?§ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:86
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ APOP ã??ã?ã??ã?³ã?«çµ?ç?±ã?§æ??å?·å??ã??ã??ã??ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ POP ã?µã?¼"
-"ã??ã?¸æ?¥ç¶?ã??ã?¾ã??ã??ã??ã??ã?¯å?¬å¹³ã?ªã?µã??ã?¼ã??ã??è¦?æ±?ã??ã??ã?µã?¼ã??ã?§ã??å?¨ã?¦ã?®ã?¦ã?¼ã?¶ã??æ£å¸¸ã?«"
-"å??ä½?ã??ã??ã??ã??ã?§ã?¯ã??ã??ã?¾ã??ã??ã??"
+"ã??ã?¸æ?¥ç¶?ã??ã?¾ã??ã??ã??ã??ã?¯å?¬å¹³ã?ªã?µã??ã?¼ã??ã??è¦?æ±?ã??ã??ã?µã?¼ã??ã?§ã??ã??ã?¹ã?¦ã?®ã?¦ã?¼ã?¶ã??æ£å¸¸"
+"ã?«å??ä½?ã??ã??ã??ã??ã?§ã?¯ã??ã??ã?¾ã??ã??ã??"
+
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:98
+msgid ": "
+msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:207
+#: ../camel/providers/pop3/camel-pop3-store.c:168
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP ã?µã?¼ã?? %s ã??ã??å¦¥å½?ã?ªæ?¨æ?¶ã?®èªã?¿è¾¼ã?¿ã??å¤±æ??ã??ã?¾ã??ã??"
 
+#: ../camel/providers/pop3/camel-pop3-store.c:186
+#: ../camel/providers/pop3/camel-pop3-store.c:217
 #: ../camel/providers/pop3/camel-pop3-store.c:224
-#: ../camel/providers/pop3/camel-pop3-store.c:238
-#: ../camel/providers/pop3/camel-pop3-store.c:248
-#: ../camel/providers/pop3/camel-pop3-store.c:254
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã??ã?¢ã?¼ã??ã?§ POP ã?µã?¼ã?? %s ã?¸ã?®æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:225
+#: ../camel/providers/pop3/camel-pop3-store.c:187
 msgid "STLS not supported by server"
 msgstr "ã?µã?¼ã??ã?¯ STLS æ?¡å¼µã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:255
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:205
+#, c-format
+msgid "Failed to connect to POP server %s in secure mode%s"
+msgstr "ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã?¢ã?¼ã??ã?§ã?® POP ã?µã?¼ã?? %s ã?¸ã?®æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:218
+msgid "TLS negotiations failed"
+msgstr "TLS æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:225
 msgid "TLS is not available in this build"
 msgstr "ã??ã?®ã??ã??ã?±ã?¼ã?¸ã?§ã?¯ TLS ã??å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:361
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "POP ã?µã?¼ã?? %s ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:402
-#: ../camel/providers/pop3/camel-pop3-store.c:535
+#: ../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 "
@@ -4350,32 +4224,32 @@ msgid ""
 msgstr ""
 "POP ã?µã?¼ã?? %s ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??: è¦?æ±?ã??ã??ã??èª?è¨¼æ?¹å¼?ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:418
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:323
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "SASL '%s' ã?® POP ã?µã?¼ã?? %s ã?¸ã?®ã?ã?°ã?¤ã?³ã?«å¤±æ??: %s"
+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:430
+#: ../camel/providers/pop3/camel-pop3-store.c:340
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "POP ã?µã?¼ã?? %s ã?¸ã?ã?°ã?¤ã?³ã?§ã??ã?¾ã??ã??: SASL ã??ã?ã??ã?³ã?«ã?»ã?¨ã?©ã?¼"
+msgstr "POP ã?µã?¼ã?? %s ã?¸ã?ã?°ã?¤ã?³ã?§ã??ã?¾ã??ã??: SASL ã??ã?ã??ã?³ã?«ã?»ã?¨ã?©ã?¼ã?§ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:449
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "POP ã?µã?¼ã?? %s ã?§èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "POP ã?µã?¼ã?? %s ã?§èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:508
+#: ../camel/providers/pop3/camel-pop3-store.c:421
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 msgstr ""
 "POP ã?µã?¼ã?? %s ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??:\tç?¡å?¹ã?ª APOP ID ã??å??ã??å??ã??ã?¾ã??ã??; è©?ç§°æ?»æ??ã?®"
-"å?¯è?½æ?§ã??ã??ã??ã?®ã?§ç®¡ç??è??ã?«é?£çµ¡ã??ã?¦ä¸?ã??ã??ã??"
+"å?¯è?½æ?§ã??ã??ã??ã?®ã?§ç®¡ç??è??ã?«é?£çµ¡ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:549
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:471
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4384,199 +4258,233 @@ msgstr ""
 "POP ã?µã?¼ã?? %s ã?«æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã??\n"
 "ã??ã?¹ã?¯ã?¼ã??ã?®é??ä¿¡ä¸ã?«ã?¨ã?©ã?¼: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:556
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:484
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username%s"
+msgstr ""
+"POP ã?µã?¼ã?? %s ã?«æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã??\n"
+"ã?¦ã?¼ã?¶å??ã?®é??ä¿¡ä¸ã?«ã?¨ã?©ã?¼%s"
+
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:497
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending password%s"
 msgstr ""
 "POP ã?µã?¼ã?? %s ã?«æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã??\n"
-"ã?¦ã?¼ã?¶å??ã?®é??ä¿¡ä¸ã?«ã?¨ã?©ã?¼: %s"
+"ã??ã?¹ã?¯ã?¼ã??ã?®é??ä¿¡ä¸ã?«ã?¨ã?©ã?¼%s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:653
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "POP ã?µã?¼ã?? %s ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:666
+#, c-format
+msgid "POP3 server %s"
+msgstr "POP ã?µã?¼ã?? %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:670
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "%s ã?® %s ã?«ã??ã?? POP ã?µã?¼ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:669
+#: ../camel/providers/pop3/camel-pop3-store.c:685
 #, c-format
 msgid "No such folder '%s'."
-msgstr "ã??ã?®ã??ã??ã?ªã??ã?©ã?«ã??ã?¯å?å?¨ã??ã?¾ã??ã??: %s"
+msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?¯å?å?¨ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:709
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "POP3 ã?¹ã??ã?¢ã?¯ã??ã?©ã?«ã??ã?®é??å±¤æ§?é? ã??æ??ã?¡ã?¾ã??ã??"
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 "ã?¡ã?¼ã?«ã??é??é??ã??ã??ã??ã??ã?«ã?ã?¼ã?«ã?«ã?·ã?¹ã??ã? ã?® \"sendmail\" ã??ã?ã?°ã?©ã? ã?¸æ¸¡ã??ã?¾ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "è¿?ä¿¡ã?ªã?¹ã??ã??è§£æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "sendmail ã?¸ã??ã?¤ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail ã?? fork(2) ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+msgid "Could not send message: "
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??ã?§ã??ã??: "
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail ã?¯ã?·ã?°ã??ã?« %s ã?§çµ?äº?ã??ã?¾ã??ã??: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s ã??å®?è¡?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail ã?¯ã?¹ã??ã?¼ã?¿ã?¹ %d ã?§çµ?äº?ã??ã?¾ã??ã??: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail çµ?ç?±ã?§ã?¡ã?¼ã?«ã??é??ä¿¡"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "SMTP ã??ä½¿ã?£ã?¦ã?ªã?¢ã?¼ã??ã?®ã?¡ã?¼ã?«ã??ã??ã?«æ?¥ç¶?ã??ã??ã??ã?¨ã?§ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:116
 msgid "Syntax error, command unrecognized"
 msgstr "æ§?æ??è§£æ??ã?¨ã?©ã?¼: ã?³ã??ã?³ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:118
 msgid "Syntax error in parameters or arguments"
 msgstr "ã??ã?©ã?¡ã?¼ã?¿ã??ã??ã??ã?¯å¼?æ?°ã?«æ§?æ??è§£æ??ã?¨ã?©ã?¼"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:120
 msgid "Command not implemented"
 msgstr "ã?³ã??ã?³ã??ã?¯å®?è£?ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:122
 msgid "Command parameter not implemented"
 msgstr "ã?³ã??ã?³ã??ã??ã?©ã?¡ã?¼ã?¿ã?¯å®?è£?ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:124
 msgid "System status, or system help reply"
 msgstr "ã?·ã?¹ã??ã? ã?»ã?¹ã??ã?¼ã?¿ã?¹ã?¾ã??ã?¯ã?·ã?¹ã??ã? ã?»ã??ã?«ã??ã?®å¿?ç?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:126
 msgid "Help message"
 msgstr "ã??ã?«ã??ã?»ã?¡ã??ã?»ã?¼ã?¸"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:128
 msgid "Service ready"
 msgstr "ã?µã?¼ã??ã?¹ã?¯å?©ç?¨ã?§ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:130
 msgid "Service closing transmission channel"
 msgstr "ã?µã?¼ã??ã?¹ã?¯é??ä¿¡ã??ã?£ã?³ã??ã?«ã??é??ã??ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:132
 msgid "Service not available, closing transmission channel"
 msgstr "ã?µã?¼ã??ã?¹ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??, é??ä¿¡ã??ã?£ã?³ã??ã?«ã??é??ã??ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:134
 msgid "Requested mail action okay, completed"
 msgstr "è¦?æ±?ã??ã??ã??ã?¡ã?¼ã?«ã?®å??ä½?ã?¯OK, å®?äº?ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:136
 msgid "User not local; will forward to <forward-path>"
 msgstr "ã?¦ã?¼ã?¶ã?¯ã?ã?¼ã?«ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??; <forward-path> ã?¸è»¢é??ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:138
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "è¦?æ±?ã??ã??ã??ã?¡ã?¼ã?«ã?®å??ä½?ã?¯å®?äº?ã??ã?¾ã??ã??: ã?¡ã?¼ã?«ã??ã??ã?¯ã?¹ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:140
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "è¦?æ±?ã??ã??ã??å??ä½?ã?¯å®?äº?ã??ã?¾ã??ã??: ã?¡ã?¼ã?«ã??ã??ã?¯ã?¹ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:142
 msgid "Requested action aborted: error in processing"
 msgstr "è¦?æ±?ã??ã??ã??å??ä½?ã??ä¸æ?ã??ã?¾ã??ã??: å?¦ç??ä¸ã?«ã?¨ã?©ã?¼"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:144
 msgid "User not local; please try <forward-path>"
-msgstr "ã?¦ã?¼ã?¶ã?¯ã?ã?¼ã?«ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??; <forward-path> ã??è©¦ã??ã?¦ä¸?ã??ã??ã??"
+msgstr "ã?¦ã?¼ã?¶ã?¯ã?ã?¼ã?«ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??; <forward-path> ã??è©¦ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:146
 msgid "Requested action not taken: insufficient system storage"
 msgstr "è¦?æ±?ã??ã??ã??å??ä½?ã?¯å®?äº?ã??ã?¾ã??ã??: ã?·ã?¹ã??ã? ã?®ä¿?å?é ?å??ã??è¶³ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:148
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "è¦?æ±?ã??ã??ã??ã?¡ã?¼ã?«ã?®å??ä½?ã??ä¸æ?ã??ã?¾ã??ã??: é ?å??å?²ã??å½?ã?¦ã??è¶?ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "è¦?æ±?ã??ã??ã??å??ä½?ã?¯å®?äº?ã??ã?¾ã??ã??: ã?¡ã?¼ã?«ã??ã??ã?¯ã?¹å??ã?¯èª?ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ã?¡ã?¼ã?«ã?®å?¥å??ã??é??å§?ã??ã?¾ã??; <CRLF>.<CRLF> ã?§çµ?äº?ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
 msgid "Transaction failed"
 msgstr "å?¦ç??ã?¯å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "A password transition is needed"
 msgstr "ã??ã?¹ã?¯ã?¼ã??ã?®å¤?æ?´ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:160
 msgid "Authentication mechanism is too weak"
 msgstr "èª?è¨¼ã?¡ã?«ã??ã?ºã? ã?¯ä¸?å??å??é??ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Encryption required for requested authentication mechanism"
 msgstr "è¦?æ±?ã??ã??èª?è¨¼ã?¡ã?«ã??ã?ºã? ã?®ã??ã??ã?«æ??å?·å??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:164
 msgid "Temporary authentication failure"
 msgstr "ä¸?æ??ç??ã?ªèª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
-msgid "Welcome response error"
-msgstr "Welcome å¿?ç?ã?¨ã?©ã?¼"
+#: ../camel/providers/smtp/camel-smtp-transport.c:252
+#: ../camel/providers/smtp/camel-smtp-transport.c:258
+msgid "Welcome response error: "
+msgstr "Welcome å¿?ç?ã?¨ã?©ã?¼: "
 
+#: ../camel/providers/smtp/camel-smtp-transport.c:294
 #: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:364
-#: ../camel/providers/smtp/camel-smtp-transport.c:370
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã??ã?¢ã?¼ã??ã?§ SMTP ã?µã?¼ã?? %s ã?¸ã?®æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:340
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:314
+#: ../camel/providers/smtp/camel-smtp-transport.c:320
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
-msgid "STARTTLS command failed"
-msgstr "STARTTLS ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
+#: ../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:567
+#: ../camel/providers/smtp/camel-smtp-transport.c:526
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4587,202 +4495,182 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
+#: ../camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ã?µã?¼ã?? %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
+#: ../camel/providers/smtp/camel-smtp-transport.c:671
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s çµ?ç?±ã?§ SMTP ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:691
+#, c-format
 msgid "Cannot send message: service not connected."
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??: ã?µã?¼ã??ã?¹ã??æ?¥ç¶?ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:698
+#, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??: å·®å?ºäººã?®ã?¢ã??ã?¬ã?¹ã??æ£ã??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Sending message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®é??ä¿¡ä¸"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
+#, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??: å®?å??ã??å®?ç¾©ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??: ç?¡å?¹ã?ªå¿?ç?ã??ä¸?ã?¤ä»¥ä¸?ã??ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:966
 msgid "SMTP Greeting"
 msgstr "SMTP ã?§æ?¥ç¶?ä¸"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "HELO ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
-msgid "HELO command failed"
-msgstr "HELO ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:990
+#: ../camel/providers/smtp/camel-smtp-transport.c:1005
+#: ../camel/providers/smtp/camel-smtp-transport.c:1012
+msgid "HELO command failed: "
+msgstr "HELO ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1079
 msgid "SMTP Authentication"
 msgstr "SMTP èª?è¨¼"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../camel/providers/smtp/camel-smtp-transport.c:1086
+#, c-format
 msgid "Error creating SASL authentication object."
 msgstr "SASL èª?è¨¼ã?ªã??ã?¸ã?§ã?¯ã??ã?®ç??æ??ä¸ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "AUTH ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
-msgid "AUTH command failed"
-msgstr "AUTH ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
-msgid "Bad authentication response from server.\n"
-msgstr "ã?µã?¼ã??ã??ã??é??é??ã?£ã??èª?è¨¼å¿?ç?ã??ã??ã??ã?¾ã??ã??\n"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1102
+#: ../camel/providers/smtp/camel-smtp-transport.c:1112
+#: ../camel/providers/smtp/camel-smtp-transport.c:1120
+msgid "AUTH command failed: "
+msgstr "AUTH ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1219
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#: ../camel/providers/smtp/camel-smtp-transport.c:1238
+msgid "MAIL FROM command failed: "
+msgstr "MAIL FROM ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
-msgid "MAIL FROM command failed"
-msgstr "MAIL FROM ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCPT TO ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1261
+msgid "RCPT TO command failed: "
+msgstr "RSET ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
+#: ../camel/providers/smtp/camel-smtp-transport.c:1275
+#: ../camel/providers/smtp/camel-smtp-transport.c:1283
 #, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: "
 
+#: ../camel/providers/smtp/camel-smtp-transport.c:1321
 #: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "DATA ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1347
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
-msgid "DATA command failed"
-msgstr "DATA ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "RSET ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
-msgid "RSET command failed"
-msgstr "RSET ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "QUIT ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
-msgid "QUIT command failed"
-msgstr "QUIT ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1340
+#: ../camel/providers/smtp/camel-smtp-transport.c:1397
+#: ../camel/providers/smtp/camel-smtp-transport.c:1413
+#: ../camel/providers/smtp/camel-smtp-transport.c:1424
+#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+msgid "DATA command failed: "
+msgstr "DATA ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1453
+#: ../camel/providers/smtp/camel-smtp-transport.c:1465
+#: ../camel/providers/smtp/camel-smtp-transport.c:1472
+msgid "RSET command failed: "
+msgstr "RSET ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1494
+#: ../camel/providers/smtp/camel-smtp-transport.c:1507
+#: ../camel/providers/smtp/camel-smtp-transport.c:1513
+msgid "QUIT command failed: "
+msgstr "QUIT ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:46
 msgid "Business"
 msgstr "ä»?äº?"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:47
 msgid "Competition"
 msgstr "ç«¶å??ä»?ç¤¾"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:48
 msgid "Favorites"
 msgstr "ã??æ°?ã?«å?¥ã??"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:49
 msgid "Gifts"
 msgstr "è´?ã??ç?©"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:50
 msgid "Goals/Objectives"
 msgstr "ç?®æ¨?/ã?´ã?¼ã?«"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:51
 msgid "Holiday"
 msgstr "ä¼?æ?¥"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:52
 msgid "Holiday Cards"
 msgstr "ã?¯ã?ªã?¹ã??ã?¹ã?»ã?«ã?¼ã??"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:54
 msgid "Hot Contacts"
 msgstr "æ??æ?°ã?®é?£çµ¡å??"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:55
 msgid "Ideas"
 msgstr "ã?¢ã?¤ã??ã?£ã?¢"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:56
 msgid "International"
 msgstr "å?½é??"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:57
 msgid "Key Customer"
 msgstr "é??è¦?ã?ªé¡§å®¢"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:58
 msgid "Miscellaneous"
 msgstr "ã??ã?®ä»?"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:59
 msgid "Personal"
 msgstr "å??äºº"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:60
 msgid "Phone Calls"
 msgstr "æ?ºå¸¯é?»è©±"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:62
 msgid "Status"
 msgstr "ç?¶æ??"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:63
 msgid "Strategies"
 msgstr "æ?¦ç?¥"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:64
 msgid "Suppliers"
 msgstr "ã?µã??ã?©ã?¤ã?¤ã?¼"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:65
 msgid "Time & Expenses"
 msgstr "æ??é??ã?¨çµ?è²»"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:66
 msgid "VIP"
 msgstr "é??è¦?äººç?©"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:67
 msgid "Waiting"
 msgstr "çµ¦ä»?"
 
@@ -4790,7 +4678,7 @@ msgstr "çµ¦ä»?"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1900
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p%l:%M:%S"
 
@@ -4798,7 +4686,7 @@ msgstr "%Y/%m/%d (%a) %p%l:%M:%S"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1891
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %k:%M:%S"
 
@@ -4806,7 +4694,7 @@ msgstr "%Y/%m/%d (%a) %k:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1896
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d (%a) %p%l:%M"
 
@@ -4814,7 +4702,7 @@ msgstr "%Y/%m/%d (%a) %p%l:%M"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1887
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%Y/%m/%d (%a) %k:%M"
 
@@ -4832,8 +4720,8 @@ msgstr "%Y/%m/%d (%a) %kæ??"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1763
-#: ../libedataserver/e-time-utils.c:1882
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1765
+#: ../libedataserver/e-time-utils.c:1884
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -4873,19 +4761,19 @@ msgstr "%Y/%m/%d %kæ??"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1766
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1768
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1824 ../libedataserver/e-time-utils.c:1944
+#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1946
 msgid "%I:%M:%S %p"
 msgstr "%p%l:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1828 ../libedataserver/e-time-utils.c:1936
+#: ../libedataserver/e-time-utils.c:1830 ../libedataserver/e-time-utils.c:1938
 msgid "%H:%M:%S"
 msgstr "%k:%M:%S"
 
@@ -4893,200 +4781,197 @@ msgstr "%k:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1833 ../libedataserver/e-time-utils.c:1941
+#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
 msgid "%I:%M %p"
 msgstr "%p%l:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1837 ../libedataserver/e-time-utils.c:1933
+#: ../libedataserver/e-time-utils.c:1839 ../libedataserver/e-time-utils.c:1935
 msgid "%H:%M"
 msgstr "%k:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1840
+#: ../libedataserver/e-time-utils.c:1842
 msgid "%H%M"
 msgstr "%k%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1844
+#: ../libedataserver/e-time-utils.c:1846
 msgid "%I %p"
 msgstr "%p%læ??"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
+#: ../libedataserverui/e-book-auth-util.c:668
 msgid "Accessing LDAP Server anonymously"
 msgstr "å?¿å??ã?§ LDAP ã?µã?¼ã??ã?¸ã?¢ã?¯ã?»ã?¹ä¸"
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
+#: ../libedataserverui/e-book-auth-util.c:430
 msgid "Failed to authenticate.\n"
 msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??ã??\n"
 
-#: ../libedataserverui/e-categories-dialog.c:327
+#: ../libedataserverui/e-categories-dialog.c:145
+msgid "Category Icon"
+msgstr "ã?«ã??ã?´ã?ªã?®ã?¢ã?¤ã?³ã?³"
+
+#: ../libedataserverui/e-categories-dialog.c:151
+msgid "_No Image"
+msgstr "ç?»å??ã?ªã??(_N)"
+
+#: ../libedataserverui/e-categories-dialog.c:368
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
-msgstr "è¨å®?ã?®ä¸ã?«ã?«ã??ã?´ã?ª '%s' ã??å?å?¨ã??ã?¾ã??ã??å?¥ã?®å??å??ã??æ??å®?ã??ã?¦ä¸?ã??ã??ã??"
+msgstr "è¨å®?ã?®ä¸ã?«ã?«ã??ã?´ã?ª '%s' ã??å?å?¨ã??ã?¾ã??ã??å?¥ã?®å??å??ã??æ??å®?ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../libedataserverui/e-categories-dialog.c:618
+#: ../libedataserverui/e-categories-dialog.c:676
 msgid "Icon"
 msgstr "ã?¢ã?¤ã?³ã?³"
 
-#: ../libedataserverui/e-categories-dialog.c:623
+#: ../libedataserverui/e-categories-dialog.c:681
 msgid "Category"
 msgstr "ã?«ã??ã?´ã?ª"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
-msgid "Category Icon"
-msgstr "ã?«ã??ã?´ã?ªã?®ã?¢ã?¤ã?³ã?³"
-
-#: ../libedataserverui/e-categories-dialog.glade.h:2
+#: ../libedataserverui/e-categories-dialog.ui.h:1
 msgid "Category Properties"
 msgstr "ã?«ã??ã?´ã?ªã?®ã??ã?ã??ã??ã?£"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
+#: ../libedataserverui/e-categories-dialog.ui.h:2
 msgid "Category _Icon"
 msgstr "ã?«ã??ã?´ã?ªã?®ã?¢ã?¤ã?³ã?³(_I)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
+#: ../libedataserverui/e-categories-dialog.ui.h:3
 msgid "Category _Name"
 msgstr "ã?«ã??ã?´ã?ªã?®å??å??(_N)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "ã?«ã??ã?´ã?ªã?«å±?ã??ã?¦ã??ã??ã?¢ã?¤ã??ã? (_C):"
+#: ../libedataserverui/e-categories-dialog.ui.h:4
+msgid "Currently _used categories:"
+msgstr "æ??è¿?ä½¿ç?¨ã??ã??ã?«ã??ã?´ã?ª(_U):"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.ui.h:5
 msgid "_Available Categories:"
 msgstr "å?©ç?¨å?¯è?½ã?ªã?«ã??ã?´ã?ª(_A):"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.ui.h:6
 msgid "_Edit"
 msgstr "ç·¨é??(_E)"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
+#: ../libedataserverui/e-categories-dialog.ui.h:7
 msgid "categories"
 msgstr "ã?«ã??ã?´ã?ª"
 
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-category-completion.c:292
 #, c-format
 msgid "Create category \"%s\""
 msgstr "\"%s\" ã?¨ã??ã??ã?«ã??ã?´ã?ªã?®ç??æ??"
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "è?²ã?®æ??å ±"
-
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "æ??ç?»ã??ã??è?²ã?®æ??å ±ã?§ã??"
-
-#: ../libedataserverui/e-name-selector-dialog.c:276
+#: ../libedataserverui/e-name-selector-dialog.c:321
 msgid "Select Contacts from Address Book"
 msgstr "ã?¢ã??ã?¬ã?¹å¸³ã??ã??é?£çµ¡å??ã?®é?¸æ??"
 
-#: ../libedataserverui/e-name-selector-dialog.c:563
+#: ../libedataserverui/e-name-selector-dialog.c:660
 msgid "_Add"
 msgstr "è¿½å? (_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:588
+#: ../libedataserverui/e-name-selector-dialog.c:664
 msgid "_Remove"
 msgstr "å??é?¤(_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:765
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:892
+#: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "ä»»æ??ã?®ã?«ã??ã?´ã?ª"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
+#: ../libedataserverui/e-name-selector-dialog.ui.h:1
 msgid "*"
 msgstr "*"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
+#: ../libedataserverui/e-name-selector-dialog.ui.h:2
 msgid "<b>Co_ntacts</b>"
 msgstr "<b>é?£çµ¡å??(_N)</b>"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
+#: ../libedataserverui/e-name-selector-dialog.ui.h:3
 msgid "<b>Show Contacts</b>"
 msgstr "<b>é?£çµ¡å??ã?®è¡¨ç¤º</b>"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
+#: ../libedataserverui/e-name-selector-dialog.ui.h:4
 msgid "Address B_ook:"
 msgstr "ã?¢ã??ã?¬ã?¹å¸³(_O):"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.ui.h:5
 msgid "Address Book"
 msgstr "ã?¢ã??ã?¬ã?¹å¸³"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
+#: ../libedataserverui/e-name-selector-dialog.ui.h:7
 msgid "Cate_gory:"
 msgstr "ã?«ã??ã?´ã?ª(_G):"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
+#: ../libedataserverui/e-name-selector-dialog.ui.h:8
 msgid "Contacts"
 msgstr "é?£çµ¡å??"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
+#: ../libedataserverui/e-name-selector-dialog.ui.h:9
 msgid "Search"
 msgstr "æ¤?ç´¢"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
+#: ../libedataserverui/e-name-selector-dialog.ui.h:10
 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:2494
+#: ../libedataserverui/e-name-selector-entry.c:2639
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s ã??ã?¤ã?³ã?©ã?¤ã?³ã?§å±?é??ã??ã??(_X)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2509
+#: ../libedataserverui/e-name-selector-entry.c:2654
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s ã?®ã?³ã??ã?¼(_Y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2519
+#: ../libedataserverui/e-name-selector-entry.c:2664
 #, c-format
 msgid "C_ut %s"
 msgstr "%s ã?®å??ã??å??ã??(_U)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2536
+#: ../libedataserverui/e-name-selector-entry.c:2681
 #, c-format
 msgid "_Edit %s"
 msgstr "%s ã?®ç·¨é??(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:516
 #, c-format
 msgid "_Delete %s"
 msgstr "%s ã?®å??é?¤(_D)"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:257
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr "ã?ã?¼ã?ªã?³ã?°ã?®ã?ã?¼ã??ä½¿ç?¨ã?§ã??ã?¾ã??ã??: ã?¦ã?¼ã?¶ã?¾ã??ã?¯ã??ã?¹ã??å??ã??å?å?¨ã??ã?¾ã??ã??"
 
-#: ../libedataserverui/e-passwords.c:1093
+#: ../libedataserverui/e-passwords.c:1120
 msgid "You have the Caps Lock key on."
 msgstr "\"[Caps Lock] ã?ã?¼ã?? ON ç?¶æ??ã?§ã??"
 
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:1243
 msgid "_Remember this passphrase"
 msgstr "ã??ã?®ã??ã?¹ã??ã?¬ã?¼ã?ºã??è¨?æ?¶ã??ã??(_R)"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1244
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "ã??ã?®ã??ã?¹ã??ã?¬ã?¼ã?ºã??ã??ã?®ã?»ã??ã?·ã?§ã?³ç?¨ã?«ä¿?å?ã??ã??(_R)"
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:1249
 msgid "_Remember this password"
 msgstr "ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??è¨?æ?¶ã??ã??(_R)"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1250
 msgid "_Remember this password for the remainder of this session"
 msgstr "ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ã??ã?®ã?»ã??ã?·ã?§ã?³ç?¨ã?«ä¿?å?ã??ã??(_R)"
 
@@ -5095,203 +4980,643 @@ msgstr "ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ã??ã?®ã?»ã??ã?·ã?§ã?³ç?¨ã?«ä¿?å?ã??ã??(_R)"
 msgid "Select destination"
 msgstr "è»¢é??å??ã?®é?¸æ??"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:174
 msgid "_Destination"
 msgstr "è»¢é??å??(_D)"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1694
-#: ../servers/exchange/storage/exchange-account.c:955
-#, c-format
-msgid "Enter password for %s"
-msgstr "%s ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ä¸?ã??ã??"
+#: ../servers/groupwise/e-gw-connection.c:227
+msgid "Invalid connection"
+msgstr "ç?¡å?¹ã?ªæ?¥ç¶?ã?§ã??"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1695
-#: ../servers/exchange/storage/exchange-account.c:960
-msgid "Enter password"
-msgstr "ã??ã?¹ã?¯ã?¼ã??ã?®å?¥å??"
+#: ../servers/groupwise/e-gw-connection.c:231
+msgid "Invalid response from server"
+msgstr "ã?µã?¼ã??ã??ã??ã?®å¿?ç?ã??ç?¡å?¹ã?§ã??"
 
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:844
-msgid "Owner"
-msgstr "æ??æ??è??"
+#: ../servers/groupwise/e-gw-connection.c:233
+msgid "No response from the server"
+msgstr "ã?µã?¼ã??ã??ã??å¿?ç?ã??ã??ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:854
-msgid "Publishing Editor"
-msgstr "Publishing Editor"
+#: ../servers/groupwise/e-gw-connection.c:239
+msgid "Bad parameter"
+msgstr "ã??ã?©ã?¡ã?¼ã?¿ã??ç?¡å?¹ã?§ã??"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:862
-msgid "Editor"
-msgstr "ç·¨é??è??"
+#~ msgid "\"%s\" on book before \"%s\""
+#~ msgstr "\"%2$s\" ã?®å??ã?«ã??ã??ã??ã??ã?¯ã?® \"%1$s\""
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:869
-msgid "Publishing Author"
-msgstr "Publishing Author"
+#~ msgid "book busy"
+#~ msgstr "ã??ã??ã?¯ã?¯å?¦ç??ä¸ã?§ã??"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:875
-msgid "Author"
-msgstr "ä½?è??"
+#~ msgid "CORBA exception making \"%s\" call"
+#~ msgstr "\"%s\" å?¼ã?³å?ºã??ã??è¡?ã??é??ã?« CORBA ä¾?å¤?ã??ç?ºç??ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:880
-msgid "Non-editing Author"
-msgstr "Non-editing Author"
+#~ msgid "%s: there is no current operation"
+#~ msgstr "%s: ç?¾å?¨å®?è¡?ä¸ã?®æ??ä½?ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:884
-msgid "Reviewer"
-msgstr "ã?¬ã??ã?¥ã?¼ã?¢"
+#~ msgid "\"%s\" on book after \"%s\""
+#~ msgstr "\"%2$s\" ã?®æ¬¡ã?«ã??ã??ã??ã??ã?¯ã?® \"%1$s\""
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:886
-msgid "Contributor"
-msgstr "è²¢ç?®è??"
+#~ msgid "%s: canceled"
+#~ msgstr "%s: ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:888
-msgid "None"
-msgstr "ã?ªã??"
+#~ msgid "%s: no factories available for URI `%s'"
+#~ msgstr "%s: URI '%s' ã?«å¯¾ã??ã??ã??ã?¡ã?¯ã??ã?ªã??å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:903
-msgid "Custom"
-msgstr "ã?«ã?¹ã?¿ã? "
+#~ msgid "%s: Could not create EBookListener"
+#~ msgstr "%s: EBookListener ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "Generic error"
-msgstr "ä¸?è?¬ç??ã?ªã?¨ã?©ã?¼"
+#~ msgid "%s: there was no self contact UID stored in gconf"
+#~ msgstr "%s: GConf ã?«ã?»ã?«ã??é?£çµ¡å?? UID ã??ã??ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "A folder with the same name already exists"
-msgstr "æ?¢ã?«å??å??ã?®ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??"
+#~ msgid "Could not create thread for getting deltas"
+#~ msgstr "å·®å??ã??å??å¾?ã??ã??ã??ã??ã?®ã?¹ã?¬ã??ã??ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "The specified folder type is not valid"
-msgstr "æ??å®?ã??ã??ã??ã?©ã?«ã??ã?®ç¨®é¡?ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+#~ msgid "Offline mode unavailable"
+#~ msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?«å??ã??æ?¿ã??ã??ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "I/O error"
-msgstr "I/O ã?¨ã?©ã?¼"
+#~ msgid "Cannot open message"
+#~ msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "Not enough space to create the folder"
-msgstr "ã??ã?©ã?«ã??ã??ç??æ??ã??ã??ã??ã??ã?®å®¹é??ã??è¶³ã??ã?¾ã??ã??"
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??æ??ä½?: %s ã?«å¯¾ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®è¿½å? "
 
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The folder is not empty"
-msgstr "ã??ã?®ã??ã?©ã?«ã??ã?¯ç©ºã?§ã?¯ã??ã??ã?¾ã??ã??"
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??æ??ä½?: %s ã?«å¯¾ã??ã?¦å¼?ã??ä½¿ã?£ã??æ¤?ç´¢"
 
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "The specified folder was not found"
-msgstr "æ??å®?ã??ã??ã??ã?©ã?«ã??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã??"
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??æ??ä½?: %s ã?«å¯¾ã??ã?¦å¼?ã??ä½¿ã?£ã??ã?«ã?¦ã?³ã??"
 
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Function not implemented in this storage"
-msgstr "ã??ã?®ã?¹ã??ã?¬ã?¼ã?¸ã?§ã?¯å®?è£?ã??ã??ã?¦ã??ã?ªã??æ©?è?½ã?§ã??"
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??æ??ä½?: %s ã?«å¯¾ã??ã?¦ UID ã??ä½¿ã?£ã??æ¤?ç´¢"
 
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "Operation not supported"
-msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??æ??ä½?ã?§ã??"
+#~ msgid "Learning junk"
+#~ msgstr "ã?¸ã?£ã?³ã?¯ã?»ã?¡ã?¼ã?«ã?®å¦ç¿?ä¸"
 
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified type is not supported in this storage"
-msgstr "ã??ã?®ã?¹ã??ã?¬ã?¼ã?¸ã?§ã?¯æ??å®?ã??ã??ç¨®é¡?ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
+#~ msgid "Learning non-junk"
+#~ msgstr "ã?¸ã?£ã?³ã?¯ã?§ã?¯ã?ªã??ã?¡ã?¼ã?«ã?®å¦ç¿?ä¸"
 
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "The specified folder cannot be modified or removed"
-msgstr "æ??å®?ã??ã??ã??ã?©ã?«ã??ã??å¤?æ?´/å??é?¤ã?§ã??ã?¾ã??ã??"
+#~ msgid "Canceled."
+#~ msgstr "ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "ã??ã?®ã??ã?©ã?«ã??ã?®å?ã??ç??æ??ã?§ã??ã?¾ã??ã??"
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ã?«ã?¯ã??ã?¸ã?¿ã?«ç½²å??ã??ã??ã??é?¨å??ã??ã??ã??ã?¾ã??"
 
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "Cannot create a folder with that name"
-msgstr "ã??ã?®ã??ã??ã?ªå??å??ã?§ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr ""
+#~ "ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ã?®æ?´å??æ?§ã??ç¢ºèª?ã?§ã??ã?¾ã??ã??: ä½?æ¥ç?¨ã??ã?¡ã?¤ã?«ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??"
+#~ "ã??: %s"
 
-#: ../servers/exchange/storage/e-storage.c:585
-msgid "This operation cannot be performed in off-line mode"
-msgstr "ã??ã?®æ??ä½?ã?¯ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??ã??"
+#~ msgid "Unable to parse message content"
+#~ msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®å??å®¹ã??è§£æ??ã?§ã??ã?¾ã??ã??"
 
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:640
-#, c-format
-msgid "%s's Folders"
-msgstr "%s ã?®ã??ã?©ã?«ã??"
+#~ msgid "cannot create thread"
+#~ msgstr "ã?¹ã?¬ã??ã??ã??ç??æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/storage/exchange-account.c:1260
-msgid "Personal Folders"
-msgstr "å??äººã??ã?©ã?«ã??"
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
 
-#: ../servers/exchange/storage/exchange-account.c:1275
-msgid "Favorite Public Folders"
-msgstr "ã??æ°?ã?«å?¥ã??ã?®ã??ã??ã?ªã??ã?¯ã?ªã??ã?©ã?«ã??"
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 4 authentication."
+#~ msgstr "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ Kerberos 4 èª?è¨¼ã??ä½¿ã?£ã?¦ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã?¾ã??"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1292
-msgid "All Public Folders"
-msgstr "å?¨ã?¦ã?®ã??ã??ã?ªã??ã?¯ã?ªã??ã?©ã?«ã??"
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kerberos ã??ã?±ã??ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??ã?§ã??ã??:\n"
+#~ "%s"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1306
-msgid "Global Address List"
-msgstr "ã?°ã?ã?¼ã??ã?«ã?ªä½?æ??ã?®ä¸?è¦§"
+#~ msgid "Camel session doesn't support forwarding of a message."
+#~ msgstr "Camel ã?®ã?»ã??ã?·ã?§ã?³ã?§ã?¯ã?¡ã??ã?»ã?¼ã?¸ã?®è»¢é??ã?¯ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "ã?¢ã?¤ã??ã? ã??å??é?¤ã??ã?¾ã??ã??"
+#~ msgid "import keys: unimplemented"
+#~ msgstr "é?µã?®ã?¤ã?³ã??ã?¼ã??: æ?ªã? å®?è£?ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "è??æ¡?"
+#~ msgid "export keys: unimplemented"
+#~ msgstr "é?µã?®ã?¨ã?ã?¹ã??ã?¼ã??: æ?ªã? å®?è£?ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "ã?¸ã?£ã?¼ã??ã?«"
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr "ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: ã??ã??ã?§ã?¯ç?¡å?¹ã?ªæ??ä½?ã?§ã??"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "ã?¡ã?¢"
+#~ msgid "Unable to get issuer's certificate"
+#~ msgstr "ç?ºè¡?è??ã?®è¨¼æ??æ?¸ã??å??å¾?ã?§ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "é??ä¿¡ç®±"
+#~ msgid "Unable to get Certificate Revocation List"
+#~ msgstr "èª?è¨¼å??ã??æ¶?ã??ä¸?è¦§ã??å??å¾?ã?§ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "ã?¢ã?¤ã??ã? ã??é??ä¿¡ã??ã?¾ã??ã??"
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "è¨¼æ??æ?¸ã?®ç½²å??ã??è§£èªã?§ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "ã?¿ã?¹ã?¯"
+#~ msgid "Unable to decrypt Certificate Revocation List signature"
+#~ msgstr "èª?è¨¼å??ã??æ¶?ã??ä¸?è¦§ã?®ç½²å??ã?®è§£èªã??ã?§ã??ã?¾ã??ã??"
 
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "ç?¡å?¹ã?ªæ?¥ç¶?ã?§ã??"
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "ç?ºè¡?è??ã?®ã??ã??ã?ªã??ã?¯ã?»ã?ã?¼ã??è§£èªã?§ã??ã?¾ã??ã??"
 
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "ã?µã?¼ã??ã??ã??ã?®å¿?ç?ã??ç?¡å?¹ã?§ã??"
+#~ msgid "Certificate signature failure"
+#~ msgstr "è¨¼æ??æ?¸ã?®ç½²å??ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "ã?µã?¼ã??ã??ã??å¿?ç?ã??ã??ã??ã?¾ã??ã??"
+#~ msgid "Certificate Revocation List signature failure"
+#~ msgstr "èª?è¨¼å??ã??æ¶?ã??ä¸?è¦§ã?®ç½²å??ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "ã??ã?©ã?¡ã?¼ã?¿ã??ç?¡å?¹ã?§ã??"
+#~ msgid "Certificate not yet valid"
+#~ msgstr "èª?è¨¼ã??ã?¾ã? æ£ã??ã??ã??ã??ã?¾ã??ã??"
+
+#~ msgid "Certificate has expired"
+#~ msgstr "è¨¼æ??æ?¸ã?®æ??å?¹æ??é??ã??å»¶ã?³ã?¾ã??ã??"
+
+#~ msgid "Certificate Revocation List (CRL) not yet valid"
+#~ msgstr "è¨¼æ??æ?¸å¤±å?¹ã?ªã?¹ã?? (CRL) ã?¯ã?¾ã? ç?¡å?¹ã?§ã??"
+
+#~ msgid "Certificate Revocation List (CRL) has expired"
+#~ msgstr "è¨¼æ??æ?¸å¤±å?¹ã?ªã?¹ã?? (CRL) ã??æ??é??å??ã??ã?§ã??"
+
+#~ msgid "Error in Certificate Revocation List (CRL)"
+#~ msgstr "è¨¼æ??æ?¸å¤±å?¹ã?ªã?¹ã?? (CRL) ã?«ã?¨ã?©ã?¼"
+
+#~ msgid "Out of memory"
+#~ msgstr "ã?¡ã?¢ã?ªã??è¶³ã??ã?¾ã??ã??"
+
+#~ msgid "Zero-depth self-signed certificate"
+#~ msgstr "Zero-depth self-signed èª?è¨¼"
+
+#~ msgid "Self-signed certificate in chain"
+#~ msgstr "ã??ã?§ã?¼ã?³ã?®ä¸ã?«ã??ã?? Self-signed èª?è¨¼"
+
+#~ msgid "Unable to get issuer's certificate locally"
+#~ msgstr "ç?ºè¡?è??ã?®èª?è¨¼ã??ã?ã?¼ã?«ã?«ã?§å??å¾?ã?§ã??ã?¾ã??ã??"
+
+#~ msgid "Unable to verify leaf signature"
+#~ msgstr "Leaf ç½²å??ã??æ¤?è¨¼ã?§ã??ã?¾ã??ã??"
+
+#~ msgid "Certificate chain too long"
+#~ msgstr "èª?è¨¼ã??ã?§ã?¼ã?³ã??é?·ã??ã??ã?¾ã??"
+
+#~ msgid "Certificate Revoked"
+#~ msgstr "ç?¡å?¹ã?«ã?ªã?£ã??è¨¼æ??æ?¸ã?§ã??"
+
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "èª?è¨¼å±? (CA) ã??ç?¡å?¹ã?§ã??"
+
+#~ msgid "Path length exceeded"
+#~ msgstr "ã??ã?¹ã?¯ã?¼ã??ã??é?·ã??ã??ã?¾ã??"
+
+#~ msgid "Invalid purpose"
+#~ msgstr "ç?®ç??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+
+#~ msgid "Certificate untrusted"
+#~ msgstr "ä¿¡é ¼ã??ã??ã?¦ã??ã?ªã??è¨¼æ??æ?¸ã?§ã??"
+
+#~ msgid "Certificate rejected"
+#~ msgstr "æ??å?¦ã??ã??ã??è¨¼æ??æ?¸ã?§ã??"
+
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "ã?¿ã?¤ã??ã?«/ç?ºè¡?è??ã??ä¸?è?´ã??ã?¾ã??ã??"
+
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "AKID/SKID ã??ä¸?è?´ã??ã?¾ã??ã??"
+
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "AKID/ç?ºè¡?è??ã?®ã?·ã?ªã?¢ã?«ç?ªå?·ã??ä¸?è?´ã??ã?¾ã??ã??"
+
+#~ msgid "Key usage does not support certificate signing"
+#~ msgstr "ã?ã?¼ã?®å?©ç?¨æ?¹æ³?ã??èª?è¨¼ç½²å??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
+
+#~ msgid "Error in application verification"
+#~ msgstr "ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?®æ¤?è¨¼ã?§ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
+
+#~ msgid ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
+#~ msgstr ""
+#~ "%s ã??ã??ã??ã??ã??ã?ªè¨¼æ??æ?¸ã?§ã??:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "å??è«¾ã??ã?¦ã?¿ã?¾ã??ã???"
+
+#~ msgid "User canceled"
+#~ msgstr "ã?¦ã?¼ã?¶ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
+
+#~ msgid "Trash Folder Full. Please Empty."
+#~ msgstr "ã?´ã??ç®±ã??ã?©ã?«ã??ã??æº?æ?¯ã?§ã??ã??ç©ºã?«ã??ã?¦ã??ã? ã??ã??ã??"
+
+#~ msgid "Hula"
+#~ msgstr "Hula"
+
+#~ msgid "For accessing Hula servers"
+#~ msgstr "Hula ã?µã?¼ã??ã?¸ã?®ã?¢ã?¯ã?»ã?¹ç?¨ã?§ã??"
+
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr ""
+#~ "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã?¬ã?¤ã?³ã?»ã??ã?ã?¹ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ Hula ã?µã?¼ã??ã?«æ?¥ç¶?ã??"
+#~ "ã?¾ã??"
+
+#~ msgid "Unexpected response status '%s' after APPEND command"
+#~ msgstr "APPEND ã?³ã??ã?³ã??ã?®å¾?ã?«æ?³å®?å¤?ã?®å¿?ç?ã?¹ã??ã?¼ã?¿ã?¹ã??ã??ã??ã?¾ã??: '%s'"
+
+#~ msgid "No response on continuation after APPEND command"
+#~ msgstr "APPEND ã?³ã??ã?³ã??ã?«ç¶?ã??å¿?ç?ã??ã??ã??ã?¾ã??ã??"
+
+#~ msgid "Unknown error occurred during APPEND command!"
+#~ msgstr "APPEND ã?³ã??ã?³ã??ã?®ç?ºè¡?ä¸ã?«å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??!"
+
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "%s ã?¨ã??ã?? IMAP ã?µã?¼ã??ã?¸ã?®ã?³ã??ã?³ã??é??ä¿¡ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
+
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "IMAP ã?µã?¼ã??ã?® %s ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
+
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "IMAP ã?µã?¼ã??ã?® %s ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??"
+
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??é?¸æ??ã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
+
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã?? ã??é?¸æ??ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "%s ã?¨ã??ã?? IMAP ã?µã?¼ã??ã?¸ã?®ã?³ã??ã?³ã??é??ä¿¡ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
+
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "çª?ç?¶ IMAP4 ã?µã?¼ã??ã?® %s ã??æ?¥ç¶?ã??å??ã??ã?¾ã??ã??: %s"
+
+#~ msgid ""
+#~ "Enable extended Mailing-List detection required for some filter and "
+#~ "vFolder rules"
+#~ msgstr ""
+#~ "ã??ã?£ã?«ã?¿ã?®ã?«ã?¼ã?«ã??ä»®æ?³ã??ã?©ã?«ã??ã?®ã?«ã?¼ã?«ã?«å¿?è¦?ã?ªã?¡ã?¼ã?ªã?³ã?°ã?»ã?ªã?¹ã??ã?®æ¤?å?ºã??æ??"
+#~ "å?¹ã?«ã??ã??"
+
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr "Xç§?é??èªã?¾ã??ã?ªã??ã?£ã??ã?ã?£ã??ã?·ã?¥æ¸?ã?®ã?¡ã??ã?»ã?¼ã?¸ã??ç?¡å?¹ã?«ã??ã?¾ã??"
+
+#~ msgid "Expire cached messages older than X seconds"
+#~ msgstr "Xç§?ã??ã??å?¤ã??ã?ã?£ã??ã?·ã?¥æ¸?ã?®ã?¡ã??ã?»ã?¼ã?¸ã??ç?¡å?¹ã?«ã??ã?¾ã??"
+
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?«ã?¢ã?¯ã?»ã?¹ã?§ã??ã?¾ã??ã??: %s"
+
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?¨ã??ã?©ã?°ã??å??æ??ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
+
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr ""
+#~ "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?¨ã??ã?©ã?°ã??å??æ??ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??æ?¹æ¶?ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
+
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??æ?¹æ¶?ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr ""
+#~ "%s ã?? '%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: ã??ã?®ã??ã??ã?ªã?¡ã??ã?»ã?¼ã?¸ã?¯ã??ã??ã?¾"
+#~ "ã??ã??"
+
+#~ msgid "Cannot get message %s from folder '%s': Bad command"
+#~ msgstr ""
+#~ "%s ã?? '%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr ""
+#~ "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: ã??ã?©ã?«ã??ã?¯èªã?¿è¾¼ã?¿å°?ç?¨ã?§"
+#~ "ã??"
+
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
+
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr ""
+#~ "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr "'%s' ã??ã?? '%s' ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ç§»å??ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr "'%s' ã??ã?? '%s' ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "'%s' ã??ã?? '%s' ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ç§»å??ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "'%s' ã??ã?? '%s' ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+
+#~ msgid "Check new messages for _Junk contents"
+#~ msgstr "æ?°ç??ã?¡ã?¼ã?«ã?«ã?¹ã??ã? ã??å?«ã?¾ã??ã?¦ã??ã??ã??ã??ã?§ã??ã?¯ã??ã??(_J)"
+
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "å??ä¿¡ç®±ã?«ã??ã??ã?¡ã?¼ã?«ã? ã??ã?¹ã??ã? ã??ã?©ã??ã??ã??ã?§ã??ã?¯ã??ã??(_G)"
+
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAP4rev1"
+
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "IMAP ã?µã?¼ã??ã?«ã??ã??ã?¡ã?¼ã?«ã??èªã??ã? ã??ä¿?å?ã??ã?¾ã??"
+
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã?¬ã?¤ã?³ã?»ã??ã?ã?¹ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ IMAPv4rev1 ã?µã?¼ã??ã?«"
+#~ "æ?¥ç¶?ã??ã?¾ã??"
+
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr ""
+#~ "ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã??ã?¢ã?¼ã??ã?§ IMAP ã?µã?¼ã?? %s ã?¸ã?®æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??: ã?µã?¼"
+#~ "ã??å?´ã?§ STARTTLS ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??ã?®ã??å??å? ã?§ã??"
+
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr "IMAP ã?µã?¼ã?? %s ã?«å¯¾ã??ã?¦èª?è¨¼æ?¹å¼? %s ã??ä½¿ã?£ã?¦èª?è¨¼ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "IMAP ã?µã?¼ã?? %s ã?§ %s ã??ä½¿ã?£ã??èª?è¨¼ã??è¡?ã??ã?¾ã??ã??"
+
+#~ msgid "Cannot create IMAP folders in offline mode."
+#~ msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ IMAP ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã??"
+
+#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+#~ msgstr "'%s' ã?? IMAP ã?µã?¼ã??ã?® %s ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
+
+#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+#~ msgstr "'%s' ã?® LIST æ??å ±ã?? IMAP ã?µã?¼ã??ã?® %s ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
+
+#~ msgid "Bad command"
+#~ msgstr "ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+
+#~ msgid "Cannot create folder '%s': Invalid mailbox name"
+#~ msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
+
+#~ msgid "Cannot create folder '%s': Bad command"
+#~ msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+
+#~ msgid "Cannot delete IMAP folders in offline mode."
+#~ msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ IMAP ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??ã??"
+
+#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
+#~ msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
+
+#~ msgid "Cannot delete folder '%s': Bad command"
+#~ msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
+#~ msgstr "'%s' ã??ã?? '%s' ã?«å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: ç?¹å?¥ã?ªã??ã?©ã?«ã??ã?§ã??"
+
+#~ msgid "Cannot rename IMAP folders in offline mode."
+#~ msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ IMAP ã?®ã??ã?©ã?«ã??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??ã??"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#~ msgstr "'%s' ã??ã?? '%s' ã?«å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
+#~ msgstr "'%s' ã??ã?? '%s' ã?«å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+
+#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+#~ msgstr "%s ã?? '%s' ã?¨ã??ã??ã??ã?¿ã?¼ã?³ã?§ IMAP ã?µã?¼ã??ã?® %s ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
+
+#~ msgid "Cannot subscribe to IMAP folders in offline mode."
+#~ msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ IMAP ã??ã?©ã?«ã??ã??è³¼èªã?§ã??ã?¾ã??ã??ã??"
+
+#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+#~ msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??è³¼èªã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
+
+#~ msgid "Cannot subscribe to folder '%s': Bad command"
+#~ msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??è³¼èªã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+
+#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
+#~ msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ IMAP ã??ã?©ã?«ã??ã?®è³¼èªã??å??æ¢ã?§ã??ã?¾ã??ã??ã??"
+
+#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+#~ msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?®è³¼èªã??å??æ¢ã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
+
+#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
+#~ msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?®è³¼èªã??å??æ¢ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+
+#~ msgid "Scanning for changed messages"
+#~ msgstr "å¤?æ?´ã?¡ã??ã?»ã?¼ã?¸ã?®è§£æ??ä¸"
+
+#~ msgid "IMAP server %s is in an inconsistent state."
+#~ msgstr "IMAP ã?µã?¼ã?? %s ã?®ç?¶æ??ã??ç??ç?¾ã??ã?¦ã??ã?¾ã??"
+
+#~ msgid "Fetching envelopes of new messages"
+#~ msgstr "æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®ã?¨ã?³ã??ã?ã?¼ã??ã?®å??å¾?ä¸"
+
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "IMAP ã?µã?¼ã?? %s ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: "
+
+#~ msgid "No data"
+#~ msgstr "ã??ã?¼ã?¿ã?ªã??"
+
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "çª?ç?¶ IMAP ã?µã?¼ã?? %s ã??æ?¥ç¶?ã??å??ã??ã?¾ã??ã??: %s"
+
+#~ msgid ""
+#~ "Experimental IMAP 4(.1) client\n"
+#~ "This is untested and unsupported code, you want to use plain imap "
+#~ "instead.\n"
+#~ "\n"
+#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+#~ msgstr ""
+#~ "IMAP 4(.1) ã?¯ã?©ã?¤ã?¢ã?³ã?? (é??ç?ºç??)\n"
+#~ "ã??ã??ã?¯æ?ªã??ã?¹ã??/æ?ªã?µã??ã?¼ã??ã?®ã?³ã?¼ã??ã?ªã?®ã?§ã??ä»£ã??ã??ã?«æ¨?æº? IMAP ã??ä½¿ç?¨ã??ã?¦ä¸?ã??"
+#~ "ã??ã??\n"
+#~ "\n"
+#~ " !!! é??è¦?ã?ªã?¡ã?¼ã?«ã?«ã?¯å?©ç?¨ã??ã?ªã??ã?§ã??ã? ã??ã??  !!!\n"
+
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "%s ã?® POP ã?µã?¼ã??ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#~ msgid "Maildir append message canceled"
+#~ msgstr "Maildir å½¢å¼?ã?®ã?¡ã??ã?»ã?¼ã?¸è¿½å? ã??å??ã??æ¶?ã??ã??ã?¾ã??ã??"
+
+#~ msgid "Invalid message contents"
+#~ msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®å??å®¹ã?¯ç?¡å?¹ã?§ã??"
+
+#~ msgid "Mail append canceled"
+#~ msgstr "ã?¡ã?¼ã?«ã?®è¿½å? ã??ã?ã?£ã?³ã?»ã?«ã??ã??ã?¾ã??ã??"
+
+#~ msgid "Message construction failed."
+#~ msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®æ§?ç¯?ã?«å¤±æ??ã??ã?¾ã??ã??ã??"
+
+#~ msgid "MH append message canceled"
+#~ msgstr "MH å½¢å¼?ã?®ã?¡ã??ã?»ã?¼ã?¸è¿½å? ã??ã?ã?£ã?³ã?»ã?«ã??ã??ã?¾ã??ã??"
+
+#~ msgid "Use cancel"
+#~ msgstr "ã?ã?£ã?³ã?»ã?«ã??å?©ç?¨ã??ã??"
+
+#~ msgid "STARTTLS command failed"
+#~ msgstr "STARTTLS ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
+
+#~ msgid "HELO command failed"
+#~ msgstr "HELO ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
+
+#~ msgid "AUTH command failed"
+#~ msgstr "AUTH ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
+
+#~ msgid "Bad authentication response from server.\n"
+#~ msgstr "ã?µã?¼ã??ã??ã??é??é??ã?£ã??èª?è¨¼å¿?ç?ã??ã??ã??ã?¾ã??ã??\n"
+
+#~ msgid "MAIL FROM command failed: %s: mail not sent"
+#~ msgstr "MAIL FROM ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
+
+#~ msgid "RCPT TO command failed: %s: mail not sent"
+#~ msgstr "RCPT TO ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
+
+#~ msgid "DATA command failed: %s: mail not sent"
+#~ msgstr "DATA ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
+
+#~ msgid "RSET command failed"
+#~ msgstr "RSET ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
+
+#~ msgid "QUIT command failed"
+#~ msgstr "QUIT ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
+
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "ã?«ã??ã?´ã?ªã?«å±?ã??ã?¦ã??ã??ã?¢ã?¤ã??ã? (_C):"
+
+#~ msgid "Color Info"
+#~ msgstr "è?²ã?®æ??å ±"
+
+#~ msgid "The color to render"
+#~ msgstr "æ??ç?»ã??ã??è?²ã?®æ??å ±ã?§ã??"
+
+#~ msgid "Enter password for %s"
+#~ msgstr "%s ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
+
+#~ msgid "Enter password"
+#~ msgstr "ã??ã?¹ã?¯ã?¼ã??ã?®å?¥å??"
+
+#~ msgid "Owner"
+#~ msgstr "æ??æ??è??"
+
+#~ msgid "Publishing Editor"
+#~ msgstr "Publishing Editor"
+
+#~ msgid "Editor"
+#~ msgstr "ç·¨é??è??"
+
+#~ msgid "Publishing Author"
+#~ msgstr "Publishing Author"
+
+#~ msgid "Author"
+#~ msgstr "ä½?è??"
+
+#~ msgid "Non-editing Author"
+#~ msgstr "Non-editing Author"
+
+#~ msgid "Reviewer"
+#~ msgstr "ã?¬ã??ã?¥ã?¼ã?¢"
+
+#~ msgid "Contributor"
+#~ msgstr "è²¢ç?®è??"
+
+#~ msgid "None"
+#~ msgstr "ã?ªã??"
+
+#~ msgid "Custom"
+#~ msgstr "ã?«ã?¹ã?¿ã? "
+
+#~ msgid "Generic error"
+#~ msgstr "ä¸?è?¬ç??ã?ªã?¨ã?©ã?¼"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "æ?¢ã?«å??å??ã?®ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "æ??å®?ã??ã??ã??ã?©ã?«ã??ã?®ç¨®é¡?ã??é??é??ã?£ã?¦ã??ã?¾ã??"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "ã??ã?©ã?«ã??ã??ç??æ??ã??ã??ã??ã??ã?®å®¹é??ã??è¶³ã??ã?¾ã??ã??"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "ã??ã?®ã??ã?©ã?«ã??ã?¯ç©ºã?§ã?¯ã??ã??ã?¾ã??ã??"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "æ??å®?ã??ã??ã??ã?©ã?«ã??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "ã??ã?®ã?¹ã??ã?¬ã?¼ã?¸ã?§ã?¯å®?è£?ã??ã??ã?¦ã??ã?ªã??æ©?è?½ã?§ã??"
+
+#~ msgid "Operation not supported"
+#~ msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??æ??ä½?ã?§ã??"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "ã??ã?®ã?¹ã??ã?¬ã?¼ã?¸ã?§ã?¯æ??å®?ã??ã??ç¨®é¡?ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "æ??å®?ã??ã??ã??ã?©ã?«ã??ã??å¤?æ?´/å??é?¤ã?§ã??ã?¾ã??ã??"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "ã??ã?®ã??ã?©ã?«ã??ã?®å?ã??ç??æ??ã?§ã??ã?¾ã??ã??"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "ã??ã?®ã??ã??ã?ªå??å??ã?§ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "ã??ã?®æ??ä½?ã?¯ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??ã??"
+
+#~ msgid "%s's Folders"
+#~ msgstr "%s ã?®ã??ã?©ã?«ã??"
+
+#~ msgid "Personal Folders"
+#~ msgstr "å??äººã??ã?©ã?«ã??"
+
+#~ msgid "Favorite Public Folders"
+#~ msgstr "ã??æ°?ã?«å?¥ã??ã?®ã??ã??ã?ªã??ã?¯ã?ªã??ã?©ã?«ã??"
+
+#~ msgid "All Public Folders"
+#~ msgstr "ã??ã?¹ã?¦ã?®ã??ã??ã?ªã??ã?¯ã?ªã??ã?©ã?«ã??"
+
+#~ msgid "Global Address List"
+#~ msgstr "ã?°ã?ã?¼ã??ã?«ã?ªä½?æ??ã?®ä¸?è¦§"
+
+#~ msgid "Deleted Items"
+#~ msgstr "ã?¢ã?¤ã??ã? ã??å??é?¤ã??ã?¾ã??ã??"
+
+#~ msgid "Drafts"
+#~ msgstr "è??æ¡?"
+
+#~ msgid "Journal"
+#~ msgstr "ã?¸ã?£ã?¼ã??ã?«"
+
+#~ msgid "Notes"
+#~ msgstr "ã?¡ã?¢"
+
+#~ msgid "Outbox"
+#~ msgstr "é??ä¿¡ç®±"
+
+#~ msgid "Sent Items"
+#~ msgstr "ã?¢ã?¤ã??ã? ã??é??ä¿¡ã??ã?¾ã??ã??"
+
+#~ msgid "Tasks"
+#~ msgstr "ã?¿ã?¹ã?¯"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Evolution ã?¢ã??ã?¬ã?¹å¸³ã??ã?¡ã?¤ã?«ã?®ã??ã??ã?¯ã?¨ã?³ã??"
+#~ msgid "Evolution Addressbook file backend"
+#~ msgstr "Evolution ã?¢ã??ã?¬ã?¹å¸³ã??ã?¡ã?¤ã?«ã?®ã??ã??ã?¯ã?¨ã?³ã??"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Evolution ã?«ã?¬ã?³ã??ã?»ã??ã?¡ã?¤ã?«ã?¨ webcal ã?®ã??ã??ã?¯ã?¨ã?³ã??"
+#~ msgid "Evolution Calendar file and webcal backend"
+#~ msgstr "Evolution ã?«ã?¬ã?³ã??ã?»ã??ã?¡ã?¤ã?«ã?¨ webcal ã?®ã??ã??ã?¯ã?¨ã?³ã??"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "Evolution ã??ã?¼ã?¿ã?»ã?µã?¼ã??ã?®ã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹ç¢ºèª?ã?µã?¼ã??ã?¹"
+#~ msgid "Evolution Data Server interface check service"
+#~ msgstr "Evolution ã??ã?¼ã?¿ã?»ã?µã?¼ã??ã?®ã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹ç¢ºèª?ã?µã?¼ã??ã?¹"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Evolution ã??ã?¼ã?¿ã?»ã?µã?¼ã??ã?®ã?ã?°è¨?é?²ã?µã?¼ã??ã?¹"
+#~ msgid "Evolution Data Server logging service"
+#~ msgstr "Evolution ã??ã?¼ã?¿ã?»ã?µã?¼ã??ã?®ã?ã?°è¨?é?²ã?µã?¼ã??ã?¹"
 
 #~ msgid "Decoder failed, error %d"
 #~ msgstr "ã??ã?³ã?¼ã??ã?®ã?¨ã?©ã?¼ (%d)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]