[evolution-data-server/gnome-3-0] Updated Japanese translation.

From: Takayuki Kusano <kusano src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server/gnome-3-0] Updated Japanese translation.
Date: Sat, 2 Apr 2011 14:31:59 +0000 (UTC)
commit c22b6f99212627372c4c3a773cacc92752175bbd
Author: Takayuki KUSANO <AE5T-KSN asahi-net or jp>
Date:   Sat Apr 2 23:30:42 2011 +0900

    Updated Japanese translation.

 po/ja.po | 2588 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 1374 insertions(+), 1214 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 96d188c..63eccfe 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,25 +1,26 @@
 # evolution-data-server ja.po.
-# Copyright (C) 2000-2010 Free Software Foundation, Inc.
+# Copyright (C) 2000-2011 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, 2010.
+# Takayuki KUSANO <AE5T-KSN asahi-net or jp>, 2009-2011.
 # Kiyotaka NISHIBORI <nl nishibori kiyotaka gmail com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server master\n"
+"Project-Id-Version: evolution-data-server gnome-3-0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution-data-server&component=Misc.\n"
-"POT-Creation-Date: 2010-09-19 18:15+0000\n"
-"PO-Revision-Date: 2010-09-12 22:08+0900\n"
-"Last-Translator: Kiyotaka NISHIBORI <nl nishibori kiyotaka gmail com>\n"
+"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
+"POT-Creation-Date: 2011-03-30 12:21+0000\n"
+"PO-Revision-Date: 2011-03-30 21:37+0900\n"
+"Last-Translator: Takayuki KUSANO <AE5T-KSN asahi-net or jp>\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"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:570
@@ -32,74 +33,142 @@ msgstr "èªã?¿è¾¼ã?¿ä¸..."
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4482
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "æ¤?ç´¢ä¸..."
 
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:589
+msgid "Querying for updated contactsâ?¦"
+msgstr "æ?´æ?°ã??ã??ã??é?£çµ¡å??ã??å??ã??å??ã??ã??ä¸â?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:624
+msgid "Personal"
+msgstr "å??äºº"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:626
+msgid "Friends"
+msgstr "å??äºº"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:628
+msgid "Family"
+msgstr "å®¶æ??"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:630
+msgid "Coworkers"
+msgstr "å??å??"
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:707
+msgid "Querying for updated groupsâ?¦"
+msgstr "æ?´æ?°ã??ã??ã??ã?°ã?«ã?¼ã??ã??å??ã??å??ã??ã??ä¸â?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:891
+msgid "Creating new contactâ?¦"
+msgstr "æ?°ã??ã??é?£çµ¡å??ã?®ä½?æ??ä¸â?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:984
+msgid "Deleting contactâ?¦"
+msgstr "é?£çµ¡å??ã?®å??é?¤ä¸â?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1092
+msgid "Modifying contactâ?¦"
+msgstr "é?£çµ¡å??ã?®æ?´æ?°ä¸â?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1199
+msgid "Loadingâ?¦"
+msgstr "èªã?¿è¾¼ã?¿ä¸â?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1346
+msgid "Authenticating with the serverâ?¦"
+msgstr "ã?µã?¼ã??ã?§èª?è¨¼ä¸â?¦"
+
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4641
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "é?£çµ¡å?? (%d å??ç?®) ã??ã??ã?¦ã?³ã?ã?¼ã??ä¸... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2849
 #: ../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 å??ç?®) ã??æ?´æ?°ä¸... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
 msgid "Not connected"
 msgstr "æ?¥ç¶?ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
 msgid "Using Distinguished Name (DN)"
 msgstr "è?å?¥å?? (DN) ã??ä½¿ç?¨ã??ã??"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
 msgid "Using Email Address"
 msgstr "E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã??ä½¿ç?¨ã??ã??"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP ã?µã?¼ã??ã?¸å??æ?¥ç¶?ä¸..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
 msgid "Invalid DN syntax"
 msgstr "ç?¡å?¹ã?ªè?å?¥å?? (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1663
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP ã?µã?¼ã??ã?¸é?£çµ¡å??ã??è¿½å? ä¸..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1795
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP ã?µã?¼ã??ã??ã??é?£çµ¡å??ã??å??é?¤ä¸..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2229
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP ã?µã?¼ã??ã?«ã??ã??é?£çµ¡å??ã??ä¿®æ£ä¸..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4332
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
 msgid "Receiving LDAP search results..."
 msgstr "LDAP ã?µã?¼ã??æ¤?ç´¢çµ?æ??ã??å??å¾?ä¸..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4504
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
 msgid "Error performing search"
 msgstr "æ¤?ç´¢ä¸ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
+#: ../calendar/backends/http/e-cal-backend-http.c:435
+#: ../calendar/libecal/e-cal.c:4177
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
+#: ../camel/providers/imap/camel-imap-command.c:481
+#: ../camel/providers/imap/camel-imap-store.c:425
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../servers/groupwise/e-gw-connection.c:243
+msgid "Unknown error"
+msgstr "ã?¨ã?©ã?¼ã??ç?¹å®?ã?§ã??ã?¾ã??ã??"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
 #, c-format
-msgid "Create resource '%s' failed with HTTP status: %d"
-msgstr "ã?ªã?½ã?¼ã?¹ '%s' ã?®ä½?æ??ã?«å¤±æ??ã??ã?¾ã??ã?? (HTTP ã?¹ã??ã?¼ã?¿ã?¹: %d)"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "ã?ªã?½ã?¼ã?¹ '%s' ã?®ä½?æ??ã?«å¤±æ??ã??ã?¾ã??ã??ã??HTTP ã?¹ã??ã?¼ã?¿ã?¹: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:2995
+#: ../addressbook/libebook/e-book.c:3160
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: GConf ã?« UID '%s' ã?®ã?½ã?¼ã?¹ã??ã??ã??ã?¾ã??ã??ã??"
 
+#: ../addressbook/libebook/e-book.c:3516
+#: ../addressbook/libedata-book/e-data-book.c:183
+msgid "Address book does not exist"
+msgstr "ã?¢ã??ã?¬ã?¹å¸³ã??ã??ã??ã?¾ã??ã??"
+
 #. Dummy row as EContactField starts from 1
 #: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
@@ -286,7 +355,7 @@ msgstr "ã??ã?ã?°ã?® URL"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:667
+#: ../libedataserverui/e-categories-dialog.c:757
 msgid "Categories"
 msgstr "ã?«ã??ã?´ã?ª"
 
@@ -551,8 +620,7 @@ msgid "Birth Date"
 msgstr "èª?ç??æ?¥"
 
 #: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:44
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
 msgid "Anniversary"
 msgstr "è¨?å¿µæ?¥"
 
@@ -635,245 +703,257 @@ msgstr "SIP ã?¢ã??ã?¬ã?¹"
 msgid "Unnamed List"
 msgstr "å??å??ã?ªã??ã?®ä¸?è¦§"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:298
+#: ../addressbook/libedata-book/e-data-book-factory.c:301
+#: ../addressbook/libedata-book/e-data-book-factory.c:334
+#: ../calendar/libedata-cal/e-data-cal-factory.c:362
 #, c-format
 msgid "Empty URI"
 msgstr "ç©ºã?® URI"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:317
-#: ../addressbook/libedata-book/e-data-book-factory.c:355
-#: ../calendar/libedata-cal/e-data-cal-factory.c:342
-#: ../calendar/libedata-cal/e-data-cal-factory.c:354
+#: ../addressbook/libedata-book/e-data-book-factory.c:320
+#: ../addressbook/libedata-book/e-data-book-factory.c:370
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
 #, c-format
 msgid "Invalid source"
 msgstr "ã?½ã?¼ã?¹ã??ç?¡å?¹ã?§ã??"
 
-#: ../addressbook/libedata-book/e-data-book.c:171
-#: ../calendar/libedata-cal/e-data-cal.c:109
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:108
 msgid "Success"
 msgstr "æ??å??ã??ã?¾ã??ã??"
 
-#: ../addressbook/libedata-book/e-data-book.c:172
-#: ../calendar/libedata-cal/e-data-cal.c:110
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:109
 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
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libecal/e-cal.c:4159 ../calendar/libedata-cal/e-data-cal.c:110
 msgid "Permission denied"
 msgstr "æ¨©é??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../addressbook/libedata-book/e-data-book.c:176
 msgid "Contact not found"
 msgstr "é?£çµ¡å??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../addressbook/libedata-book/e-data-book.c:177
 msgid "Contact ID already exists"
 msgstr "é?£çµ¡å?? ID ã??æ?¢ã?«å?å?¨ã??ã?¦ã??ã?¾ã??"
 
-#: ../addressbook/libedata-book/e-data-book.c:176
-#: ../calendar/libedata-cal/e-data-cal.c:116
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:115
 msgid "Authentication Failed"
 msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../addressbook/libedata-book/e-data-book.c:177
-#: ../calendar/libedata-cal/e-data-cal.c:117
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:116
 msgid "Authentication Required"
 msgstr "èª?è¨¼ã??å¿?è¦?ã?§ã??"
 
-#: ../addressbook/libedata-book/e-data-book.c:178
-#: ../calendar/libedata-cal/e-data-cal.c:118
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:117
 msgid "Unsupported field"
 msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??é ?ç?®ã?§ã??"
 
-#: ../addressbook/libedata-book/e-data-book.c:179
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:119
 msgid "Unsupported authentication method"
 msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??èª?è¨¼æ?¹æ³?ã?§ã??"
 
-#: ../addressbook/libedata-book/e-data-book.c:180
-#: ../calendar/libedata-cal/e-data-cal.c:121
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:120
 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
+#: ../addressbook/libedata-book/e-data-book.c:184
 msgid "Book removed"
 msgstr "ã??ã?¼ã?¿ã??ã??ã?¯ã?¯å??é?¤ã??ã??ã?¾ã??ã??"
 
-#: ../addressbook/libedata-book/e-data-book.c:183
-#: ../calendar/libedata-cal/e-data-cal.c:124
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:123
 msgid "Not available in offline mode"
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?¢ã?¼ã??ã?§ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../addressbook/libedata-book/e-data-book.c:184
-#: ../calendar/libedata-cal/e-data-cal.c:125
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:124
 msgid "Search size limit exceeded"
 msgstr "æ¤?ç´¢ã?µã?¤ã?ºã??ä¸?é??ã??è¶?ã??ã?¾ã??ã??"
 
-#: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:126
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:125
 msgid "Search time limit exceeded"
 msgstr "æ¤?ç´¢æ??é??ã?®ä¸?é??ã??è¶?ã??ã?¾ã??ã??"
 
-#: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:127
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:126
 msgid "Invalid query"
 msgstr "å??ã??å??ã??ã??ã?®å??å®¹ã??ç?¡å?¹ã?§ã??"
 
-#: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libedata-cal/e-data-cal.c:128
+#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../calendar/libedata-cal/e-data-cal.c:127
 msgid "Query refused"
 msgstr "å??ã??å??ã??ã??ã??æ??å?¦ã??ã?¾ã??ã??"
 
-#: ../addressbook/libedata-book/e-data-book.c:188
-#: ../calendar/libedata-cal/e-data-cal.c:129
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:128
 msgid "Could not cancel"
 msgstr "ã?ã?£ã?³ã?»ã?«ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:190
-#: ../calendar/libedata-cal/e-data-cal.c:131
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:130
 msgid "Invalid server version"
 msgstr "ã?µã?¼ã??ã?»ã??ã?¼ã?¸ã?§ã?³ã??ç?¡å?¹ã?§ã??"
 
-#: ../addressbook/libedata-book/e-data-book.c:191
+#: ../addressbook/libedata-book/e-data-book.c:193
 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
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libecal/e-cal.c:4143 ../calendar/libedata-cal/e-data-cal.c:131
 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
+#. Translators: The string for NOT_SUPPORTED error
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libecal/e-cal.c:4182 ../calendar/libedata-cal/e-data-cal.c:133
 msgid "Not supported"
 msgstr "ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../addressbook/libedata-book/e-data-book.c:201
+#: ../addressbook/libedata-book/e-data-book.c:204
 #: ../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
+#: ../addressbook/libedata-book/e-data-book.c:325
 #, c-format
 msgid "Cannot open book: %s"
 msgstr "ã??ã?¼ã?¿ã??ã??ã?¯ã??é??ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:344
+#: ../addressbook/libedata-book/e-data-book.c:347
 #, c-format
 msgid "Cannot remove book: %s"
 msgstr "ã??ã?¼ã?¿ã??ã??ã?¯ã??å??é?¤ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:361
-#: ../addressbook/libedata-book/e-data-book.c:380
+#: ../addressbook/libedata-book/e-data-book.c:364
+#: ../addressbook/libedata-book/e-data-book.c:383
 #, c-format
 msgid "Cannot get contact: %s"
 msgstr "é?£çµ¡å??ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:395
+#: ../addressbook/libedata-book/e-data-book.c:402
 #, c-format
 msgid "Empty query: %s"
 msgstr "å??ã??å??ã??ã??å??å®¹ã??ç©ºã?§ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:411
+#: ../addressbook/libedata-book/e-data-book.c:418
 #, c-format
 msgid "Cannot get contact list: %s"
 msgstr "é?£çµ¡å??ã?®ä¸?è¦§ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:448
+#: ../addressbook/libedata-book/e-data-book.c:457
 #, c-format
 msgid "Cannot authenticate user: %s"
 msgstr "ã?¦ã?¼ã?¶ã?¼èª?è¨¼ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:463
-#: ../addressbook/libedata-book/e-data-book.c:482
+#: ../addressbook/libedata-book/e-data-book.c:472
+#: ../addressbook/libedata-book/e-data-book.c:491
 #, c-format
 msgid "Cannot add contact: %s"
 msgstr "é?£çµ¡å??ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:500
-#: ../addressbook/libedata-book/e-data-book.c:519
+#: ../addressbook/libedata-book/e-data-book.c:513
+#: ../addressbook/libedata-book/e-data-book.c:532
 #, c-format
 msgid "Cannot modify contact: %s"
 msgstr "é?£çµ¡å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:558
+#: ../addressbook/libedata-book/e-data-book.c:571
 #, c-format
 msgid "Cannot remove contacts: %s"
 msgstr "é?£çµ¡å??ã??å??é?¤ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:595
+#: ../addressbook/libedata-book/e-data-book.c:610
 #, c-format
 msgid "Cannot get supported fields: %s"
 msgstr "å¯¾å¿?ã??ã??é ?ç?®ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:610
+#: ../addressbook/libedata-book/e-data-book.c:625
 #, c-format
 msgid "Cannot get required fields: %s"
 msgstr "è¦?æ±?ã??ã??ã??é ?ç?®ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:625
+#: ../addressbook/libedata-book/e-data-book.c:640
 #, c-format
 msgid "Cannot get supported authentication methods: %s"
 msgstr "å¯¾å¿?ã??ã??èª?è¨¼æ?¹æ³?ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:651
-#: ../addressbook/libedata-book/e-data-book.c:662
+#: ../addressbook/libedata-book/e-data-book.c:666
+#: ../addressbook/libedata-book/e-data-book.c:677
 #, c-format
 msgid "Invalid query: %s"
 msgstr "å??ã??å??ã??ã??å??å®¹ã??ç?¡å?¹ã?§ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:698
+#: ../addressbook/libedata-book/e-data-book.c:713
 #, c-format
 msgid "Cannot get changes: %s"
 msgstr "å¤?æ?´ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:738
+#: ../addressbook/libedata-book/e-data-book.c:755
 #, c-format
 msgid "Cancel operation failed: %s"
 msgstr "æ??ä½?ã?®ã?ã?£ã?³ã?»ã?«ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:530
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
+#, c-format
+msgid "Server is unreachable (%s)"
+msgstr "ã?µã?¼ã??ã?«æ?¥ç¶?ã?§ã??ã?¾ã??ã?? (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#, c-format
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr "äº?æ?³å¤?ã?® HTTP ã?¹ã??ã?¼ã?¿ã?¹ã?³ã?¼ã?? %d ã??è¿?ã??ã??ã?¾ã??ã?? (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2096
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2496
 #, c-format
-msgid "Unexpected HTTP status code %d returned"
-msgstr "äº?æ?³å¤?ã?® HTTP ã?¹ã??ã?¼ã?¿ã?¹ã?³ã?¼ã?? %d ã??è¿?ã??ã??ã?¾ã??ã??"
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+"ã?µã?¼ã??ã?«æ?¥ç¶?ã?§ã??ã?ªã??ã??ã?§ã??ã?«ã?¬ã?³ã??ã??èªã?¿è¾¼ã?¿å°?ç?¨ã?¢ã?¼ã??ã?§é??ã??ã?¾ã??ã??\n"
+"ã?¨ã?©ã?¼ã?¡ã??ã?»ã?¼ã?¸: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4142
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
 msgid "Calendar doesn't support Free/Busy"
 msgstr "ã?«ã?¬ã?³ã??ã?¯äº?å®?ã?®æ??ç?¡ã?«å¯¾å¿?ã??ã?¾ã??ã??"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
-#: ../libedataserver/e-categories.c:45
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
 msgid "Birthday"
 msgstr "èª?ç??æ?¥"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:748
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
 #, c-format
 msgid "Birthday: %s"
 msgstr "èª?ç??æ?¥: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:772
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
 #, c-format
 msgid "Anniversary: %s"
 msgstr "è¨?å¿µæ?¥: %s"
@@ -888,48 +968,59 @@ msgid "Cannot save calendar data"
 msgstr "ã?«ã?¬ã?³ã??ã?®ã??ã?¼ã?¿ã??ä¿?å?ã?§ã??ã?¾ã??ã??"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2251
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2101
 msgid "Reply Requested: by "
 msgstr "è¿?ä¿¡è¦?æ±?: by "
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2256
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2106
 msgid "Reply Requested: When convenient"
 msgstr "è¿?ä¿¡è¦?æ±?: When convenient"
 
-#: ../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:329
+msgid "Loading Appointment items"
+msgstr "äº?å®?ã?¢ã?¤ã??ã? ã?®èªã?¿è¾¼ã?¿ä¸"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
+msgid "Loading Task items"
+msgstr "ã?¿ã?¹ã?¯ã?¢ã?¤ã??ã? ã?®èªã?¿è¾¼ã?¿ä¸"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
+msgid "Loading Note items"
+msgstr "ã??ã?¼ã??ã?¢ã?¤ã??ã? ã?®èªã?¿è¾¼ã?¿ä¸"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:959
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
+msgid "Loading items"
+msgstr "ã?¢ã?¤ã??ã? ã?®èªã?¿è¾¼ã?¿ä¸"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
 msgid "Calendar"
 msgstr "ã?«ã?¬ã?³ã??"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1022
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
 msgid "Invalid server URI"
 msgstr "ç?¡å?¹ã?ªã?µã?¼ã?? URI ã?§ã??"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1123
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1383
-#: ../calendar/backends/http/e-cal-backend-http.c:690
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
+#: ../calendar/backends/http/e-cal-backend-http.c:783
 #: ../calendar/backends/weather/e-cal-backend-weather.c:520
 msgid "Could not create cache file"
 msgstr "ã?ã?£ã??ã?·ã?¥ã?»ã??ã?¡ã?¤ã?«ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1135
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
 msgid "Could not create thread for populating cache"
 msgstr "ã?ã?£ã??ã?·ã?¥ã??ç??æ??ã??ã??ã??ã??ã?®ã?¹ã?¬ã??ã??ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:359
+#: ../calendar/backends/http/e-cal-backend-http.c:423
 msgid "Redirected to Invalid URI"
 msgstr "URI ã?¸ã?®ã?ªã??ã?¤ã?¬ã?¯ã??ã??ç?¡å?¹ã?§ã??"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:382
+#: ../calendar/backends/http/e-cal-backend-http.c:456
 msgid "Bad file format."
 msgstr "ã??ã?¡ã?¤ã?«ã?®ã??ã?©â??ã??ã??ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??ã??"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:389
+#: ../calendar/backends/http/e-cal-backend-http.c:463
 msgid "Not a calendar."
 msgstr "ã?«ã?¬ã?³ã??ã?§ã?¯ã??ã??ã?¾ã??ã??ã??"
 
@@ -977,131 +1068,131 @@ msgstr "å¤©æ°?: é?·é?¨"
 msgid "Forecast"
 msgstr "å¤©æ°?äº?å ±"
 
-#: ../calendar/libecal/e-cal-component.c:1286
+#: ../calendar/libecal/e-cal-component.c:1299
 msgid "Untitled appointment"
 msgstr "ã?¿ã?¤ã??ã?«ã?ªã??ã?®äº?å®?"
 
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "1st"
 msgstr "1æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "2nd"
 msgstr "2æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "3rd"
 msgstr "3æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "4th"
 msgstr "4æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "5th"
 msgstr "5æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "6th"
 msgstr "6æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "7th"
 msgstr "7æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "8th"
 msgstr "8æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "9th"
 msgstr "9æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "10th"
 msgstr "10æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "11th"
 msgstr "11æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "12th"
 msgstr "12æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "13th"
 msgstr "13æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "14th"
 msgstr "14æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "15th"
 msgstr "15æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "16th"
 msgstr "16æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "17th"
 msgstr "17æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "18th"
 msgstr "18æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "19th"
 msgstr "19æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "20th"
 msgstr "20æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "21st"
 msgstr "21æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "22nd"
 msgstr "22æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "23rd"
 msgstr "23æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "24th"
 msgstr "24æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "25th"
 msgstr "25æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "26th"
 msgstr "26æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "27th"
 msgstr "27æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "28th"
 msgstr "28æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "29th"
 msgstr "29æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "30th"
 msgstr "30æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "31st"
 msgstr "31æ?¥"
 
@@ -1122,8 +1213,8 @@ msgstr "ä½?ã??"
 msgid "Undefined"
 msgstr "æ?ªå®?ç¾©"
 
-#: ../calendar/libecal/e-cal.c:1227 ../libedataserverui/e-book-auth-util.c:206
-#: ../libedataserverui/e-book-auth-util.c:435
+#: ../calendar/libecal/e-cal.c:1236 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:440
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (ã?¦ã?¼ã?¶ %s) ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
@@ -1132,91 +1223,82 @@ msgstr "%s (ã?¦ã?¼ã?¶ %s) ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??"
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1241
+#: ../calendar/libecal/e-cal.c:1250
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "%s ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã?¦ã?¼ã?¶ %s ã?®ã??ã?ã?ã?·ã??æ??å?¹ã?«ã??ã?¦ã??ã? ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:4051
+#: ../calendar/libecal/e-cal.c:4145
 msgid "Backend is busy"
 msgstr "ã??ã??ã?¯ã?¨ã?³ã??ã??å?¦ç??ä¸ã?§ã??"
 
-#: ../calendar/libecal/e-cal.c:4053
+#: ../calendar/libecal/e-cal.c:4147
 msgid "Repository is offline"
 msgstr "ã?ªã??ã?¸ã??ã?ªã?¯ã?ªã??ã?©ã?¤ã?³ã?§ã??"
 
-#: ../calendar/libecal/e-cal.c:4055
+#: ../calendar/libecal/e-cal.c:4149
 msgid "No such calendar"
 msgstr "ã??ã?®ã??ã??ã?ªã?«ã?¬ã?³ã??ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:4057 ../calendar/libedata-cal/e-data-cal.c:113
+#: ../calendar/libecal/e-cal.c:4151 ../calendar/libedata-cal/e-data-cal.c:112
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:4059 ../calendar/libedata-cal/e-data-cal.c:114
+#: ../calendar/libecal/e-cal.c:4153 ../calendar/libedata-cal/e-data-cal.c:113
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "ç?¡å?¹ã?ªã?ªã??ã?¸ã?§ã?¯ã??ã?§ã??"
 
-#: ../calendar/libecal/e-cal.c:4061
+#: ../calendar/libecal/e-cal.c:4155
 msgid "URI not loaded"
 msgstr "URI ã??èªã?¿è¾¼ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:4063
+#: ../calendar/libecal/e-cal.c:4157
 msgid "URI already loaded"
 msgstr "URL ã?¯æ?¢ã?«èªã?¿è¾¼ã?¿æ¸?ã?¿ã?§ã??"
 
-#: ../calendar/libecal/e-cal.c:4067 ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4161 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "ã?¦ã?¼ã?¶ã??ç?¹å®?ã?§ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:4069 ../calendar/libedata-cal/e-data-cal.c:115
+#: ../calendar/libecal/e-cal.c:4163 ../calendar/libedata-cal/e-data-cal.c:114
 msgid "Object ID already exists"
 msgstr "æ?¢ã?«ã?ªã??ã?¸ã?§ã?¯ã?? ID ã??å?å?¨ã??ã?¦ã??ã?¾ã??"
 
-#: ../calendar/libecal/e-cal.c:4071
+#: ../calendar/libecal/e-cal.c:4165
 msgid "Protocol not supported"
 msgstr "ã??ã?ã??ã?³ã?«ã?¯ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:4073
+#: ../calendar/libecal/e-cal.c:4167
 msgid "Operation has been canceled"
 msgstr "æ??ä½?ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:4075
+#: ../calendar/libecal/e-cal.c:4169
 msgid "Could not cancel operation"
 msgstr "æ??ä½?ã??ã?ã?£ã?³ã?»ã?«ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:4077
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1466
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1484
-#: ../camel/providers/groupwise/camel-groupwise-store.c:618
-#: ../camel/providers/groupwise/camel-groupwise-store.c:793
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
+#: ../calendar/libecal/e-cal.c:4171
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1306
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1324
+#: ../camel/providers/groupwise/camel-groupwise-store.c:628
+#: ../camel/providers/groupwise/camel-groupwise-store.c:810
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
 #, c-format
 msgid "Authentication failed"
 msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:4079
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../calendar/libecal/e-cal.c:4173
+#: ../camel/providers/smtp/camel-smtp-transport.c:775
 msgid "Authentication required"
 msgstr "èª?è¨¼ã??å¿?è¦?ã?¨ã??ã?¦ã??ã?¾ã??"
 
-#: ../calendar/libecal/e-cal.c:4081
+#: ../calendar/libecal/e-cal.c:4175
 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:4085
+#: ../calendar/libecal/e-cal.c:4179
 msgid "No error"
 msgstr "ã?¨ã?©ã?¼ã?¯ã??ã??ã?¾ã??ã??"
 
@@ -1316,19 +1398,19 @@ msgstr ""
 "\"%s\" ã?¯ã??ã?¹ã?¦ã?¾ã??ã?¯ä¸?ã?¤ã??æ??å?å??ã?§ã??è«?ç??å?¤ FAULSE (#f) ã??ä¸?ã?¤ã? ã??å¿?è¦?ã?¨ã??ã?¾"
 "ã??"
 
-#: ../calendar/libedata-cal/e-data-cal.c:112
+#: ../calendar/libedata-cal/e-data-cal.c:111
 msgid "Invalid range"
 msgstr "æ??å?¹ç¯?å?²ã??ç?¡å?¹ã?§ã??"
 
-#: ../calendar/libedata-cal/e-data-cal.c:119
+#: ../calendar/libedata-cal/e-data-cal.c:118
 msgid "Unsupported method"
 msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??æ?¹æ³?ã?§ã??"
 
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#: ../calendar/libedata-cal/e-data-cal.c:121
 msgid "Calendar does not exist"
 msgstr "ã?«ã?¬ã?³ã??ã??å?å?¨ã??ã?¾ã??ã??"
 
-#: ../calendar/libedata-cal/e-data-cal.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:122
 msgid "Unknown user"
 msgstr "ã?¦ã?¼ã?¶ã??ç?¹å®?ã?§ã??ã?¾ã??ã??"
 
@@ -1339,214 +1421,210 @@ msgid "Cannot retrieve calendar address: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?®ã?¢ã??ã?¬ã?¹ã??å??å¾©ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:628
+#: ../calendar/libedata-cal/e-data-cal.c:633
 #, c-format
 msgid "Cannot retrieve calendar alarm e-mail address: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?®ã?¢ã?©ã?¼ã? ã??é??ä¿¡ã??ã?? E-ã?¡ã?¼ã?«ã?¢ã??ã?¬ã?¹ã??å??å¾©ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:648
+#: ../calendar/libedata-cal/e-data-cal.c:658
 #, c-format
 msgid "Cannot retrieve calendar's LDAP attribute: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?® LDAP å±?æ?§ã??å??å¾©ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:668
+#: ../calendar/libedata-cal/e-data-cal.c:683
 #, c-format
 msgid "Cannot retrieve calendar scheduling information: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?®äº?å®?æ??å ±ã??å??å¾©ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:687
+#: ../calendar/libedata-cal/e-data-cal.c:707
 #, c-format
 msgid "Cannot open calendar: %s"
 msgstr "ã?«ã?¬ã?³ã??ã??é??ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:708
+#: ../calendar/libedata-cal/e-data-cal.c:728
 #, c-format
 msgid "Cannot refresh calendar: %s"
 msgstr "ã?«ã?¬ã?³ã??ã??æ?´æ?°ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:727
+#: ../calendar/libedata-cal/e-data-cal.c:747
 #, c-format
 msgid "Cannot remove calendar: %s"
 msgstr "ã?«ã?¬ã?³ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:748
+#: ../calendar/libedata-cal/e-data-cal.c:768
 #, c-format
 msgid "Cannot create calendar object: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:772
+#: ../calendar/libedata-cal/e-data-cal.c:796
 #, c-format
 msgid "Cannot modify calendar object: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?ªã??ã?¸ã?§ã?¯ã??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:798
+#: ../calendar/libedata-cal/e-data-cal.c:822
 #, c-format
 msgid "Cannot remove calendar object: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?ªã??ã?¸ã?§ã?¯ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:819
+#: ../calendar/libedata-cal/e-data-cal.c:843
 #, c-format
 msgid "Cannot receive calendar objects: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?ªã??ã?¸ã?§ã?¯ã??ã??å??ä¿¡ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:838
+#: ../calendar/libedata-cal/e-data-cal.c:862
 #, c-format
 msgid "Cannot discard calendar alarm: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?®ã?¢ã?©ã?¼ã? ã??ç ´æ£?ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:859
+#: ../calendar/libedata-cal/e-data-cal.c:883
 #, c-format
 msgid "Cannot send calendar objects: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?ªã??ã?¸ã?§ã?¯ã??ã??é??ä¿¡ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:884
+#: ../calendar/libedata-cal/e-data-cal.c:910
 #, c-format
 msgid "Cannot retrieve default calendar object path: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?¸ã?®æ?¢å®?ã?®ã??ã?¹ã??å??å¾©ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:904
+#: ../calendar/libedata-cal/e-data-cal.c:935
 #, c-format
 msgid "Cannot retrieve calendar object path: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?¸ã?®ã??ã?¹ã??å??å¾©ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:924
+#: ../calendar/libedata-cal/e-data-cal.c:960
 #, c-format
 msgid "Cannot retrieve calendar object list: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ä¸?è¦§ã??å??å¾©ã?§ã??ã?¾ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:952
+#: ../calendar/libedata-cal/e-data-cal.c:988
 #, c-format
 msgid "Could not retrieve attachment list: %s"
 msgstr "æ·»ä»?ã??ã?¡ã?¤ã?«ã?®ä¸?è¦§ã??å??å¾©ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:978
+#: ../calendar/libedata-cal/e-data-cal.c:1014
 #, c-format
 msgid "Could not complete calendar query: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?®æ¤?ç´¢ã??å®?äº?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:998
+#: ../calendar/libedata-cal/e-data-cal.c:1039
 #, c-format
 msgid "Could not retrieve calendar time zone: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?®ã?¿ã?¤ã? ã?¾ã?¼ã?³ã??å??å¾©ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1018
+#: ../calendar/libedata-cal/e-data-cal.c:1064
 #, c-format
 msgid "Could not add calendar time zone: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?®ã?¿ã?¤ã? ã?¾ã?¼ã?³ã??è¿½å? ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1037
+#: ../calendar/libedata-cal/e-data-cal.c:1083
 #, c-format
 msgid "Could not set default calendar time zone: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?®æ?¢å®?ã?®ã?¿ã?¤ã? ã?¾ã?¼ã?³ã??è¨å®?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1060
+#: ../calendar/libedata-cal/e-data-cal.c:1106
 #, c-format
 msgid "Cannot retrieve calendar changes: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?®å¤?æ?´ã??å??å¾©ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1091
+#: ../calendar/libedata-cal/e-data-cal.c:1137
 #, c-format
 msgid "Cannot retrieve calendar free/busy list: %s"
 msgstr "ã?«ã?¬ã?³ã??ã?®äº?å®?ã?®æ??ç?¡ã?®ä¸?è¦§ã??å??å¾©ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:364
+#: ../calendar/libedata-cal/e-data-cal-factory.c:375
 #, c-format
 msgid "Invalid URI"
 msgstr "ç?¡å?¹ã?ª URI ã?§ã??"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:382
+#: ../calendar/libedata-cal/e-data-cal-factory.c:393
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "'%2$s' ã?® '%1$s' ã?®ã??ã??ã?¯ã?¨ã?³ã??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:432
+#: ../calendar/libedata-cal/e-data-cal-factory.c:443
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "ã??ã??ã?¯ã?¨ã?³ã??ã?®ã?¤ã?³ã?¹ã?¿ã?³ã?¹ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/camel-cipher-context.c:75
+#: ../camel/camel-cipher-context.c:200
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "ã??ã?®æ??å?·ã?¯ç½²å??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/camel-cipher-context.c:110
-msgid "Signing message"
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®ç½²å??ä¸"
-
-#: ../camel/camel-cipher-context.c:131
+#: ../camel/camel-cipher-context.c:213
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "ã??ã?®æ??å?·ã?¯å¦¥å½?æ?§ã?®æ¤?è¨¼ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/camel-cipher-context.c:164
-msgid "Verifying message"
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®æ¤?è¨¼ä¸"
-
-#: ../camel/camel-cipher-context.c:188
+#: ../camel/camel-cipher-context.c:229
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "ã??ã?®æ??å?·å??ã?¯ç¬¦å?·å??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/camel-cipher-context.c:223
-msgid "Encrypting message"
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??æ??å?·å??ã??ã?¦ã??ã?¾ã??"
-
-#: ../camel/camel-cipher-context.c:246
+#: ../camel/camel-cipher-context.c:243
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "ã??ã?®æ??å?·ã?¯å¾©å?·å??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/camel-cipher-context.c:276
-msgid "Decrypting message"
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®æ??å?·ã??è§£é?¤ã??ã?¦ã??ã?¾ã??"
-
-#: ../camel/camel-cipher-context.c:297
+#: ../camel/camel-cipher-context.c:256
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "ã??ã?®æ??å?·ã?§é?µã??ã?¤ã?³ã??ã?¼ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-cipher-context.c:341
+#: ../camel/camel-cipher-context.c:270
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "ã??ã?®æ??å?·ã?§é?µã??ã?¨ã?¯ã?¹ã??ã?¼ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-data-cache.c:181
+#: ../camel/camel-cipher-context.c:812
+msgid "Signing message"
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®ç½²å??ä¸"
+
+#: ../camel/camel-cipher-context.c:1053
+msgid "Encrypting message"
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??æ??å?·å??ã??ã?¦ã??ã?¾ã??"
+
+#: ../camel/camel-cipher-context.c:1180
+msgid "Decrypting message"
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®æ??å?·ã??è§£é?¤ã??ã?¦ã??ã?¾ã??"
+
+#: ../camel/camel-data-cache.c:178
 #, c-format
 msgid "Unable to create cache path"
 msgstr "ã?ã?£ã??ã?·ã?¥ã??ã?¡ã?¤ã?«ã??ç??æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-data-cache.c:494
+#: ../camel/camel-data-cache.c:496
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ã?ã?£ã??ã?·ã?¥ã?»ã?¨ã?³ã??ã?ªã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s: %s"
 
-#: ../camel/camel-data-wrapper.c:89
+#: ../camel/camel-data-wrapper.c:143
 #, c-format
 msgid "No stream available"
 msgstr "å?©ç?¨ã?§ã??ã??ã?¹ã??ã?ªã?¼ã? ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-db.c:464
+#: ../camel/camel-db.c:455
 #, c-format
 msgid "Insufficient memory"
 msgstr "ã?¡ã?¢ã?ªã??è¶³ã??ã?¾ã??ã??"
@@ -1562,8 +1640,8 @@ msgstr ""
 "ã??ã??ã??ã?¯ã?¼ã?¯ã?«å??æ?¥ç¶?ã??ã?¦ã??ã??ã??ã?®ã?µã?¼ã??ã?«å¯¾ã??ã??\n"
 "ã??ã??ä»¥é??ã?®æ??ä½?ã?¯å??ç?¾ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-disco-diary.c:258
-#: ../camel/providers/imap/camel-imap-journal.c:298
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:300
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1574,126 +1652,107 @@ msgstr ""
 "%s\n"
 "ã??ã?®ã??ã?©ã?«ã??ã?«å¯¾ã??ã??å¤?æ?´ã??å??ã?³å??æ??ã??ã??ã??ã??ã?¨ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-disco-diary.c:299
+#: ../camel/camel-disco-diary.c:304
 msgid "Resynchronizing with server"
 msgstr "ã?µã?¼ã??ã?®å??å??æ??ä¸"
 
-#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
+#: ../camel/camel-disco-folder.c:63 ../camel/camel-offline-folder.c:79
 msgid "Downloading new messages for offline mode"
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?®æ?°ç??ã?¡ã?¼ã?«ã?®ã??ã?¦ã?³ã?ã?¼ã??ä¸"
 
-#: ../camel/camel-disco-folder.c:379
+#: ../camel/camel-disco-folder.c:398
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?«å??ã??æ?¿ã??ã??æº?å??ä¸: %s"
 
-#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
+#: ../camel/camel-disco-folder.c:464 ../camel/camel-offline-folder.c:312
 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:164
-#: ../camel/providers/imapx/camel-imapx-folder.c:195
-#: ../camel/providers/imapx/camel-imapx-folder.c:224
-#: ../camel/providers/imapx/camel-imapx-folder.c:281
-#: ../camel/providers/imapx/camel-imapx-folder.c:324
-#: ../camel/providers/imapx/camel-imapx-folder.c:356
-#: ../camel/providers/imapx/camel-imapx-folder.c:387
-#: ../camel/providers/imapx/camel-imapx-store.c:193
-#: ../camel/providers/imapx/camel-imapx-store.c:715
-#: ../camel/providers/imapx/camel-imapx-store.c:778
-#: ../camel/providers/imapx/camel-imapx-store.c:837
+#: ../camel/camel-disco-store.c:420
+#: ../camel/providers/groupwise/camel-groupwise-store.c:228
+#: ../camel/providers/imap/camel-imap-store.c:1250
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2244
+#: ../camel/providers/imap/camel-imap-store.c:3094
+#: ../camel/providers/imapx/camel-imapx-folder.c:298
+#: ../camel/providers/imapx/camel-imapx-folder.c:331
+#: ../camel/providers/imapx/camel-imapx-folder.c:385
+#: ../camel/providers/imapx/camel-imapx-folder.c:431
+#: ../camel/providers/imapx/camel-imapx-folder.c:465
+#: ../camel/providers/imapx/camel-imapx-folder.c:505
+#: ../camel/providers/imapx/camel-imapx-folder.c:541
+#: ../camel/providers/imapx/camel-imapx-store.c:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1298
+#: ../camel/providers/imapx/camel-imapx-store.c:1386
+#: ../camel/providers/imapx/camel-imapx-store.c:1421
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "ã??ã?®å??ä½?ã??å®?äº?ã??ã??ã??ã??ã?«ã?ªã?³ã?©ã?¤ã?³ã?§ä½?æ¥ã??ã?¦ã??ã? ã??ã??"
 
-#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
-#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
-#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
-#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:514
-#: ../camel/camel-net-utils.c:691 ../camel/camel-net-utils.c:840
-#: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:4675
-#: ../camel/providers/imapx/camel-imapx-server.c:4692
-#: ../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-file-utils.c:643 ../camel/camel-file-utils.c:734
-#: ../camel/camel-file-utils.c:791
+#: ../camel/camel-file-utils.c:722
 #, c-format
 msgid "Canceled"
 msgstr "ã?ã?£ã?³ã?»ã?«æ¸?ã?¿"
 
-#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:817 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "å?ã??ã?ã?»ã?¹ '%s' ã?®ç??æ??ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-filter-driver.c:853
+#: ../camel/camel-filter-driver.c:864
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s ã??ã??å??ä¿¡ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?»ã?¹ã??ã?ªã?¼ã? ã??æ£ã??ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
+#: ../camel/camel-filter-driver.c:1051 ../camel/camel-filter-driver.c:1060
 msgid "Syncing folders"
 msgstr "ã??ã?©ã?«ã??ã?®å??æ??ä¸"
 
-#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
+#: ../camel/camel-filter-driver.c:1148 ../camel/camel-filter-driver.c:1598
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ã??ã?£ã?«ã?¿ã?®æ§?æ??è§£æ??ä¸ã?«ã?¨ã?©ã?¼: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
+#: ../camel/camel-filter-driver.c:1159 ../camel/camel-filter-driver.c:1609
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ã??ã?£ã?«ã?¿å®?è¡?ä¸ã?«ã?¨ã?©ã?¼: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1240
+#: ../camel/camel-filter-driver.c:1256
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã??é??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-filter-driver.c:1251
+#: ../camel/camel-filter-driver.c:1267
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã??å?¦ç??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1285
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ %d ã?®å??å¾?ä¸ (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
+#: ../camel/camel-filter-driver.c:1292 ../camel/camel-filter-driver.c:1314
 #, c-format
 msgid "Failed on message %d"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ %d ã?§å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
+#: ../camel/camel-filter-driver.c:1329 ../camel/camel-filter-driver.c:1434
 msgid "Syncing folder"
 msgstr "ã??ã?©ã?«ã??ã?®å??æ??ä¸"
 
-#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
+#: ../camel/camel-filter-driver.c:1334 ../camel/camel-filter-driver.c:1440
 msgid "Complete"
 msgstr "å®?äº?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-filter-driver.c:1377
+#: ../camel/camel-filter-driver.c:1398
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ %d / %d ã?®å??å¾?ä¸"
 
-#: ../camel/camel-filter-driver.c:1395
+#: ../camel/camel-filter-driver.c:1416
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ %d / %d ã?§å¤±æ??ã??ã?¾ã??ã??"
@@ -1715,8 +1774,8 @@ msgstr "(user-tag) ã?«å¯¾ã??ã??ç?¡å?¹ã?ªå¼?æ?°"
 msgid "Error executing filter search: %s: %s"
 msgstr "ã??ã?£ã?«ã?¿æ¤?ç´¢å®?è¡?ä¸ã?«ã?¨ã?©ã?¼: %s: %s"
 
-#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
-#: ../camel/camel-folder-search.c:627
+#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:624
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1725,8 +1784,8 @@ msgstr ""
 "æ£è¦?è¡¨ç?¾ã?®æ§?æ??ã??è§£æ??ã?§ã??ã?¾ã??ã??: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
-#: ../camel/camel-folder-search.c:639
+#: ../camel/camel-folder-search.c:354 ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:636
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1735,71 +1794,76 @@ msgstr ""
 "æ£è¦?è¡¨ç?¾ã?§ã?®æ¤?ç´¢ã??å®?è¡?ä¸ã?«ã?¨ã?©ã?¼: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
+#: ../camel/camel-folder-search.c:840 ../camel/camel-folder-search.c:882
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ã?«ã?¯è«?ç??çµ?æ??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-folder-search.c:938
+#: ../camel/camel-folder-search.c:935
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ã?¯ %s ã?®ä¸ã?«å?«ã??ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
+#: ../camel/camel-folder-search.c:941 ../camel/camel-folder-search.c:948
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ã?«ã?¯æ¤?ç´¢ã?®ç¨®é¡?ã??è¡¨ã??æ??å?å??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-folder-search.c:978
+#: ../camel/camel-folder-search.c:975
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ã?¯é??å??ã?®çµ?æ??ã??æ??å¾?ã??ã?¾ã??"
 
-#: ../camel/camel-folder-search.c:987
+#: ../camel/camel-folder-search.c:984
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ã?«ã?¯ã??ã?©ã?«ã??ã?®çµ?ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-folder.c:125
+#: ../camel/camel-folder.c:216
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "'%s' ã?«ã??ã??æ?°ã??ã??ã?¹ã??ã? ã?»ã?¡ã??ã?»ã?¼ã?¸ã?®å¦ç¿?ä¸"
 
-#: ../camel/camel-folder.c:147
+#: ../camel/camel-folder.c:240
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "'%s' ã?«ã??ã??æ?°ã??ã??ã??ã? ã?»ã?¡ã??ã?»ã?¼ã?¸ã?®å¦ç¿?ä¸"
 
-#: ../camel/camel-folder.c:171
+#: ../camel/camel-folder.c:266
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "'%s' ã?«ã??ã??æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®ã??ã?£ã?«ã?¿ã?ªã?³ã?°ä¸"
 
-#: ../camel/camel-folder.c:688
-#: ../camel/providers/local/camel-maildir-folder.c:366
+#: ../camel/camel-folder.c:875
+#: ../camel/providers/local/camel-maildir-folder.c:293
 msgid "Moving messages"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®ç§»å??ä¸"
 
-#: ../camel/camel-folder.c:690
+#: ../camel/camel-folder.c:878
 msgid "Copying messages"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®ã?³ã??ã?¼ä¸"
 
-#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
-#: ../camel/camel-gpg-context.c:1330
+#: ../camel/camel-folder.c:3247
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ '%s' ã?®å??å¾?ä¸"
+
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "GPG ã?®å®?è¡?ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-gpg-context.c:706
-#: ../camel/providers/smtp/camel-smtp-transport.c:114
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/camel-gpg-context.c:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:778
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1810,17 +1874,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:787
+#: ../camel/camel-gpg-context.c:728
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "GnuPG ã?®ã?¦ã?¼ã?¶ ID ã??ã?³ã??ã?®è§£æ??ã?«å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "GnuPG ã?®ã??ã?¹ã?¯ã?¼ã??è¦?æ±?ã?®è§£æ??ã?«å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-gpg-context.c:848
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1829,7 +1893,7 @@ msgstr ""
 "ã??ä½¿ã??ã?®ã?¹ã??ã?¼ã??ã?«ã?¼ã??ã?®ã?ã?¼ã??è§£é?¤ã??ã??ã?«ã?¯\n"
 "PIN ã??å¿?è¦?ã?§ã??: \"%s\""
 
-#: ../camel/camel-gpg-context.c:852
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1838,70 +1902,85 @@ msgstr ""
 "æ¬¡ã?®ã?¦ã?¼ã?¶ã?®ã?ã?¼ã??è§£é?¤ã??ã??ã?«ã?¯ã??ã?¹ã?¯ã?¼ã??ã??å¿?è¦?ã?§ã??:\n"
 " \"%s\""
 
-#: ../camel/camel-gpg-context.c:858
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "'%s' ã?«å¯¾ã??ã?¦ GnuPG ã??ã??æ?³å®?å¤?ã?®è¦?æ±?ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-gpg-context.c:905
+#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4892
+#: ../camel/providers/imapx/camel-imapx-server.c:4909
+#: ../camel/providers/imapx/camel-imapx-store.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:405
+#: ../camel/providers/pop3/camel-pop3-folder.c:366
+#: ../camel/providers/pop3/camel-pop3-folder.c:431
+#: ../camel/providers/pop3/camel-pop3-folder.c:506
+#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "ã?ã?£ã?³ã?»ã?«æ¸?ã?¿"
+
+#: ../camel/camel-gpg-context.c:846
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "ç§?å¯?é?µã?®è§£é?¤ã?«å¤±æ??ã??ã?¾ã??ã??: æ??å®?ã??ã??ä¸?ã?¤ã?®ã??ã?¹ã?¯ã?¼ã??ã??ã??ã??ã??ã??ã?§ã??ã??"
 
-#: ../camel/camel-gpg-context.c:917
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-gpg-context.c:1048
+#: ../camel/camel-gpg-context.c:989
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "æ??å?·å??ã?«å¤±æ??ã??ã?¾ã??ã??: æ£ã??ã??å®?å??ã??æ??å®?ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
 msgid "Could not generate signing data: "
 msgstr "ç½²å??ã??ã?¼ã?¿ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: "
 
-#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
-#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
-#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
+#: ../camel/camel-gpg-context.c:1582 ../camel/camel-gpg-context.c:1782
+#: ../camel/camel-gpg-context.c:1892 ../camel/camel-gpg-context.c:2038
+#: ../camel/camel-gpg-context.c:2137 ../camel/camel-gpg-context.c:2185
 msgid "Failed to execute gpg."
 msgstr "GPG ã?®å®?è¡?ã?«å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
-#: ../camel/camel-smime-context.c:966
+#: ../camel/camel-gpg-context.c:1662 ../camel/camel-gpg-context.c:1670
+#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1697
+#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
+#: ../camel/camel-smime-context.c:971
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ç½²å??ã?®æ?´å??æ?§ã??ç¢ºèª?ã?§ã??ã?¾ã??ã??: ã?¡ã??ã?»ã?¼ã?¸ã?®æ?¸å¼?ã??æ£ã??ã??ã??ã??ã?¾ã??"
 "ã??"
 
-#: ../camel/camel-gpg-context.c:1695
+#: ../camel/camel-gpg-context.c:1737
 msgid "Cannot verify message signature: "
 msgstr "ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ç½²å??ã?®æ?´å??æ?§ã??ç¢ºèª?ã?§ã??ã?¾ã??ã??: "
 
-#: ../camel/camel-gpg-context.c:1814
+#: ../camel/camel-gpg-context.c:1858
 msgid "Could not generate encrypting data: "
 msgstr "æ??å?·å??ã??ã??ã??ã??ã?¼ã?¿ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: "
 
-#: ../camel/camel-gpg-context.c:1866
+#: ../camel/camel-gpg-context.c:1911
 msgid "This is a digitally encrypted message part"
 msgstr "ã??ã??ã?¯ã??ã?¸ã?¿ã?«ç½²å??ã??ã??ã??é?¨å??ã?§ã??"
 
-#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
-#: ../camel/camel-gpg-context.c:1954
+#: ../camel/camel-gpg-context.c:1969 ../camel/camel-gpg-context.c:1978
+#: ../camel/camel-gpg-context.c:2001
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??è§£èªã?§ã??ã?¾ã??ã??: ã?¡ã??ã?»ã?¼ã?¸ã?®æ?¸å¼?ã??æ£ã??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-gpg-context.c:1942
+#: ../camel/camel-gpg-context.c:1989
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME å??ã?®æ??å?·è§£èªã?«å¤±æ??ã??ã?¾ã??ã??: ã??ã?ã??ã?³ã?«ã?»ã?¨ã?©ã?¼"
 
-#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
+#: ../camel/camel-gpg-context.c:2078 ../camel/camel-smime-context.c:1255
 msgid "Encrypted content"
 msgstr "æ??å?·å??ã??ã??å??å®¹"
 
@@ -2000,17 +2079,17 @@ msgstr "ã?¡ã?¼ã?«ä½?æ¥ã??ã?¡ã?¤ã?«ã?®æ?¸ã??è¾¼ã?¿ä¸ã?«ã?¨ã?©ã?¼: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "ã?¡ã?¼ã?«ä½?æ¥ã??ã?¡ã?¤ã?«ã?®ã?³ã??ã?¼ä¸ã?«ã?¨ã?©ã?¼: %s"
 
-#: ../camel/camel-multipart-signed.c:285
+#: ../camel/camel-multipart-signed.c:327
 #, c-format
 msgid "No content available"
 msgstr "å?©ç?¨ã?§ã??ã??ã?³ã?³ã??ã?³ã??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-multipart-signed.c:293
+#: ../camel/camel-multipart-signed.c:335
 #, c-format
 msgid "No signature available"
 msgstr "å?©ç?¨ã?§ã??ã??ç½²å??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-multipart-signed.c:612
+#: ../camel/camel-multipart-signed.c:663
 #, c-format
 msgid "parse error"
 msgstr "è§£æ??ã?¨ã?©ã?¼"
@@ -2020,34 +2099,34 @@ msgstr "è§£æ??ã?¨ã?©ã?¼"
 msgid "Resolving: %s"
 msgstr "è§£æ±ºä¸: %s"
 
-#: ../camel/camel-net-utils.c:717
+#: ../camel/camel-net-utils.c:718
 msgid "Host lookup failed"
 msgstr "ã??ã?¹ã??ã?®æ¤?ç´¢ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-net-utils.c:721
+#: ../camel/camel-net-utils.c:724
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "ã??ã?¹ã??ã?®æ¤?ç´¢ã?«å¤±æ??ã??ã?¾ã??ã??: %s: %s"
 
-#: ../camel/camel-net-utils.c:844
+#: ../camel/camel-net-utils.c:845
 msgid "Resolving address"
 msgstr "ã?¢ã??ã?¬ã?¹ã?®è§£æ±ºä¸"
 
-#: ../camel/camel-net-utils.c:864
+#: ../camel/camel-net-utils.c:866
 msgid "Name lookup failed"
 msgstr "å??å??ã?®æ¤?ç´¢ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-net-utils.c:869
+#: ../camel/camel-net-utils.c:872
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "å??å??ã?®æ¤?ç´¢ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-offline-folder.c:169
+#: ../camel/camel-offline-folder.c:189
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ã??ã?©ã?«ã?? '%s' ã?«ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??å??æ??ã??ã?¦ä¿?å?ä¸"
 
-#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "ã??ã?©ã?«ã?? '%s' ã?®ã?ªã??ã?©ã?¤ã?³ã?»ã?¸ã?£ã?¼ã??ã?«ã?«æ?¸ã??è¾¼ã??ã?¾ã??ã??: %s"
@@ -2077,7 +2156,7 @@ msgstr "%s ã??èªã?¿è¾¼ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ã??èªã?¿è¾¼ã??ã?¾ã??ã??ã?§ã??ã??: ã?¢ã?¸ã?¥ã?¼ã?«ã?®ã?³ã?¼ã??ã??å??æ??å??ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-provider.c:388 ../camel/camel-session.c:207
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:202
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "'%s' ã?¨ã??ã??ã??ã?ã??ã?³ã?«ã??å?©ç?¨ã?§ã??ã??ã??ã?ã??ã?¤ã??ã?¯ã??ã??ã?¾ã??ã??"
@@ -2090,12 +2169,12 @@ msgstr "å?¿å??"
 msgid "This option will connect to the server using an anonymous login."
 msgstr "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯å?¿å??ã?ã?°ã?¤ã?³ã??ä½¿ã?£ã?¦ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-anonymous.c:69
+#: ../camel/camel-sasl-anonymous.c:70
 #, c-format
 msgid "Authentication failed."
-msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??"
+msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-sasl-anonymous.c:80
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2104,7 +2183,7 @@ msgstr ""
 "ç?¡å?¹ã?ª E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã?®ã??ã?¬ã?¼ã?¹æ??å ±:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:94
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2113,7 +2192,7 @@ msgstr ""
 "ç?¡å?¹ã?§ä¸?å?¯è§£ã?ªã??ã?¬ã?¼ã?¹æ??å ±:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:108
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2122,11 +2201,11 @@ msgstr ""
 "ç?¡å?¹ã?ªã??ã?¬ã?¼ã?¹æ??å ±:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:45
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:47
+#: ../camel/camel-sasl-cram-md5.c:43
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2134,11 +2213,11 @@ msgstr ""
 "ã?µã?¼ã??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã??å ´å??ã??ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã?? CRAM-"
 "MD5 èª?è¨¼ã??ä½¿ã?£ã?¦ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-digest-md5.c:58
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:60
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2146,17 +2225,17 @@ msgstr ""
 "ã?µã?¼ã??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã??å ´å??ã??ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã?? DIGEST-"
 "MD5 ã??ä½¿ã?£ã?¦ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-digest-md5.c:820
+#: ../camel/camel-sasl-digest-md5.c:817
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ã?µã?¼ã??è¦?æ±?ã??é?·ã??ã??ã?¾ã?? (2048 octet ä»¥ä¸?ã?§ã??)"
 
-#: ../camel/camel-sasl-digest-md5.c:831
+#: ../camel/camel-sasl-digest-md5.c:828
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "ç?¡å?¹ã?§ã??\n"
 
-#: ../camel/camel-sasl-digest-md5.c:839
+#: ../camel/camel-sasl-digest-md5.c:836
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr ""
@@ -2178,15 +2257,15 @@ msgstr "ã?µã?¼ã??ã?®å¿?ç?ã?«ä¸?å®?å?¨ã?ªèª?è¨¼ã??ã?¼ã?¿ã??ã??ã??ã?¾ã??"
 msgid "Server response does not match"
 msgstr "ã?µã?¼ã??ã?®å¿?ç?ã??ä¸?è?´ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:80
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:82
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ Kerberos 5 èª?è¨¼ã??ä½¿ã?£ã?¦ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:119
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2194,11 +2273,11 @@ msgstr ""
 "æ??å®?ã??ã??ã?¡ã?«ã??ã?ºã? ã??æ??ä¾?ã??ã??ã??è¨¼æ??æ?¸ã?§ã?¯ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?ªã??ã??ã??ã??ã?®å®?è£?ã?§èª?"
 "è?ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:124
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr "æ??å®?ã??ã??å¼?æ?° target_name ã?®å½¢å¼?ã??é??é??ã?£ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:127
+#: ../camel/camel-sasl-gssapi.c:137
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2206,7 +2285,7 @@ msgstr ""
 "æ??å®?ã??ã??å¼?æ?°ã?® target_name ã?«ç?¡å?¹ã?ªã??ã??ã??ã??ã?¯ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??ç¨®é¡?ã?®å??å??ã??ã??"
 "ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:131
+#: ../camel/camel-sasl-gssapi.c:141
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2214,14 +2293,14 @@ msgstr ""
 "input_token ã?«å¼?æ?° input_chan_bindigs ã??ä»?ã??ã?¦æ??å®?ã??ã??ã??å?¥ã?®ã??ã?£ã?³ã??ã?«ã?®ã??ã?³"
 "ã??ã?£ã?³ã?°ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:136
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr ""
 "input_token ã?®ä¸ã?«ç?¡å?¹ã?ªç½²å??ã??ã??ã??ã??ã??ã?¾ã??ã?¯ã??ã?®ç½²å??ã??æ£ã??ã??ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:140
+#: ../camel/camel-sasl-gssapi.c:150
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2229,53 +2308,53 @@ msgstr ""
 "æ??å®?ã??ã??è¨¼æ??æ?¸ã?§ã?³ã?³ã??ã?ã?¹ã??ã?®å??æ??å??ã?¯ã?§ã??ã?ªã??ã??ã??ã?¾ã??ã?¯è¨¼æ??æ?¸ã?®ã??ã?³ã??ã?«ã??ä»»"
 "æ??ã?®è¨¼æ??æ?¸ã??å??ç?§ã??ã?¦ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:145
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 "æ??å®?ã??ã??ã?³ã?³ã??ã?ã?¹ã??ã?®ã??ã?³ã??ã?«ã??æ£ã??ã??ã?³ã?³ã??ã?ã?¹ã??ã??å??ç?§ã??ã?¦ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:148
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token ã?§å®?æ?½ã??ã??æ?´å??æ?§ã?®ã??ã?§ã??ã?¯ã??å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:151
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
 msgstr "è¨¼æ??æ?¸ã?§å®?æ?½ã??ã??æ?´å??æ?§ã?®ã??ã?§ã??ã?¯ã??å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:154
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The referenced credentials have expired."
 msgstr "å??ç?§ã??ã?¦ã??ã??è¨¼æ??æ?¸ã?®æ??é??ã??é??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:160 ../camel/camel-sasl-gssapi.c:296
-#: ../camel/camel-sasl-gssapi.c:340 ../camel/camel-sasl-gssapi.c:357
-#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:310
+#: ../camel/camel-sasl-gssapi.c:354 ../camel/camel-sasl-gssapi.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ã?µã?¼ã??ã??ã??é??é??ã?£ã??èª?è¨¼å¿?ç?ã??ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:369
+#: ../camel/camel-sasl-gssapi.c:383
 #, c-format
 msgid "Unsupported security layer."
 msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??ã?»ã?ã?¥ã?ªã??ã?£ã?»ã?¬ã?¤ã?¤ã?§ã??ã??"
 
-#: ../camel/camel-sasl-login.c:39
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "ã?ã?°ã?¤ã?³"
 
-#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
-msgstr "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ç°¡å??ã?ªã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã?¾ã??"
+msgstr "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ç°¡å??ã?ªã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-login.c:94
+#: ../camel/camel-sasl-login.c:91
 #, c-format
 msgid "Unknown authentication state."
-msgstr "ç?¹å®?ã?§ã??ã?ªã??èª?è¨¼ç?¶æ??ã?§ã??"
+msgstr "ç?¹å®?ã?§ã??ã?ªã??èª?è¨¼ç?¶æ??ã?§ã??ã??"
 
-#: ../camel/camel-sasl-ntlm.c:41
+#: ../camel/camel-sasl-ntlm.c:37
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:43
+#: ../camel/camel-sasl-ntlm.c:39
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2283,28 +2362,28 @@ msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ NTLM/ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã??ã??ã?¹ã?¯ã?¼ã??èª?è¨¼ã??ä½¿ã?£ã?¦ Windows "
 "ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-plain.c:43
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "POP before SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:48
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ SMTP æ?¥ç¶?ã??ç¢ºç«?ã??ã??å??ã?« POP æ?¥ç¶?ã?®èª?è¨¼ã??è¡?ã??ã?¾ã??"
 
-#: ../camel/camel-sasl-popb4smtp.c:82
+#: ../camel/camel-sasl-popb4smtp.c:79
 msgid "POP Source URI"
 msgstr "POP ã?½ã?¼ã?¹ URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:89
+#: ../camel/camel-sasl-popb4smtp.c:86
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "ä¸?æ??ã?ªè»¢é??ã??å?©ç?¨ã??ã?? POP Before SMTP èª?è¨¼ã?§ã??"
 
-#: ../camel/camel-sasl-popb4smtp.c:97
+#: ../camel/camel-sasl-popb4smtp.c:94
 #, c-format
 msgid "POP Before SMTP authentication using a non-POP source"
 msgstr "POP ã?½ã?¼ã?¹ã??å?©ç?¨ã??ã?ªã?? POP Before SMTP ã?§ã??"
@@ -2314,22 +2393,22 @@ msgstr "POP ã?½ã?¼ã?¹ã??å?©ç?¨ã??ã?ªã?? POP Before SMTP ã?§ã??"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "æ£è¦?è¡¨ç?¾ã?®ç·¨é??ã?«å¤±æ??: %s: %s"
 
-#: ../camel/camel-service.c:88
+#: ../camel/camel-service.c:85
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' ã?¯ã?¦ã?¼ã?¶å??ã?³ã?³ã??ã?¼ã??ã?³ã??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-service.c:92
+#: ../camel/camel-service.c:89
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' ã?¯ã??ã?¹ã??ã?»ã?³ã?³ã??ã?¼ã??ã?³ã??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-service.c:96
+#: ../camel/camel-service.c:93
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' ã?¯ã??ã?¹ã?»ã?³ã?³ã??ã?¼ã??ã?³ã??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-session.c:261
+#: ../camel/camel-session.c:256
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2338,102 +2417,103 @@ msgstr ""
 "ã??ã?©ã?«ã?? %s ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??:\n"
 "%s"
 
-#: ../camel/camel-session.c:758
+#: ../camel/camel-session.c:753
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "%s%s %s ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1048
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' ã?®è¨¼æ??æ?¸ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:376
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
 msgstr "CMS ã?¡ã??ã?»ã?¼ã?¸ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:381
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS signed data"
 msgstr "CMS ç½²å??ã??ã?¼ã?¿ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:387
+#: ../camel/camel-smime-context.c:383
 msgid "Cannot attach CMS signed data"
 msgstr "CMS ç½²å??ã??ã?¼ã?¿ã??æ·»ä»?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:394
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
 msgstr "CMS ã??ã?¼ã?¿ã??æ·»ä»?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:400
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
 msgstr "CMS ç½²å??è??ã?®æ??å ±ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:406
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
 msgstr "èª?è¨¼ã??ã?§ã?¤ã?³ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:412
+#: ../camel/camel-smime-context.c:408
 msgid "Cannot add CMS Signing time"
 msgstr "CMS ç½²å??æ??å?»ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
+#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ã?®æ??å?·å??è¨¼æ??æ?¸ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "å±?æ?§ SMIMEEncKeyPrefs ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:463
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "å±?æ?§ MS SMIMEEncKeyPrefs ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
 msgstr "æ??å?·å??è¨¼æ??æ?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:470
 msgid "Cannot add CMS Signer information"
 msgstr "CMS ç½²å??è??æ??å ±ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:506
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:503
 msgid "Unverified"
 msgstr "æ?ªæ¤?è¨¼"
 
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "è?¯ã??ç½²å??"
 
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "æ?ªã??ç½²å??"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr "ã??ã?¼ã?¿ã?®è»¢é??ä¸ã?«ä¸?å½?ã?«æ?¹ç«?ã??ã??ã??å??å®¹ã?§ã??"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
 msgstr "ç½²å??ä»?ã??è¨¼æ??æ?¸ã??ã?¿ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
 msgstr "ç½²å??ä»?ã??è¨¼æ??æ?¸ã?¯ä¿¡é ¼ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr "ç½²å??ã?¢ã?«ã?´ã?ªã?ºã? ã??ä¸?æ??ã?§ã??"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
 msgstr "ç½²å??ã?¢ã?«ã?´ã?ªã?ºã? ã?¯æ?ªã?µã??ã?¼ã??ã?§ã??"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "ã??ã??ã??ã?ªç½²å??ã?§ã??"
 
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr "å?¦ç??ã?¨ã?©ã?¼ã?§ã??"
 
@@ -2476,163 +2556,175 @@ msgstr "è¨¼æ??æ?¸ã?®ã??ã?¤ã?¸ã?§ã?¹ã??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ç½²å??è??: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
 msgid "Cannot create encoder context"
 msgstr "ã?¨ã?³ã?³ã?¼ã??ã?®ã?³ã?³ã??ã?ã?¹ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:838
+#: ../camel/camel-smime-context.c:841
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS ã?¨ã?³ã?³ã?¼ã??ã?¸ã?®ã??ã?¼ã?¿ã?®è¿½å? ã??å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
 msgid "Failed to encode data"
 msgstr "ã??ã?¼ã?¿ã?®ã?¨ã?³ã?³ã?¼ã??ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
+#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
 msgid "Decoder failed"
 msgstr "ã??ã?³ã?¼ã??ã?®ã?¨ã?©ã?¼ã?§ã??"
 
-#: ../camel/camel-smime-context.c:1049
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "å?±é??ã?ªã??ã?«ã?¯æ??å?·å??ã?¢ã?«ã?´ã?ªã?ºã? ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1057
+#: ../camel/camel-smime-context.c:1064
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "æ??å?·å??ã??ã?«ã?¯é?µã?®ã?¹ã?ã??ã??ã??ç¢ºä¿?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1068
+#: ../camel/camel-smime-context.c:1075
 msgid "Cannot create CMS Message"
 msgstr "CMS ã?¡ã??ã?»ã?¼ã?¸ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1074
+#: ../camel/camel-smime-context.c:1081
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS Enveloped ã??ã?¼ã?¿ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1080
+#: ../camel/camel-smime-context.c:1087
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS Enveloped ã??ã?¼ã?¿ã??æ·»ä»?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1086
+#: ../camel/camel-smime-context.c:1093
 msgid "Cannot attach CMS data object"
 msgstr "CMS ã??ã?¼ã?¿ã?»ã?ªã??ã?¸ã?§ã?¯ã??ã??æ·»ä»?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS å??é ?æ??å ±ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1100
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS å??é ?æ??å ±ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1125
+#: ../camel/camel-smime-context.c:1132
 msgid "Failed to add data to encoder"
 msgstr "ã??ã?¼ã?¿ã?®ã?¨ã?³ã?³ã?¼ã??ã?¸ã?®è¿½å? ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:1227
+#: ../camel/camel-smime-context.c:1240
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME å¾©å?·å??: æ??å?·å??ã??ã??ã??å??å®¹ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-store.c:444
+#: ../camel/camel-store.c:2181
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: æ?¢ã?«å?å?¨ã??ã?¦ã??ã?¾ã??"
 
-#: ../camel/camel-store.c:543
+#. the name of the Trash folder, used for deleted messages
+#: ../camel/camel-store.c:2372 ../camel/camel-store.c:2382
+#: ../camel/camel-vtrash-folder.c:48
+msgid "Trash"
+msgstr "ã?´ã??ç®±"
+
+#. the name of the Junk folder, used for spam messages
+#: ../camel/camel-store.c:2375 ../camel/camel-store.c:2386
+#: ../camel/camel-vtrash-folder.c:50
+msgid "Junk"
+msgstr "ã?¸ã?£ã?³ã?¯"
+
+#: ../camel/camel-store.c:2829
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s: ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??"
 
-#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
-#: ../camel/providers/local/camel-maildir-store.c:224
+#: ../camel/camel-store.c:2956 ../camel/camel-vee-store.c:367
+#: ../camel/providers/local/camel-maildir-store.c:272
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: %s: ç?¡å?¹ã?ªæ??ä½?ã?§ã??"
 
-#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
-#: ../camel/providers/local/camel-maildir-store.c:314
+#: ../camel/camel-store.c:3097 ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:668
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ã??ã?©ã?«ã??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: %s: ç?¡å?¹ã?ªæ??ä½?ã?§ã??"
 
-#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:1129 ../camel/camel-vtrash-folder.c:48
-msgid "Trash"
-msgstr "ã?´ã??ç®±"
+#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
+#, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr "ã??ã?ã?ã?·ã??ã?¹ã??ã?¯ SOCKS 4 ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??"
 
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:1132 ../camel/camel-vtrash-folder.c:50
-msgid "Junk"
-msgstr "ã?¸ã?£ã?³ã?¯"
+#: ../camel/camel-tcp-stream-raw.c:771
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr "ã??ã?ã?ã?·ã??ã?¹ã??ã?¯ã?ªã?¯ã?¨ã?¹ã??ã??æ??å?¦ã??ã?¾ã??ã??: ã?³ã?¼ã?? %d"
 
-#: ../camel/camel-tcp-stream-raw.c:814
+#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "ã??ã?ã?ã?·ã??ã?¹ã??ã?¯ SOCKS 5 ã??ã?µã??ã?¼ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-raw.c:820
+#: ../camel/camel-tcp-stream-raw.c:879
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "é?©å??ã??ã??èª?è¨¼å½¢å¼?ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã??: ã?³ã?¼ã?? 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:832
+#: ../camel/camel-tcp-stream-raw.c:891
 msgid "General SOCKS server failure"
 msgstr "SOCKS ã?µã?¼ã??ã?®ä¸?è?¬ç??ã?ªå¤±æ??ã?§ã??"
 
-#: ../camel/camel-tcp-stream-raw.c:833
+#: ../camel/camel-tcp-stream-raw.c:892
 msgid "SOCKS server's rules do not allow connection"
 msgstr "SOCKS ã?µã?¼ã??ã?®ã?«ã?¼ã?«è¨å®?ã?«ã??ã??æ?¥ç¶?ã??è¨±å?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-raw.c:834
+#: ../camel/camel-tcp-stream-raw.c:893
 msgid "Network is unreachable from SOCKS server"
 msgstr "SOCKS ã?µã?¼ã??ã??ã??ã??ã??ã??ã?¯ã?¼ã?¯ã?«å?°é??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-raw.c:835
+#: ../camel/camel-tcp-stream-raw.c:894
 msgid "Host is unreachable from SOCKS server"
 msgstr "SOCKS ã?µã?¼ã??ã??ã??ã??ã?¹ã??ã?«å?°é??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-raw.c:836
+#: ../camel/camel-tcp-stream-raw.c:895
 msgid "Connection refused"
 msgstr "æ?¥ç¶?ã??æ??å?¦ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-raw.c:837
+#: ../camel/camel-tcp-stream-raw.c:896
 msgid "Time-to-live expired"
 msgstr "Time-to-live ã?®æ??é??ã??å??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-raw.c:838
+#: ../camel/camel-tcp-stream-raw.c:897
 msgid "Command not supported by SOCKS server"
 msgstr "SOCKSã?µã?¼ã??ã?§ã?µã??ã?¼ã??ã??ã??ã?ªã??ã?³ã??ã?³ã??ã?§ã??"
 
-#: ../camel/camel-tcp-stream-raw.c:839
+#: ../camel/camel-tcp-stream-raw.c:898
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKSã?µã?¼ã??ã?§ã?µã??ã?¼ã??ã??ã??ã?ªã??ã?¢ã??ã?¬ã?¹å½¢å¼?ã?§ã??"
 
-#: ../camel/camel-tcp-stream-raw.c:840
+#: ../camel/camel-tcp-stream-raw.c:899
 msgid "Unknown error from SOCKS server"
 msgstr "SOCKSã?µã?¼ã??ã??ã??ã?®ä¸?æ??ã?ªã?¨ã?©ã?¼ã?§ã??"
 
-#: ../camel/camel-tcp-stream-raw.c:870
+#: ../camel/camel-tcp-stream-raw.c:932
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "SOCKS ã?µã?¼ã??ã??ã??ä¸?æ??ã?ªã?¢ã??ã?¬ã?¹å½¢å¼?ã??å??å¾?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-raw.c:887
+#: ../camel/camel-tcp-stream-raw.c:950
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "SOCKS ã?µã?¼ã??ã??ã??ã?®å¿?ç?ã??ä¸?å®?å?¨ã?§ã??"
 
-#: ../camel/camel-tcp-stream-raw.c:902
+#: ../camel/camel-tcp-stream-raw.c:970
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ã??ã?¹ã??å??ã??é?·ã??ã??ã?¾ã?? (255 æ??å?ä»¥ä¸?ã?§ã?ªã??ã??ã?°ã??ã??ã?¾ã??ã??)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:934 ../camel/camel-tcp-stream-raw.c:944
+#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "ã??ã?ã?ã?·ã?µã?¼ã??ã??ã??ã?®å¿?ç?ã??ç?¡å?¹ã?§ã??"
 
-#: ../camel/camel-tcp-stream-ssl.c:457
+#: ../camel/camel-tcp-stream-ssl.c:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2645,16 +2737,16 @@ msgstr ""
 "æ??ç´?:              %s\n"
 "ç½²å??:              %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "BAD"
 msgstr "BAD"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:467
+#: ../camel/camel-tcp-stream-ssl.c:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2669,7 +2761,7 @@ msgstr ""
 "\n"
 "å??è«¾ã??ã?¦ã?¿ã?¾ã??ã???"
 
-#: ../camel/camel-tcp-stream-ssl.c:511
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2678,7 +2770,7 @@ msgstr ""
 "èª?è¨¼å??é¡?: %s\n"
 "ç?ºè¡?è??: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:563
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2687,7 +2779,7 @@ msgstr ""
 "ã??ã??ã??ã?ªèª?è¨¼ã??ã?¡ã?¤ã?³: %s\n"
 "ç?ºè¡?è??: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:581
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2696,7 +2788,7 @@ msgstr ""
 "è¨¼æ??æ?¸ã?®æ??å?¹æ??é??å??ã??: %s\n"
 "ç?ºè¡?è??: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:598
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2705,41 +2797,41 @@ msgstr ""
 "è¨¼æ??æ?¸å??ã??æ¶?ã??ä¸?è¦§ã?®æ??é??å??ã??: %s\n"
 "ç?ºè¡?è??: %s"
 
-#: ../camel/camel-url.c:314
+#: ../camel/camel-url.c:316
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "'%s' ã?¨ã??ã?? URL ã??è§£æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/camel-vee-folder.c:1045
+#: ../camel/camel-vee-folder.c:1235 ../camel/camel-vee-folder.c:1398
 #, c-format
-msgid "Error storing '%s': "
-msgstr "'%s' ã?®æ ¼ç´?ä¸ã?«ã?¨ã?©ã?¼: "
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®ä»®æ?³ã??ã?©ã?«ã??ã?¸ã?®ã?³ã??ã?¼ã?¾ã??ã?¯ç§»å??ã??ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-vee-folder.c:1118
+#: ../camel/camel-vee-folder.c:1271
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%2$s ã?«ã?¡ã??ã?»ã?¼ã?¸ %1$s ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-vee-folder.c:1134 ../camel/camel-vee-folder.c:1149
+#: ../camel/camel-vee-folder.c:1339
 #, c-format
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®ä»®æ?³ã??ã?©ã?«ã??ã?¸ã?®ã?³ã??ã?¼ã?¾ã??ã?¯ç§»å??ã??ã?§ã??ã?¾ã??ã??ã??"
+msgid "Error storing '%s': "
+msgstr "'%s' ã?®æ ¼ç´?ä¸ã?«ã?¨ã?©ã?¼: "
 
 #: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
-#: ../camel/camel-vee-store.c:417
+#: ../camel/camel-vee-store.c:322
 msgid "Unmatched"
 msgstr "è©²å½?ã??ã?ªã??ã??ã?®"
 
-#: ../camel/camel-vee-store.c:223
-#, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "ã??ã?©ã?«ã??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: %s: ã??ã?®ã??ã??ã?ªã??ã?©ã?«ã??ã?¯ã??ã??ã?¾ã??ã??"
-
-#: ../camel/camel-vee-store.c:289
+#: ../camel/camel-vee-store.c:393
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: %s: ã??ã?®ã??ã??ã?ªã??ã?©ã?«ã??ã?¯ã??ã??ã?¾ã??ã??"
 
+#: ../camel/camel-vee-store.c:427
+#, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "ã??ã?©ã?«ã??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: %s: ã??ã?®ã??ã??ã?ªã??ã?©ã?«ã??ã?¯ã??ã??ã?¾ã??ã??"
+
 #: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "ã?´ã??ç®±ã??ã?©ã?«ã??ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??"
@@ -2748,93 +2840,92 @@ msgstr "ã?´ã??ç®±ã??ã?©ã?«ã??ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ã?¸ã?£ã?³ã?¯ã?»ã??ã?©ã?«ã??ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"ã?¡ã??ã?»ã?¼ã?¸ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s\n"
-"  %s"
-
-#: ../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: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: "
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ %s ã??å??å¾?ã?§ã??ã?¾ã??ã??: "
-
-#: ../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: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:1070
-#: ../camel/providers/imap/camel-imap-folder.c:376
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:954
+#: ../camel/providers/imap/camel-imap-folder.c:392
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s ã?®ã?µã??ã?ªã??ã?ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1144
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1030
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "å??é?¤ã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ %s ã?®ã??ã?§ã??ã?¯ä¸"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c: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:3741
-#: ../camel/providers/imapx/camel-imapx-server.c:3865
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1517
+#: ../camel/providers/groupwise/camel-groupwise-store.c:665
+#: ../camel/providers/groupwise/camel-groupwise-store.c:796
+#: ../camel/providers/imap/camel-imap-folder.c:3962
+#: ../camel/providers/imap/camel-imap-folder.c:4044
+#: ../camel/providers/imapx/camel-imapx-server.c:3871
+#: ../camel/providers/imapx/camel-imapx-server.c:4002
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "%s ã?«ã??ã??æ?°ç??ã?¡ã??ã?»ã?¼ã?¸ã?®ã?µã??ã?ªæ??å ±ã?®å??æ??ä¸"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2502
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2552
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1987
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2040
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2704
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2714
+#, c-format
+msgid "Could not get message"
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??å¾?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2424
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2538
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2460
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"ã?¡ã??ã?»ã?¼ã?¸ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s\n"
+"  %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:307
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "ã??ã?®ã??ã??ã?ªã?¡ã??ã?»ã?¼ã?¸ã?¯ã??ã??ã?¾ã??ã??"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2659
+#: ../camel/providers/nntp/camel-nntp-folder.c:246
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
+#: ../camel/providers/pop3/camel-pop3-folder.c:457
+#, c-format
+msgid "Cannot get message %s: "
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ %s ã??å??å¾?ã?§ã??ã?¾ã??ã??: "
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2677
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2687
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2890
+#, c-format
+msgid "This message is not available in offline mode."
+msgstr "ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ã?¯ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??ã??"
+
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "ã??ã?©ã?«ã??ã?®ã?³ã?³ã??ã?? %s ã??å??å¾?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
 #, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr ""
 "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: ã?ã?£ã??ã?·ã?¥ã??å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
 msgid "Cannot append message in offline mode: "
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: "
 
@@ -2858,8 +2949,10 @@ msgid "Options"
 msgstr "ã?ªã??ã?·ã?§ã?³"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:55
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "ã??ã?®ã?µã?¼ã??ã?® Inbox ã?«ã??ã??æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?¸ã??ã?£ã?«ã?¿ã??é?©ç?¨ã??ã??(_A)"
+msgstr "ã??ã?®ã?µã?¼ã??ã?®å??ä¿¡ç®±ã?«ã??ã??æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?¸ã??ã?£ã?«ã?¿ã??é?©ç?¨ã??ã??(_A)"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
@@ -2895,7 +2988,7 @@ msgstr "Novell GroupWise ã?µã?¼ã??ã?¸ã?®ã?¢ã?¯ã?»ã?¹ç?¨ã?§ã??"
 #: ../camel/providers/imap/camel-imap-provider.c:97
 #: ../camel/providers/imapx/camel-imapx-provider.c:104
 #: ../camel/providers/nntp/camel-nntp-provider.c:72
-#: ../camel/providers/pop3/camel-pop3-provider.c:70
+#: ../camel/providers/pop3/camel-pop3-provider.c:73
 msgid "Password"
 msgstr "ã??ã?¹ã?¯ã?¼ã??"
 
@@ -2904,19 +2997,19 @@ msgid ""
 "This option will connect to the GroupWise server using a plaintext password."
 msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã?¬ã?¤ã?³ã?»ã??ã?ã?¹ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ IMAP ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã?¾"
-"ã??"
+"ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#: ../camel/providers/groupwise/camel-groupwise-store.c:103
 #, c-format
 msgid "Host or user not available in url"
 msgstr "ã??ã?¹ã??å??ã?¾ã??ã?¯ã?¦ã?¼ã?¶å??ã?¯ URI ã?§æ??å®?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1188
-#: ../camel/providers/imapx/camel-imapx-server.c:2992
+#: ../camel/providers/groupwise/camel-groupwise-store.c:205
+#: ../camel/providers/imap/camel-imap-store.c:801
+#: ../camel/providers/imapx/camel-imapx-server.c:3085
 #, c-format
 msgid "You did not enter a password."
-msgstr "ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¾ã??ã??ã?§ã??ã??"
+msgstr "ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
 #: ../camel/providers/groupwise/camel-groupwise-store.c:328
 msgid "Some features may not work correctly with your current server version"
@@ -2924,64 +3017,64 @@ msgstr ""
 "ã??ä½¿ã??ã?®ã?µã?¼ã??ã?®ã??ã?¼ã?¸ã?§ã?³ã?§ã?¯ã??ã??ã??ã?¤ã??ã?®æ©?è?½ã??æ£ã??ã??å??ä½?ã??ã?ªã??ã??ã??ã??ã??ã?¾ã??"
 "ã??"
 
-#: ../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:416
+#: ../camel/providers/groupwise/camel-groupwise-store.c:556
+#: ../camel/providers/imap/camel-imap-store.c:1808
+#: ../camel/providers/imap/camel-imap-store.c:2005
+#: ../camel/providers/imapx/camel-imapx-store.c:341
 #, c-format
 msgid "No such folder %s"
 msgstr "ã??ã?®ã??ã??ã?ªã??ã?©ã?«ã?? %s ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1217
 #, c-format
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ GroupWise ã??ã?©ã?«ã??ã??ç??æ??ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1196
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1226
 #, c-format
 msgid "Cannot create a special system folder"
 msgstr "ç?¹å?¥ã?ªã?·ã?¹ã??ã? ã??ã?©ã?«ã??ã??ä½?æ??ã??ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
-#: ../camel/providers/imap/camel-imap-store.c:1835
-#: ../camel/providers/imap/camel-imap-store.c:2257
-#: ../camel/providers/imapx/camel-imapx-store.c:879
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1236
+#: ../camel/providers/imap/camel-imap-store.c:1886
+#: ../camel/providers/imap/camel-imap-store.c:2323
+#: ../camel/providers/imapx/camel-imapx-store.c:1340
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "è¦ªã??ã?©ã?«ã??ã?«ã?¯è¤?æ?°ã?®ã?µã??ã??ã?©ã?«ã??ã??å?«ã??ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1321
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1346
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "GroupWise ã??ã?©ã?«ã??ã?® '%s' ã?? '%s' ã?¨ã??ã??å??å??ã?«å¤?æ?´ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1380
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise ã?®ã?µã?¼ã?? %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "%s ã?® %s ã?«ã??ã?? GroupWise ã?®ã?µã?¼ã??ã?¹"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "%s çµ?ç?±ã?§ GroupWise ã?®ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
 msgid "Sending Message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®é??ä¿¡"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
 #, c-format
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: ã??ã??ã?§ã?¯ç?¡å?¹ã?ªæ??ä½?ã?§ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
 #, c-format
 msgid ""
 "You have exceeded this account's storage limit. Your messages are queued in "
@@ -2992,36 +3085,36 @@ msgstr ""
 "ç®±ã?«ä¿?å?ã??ã??ã?¾ã??ã??ã?¾ã??ã?¯ã?¡ã?¼ã?«ã??å??é?¤ã??ã??ã??ã?¢ã?¼ã?«ã?¤ã??ã?«ã?¾ã?¨ã??ã??ç?ã??ã?¦ã??ã??ã??[é??"
 "å??ä¿¡] ã??ã?¿ã?³ã??æ?¼ã??ã?¦ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã?¦ã??ã? ã??ã??ã??\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
 #, c-format
 msgid "Could not send message: %s"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:190
-#: ../camel/providers/imap/camel-imap-command.c:288
+#: ../camel/providers/imap/camel-imap-command.c:197
+#: ../camel/providers/imap/camel-imap-command.c:301
 #, c-format
 msgid "No output stream"
 msgstr "å?ºå??ã?¹ã??ã?ªã?¼ã? ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-command.c:198
-#: ../camel/providers/imap/camel-imap-command.c:296
+#: ../camel/providers/imap/camel-imap-command.c:205
+#: ../camel/providers/imap/camel-imap-command.c:309
 #, c-format
 msgid "No input stream"
 msgstr "å?¥å??ã?¹ã??ã?ªã?¼ã? ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-command.c:245
+#: ../camel/providers/imap/camel-imap-command.c:255
 #, c-format
 msgid "Operation cancelled"
 msgstr "å?¦ç??ã??ã?ã?£ã?³ã?»ã?«ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-command.c:353
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "çª?ç?¶ã?µã?¼ã??ã??æ?¥ç¶?ã??å??ã??ã?¾ã??ã??: %s"
 
 #. for imap ALERT codes, account user host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:373
+#: ../camel/providers/imap/camel-imap-command.c:394
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3030,79 +3123,79 @@ msgstr ""
 "IMAP ã?µã?¼ã?? %s %s ã??ã??ã?®è¦å??:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:444
+#: ../camel/providers/imap/camel-imap-command.c:468
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP ã?µã?¼ã??ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:456
+#: ../camel/providers/imap/camel-imap-command.c:480
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:532
+#: ../camel/providers/imap/camel-imap-command.c:560
 #, c-format
 msgid "Server response ended too soon."
-msgstr "ã?µã?¼ã??ã?¬ã?¹ã??ã?³ã?¹ã?¯ã??ã?£ã??ã?ªã??çµ?ã??ã??ã?¾ã??ã??"
+msgstr "ã?µã?¼ã??ã?¬ã?¹ã??ã?³ã?¹ã?¯ã??ã?£ã??ã?ªã??çµ?ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-command.c:740
+#: ../camel/providers/imap/camel-imap-command.c:771
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ã?µã?¼ã??ã?®å¿?ç?ã?¯ %s æ??å ±ã??å?«ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-command.c:778
+#: ../camel/providers/imap/camel-imap-command.c:809
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ã?µã?¼ã??ã??ã??æ?³å®?å¤?ã?® OK å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:281
+#: ../camel/providers/imap/camel-imap-folder.c:292
 msgid "Always check for new mail in this folder"
 msgstr "å¸¸ã?«ã??ã?®ã??ã?©ã?«ã??ã?«ã??ã??æ?°ç??ã?¡ã?¼ã?«ã??ã??ã?§ã??ã?¯ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:353
+#: ../camel/providers/imap/camel-imap-folder.c:369
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ã??ã?©ã?«ã?? %s ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:960
-#: ../camel/providers/imapx/camel-imapx-server.c:3781
+#: ../camel/providers/imap/camel-imap-folder.c:992
+#: ../camel/providers/imapx/camel-imapx-server.c:3915
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s ã?«ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®è§£æ??ä¸"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3231
+#: ../camel/providers/imap/camel-imap-folder.c:3369
 msgid "Unable to retrieve message: "
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??å¾©ã?§ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3266
-#: ../camel/providers/imapx/camel-imapx-server.c:4958
+#: ../camel/providers/imap/camel-imap-folder.c:3404
+#: ../camel/providers/imapx/camel-imapx-server.c:5193
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "%s ã?¨ã??ã?? ID ã?®ã?¡ã??ã?»ã?¼ã?¸ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3267
-#: ../camel/providers/imapx/camel-imapx-server.c:4959
+#: ../camel/providers/imap/camel-imap-folder.c:3405
+#: ../camel/providers/imapx/camel-imapx-server.c:5194
 msgid "No such message available."
-msgstr "ã??ã?®ã??ã??ã?ªã?¡ã??ã?»ã?¼ã?¸ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
+msgstr "ã??ã?®ã??ã??ã?ªã?¡ã??ã?»ã?¼ã?¸ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3341
-#: ../camel/providers/imap/camel-imap-folder.c:4211
-#: ../camel/providers/nntp/camel-nntp-folder.c:326
+#: ../camel/providers/imap/camel-imap-folder.c:3480
+#: ../camel/providers/imap/camel-imap-folder.c:4375
+#: ../camel/providers/nntp/camel-nntp-folder.c:402
 #, c-format
 msgid "This message is not currently available"
 msgstr "ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ã?¯ç?¾å?¨å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4021
+#: ../camel/providers/imap/camel-imap-folder.c:4176
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ä¸?å®?å?¨ã?ªã?µã?¼ã??ã?®å¿?ç?: ã?¡ã??ã?»ã?¼ã?¸ %d ã?®æ??å ±ã??æ??ä¾?ã??ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4031
+#: ../camel/providers/imap/camel-imap-folder.c:4186
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ä¸?å®?å?¨ã?ªã?µã?¼ã??ã?®å¿?ç?: ã?¡ã??ã?»ã?¼ã?¸ %d ã?® UID ã??æ??ä¾?ã??ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4251
+#: ../camel/providers/imap/camel-imap-folder.c:4415
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH å¿?ç?ã?«ã?¡ã??ã?»ã?¼ã?¸æ?¬ä½?ã??ã??ã??ã?¾ã??ã??ã?§ã??ã??ã??"
@@ -3117,12 +3210,12 @@ msgstr "ã?ã?£ã??ã?·ã?¥ã?»ã??ã?©ã?«ã??ã??é??ã??ã?¾ã??ã??ã?§ã??ã??: "
 msgid "Failed to cache message %s: %s"
 msgstr "%s ã?¨ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??ã?ã?£ã??ã?·ã?¥ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:388
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
 #, c-format
 msgid "Failed to cache message %s: "
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ %s ã?®ã?ã?£ã??ã?·ã?¥ã?«å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:525
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
 #, c-format
 msgid "Failed to cache %s: "
 msgstr "%s ã?®ã?ã?£ã??ã?·ã?¥ã?«å¤±æ??ã??ã?¾ã??ã??: "
@@ -3171,11 +3264,6 @@ msgstr "ã?µã?¼ã??ã??æ??ä¾?ã??ã??ã??ã?©ã?«ã??ã?®ã??ã?¼ã? ã?¹ã??ã?¼ã?¹ã??ä¸?æ?¸ã??
 msgid "Names_pace:"
 msgstr "ã??ã?¼ã? ã?¹ã??ã?¼ã?¹(_P):"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "ã??ã?®ã?µã?¼ã??ã?®å??ä¿¡ç®±ã?«ã??ã??æ?°ç??ã?¡ã?¼ã?«ã?«ã??ã?£ã?«ã?¿ã??é?©ç?¨ã??ã??(_A)"
-
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
@@ -3193,116 +3281,90 @@ msgstr "IMAP"
 #: ../camel/providers/imap/camel-imap-provider.c:81
 #: ../camel/providers/imapx/camel-imapx-provider.c:90
 msgid "For reading and storing mail on IMAP servers."
-msgstr "IMAP ã?µã?¼ã??ã?®ã?¡ã?¼ã?«ã??èªã??ã? ã??å¤§å??ã?ªã?¡ã?¼ã?«ã??ä¿?å?ã??ã?¾ã??"
+msgstr "IMAP ã?µã?¼ã??ã?®ã?¡ã?¼ã?«ã??èªã??ã? ã??å¤§å??ã?ªã?¡ã?¼ã?«ã??ä¿?å?ã??ã?¾ã??ã??"
 
 #: ../camel/providers/imap/camel-imap-provider.c:99
 #: ../camel/providers/imapx/camel-imapx-provider.c:106
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã?¬ã?¤ã?³ã?»ã??ã?ã?¹ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ IMAP ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã?¾"
-"ã??"
-
-#: ../camel/providers/imap/camel-imap-store.c:310
-#: ../camel/providers/imapx/camel-imapx-store.c:228
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP ã?µã?¼ã?? %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:312
-#: ../camel/providers/imapx/camel-imapx-store.c:230
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s ã?® %s ã?«ã??ã?? IMAP ã?µã?¼ã??ã?¹"
+"ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:447
-#: ../camel/providers/nntp/camel-nntp-store.c:234
-#: ../camel/providers/pop3/camel-pop3-store.c:132
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/imap/camel-imap-store.c:243
+#: ../camel/providers/nntp/camel-nntp-store.c:342
+#: ../camel/providers/pop3/camel-pop3-store.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "%s ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:448
-#: ../camel/providers/nntp/camel-nntp-store.c:235
-#: ../camel/providers/pop3/camel-pop3-store.c:133
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/imap/camel-imap-store.c:244
+#: ../camel/providers/nntp/camel-nntp-store.c:343
+#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "SSL unavailable"
 msgstr "SSL ã?¯ç?¡å?¹ã?§ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:466
-#: ../camel/providers/nntp/camel-nntp-store.c:252
+#: ../camel/providers/imap/camel-imap-store.c:264
+#: ../camel/providers/nntp/camel-nntp-store.c:362
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "%s ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: "
 
-#: ../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:2845
-#: ../camel/providers/imapx/camel-imapx-server.c:2881
+#: ../camel/providers/imap/camel-imap-store.c:370
+#: ../camel/providers/imap/camel-imap-store.c:390
+#: ../camel/providers/imap/camel-imap-store.c:397
+#: ../camel/providers/imap/camel-imap-store.c:424
+#: ../camel/providers/imapx/camel-imapx-server.c:2927
+#: ../camel/providers/imapx/camel-imapx-server.c:2967
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã??ã?¢ã?¼ã??ã?§ IMAP ã?µã?¼ã?? %s ã?¸ã?®æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:573
-#: ../camel/providers/imapx/camel-imapx-server.c:2846
-#: ../camel/providers/smtp/camel-smtp-transport.c:295
+#: ../camel/providers/imap/camel-imap-store.c:371
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "STARTTLS not supported"
 msgstr "STARTTLS æ?¡å¼µã?¯ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:593
-#: ../camel/providers/imapx/camel-imapx-server.c:2882
+#: ../camel/providers/imap/camel-imap-store.c:391
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
 msgid "SSL negotiations failed"
 msgstr "SSL æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:600
-#: ../camel/providers/smtp/camel-smtp-transport.c:339
+#: ../camel/providers/imap/camel-imap-store.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
 msgid "SSL is not available in this build"
 msgstr "ã??ã?®ã??ã??ã?±ã?¼ã?¸ã?§ã?¯ SSL ã??å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:748
-#: ../camel/providers/imapx/camel-imapx-server.c:2682
+#: ../camel/providers/imap/camel-imap-store.c:549
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
 #, c-format
 msgid "Connection cancelled"
 msgstr "æ?¥ç¶?ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:753
-#: ../camel/providers/imapx/camel-imapx-server.c:2687
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imapx/camel-imapx-server.c:2760
 #, 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:926
-#: ../camel/providers/imap/camel-imap-store.c:2350
-#: ../camel/providers/imapx/camel-imapx-store.c:463
-#: ../camel/providers/imapx/camel-imapx-store.c:1060
-#: ../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:1129
-#: ../camel/providers/imapx/camel-imapx-server.c:2948
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ã?µã?¼ã??ã?® %s ã?§ã?¯ %s ã?¨ã??ã??èª?è¨¼ã?¿ã?¤ã??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:1141
-#: ../camel/providers/imapx/camel-imapx-server.c:2960
-#: ../camel/providers/smtp/camel-smtp-transport.c:462
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:3053
+#: ../camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s ã?¨ã??ã??èª?è¨¼ã?¿ã?¤ã??ã?¯ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:1220
-#: ../camel/providers/imapx/camel-imapx-server.c:3030
+#: ../camel/providers/imap/camel-imap-store.c:836
+#: ../camel/providers/imapx/camel-imapx-server.c:3129
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3313,34 +3375,60 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1771
-#: ../camel/providers/imap/camel-imap-store.c:2193
-#: ../camel/providers/imapx/camel-imapx-store.c:858
+#: ../camel/providers/imap/camel-imap-store.c:997
+#: ../camel/providers/imapx/camel-imapx-store.c:182
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP ã?µã?¼ã?? %s"
+
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:184
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s ã?® %s ã?«ã??ã?? IMAP ã?µã?¼ã??ã?¹"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:1367
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imapx/camel-imapx-store.c:371
+#: ../camel/providers/imapx/camel-imapx-store.c:793
+#: ../camel/providers/local/camel-maildir-folder.c:409
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:615
+#: ../camel/providers/local/camel-maildir-store.c:621
+#: ../camel/providers/local/camel-maildir-store.c:669
+#: ../camel/providers/local/camel-spool-store.c:289
+msgid "Inbox"
+msgstr "å??ä¿¡ç®±"
+
+#: ../camel/providers/imap/camel-imap-store.c:1822
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imapx/camel-imapx-store.c:1319
 #, 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:1887
-#: ../camel/providers/local/camel-maildir-store.c:189
-#: ../camel/providers/local/camel-mbox-store.c:193
-#: ../camel/providers/local/camel-mh-store.c:255
+#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:407
+#: ../camel/providers/local/camel-mh-store.c:504
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: æ?¢ã?«å?å?¨ã??ã?¦ã??ã?¾ã??"
+msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: æ?¢ã?«å?å?¨ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:2206
-#: ../camel/providers/imapx/camel-imapx-store.c:869
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imapx/camel-imapx-store.c:1330
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "è¦ªã??ã?©ã?«ã??ã??ç?¹å®?ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3062
+#: ../camel/providers/imap/camel-imap-store.c:3137
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "çª?ç?¶ã?µã?¼ã??ã??æ?¥ç¶?ã??å??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:3065
+#: ../camel/providers/imap/camel-imap-store.c:3140
 msgid "Server unexpectedly disconnected: "
 msgstr "çª?ç?¶ã?µã?¼ã??ã??ã??å??æ?ã??ã??ã?¾ã??ã??: "
 
@@ -3378,70 +3466,66 @@ msgstr "ã??ã?¼ã? ã?¹ã??ã?¼ã?¹:"
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1384
+#: ../camel/providers/imapx/camel-imapx-server.c:1404
 msgid "Error writing to cache stream: "
 msgstr "ã?ã?£ã??ã?·ã?¥ã?¹ã??ã?ªã?¼ã? ã?«æ?¸ã??è¾¼ã?¿ä¸ã?«ã?¨ã?©ã?¼: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2039
+#: ../camel/providers/imapx/camel-imapx-server.c:2083
 #, c-format
 msgid "Not authenticated"
 msgstr "èª?è¨¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2773
+#: ../camel/providers/imapx/camel-imapx-server.c:2850
 #, c-format
 msgid "Could not connect to %s (port %s): "
 msgstr "%s (ã??ã?¼ã?? %s) ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3202
+#: ../camel/providers/imapx/camel-imapx-server.c:3311
 msgid "Closing tmp stream failed: "
 msgstr "ä½?æ¥ç?¨ã?¹ã??ã?ªã?¼ã? ã?®ã?¯ã?ã?¼ã?ºã?«å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5083
-#, c-format
-msgid "Cannot create spool file: %s"
-msgstr "ã?¹ã??ã?¼ã?«ã??ã?¡ã?¤ã?«ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:5099
+#: ../camel/providers/imapx/camel-imapx-server.c:5343
+#: ../camel/providers/imapx/camel-imapx-server.c:5358
 msgid "Cannot create spool file: "
 msgstr "ã?¹ã??ã?¼ã?«ã??ã?¡ã?¤ã?«ã??ä½?æ??ã?§ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/imapx/camel-imapx-store.c:432
-#: ../camel/providers/nntp/camel-nntp-store.c:1510
+#: ../camel/providers/imapx/camel-imapx-store.c:1135
+#: ../camel/providers/nntp/camel-nntp-store.c:1666
 #, c-format
 msgid "No such folder: %s"
 msgstr "ã??ã?®ã??ã??ã?ªã??ã?©ã?«ã??ã?¯ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:68
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
 msgid "Source stream returned no data"
 msgstr "ã?½ã?¼ã?¹ã?¹ã??ã?ªã?¼ã? ã?¯ã??ã?¼ã?¿ã??è¿?ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:77
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
 #, c-format
 msgid "Source stream unavailable"
 msgstr "ã?½ã?¼ã?¹ã?¹ã??ã?ªã?¼ã? ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-local-folder.c:199
+#: ../camel/providers/local/camel-local-folder.c:178
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:209
-#: ../camel/providers/local/camel-local-folder.c:218
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "mailbox: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:227
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:272
+#: ../camel/providers/local/camel-local-folder.c:466
 msgid "Index message body data"
 msgstr "ã?¡ã?¼ã?«æ?¬æ??ã?®ã?¤ã?³ã??ã??ã?¯ã?¹ã??ä½?æ??ã??ã??"
 
-#: ../camel/providers/local/camel-local-folder.c:686
+#: ../camel/providers/local/camel-local-folder.c:700
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3460,7 +3544,7 @@ msgstr "MH å½¢å¼?ã?®ã?¡ã?¼ã?«ã?»ã??ã?©ã?«ã??"
 
 #: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
-msgstr "ã?ã?¼ã?«ã?«ã?»ã?¡ã?¼ã?«ã?? MH å½¢å¼?ã?®ã?¡ã?¼ã?«ã?»ã??ã?©ã?«ã??ã?®ä¸ã?«ä¿?å?ã??ã?¾ã??"
+msgstr "ã?ã?¼ã?«ã?«ã?»ã?¡ã?¼ã?«ã?? MH å½¢å¼?ã?®ã?¡ã?¼ã?«ã?»ã??ã?©ã?«ã??ã?®ä¸ã?«ä¿?å?ã??ã?¾ã??ã??"
 
 #: ../camel/providers/local/camel-local-provider.c:69
 msgid "Local delivery"
@@ -3472,7 +3556,7 @@ msgid ""
 "folders managed by Evolution."
 msgstr ""
 "ã?ã?¼ã?«ã?«ã?»ã?¡ã?¼ã?«ã??å??é??ã??ã?¦æ¨?æº? mbox å½¢å¼?ã?®ã?¹ã??ã?¼ã?«ã??ã?? Evolution ã??ç®¡ç??ã??ã??"
-"ã??ã?©ã?«ã??ã?«ç§»å??ã??ã?¾ã??"
+"ã??ã?©ã?«ã??ã?«ç§»å??ã??ã?¾ã??ã??"
 
 #: ../camel/providers/local/camel-local-provider.c:84
 #: ../camel/providers/local/camel-local-provider.c:103
@@ -3485,7 +3569,7 @@ msgstr "Maildir å½¢å¼?ã?®ã?¡ã?¼ã?«ã?»ã??ã?©ã?«ã??"
 
 #: ../camel/providers/local/camel-local-provider.c:92
 msgid "For storing local mail in maildir directories."
-msgstr "ã?ã?¼ã?«ã?«ã?»ã?¡ã?¼ã?«ã?? Maildir å½¢å¼?ã?®ã??ã?©ã?«ã??ã?«ä¿?å?ã??ã?¾ã??"
+msgstr "ã?ã?¼ã?«ã?«ã?»ã?¡ã?¼ã?«ã?? Maildir å½¢å¼?ã?®ã??ã?©ã?«ã??ã?«ä¿?å?ã??ã?¾ã??ã??"
 
 #: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
@@ -3501,191 +3585,225 @@ 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."
 msgstr ""
-"å¤?é?¨ã?®æ¨?æº? mbox å½¢å¼?ã?®ã?¹ã??ã?¼ã?«ã?»ã??ã?¡ã?¤ã?«ã?«ã??ã??ã?ã?¼ã?«ã?«ã?»ã?¡ã?¼ã?«ã??èªã?¿è¾¼ã?¿ã??ã? "
-"ã??æ ¼ç´?ã??ã?¾ã??\n"
-"(Elmã??Pineã??Mutt å½¢å¼?ã?®ã??ã?©ã?«ã??ã?®èªã?¿è¾¼ã?¿ã?«ã??å¯¾å¿?)"
+"å¤?é?¨ã?®æ¨?æº? mbox å½¢å¼?ã?®ã?¹ã??ã?¼ã?«ã?»ã??ã?¡ã?¤ã?«ã?«ã??ã??ã?ã?¼ã?«ã?«ã?»ã?¡ã?¼ã?«ã??èªã?¿è¾¼ã??ã? ã??"
+"æ ¼ç´?ã??ã?¾ã??\n"
+"(Elmã??Pineã??Mutt å½¢å¼?ã?®ã??ã?©ã?«ã??ã?®èªã?¿è¾¼ã?¿ã?«ã??å¯¾å¿?)ã??"
 
 #: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
 msgstr "æ¨?æº?ç??ã?ª UNIX ã?® mbox å½¢å¼?ã?®ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??"
 
-#: ../camel/providers/local/camel-local-store.c:149
-#: ../camel/providers/local/camel-local-store.c:284
-#: ../camel/providers/local/camel-mbox-store.c:371
-#: ../camel/providers/local/camel-spool-store.c:109
+#: ../camel/providers/local/camel-local-store.c:174
+#: ../camel/providers/local/camel-local-store.c:319
+#: ../camel/providers/local/camel-maildir-store.c:92
+#: ../camel/providers/local/camel-mbox-store.c:526
+#: ../camel/providers/local/camel-spool-store.c:318
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "ä¿?å?ã??ã??ã?«ã?¼ã?? %s ã?¯çµ¶å¯¾ã??ã?¹ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "ä¿?å?ã??ã??ã?«ã?¼ã?? %s ã?¯é??å¸¸ã?®ã??ã?©ã?«ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-local-store.c:169
-#: ../camel/providers/local/camel-local-store.c:179
-#: ../camel/providers/local/camel-local-store.c:297
+#: ../camel/providers/local/camel-local-store.c:194
+#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:332
+#: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:193
+#: ../camel/providers/local/camel-local-store.c:220
 #, c-format
 msgid "Local stores do not have an inbox"
-msgstr "ã?ã?¼ã?«ã?«ã?¸ã?®ä¿?å?ã?§ã?¯ inbox ã??æ??ã?¦ã?¾ã??ã??"
+msgstr "ã?ã?¼ã?«ã?«ã?¸ã?®ä¿?å?ã?§ã?¯å??ä¿¡ç®±ã??æ??ã?¦ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-local-store.c:250
+#: ../camel/providers/local/camel-local-store.c:281
 #, c-format
 msgid "Local mail file %s"
 msgstr "ã?ã?¼ã?«ã?«ã?»ã?¡ã?¼ã?«ã?®ã??ã?¡ã?¤ã?« %s"
 
-#: ../camel/providers/local/camel-local-store.c:358
+#: ../camel/providers/local/camel-local-store.c:393
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ã??ã?©ã?«ã??ã?? %s ã??ã?? %s ã?¸å??å??å¤?æ?´ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-local-store.c:431
+#: ../camel/providers/local/camel-local-store.c:467
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' ã?®å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-local-store.c:461
-#: ../camel/providers/local/camel-mbox-store.c:304
+#: ../camel/providers/local/camel-local-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:695
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã?¤ã?³ã??ã??ã?¯ã?¹ã?»ã??ã?¡ã?¤ã?«ã??å??é?¤ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-local-store.c:489
-#: ../camel/providers/local/camel-mbox-store.c:333
+#: ../camel/providers/local/camel-local-store.c:526
+#: ../camel/providers/local/camel-mbox-store.c:724
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã?¡ã?¿ã?»ã??ã?¡ã?¤ã?«ã??å??é?¤ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:537
+#: ../camel/providers/local/camel-local-summary.c:548
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??ã?µã??ã?ªã?¸è¿½å? ã?§ã??ã?¾ã??ã??: å??å? ã?¯ä¸?æ??ã?§ã??"
 
-#: ../camel/providers/local/camel-maildir-folder.c:195
+#: ../camel/providers/local/camel-maildir-folder.c:198
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "Maildir å½¢å¼?ã?®ã??ã?©ã?«ã??ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:283
-#: ../camel/providers/local/camel-maildir-folder.c:291
-#: ../camel/providers/local/camel-mbox-folder.c:440
-#: ../camel/providers/local/camel-mh-folder.c:227
-#: ../camel/providers/local/camel-mh-folder.c:235
+#: ../camel/providers/local/camel-maildir-folder.c:246
+#: ../camel/providers/local/camel-maildir-folder.c:256
+#: ../camel/providers/local/camel-mbox-folder.c:386
+#: ../camel/providers/local/camel-mh-folder.c:168
+#: ../camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ %s ã??ã??ã?©ã?«ã?? %s ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:399
+#: ../camel/providers/local/camel-maildir-folder.c:326
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "æ??å®?ã?®ã??ã?©ã?«ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è»¢é??ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:136
-#: ../camel/providers/local/camel-maildir-store.c:167
-#: ../camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:175
+#: ../camel/providers/local/camel-maildir-store.c:100
+#, c-format
+msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+msgstr "ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s: ã??ã?©ã?«ã??å??ã?«ã??ã??ã??ã??å?«ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??"
+
+#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:686
+#, c-format
+msgid "Folder %s already exists"
+msgstr "æ?¢ã?«ã??ã?©ã?«ã?? %s ã??ã??ã??ã?¾ã??"
+
+#: ../camel/providers/local/camel-maildir-store.c:191
+#: ../camel/providers/local/camel-maildir-store.c:222
+#: ../camel/providers/local/camel-mbox-store.c:375
+#: ../camel/providers/local/camel-mbox-store.c:389
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:151
-#: ../camel/providers/local/camel-mbox-store.c:127
-#: ../camel/providers/local/camel-mh-store.c:215
+#: ../camel/providers/local/camel-maildir-store.c:206
+#: ../camel/providers/local/camel-mbox-store.c:341
+#: ../camel/providers/local/camel-mh-store.c:464
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:157
-#: ../camel/providers/local/camel-mbox-store.c:137
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:212
+#: ../camel/providers/local/camel-mbox-store.c:351
+#: ../camel/providers/local/camel-mh-store.c:473
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??ã??"
+msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/local/camel-maildir-store.c:184
+#: ../camel/providers/local/camel-maildir-store.c:239
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: maildir ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??ã??"
+msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: maildir ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/local/camel-maildir-store.c:242
-#: ../camel/providers/local/camel-maildir-store.c:282
-#: ../camel/providers/local/camel-mh-store.c:287
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:584
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-maildir-store.c:295
 msgid "not a maildir directory"
 msgstr "maildir å½¢å¼?ã?®ã??ã?©ã?«ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-maildir-store.c:482
-#: ../camel/providers/local/camel-spool-store.c:364
-#: ../camel/providers/local/camel-spool-store.c:380
+#: ../camel/providers/local/camel-maildir-store.c:508
+#: ../camel/providers/local/camel-maildir-store.c:825
+#: ../camel/providers/local/camel-spool-store.c:143
+#: ../camel/providers/local/camel-spool-store.c:159
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ã?¹ã?ã?£ã?³ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:435
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-store.c:677
+#, c-format
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr ""
+"ã??ã?©ã?«ã??ã?®å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: %s: ã??ã?©ã?«ã??å??ã?«ã??ã??ã??ã??å?«ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??"
+
+#: ../camel/providers/local/camel-maildir-summary.c:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir ã??ã?©ã?«ã??ã?®ã??ã?¹ã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
 msgstr "ã??ã?©ã?«ã??ã?®æ?´å??æ?§ã?®ç¢ºèª?ä¸"
 
-#: ../camel/providers/local/camel-maildir-summary.c:641
+#: ../camel/providers/local/camel-maildir-summary.c:650
 msgid "Checking for new messages"
 msgstr "æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®ã??ã?§ã??ã?¯"
 
-#: ../camel/providers/local/camel-maildir-summary.c:732
-#: ../camel/providers/local/camel-mbox-summary.c:465
-#: ../camel/providers/local/camel-mbox-summary.c:679
-#: ../camel/providers/local/camel-mbox-summary.c:809
-#: ../camel/providers/local/camel-spool-summary.c:130
+#: ../camel/providers/local/camel-maildir-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:468
+#: ../camel/providers/local/camel-mbox-summary.c:690
+#: ../camel/providers/local/camel-mbox-summary.c:826
+#: ../camel/providers/local/camel-spool-summary.c:131
 msgid "Storing folder"
 msgstr "ã??ã?©ã?«ã??ã?«æ ¼ç´?ã??ã??"
 
-#: ../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:194
+#: ../camel/providers/local/camel-mbox-folder.c:183
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "mailbox ã??é??ã??ã?¾ã??ã??: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:260
+#: ../camel/providers/local/camel-mbox-folder.c:249
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "mbox ã??ã?¡ã?¤ã?«ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:433
+#: ../camel/providers/local/camel-mbox-folder.c:378
 msgid "The folder appears to be irrecoverably corrupted."
-msgstr "ã??ã?©ã?«ã??ã?§å??å¾©ã?§ã??ã?ªã??ã?¨ã?©ã?¼ã??ç?ºç??ã??ã??ã??ã??ã?§ã??"
+msgstr "ã??ã?©ã?«ã??ã?§å??å¾©ã?§ã??ã?ªã??ã?¨ã?©ã?¼ã??ç?ºç??ã??ã??ã??ã??ã?§ã??ã??"
+
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../camel/providers/local/camel-spool-folder.c:70
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "%s ã?®ã??ã?©ã?«ã??ã?»ã?ã??ã?¯ã??ç??æ??ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:149
-#: ../camel/providers/local/camel-mbox-store.c:379
+#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:534
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "ã??ã?®ã??ã??ã?ªå??å??ã?§ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/local/camel-mbox-store.c:186
+#: ../camel/providers/local/camel-mbox-store.c:400
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: é??å¸¸ã?®ã??ã?¡ã?¤ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??"
+msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: é??å¸¸ã?®ã??ã?¡ã?¤ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/local/camel-mbox-store.c:218
-#: ../camel/providers/local/camel-mbox-store.c:231
-#: ../camel/providers/local/camel-mbox-store.c:260
+#: ../camel/providers/local/camel-mbox-store.c:550
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:566
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:568
+msgid "Folder already exists"
+msgstr "æ?¢ã?«ã??ã?©ã?«ã??ã??ã??ã??ã?¾ã??"
+
+#: ../camel/providers/local/camel-mbox-store.c:609
+#: ../camel/providers/local/camel-mbox-store.c:622
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3694,103 +3812,89 @@ msgstr ""
 "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??ã?§ã??ã??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:241
+#: ../camel/providers/local/camel-mbox-store.c:632
 #, c-format
 msgid "'%s' is not a regular file."
-msgstr "'%s' ã?¯é??å¸¸ã?®ã??ã?¡ã?¤ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??"
+msgstr "'%s' ã?¯é??å¸¸ã?®ã??ã?¡ã?¤ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/local/camel-mbox-store.c:250
+#: ../camel/providers/local/camel-mbox-store.c:641
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?¯ç©ºã?§ã?¯ã?ªã??ã?®ã?§å??é?¤ã??ã?¾ã??ã??"
+msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?¯ç©ºã?§ã?¯ã?ªã??ã?®ã?§å??é?¤ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:290
+#: ../camel/providers/local/camel-mbox-store.c:667
+#: ../camel/providers/local/camel-mbox-store.c:681
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã?µã??ã?ªã?»ã??ã?¡ã?¤ã?«ã??å??é?¤ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:395
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:411
-#, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:413
-msgid "Folder already exists"
-msgstr "æ?¢ã?«ã??ã?©ã?«ã??ã??ã??ã??ã?¾ã??"
-
-#: ../camel/providers/local/camel-mbox-store.c:507
+#: ../camel/providers/local/camel-mbox-store.c:761
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "æ?°ã??ã??ã??ã?©ã?«ã??ã?®å??å??ã?¯æ£ã??ã??ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/local/camel-mbox-store.c:522
+#: ../camel/providers/local/camel-mbox-store.c:776
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "'%s' ã?®å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??ã?§ã??ã??: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:605
+#: ../camel/providers/local/camel-mbox-store.c:859
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s' ã??ã?? %s ã?¸å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:473
+#: ../camel/providers/local/camel-mbox-summary.c:476
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ã??ã?©ã?«ã??ã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:533
+#: ../camel/providers/local/camel-mbox-summary.c:537
 #, c-format
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "ã??ã?©ã?«ã?? %2$s ã?® %1$s ä»?è¿?ã?§è?´å?½ç??ã?ªã?¡ã?¼ã?«æ§?æ??è§£æ??ã?¨ã?©ã?¼ã?§ã??"
 
-#: ../camel/providers/local/camel-mbox-summary.c:615
+#: ../camel/providers/local/camel-mbox-summary.c:622
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ã??ã?©ã?«ã??ã??ã??ã?§ã??ã?¯ã?§ã??ã?¾ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:686
-#: ../camel/providers/local/camel-mbox-summary.c:816
-#: ../camel/providers/local/camel-spool-summary.c:137
+#: ../camel/providers/local/camel-mbox-summary.c:697
+#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../camel/providers/local/camel-spool-summary.c:138
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ã??ã?¡ã?¤ã?«ã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:700
-#: ../camel/providers/local/camel-spool-summary.c:152
+#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ä½?æ¥ç?¨ã?® mailbox ã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:715
-#: ../camel/providers/local/camel-mbox-summary.c:932
+#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:949
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "å??ã?®ã??ã?©ã?«ã?? %s ã??é??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:726
+#: ../camel/providers/local/camel-mbox-summary.c:739
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ä½?æ¥ç?¨ã??ã?©ã?«ã??ã??é??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:756
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ã??ã?©ã?«ã??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:829
-#: ../camel/providers/local/camel-mbox-summary.c:1070
+#: ../camel/providers/local/camel-mbox-summary.c:846
+#: ../camel/providers/local/camel-mbox-summary.c:1099
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ã??ã?©ã?«ã??ã??ä¿?å?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:869
-#: ../camel/providers/local/camel-mbox-summary.c:1102
+#: ../camel/providers/local/camel-mbox-summary.c:886
+#: ../camel/providers/local/camel-mbox-summary.c:1131
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -3799,65 +3903,75 @@ msgstr ""
 "MBOX ã??ã?¡ã?¤ã?«ã??å£?ã??ã?¦ã??ã?¾ã?? (å·®å?ºäººã?®è¡?ã??å¾?ã??ã?¯ã??ã?§ã??ã??ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??)ã??"
 "ä¿®æ£ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../camel/providers/local/camel-mbox-summary.c:878
-#: ../camel/providers/local/camel-mbox-summary.c:1111
+#: ../camel/providers/local/camel-mbox-summary.c:895
+#: ../camel/providers/local/camel-mbox-summary.c:1140
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ã?µã??ã?ªã?¨ã??ã?©ã?«ã??ã??ä¸?è?´ã??ã?¾ã??ã??ã?§ã??ã?? (å??æ??ã??ã?¦ã??)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1029
-#: ../camel/providers/local/camel-spool-summary.c:337
+#: ../camel/providers/local/camel-mbox-summary.c:1052
+#: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
 msgstr "å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1211
+#: ../camel/providers/local/camel-mbox-summary.c:1210
+#: ../camel/providers/local/camel-mbox-summary.c:1240
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ä½?æ¥ç?¨ã?® mailbox ã?«æ?¸ã??è¾¼ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1200
+#: ../camel/providers/local/camel-mbox-summary.c:1229
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ä½?æ¥ç?¨ã?® mailbox ã?«æ?¸ã??è¾¼ã??ã?¾ã??ã??ã?§ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:165
+#: ../camel/providers/local/camel-mh-folder.c:115
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "MH å½¢å¼?ã??ã?©ã?«ã??ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:234
+#: ../camel/providers/local/camel-mh-store.c:483
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:248
+#: ../camel/providers/local/camel-mh-store.c:497
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: ã??ã?©ã?«ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
+msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: ã??ã?©ã?«ã??ã?§ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/local/camel-mh-summary.c:228
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH ã??ã?©ã?«ã??ã?®ã??ã?¹ã??é??ã??ã?¾ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:118
+#: ../camel/providers/local/camel-spool-store.c:327
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "'%s' ã?¨ã??ã??ã?¹ã??ã?¼ã?«ã??é??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../camel/providers/local/camel-spool-store.c:341
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "'%s' ã?¨ã??ã??ã?¹ã??ã?¼ã?«ã?¯é??å¸¸ã?®ã??ã?¡ã?¤ã?«ã?¾ã??ã?¯ã??ã?©ã?«ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:158
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool mail file %s"
+msgstr "ã?¹ã??ã?¼ã?«ã?»ã?¡ã?¼ã?«ã?»ã??ã?¡ã?¤ã?« %s"
+
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã?»ã??ã?ªã?¼ %s"
+
+#: ../camel/providers/local/camel-spool-store.c:391
 #, c-format
 msgid "Folder '%s/%s' does not exist."
-msgstr "'%s/%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??ã??"
+msgstr "'%s/%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:170
+#: ../camel/providers/local/camel-spool-store.c:403
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3866,12 +3980,12 @@ msgstr ""
 "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??é??ã??ã?¾ã??ã??ã?§ã??ã??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:409
 #, c-format
 msgid "Folder '%s' does not exist."
-msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??ã??"
+msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:183
+#: ../camel/providers/local/camel-spool-store.c:416
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3880,51 +3994,41 @@ msgstr ""
 "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:426
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' ã?¯ã?¡ã?¼ã?«ã??ã??ã?¯ã?¹ã?»ã??ã?¡ã?¤ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:213
+#: ../camel/providers/local/camel-spool-store.c:462
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "å??ä¿¡ç®±ã?¸ã?®æ ¼ç´?ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:226
+#: ../camel/providers/local/camel-spool-store.c:476
 #, c-format
-msgid "Spool mail file %s"
-msgstr "ã?¹ã??ã?¼ã?«ã?»ã?¡ã?¼ã?«ã?»ã??ã?¡ã?¤ã?« %s"
-
-#: ../camel/providers/local/camel-spool-store.c:226
-#, c-format
-msgid "Spool folder tree %s"
-msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã?»ã??ã?ªã?¼ %s"
+msgid "Spool folders cannot be deleted"
+msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã?¯å??é?¤ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:238
+#: ../camel/providers/local/camel-spool-store.c:491
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã?®å??å??ã?¯å¤?æ?´ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:251
-#, c-format
-msgid "Spool folders cannot be deleted"
-msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã?¯å??é?¤ã?§ã??ã?¾ã??ã??"
-
-#: ../camel/providers/local/camel-spool-summary.c:166
-#: ../camel/providers/local/camel-spool-summary.c:178
-#: ../camel/providers/local/camel-spool-summary.c:190
+#: ../camel/providers/local/camel-spool-summary.c:169
+#: ../camel/providers/local/camel-spool-summary.c:181
+#: ../camel/providers/local/camel-spool-summary.c:193
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "ä½?æ¥ç?¨ã??ã?©ã?«ã?? %s ã??å??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:208
+#: ../camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã?? %s ã??å??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:240
-#: ../camel/providers/local/camel-spool-summary.c:259
-#: ../camel/providers/local/camel-spool-summary.c:272
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
 #, c-format
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
@@ -3933,40 +4037,40 @@ msgstr ""
 "%s ã?¨ã??ã??ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã?¨å??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s\n"
 "ã??ã?©ã?«ã??ã??å£?ã??ã?¦ã??ã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??ã??ã??ã?®ã?³ã??ã?¼ã?? '%s' ã?«ä¿?å?ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:197
-#: ../camel/providers/nntp/camel-nntp-folder.c:271
-#: ../camel/providers/nntp/camel-nntp-folder.c:312
+#: ../camel/providers/nntp/camel-nntp-folder.c:195
+#: ../camel/providers/nntp/camel-nntp-folder.c:274
+#: ../camel/providers/nntp/camel-nntp-folder.c:388
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "å??é?¨ã?¨ã?©ã?¼: UID ã?®æ?¸å¼?ã??ç?¡å?¹ã?§ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c: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
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/nntp/camel-nntp-folder.c:240
+#: ../camel/providers/pop3/camel-pop3-folder.c:371
+#: ../camel/providers/pop3/camel-pop3-folder.c:436
+#: ../camel/providers/pop3/camel-pop3-folder.c:448
+#: ../camel/providers/pop3/camel-pop3-folder.c:697
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ %s ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:465
-#: ../camel/providers/nntp/camel-nntp-folder.c:471
-#: ../camel/providers/nntp/camel-nntp-folder.c:518
+#: ../camel/providers/nntp/camel-nntp-folder.c:472
+#: ../camel/providers/nntp/camel-nntp-folder.c:478
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 #, c-format
 msgid "Posting failed: %s"
 msgstr "æ??ç¨¿ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:513
+#: ../camel/providers/nntp/camel-nntp-folder.c:520
 msgid "Posting failed: "
 msgstr "æ??ç¨¿ã?«å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#: ../camel/providers/nntp/camel-nntp-folder.c:549
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "ã?ªã??ã?©ã?¤ã?³ç?¶æ??ã?®é??ã?¯ NNTP ã?¡ã??ã?»ã?¼ã?¸ã??æ??ç¨¿ã?§ã??ã?¾ã??ã??!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:560
+#: ../camel/providers/nntp/camel-nntp-folder.c:569
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NNTP ã??ã?©ã?«ã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®ã?³ã??ã?¼ã?¯ã?§ã??ã?¾ã??ã??!"
@@ -3986,7 +4090,7 @@ msgstr "USENET ã??ã?¥ã?¼ã?¹"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting to USENET newsgroups."
-msgstr "USENET ã?®ã??ã?¥ã?¼ã?¹ã?°ã?«ã?¼ã??ã??è³¼èªã??ã??ã??æ??ç¨¿ã??ã?¾ã??"
+msgstr "USENET ã?®ã??ã?¥ã?¼ã?¹ã?°ã?«ã?¼ã??ã??è³¼èªã??ã??ã??æ??ç¨¿ã??ã?¾ã??ã??"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:74
 msgid ""
@@ -3996,22 +4100,32 @@ msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã?¬ã?¤ã?³ã?»ã??ã?ã?¹ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ NNTP ã?µã?¼ã??ã?§èª?è¨¼ã??ã?¾"
 "ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:265
+#: ../camel/providers/nntp/camel-nntp-store.c:73
+#, c-format
+msgid "Authentication requested but no username provided"
+msgstr "èª?è¨¼ã??å¿?è¦?ã?¨ã??ã?¦ã??ã?¾ã??ã??ã??ã?¦ã?¼ã?¶å??ã??æ??å®?ã??ã??ã?¦ã??ã?¾ã??ã??"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:85
+#, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "ã?µã?¼ã??ã?®èª?è¨¼ã??è¡?ã??ã?¾ã??ã??: %s"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:375
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "%s ã??ã??ã?®æ?¨æ?¶ã??èªã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:278
+#: ../camel/providers/nntp/camel-nntp-store.c:388
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP ã?µã?¼ã?? %s ã??ã?¨ã?©ã?¼ã?³ã?¼ã?? %d ã??è¿?ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:434
+#: ../camel/providers/nntp/camel-nntp-store.c:582
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s çµ?ç?±ã?® USENET ã??ã?¥ã?¼ã?¹"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:927
+#: ../camel/providers/nntp/camel-nntp-store.c:1100
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4022,7 +4136,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1024
+#: ../camel/providers/nntp/camel-nntp-store.c:1215
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4034,7 +4148,7 @@ msgstr ""
 "ã??ã?®ã??ã??ã?ªã??ã?¥ã?¼ã?¹ã?°ã?«ã?¼ã??ã?¯ã??ã??ã?¾ã??ã??ã??é?¸æ??ã??ã??ã?¢ã?¤ã??ã? ã?¯è¦ªã??ã?©ã?«ã??ã?®ã??ã?®ã??"
 "ã??ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1064
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4045,44 +4159,34 @@ msgstr ""
 "\n"
 "ã??ã?¥ã?¼ã?¹ã?°ã?«ã?¼ã??ã??ã??ã??ã?¾ã??ã??!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1094
+#: ../camel/providers/nntp/camel-nntp-store.c:1290
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "ã??ã?¥ã?¼ã?¹ã?»ã?¹ã??ã?¢ã?«ã??ã?©ã?«ã??ã??ç??æ??ã?§ã??ã?¾ã??ã??: ä»£ã??ã??ã?«è³¼èªã??ç?³è«?ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1106
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "ã??ã?¥ã?¼ã?¹æ ¼ç´?å ´æ??ã?®ã??ã?©ã?«ã??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1119
+#: ../camel/providers/nntp/camel-nntp-store.c:1323
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "ã??ã?¥ã?¼ã?¹æ ¼ç´?å ´æ??ã?®ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: ä»£ã??ã??ã?«è³¼èªã??å??æ¢ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1257
-#, c-format
-msgid "Authentication requested but no username provided"
-msgstr "èª?è¨¼ã??å¿?è¦?ã?¨ã??ã?¦ã??ã?¾ã??ã??ã??ã?¦ã?¼ã?¶å??ã??æ??å®?ã??ã??ã?¦ã??ã?¾ã??ã??"
-
-#: ../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:1395
+#: ../camel/providers/nntp/camel-nntp-store.c:1535
 msgid "NNTP Command failed: "
 msgstr "NNTP ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#: ../camel/providers/nntp/camel-nntp-store.c:1609
 #, c-format
 msgid "Not connected."
-msgstr "æ?¥ç¶?ã??ã?¦ã??ã?¾ã??ã??"
+msgstr "æ?¥ç¶?ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:238
-#: ../camel/providers/nntp/camel-nntp-summary.c:340
+#: ../camel/providers/nntp/camel-nntp-summary.c:232
+#: ../camel/providers/nntp/camel-nntp-summary.c:348
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®è§£æ??ä¸"
@@ -4092,50 +4196,48 @@ msgstr "%s: æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®è§£æ??ä¸"
 msgid "Unexpected server response from xover: %s"
 msgstr "xover ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:356
+#: ../camel/providers/nntp/camel-nntp-summary.c:365
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "head ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:401
+#: ../camel/providers/nntp/camel-nntp-summary.c:410
 #, c-format
 msgid "Operation failed: %s"
 msgstr "æ??ä½?ã??å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:251
+#: ../camel/providers/pop3/camel-pop3-folder.c:277
+#: ../camel/providers/pop3/camel-pop3-folder.c:336
+#, c-format
+msgid "No message with UID %s"
+msgstr "UID %s ã?®ã?¡ã??ã?»ã?¼ã?¸ã?¯ã??ã??ã?¾ã??ã??"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:344
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ %d ã?? POP ã?§å??å¾?ä¸"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:449
+msgid "Unknown reason"
+msgstr "å??å? ä¸?æ??"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:488
 msgid "Retrieving POP summary"
 msgstr "POP ã?µã??ã?ªã?®å??å¾?ä¸"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:274
+#: ../camel/providers/pop3/camel-pop3-folder.c:511
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "POP ã?µã??ã?ªã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:324
+#: ../camel/providers/pop3/camel-pop3-folder.c:563
 msgid "Expunging old messages"
 msgstr "å??é?¤æ¸?ã?¿ã?¡ã??ã?»ã?¼ã?¸ã?®æ?¹æ¶?ä¸"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:332
+#: ../camel/providers/pop3/camel-pop3-folder.c:577
 msgid "Expunging deleted messages"
 msgstr "å??é?¤æ¸?ã?¿ã?®ã?¡ã??ã?»ã?¼ã?¸ã?®æ?¹æ¶?ä¸"
 
-#: ../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:603
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ %d ã?? POP ã?§å??å¾?ä¸"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:707
-msgid "Unknown reason"
-msgstr "å??å? ä¸?æ??"
-
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message storage"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®æ ¼ç´?"
@@ -4144,24 +4246,29 @@ msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®æ ¼ç´?"
 msgid "_Leave messages on server"
 msgstr "ã?µã?¼ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã??æ®?ã??(_L)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "%s æ?¥å¾?ã?«å??é?¤ã??ã??(_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr "ã?ã?¼ã?«ã?«ã?®å??ä¿¡ç®±ã?§æ¶?ã??ã??ã?¡ã?¼ã?«ã??å??é?¤ã??ã??(_E)"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
 msgstr "ã??ã?¹ã?¦ã?® POP3 æ?¡å¼µã?µã??ã?¼ã??ã??ç?¡å?¹ã?«ã??ã??(_S)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:53
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:58
 msgid "For connecting to and downloading mail from POP servers."
-msgstr "POP ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã??ã??ã?¡ã?¼ã?«ã??èªã??ã? ã??ã??ã?¾ã??"
+msgstr "POP ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã??ã??ã?¡ã?¼ã?«ã??èªã??ã? ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:75
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4169,7 +4276,7 @@ msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã?¬ã?¤ã?³ã?»ã??ã?ã?¹ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ POP ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã?¾"
 "ã??ã??ã??ã??ã?¯å¤?ã??ã?® POP ã?µã?¼ã??ã?§ã?µã??ã?¼ã??ã??ã??ã??ã?ªã??ã?·ã?§ã?³ã?§ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:82
+#: ../camel/providers/pop3/camel-pop3-provider.c:85
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4184,39 +4291,39 @@ msgstr ""
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:168
+#: ../camel/providers/pop3/camel-pop3-store.c:181
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP ã?µã?¼ã?? %s ã??ã??å¦¥å½?ã?ªæ?¨æ?¶ã?®èªã?¿è¾¼ã?¿ã??å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/pop3/camel-pop3-store.c:217
-#: ../camel/providers/pop3/camel-pop3-store.c:224
+#: ../camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/pop3/camel-pop3-store.c:230
+#: ../camel/providers/pop3/camel-pop3-store.c:237
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã??ã?¢ã?¼ã??ã?§ POP ã?µã?¼ã?? %s ã?¸ã?®æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:187
+#: ../camel/providers/pop3/camel-pop3-store.c:200
 msgid "STLS not supported by server"
 msgstr "ã?µã?¼ã??ã?¯ STLS æ?¡å¼µã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:205
+#: ../camel/providers/pop3/camel-pop3-store.c:218
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã?¢ã?¼ã??ã?§ã?® POP ã?µã?¼ã?? %s ã?¸ã?®æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:218
+#: ../camel/providers/pop3/camel-pop3-store.c:231
 msgid "TLS negotiations failed"
 msgstr "TLS æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:225
+#: ../camel/providers/pop3/camel-pop3-store.c:238
 msgid "TLS is not available in this build"
 msgstr "ã??ã?®ã??ã??ã?±ã?¼ã?¸ã?§ã?¯ TLS ã??å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:300
-#: ../camel/providers/pop3/camel-pop3-store.c:452
+#: ../camel/providers/pop3/camel-pop3-store.c:317
+#: ../camel/providers/pop3/camel-pop3-store.c:472
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4225,22 +4332,22 @@ msgstr ""
 "POP ã?µã?¼ã?? %s ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??: è¦?æ±?ã??ã??ã??èª?è¨¼æ?¹å¼?ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:323
+#: ../camel/providers/pop3/camel-pop3-store.c:340
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "POP ã?µã?¼ã?? %2$s ã?¸ã?® SASL '%1$s' èª?è¨¼ã?ã?°ã?¤ã?³ã?«å¤±æ??ã??ã?¾ã??ã??: %3$s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:340
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP ã?µã?¼ã?? %s ã?¸ã?ã?°ã?¤ã?³ã?§ã??ã?¾ã??ã??: SASL ã??ã?ã??ã?³ã?«ã?»ã?¨ã?©ã?¼ã?§ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:357
+#: ../camel/providers/pop3/camel-pop3-store.c:374
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "POP ã?µã?¼ã?? %s ã?§èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:421
+#: ../camel/providers/pop3/camel-pop3-store.c:439
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4249,7 +4356,7 @@ msgstr ""
 "POP ã?µã?¼ã?? %s ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??:\tç?¡å?¹ã?ª APOP ID ã??å??ã??å??ã??ã?¾ã??ã??; è©?ç§°æ?»æ??ã?®"
 "å?¯è?½æ?§ã??ã??ã??ã?®ã?§ç®¡ç??è??ã?«é?£çµ¡ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:471
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4259,7 +4366,7 @@ msgstr ""
 "ã??ã?¹ã?¯ã?¼ã??ã?®é??ä¿¡ä¸ã?«ã?¨ã?©ã?¼: %s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:484
+#: ../camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4269,7 +4376,7 @@ msgstr ""
 "ã?¦ã?¼ã?¶å??ã?®é??ä¿¡ä¸ã?«ã?¨ã?©ã?¼%s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:497
+#: ../camel/providers/pop3/camel-pop3-store.c:518
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4278,27 +4385,27 @@ msgstr ""
 "POP ã?µã?¼ã?? %s ã?«æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã??\n"
 "ã??ã?¹ã?¯ã?¼ã??ã?®é??ä¿¡ä¸ã?«ã?¨ã?©ã?¼%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
+#: ../camel/providers/pop3/camel-pop3-store.c:558
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP ã?µã?¼ã?? %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:670
+#: ../camel/providers/pop3/camel-pop3-store.c:562
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "%s ã?® %s ã?«ã??ã?? POP ã?µã?¼ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:685
+#: ../camel/providers/pop3/camel-pop3-store.c:693
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "POP ã?µã?¼ã?? %s ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:720
 #, c-format
 msgid "No such folder '%s'."
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?¯å?å?¨ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:709
+#: ../camel/providers/pop3/camel-pop3-store.c:737
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 ã?¹ã??ã?¢ã?¯ã??ã?©ã?«ã??ã?®é??å±¤æ§?é? ã??æ??ã?¡ã?¾ã??ã??"
@@ -4312,49 +4419,49 @@ msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
-"ã?¡ã?¼ã?«ã??é??é??ã??ã??ã??ã??ã?«ã?ã?¼ã?«ã?«ã?·ã?¹ã??ã? ã?® \"sendmail\" ã??ã?ã?°ã?©ã? ã?¸æ¸¡ã??ã?¾ã??"
+"ã?¡ã?¼ã?«ã??é??é??ã??ã??ã??ã??ã?«ã?ã?¼ã?«ã?«ã?·ã?¹ã??ã? ã?® \"sendmail\" ã??ã?ã?°ã?©ã? ã?¸æ¸¡ã??ã?¾ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "sendmail çµ?ç?±ã?§ã?¡ã?¼ã?«ã??é??ä¿¡"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "è¿?ä¿¡ã?ªã?¹ã??ã??è§£æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "sendmail ã?¸ã??ã?¤ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail ã?? fork(2) ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
 msgid "Could not send message: "
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??ã?§ã??ã??: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail ã?¯ã?·ã?°ã??ã?« %s ã?§çµ?äº?ã??ã?¾ã??ã??: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
+msgstr "sendmail ã?¯ã?·ã?°ã??ã?« %s ã?§çµ?äº?ã??ã?¾ã??ã??: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s ã??å®?è¡?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail ã?¯ã?¹ã??ã?¼ã?¿ã?¹ %d ã?§çµ?äº?ã??ã?¾ã??ã??: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
-msgid "sendmail"
-msgstr "sendmail"
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
-msgid "Mail delivery via the sendmail program"
-msgstr "sendmail çµ?ç?±ã?§ã?¡ã?¼ã?«ã??é??ä¿¡"
+msgstr "sendmail ã?¯ã?¹ã??ã?¼ã?¿ã?¹ %d ã?§çµ?äº?ã??ã?¾ã??ã??: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??ã??"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
@@ -4362,323 +4469,353 @@ msgstr "SMTP"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:45
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "SMTP ã??ä½¿ã?£ã?¦ã?ªã?¢ã?¼ã??ã?®ã?¡ã?¼ã?«ã??ã??ã?«æ?¥ç¶?ã??ã??ã??ã?¨ã?§ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??"
+msgstr "SMTP ã??ä½¿ã?£ã?¦ã?ªã?¢ã?¼ã??ã?®ã?¡ã?¼ã?«ã??ã??ã?«æ?¥ç¶?ã??ã??ã??ã?¨ã?§ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+msgid "Welcome response error: "
+msgstr "Welcome å¿?ç?ã?¨ã?©ã?¼: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:277
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr ""
+"ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã??ã?¢ã?¼ã??ã?§ SMTP ã?µã?¼ã?? %s ã?¸ã?®æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:116
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#, c-format
+msgid "SMTP server %s"
+msgstr "SMTP ã?µã?¼ã?? %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "%s çµ?ç?±ã?§ SMTP ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "SMTP ã?µã?¼ã?? %s ã?¯è¦?æ±?ã??ã??èª?è¨¼æ?¹å¼? %s ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:495
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"SMTP ã?µã?¼ã??ã?«èª?è¨¼ã?§ã??ã?¾ã??ã??ã??\n"
+"%s\n"
+"\n"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#, c-format
+msgid "Cannot send message: service not connected."
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??: ã?µã?¼ã??ã?¹ã??æ?¥ç¶?ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:620
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??: å·®å?ºäººã?®ã?¢ã??ã?¬ã?¹ã??æ£ã??ã??ã??ã??ã?¾ã??ã??ã??"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:624
+msgid "Sending message"
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®é??ä¿¡ä¸"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??: å®?å??ã??å®?ç¾©ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:662
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??: ç?¡å?¹ã?ªå¿?ç?ã??ä¸?ã?¤ä»¥ä¸?ã??ã??ã?¾ã??"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
 msgid "Syntax error, command unrecognized"
 msgstr "æ§?æ??è§£æ??ã?¨ã?©ã?¼: ã?³ã??ã?³ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:118
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 msgid "Syntax error in parameters or arguments"
 msgstr "ã??ã?©ã?¡ã?¼ã?¿ã??ã??ã??ã?¯å¼?æ?°ã?«æ§?æ??è§£æ??ã?¨ã?©ã?¼"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:120
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
 msgid "Command not implemented"
 msgstr "ã?³ã??ã?³ã??ã?¯å®?è£?ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:122
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
 msgid "Command parameter not implemented"
 msgstr "ã?³ã??ã?³ã??ã??ã?©ã?¡ã?¼ã?¿ã?¯å®?è£?ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:124
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
 msgid "System status, or system help reply"
 msgstr "ã?·ã?¹ã??ã? ã?»ã?¹ã??ã?¼ã?¿ã?¹ã?¾ã??ã?¯ã?·ã?¹ã??ã? ã?»ã??ã?«ã??ã?®å¿?ç?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:126
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
 msgid "Help message"
 msgstr "ã??ã?«ã??ã?»ã?¡ã??ã?»ã?¼ã?¸"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:128
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
 msgid "Service ready"
 msgstr "ã?µã?¼ã??ã?¹ã?¯å?©ç?¨ã?§ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:130
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
 msgid "Service closing transmission channel"
 msgstr "ã?µã?¼ã??ã?¹ã?¯é??ä¿¡ã??ã?£ã?³ã??ã?«ã??é??ã??ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:132
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
 msgid "Service not available, closing transmission channel"
 msgstr "ã?µã?¼ã??ã?¹ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??, é??ä¿¡ã??ã?£ã?³ã??ã?«ã??é??ã??ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:134
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
 msgid "Requested mail action okay, completed"
 msgstr "è¦?æ±?ã??ã??ã??ã?¡ã?¼ã?«ã?®å??ä½?ã?¯OK, å®?äº?ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 msgid "User not local; will forward to <forward-path>"
 msgstr "ã?¦ã?¼ã?¶ã?¯ã?ã?¼ã?«ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??; <forward-path> ã?¸è»¢é??ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:138
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "è¦?æ±?ã??ã??ã??ã?¡ã?¼ã?«ã?®å??ä½?ã?¯å®?äº?ã??ã?¾ã??ã??: ã?¡ã?¼ã?«ã??ã??ã?¯ã?¹ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:140
+#: ../camel/providers/smtp/camel-smtp-transport.c:749
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "è¦?æ±?ã??ã??ã??å??ä½?ã?¯å®?äº?ã??ã?¾ã??ã??: ã?¡ã?¼ã?«ã??ã??ã?¯ã?¹ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:142
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
 msgid "Requested action aborted: error in processing"
 msgstr "è¦?æ±?ã??ã??ã??å??ä½?ã??ä¸æ?ã??ã?¾ã??ã??: å?¦ç??ä¸ã?«ã?¨ã?©ã?¼"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:144
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
 msgid "User not local; please try <forward-path>"
 msgstr "ã?¦ã?¼ã?¶ã?¯ã?ã?¼ã?«ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??; <forward-path> ã??è©¦ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:146
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
 msgid "Requested action not taken: insufficient system storage"
 msgstr "è¦?æ±?ã??ã??ã??å??ä½?ã?¯å®?äº?ã??ã?¾ã??ã??: ã?·ã?¹ã??ã? ã?®ä¿?å?é ?å??ã??è¶³ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:148
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "è¦?æ±?ã??ã??ã??ã?¡ã?¼ã?«ã?®å??ä½?ã??ä¸æ?ã??ã?¾ã??ã??: é ?å??å?²ã??å½?ã?¦ã??è¶?ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:150
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "è¦?æ±?ã??ã??ã??å??ä½?ã?¯å®?äº?ã??ã?¾ã??ã??: ã?¡ã?¼ã?«ã??ã??ã?¯ã?¹å??ã?¯èª?ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:152
+#: ../camel/providers/smtp/camel-smtp-transport.c:761
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ã?¡ã?¼ã?«ã?®å?¥å??ã??é??å§?ã??ã?¾ã??; <CRLF>.<CRLF> ã?§çµ?äº?ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:154
+#: ../camel/providers/smtp/camel-smtp-transport.c:763
 msgid "Transaction failed"
 msgstr "å?¦ç??ã?¯å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
+#: ../camel/providers/smtp/camel-smtp-transport.c:767
 msgid "A password transition is needed"
 msgstr "ã??ã?¹ã?¯ã?¼ã??ã?®å¤?æ?´ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:160
+#: ../camel/providers/smtp/camel-smtp-transport.c:769
 msgid "Authentication mechanism is too weak"
 msgstr "èª?è¨¼ã?¡ã?«ã??ã?ºã? ã?¯ä¸?å??å??é??ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:162
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
 msgid "Encryption required for requested authentication mechanism"
 msgstr "è¦?æ±?ã??ã??èª?è¨¼ã?¡ã?«ã??ã?ºã? ã?®ã??ã??ã?«æ??å?·å??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:164
+#: ../camel/providers/smtp/camel-smtp-transport.c:773
 msgid "Temporary authentication failure"
 msgstr "ä¸?æ??ç??ã?ªèª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../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: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: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: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:526
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"SMTP ã?µã?¼ã??ã?«èª?è¨¼ã?§ã??ã?¾ã??ã??ã??\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:669
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP ã?µã?¼ã?? %s"
-
-#: ../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:691
-#, c-format
-msgid "Cannot send message: service not connected."
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??: ã?µã?¼ã??ã?¹ã??æ?¥ç¶?ã??ã??ã?¦ã??ã?¾ã??ã??"
-
-#: ../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:702
-msgid "Sending message"
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®é??ä¿¡ä¸"
-
-#: ../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:730
-#, c-format
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??: ç?¡å?¹ã?ªå¿?ç?ã??ä¸?ã?¤ä»¥ä¸?ã??ã??ã?¾ã??"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:966
+#: ../camel/providers/smtp/camel-smtp-transport.c:1030
 msgid "SMTP Greeting"
 msgstr "SMTP ã?§æ?¥ç¶?ä¸"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:990
-#: ../camel/providers/smtp/camel-smtp-transport.c:1005
-#: ../camel/providers/smtp/camel-smtp-transport.c:1012
+#: ../camel/providers/smtp/camel-smtp-transport.c:1057
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../camel/providers/smtp/camel-smtp-transport.c:1082
 msgid "HELO command failed: "
 msgstr "HELO ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1079
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
 msgid "SMTP Authentication"
 msgstr "SMTP èª?è¨¼"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1086
+#: ../camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "Error creating SASL authentication object."
-msgstr "SASL èª?è¨¼ã?ªã??ã?¸ã?§ã?¯ã??ã?®ç??æ??ä¸ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
+msgstr "SASL èª?è¨¼ã?ªã??ã?¸ã?§ã?¯ã??ã?®ç??æ??ä¸ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1102
-#: ../camel/providers/smtp/camel-smtp-transport.c:1112
-#: ../camel/providers/smtp/camel-smtp-transport.c:1120
+#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../camel/providers/smtp/camel-smtp-transport.c:1187
+#: ../camel/providers/smtp/camel-smtp-transport.c:1196
 msgid "AUTH command failed: "
 msgstr "AUTH ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1219
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#: ../camel/providers/smtp/camel-smtp-transport.c:1238
+#: ../camel/providers/smtp/camel-smtp-transport.c:1304
+#: ../camel/providers/smtp/camel-smtp-transport.c:1318
+#: ../camel/providers/smtp/camel-smtp-transport.c:1327
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1261
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
 msgid "RCPT TO command failed: "
 msgstr "RSET ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1275
-#: ../camel/providers/smtp/camel-smtp-transport.c:1283
+#: ../camel/providers/smtp/camel-smtp-transport.c:1370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 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: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:1421
 #: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1441
+#: ../camel/providers/smtp/camel-smtp-transport.c:1500
+#: ../camel/providers/smtp/camel-smtp-transport.c:1519
+#: ../camel/providers/smtp/camel-smtp-transport.c:1532
+#: ../camel/providers/smtp/camel-smtp-transport.c:1540
 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:1565
+#: ../camel/providers/smtp/camel-smtp-transport.c:1579
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
 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
+#: ../camel/providers/smtp/camel-smtp-transport.c:1612
+#: ../camel/providers/smtp/camel-smtp-transport.c:1626
+#: ../camel/providers/smtp/camel-smtp-transport.c:1633
 msgid "QUIT command failed: "
 msgstr "QUIT ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: "
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:47
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "è¨?å¿µæ?¥"
+
+#: ../libedataserver/e-categories.c:48
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "èª?ç??æ?¥"
+
+#: ../libedataserver/e-categories.c:49
+msgctxt "CategoryName"
 msgid "Business"
 msgstr "ä»?äº?"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:50
+msgctxt "CategoryName"
 msgid "Competition"
 msgstr "ç«¶å??ä»?ç¤¾"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:51
+msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "ã??æ°?ã?«å?¥ã??"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:52
+msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "è´?ã??ç?©"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:53
+msgctxt "CategoryName"
 msgid "Goals/Objectives"
-msgstr "ç?®æ¨?/ã?´ã?¼ã?«"
+msgstr "ã?´ã?¼ã?«/ç?®æ¨?"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:54
+msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "ä¼?æ?¥"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:55
+msgctxt "CategoryName"
 msgid "Holiday Cards"
-msgstr "ã?¯ã?ªã?¹ã??ã?¹ã?»ã?«ã?¼ã??"
+msgstr "ã??ã?ªã??ã?¼ã?»ã?«ã?¼ã??"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:57
+msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "æ??æ?°ã?®é?£çµ¡å??"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:58
+msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "ã?¢ã?¤ã??ã?£ã?¢"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:59
+msgctxt "CategoryName"
 msgid "International"
 msgstr "å?½é??"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:60
+msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "é??è¦?ã?ªé¡§å®¢"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:61
+msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "ã??ã?®ä»?"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:62
+msgctxt "CategoryName"
 msgid "Personal"
 msgstr "å??äºº"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:63
+msgctxt "CategoryName"
 msgid "Phone Calls"
-msgstr "æ?ºå¸¯é?»è©±"
+msgstr "é?»è©±ã??ã??"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:65
+msgctxt "CategoryName"
 msgid "Status"
 msgstr "ç?¶æ??"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:66
+msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "æ?¦ç?¥"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:67
+msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "ã?µã??ã?©ã?¤ã?¤ã?¼"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:68
+msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "æ??é??ã?¨çµ?è²»"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:69
+msgctxt "CategoryName"
 msgid "VIP"
 msgstr "é??è¦?äººç?©"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:70
+msgctxt "CategoryName"
 msgid "Waiting"
-msgstr "çµ¦ä»?"
+msgstr "å¾?ã?¡"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1931
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p%l:%M:%S"
 
@@ -4686,7 +4823,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:1893
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1922
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %k:%M:%S"
 
@@ -4694,7 +4831,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:1898
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1927
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d (%a) %p%l:%M"
 
@@ -4702,7 +4839,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:1889
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1918
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%Y/%m/%d (%a) %k:%M"
 
@@ -4720,8 +4857,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:1765
-#: ../libedataserver/e-time-utils.c:1884
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1783
+#: ../libedataserver/e-time-utils.c:1913
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -4761,19 +4898,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:1768
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1786
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1946
+#: ../libedataserver/e-time-utils.c:1855 ../libedataserver/e-time-utils.c:1975
 msgid "%I:%M:%S %p"
 msgstr "%p%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:1830 ../libedataserver/e-time-utils.c:1938
+#: ../libedataserver/e-time-utils.c:1859 ../libedataserver/e-time-utils.c:1967
 msgid "%H:%M:%S"
 msgstr "%k:%M:%S"
 
@@ -4781,197 +4918,199 @@ msgstr "%k:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
+#: ../libedataserver/e-time-utils.c:1864 ../libedataserver/e-time-utils.c:1972
 msgid "%I:%M %p"
 msgstr "%p%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:1839 ../libedataserver/e-time-utils.c:1935
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1964
 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:1842
+#: ../libedataserver/e-time-utils.c:1871
 msgid "%H%M"
 msgstr "%k%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1846
+#: ../libedataserver/e-time-utils.c:1875
 msgid "%I %p"
 msgstr "%p%læ??"
 
 #: ../libedataserverui/e-book-auth-util.c:93
-#: ../libedataserverui/e-book-auth-util.c:668
+#: ../libedataserverui/e-book-auth-util.c:673
 msgid "Accessing LDAP Server anonymously"
 msgstr "å?¿å??ã?§ LDAP ã?µã?¼ã??ã?¸ã?¢ã?¯ã?»ã?¹ä¸"
 
 #: ../libedataserverui/e-book-auth-util.c:199
-#: ../libedataserverui/e-book-auth-util.c:430
+#: ../libedataserverui/e-book-auth-util.c:435
 msgid "Failed to authenticate.\n"
 msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??ã??\n"
 
-#: ../libedataserverui/e-categories-dialog.c:145
+#: ../libedataserverui/e-categories-dialog.c:127
+msgid "Category Properties"
+msgstr "ã?«ã??ã?´ã?ªã?®ã??ã?ã??ã??ã?£"
+
+#: ../libedataserverui/e-categories-dialog.c:138
+msgid "Category _Name"
+msgstr "ã?«ã??ã?´ã?ªã?®å??å??(_N)"
+
+#: ../libedataserverui/e-categories-dialog.c:144
+msgid "Category _Icon"
+msgstr "ã?«ã??ã?´ã?ªã?®ã?¢ã?¤ã?³ã?³(_I)"
+
+#: ../libedataserverui/e-categories-dialog.c:185
 msgid "Category Icon"
 msgstr "ã?«ã??ã?´ã?ªã?®ã?¢ã?¤ã?³ã?³"
 
-#: ../libedataserverui/e-categories-dialog.c:151
+#: ../libedataserverui/e-categories-dialog.c:191
 msgid "_No Image"
 msgstr "ç?»å??ã?ªã??(_N)"
 
-#: ../libedataserverui/e-categories-dialog.c:368
+#: ../libedataserverui/e-categories-dialog.c:406
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "è¨å®?ã?®ä¸ã?«ã?«ã??ã?´ã?ª '%s' ã??å?å?¨ã??ã?¾ã??ã??å?¥ã?®å??å??ã??æ??å®?ã??ã?¦ã??ã? ã??ã??ã??"
 
-#: ../libedataserverui/e-categories-dialog.c:676
-msgid "Icon"
-msgstr "ã?¢ã?¤ã?³ã?³"
-
-#: ../libedataserverui/e-categories-dialog.c:681
-msgid "Category"
-msgstr "ã?«ã??ã?´ã?ª"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:1
-msgid "Category Properties"
-msgstr "ã?«ã??ã?´ã?ªã?®ã??ã?ã??ã??ã?£"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:2
-msgid "Category _Icon"
-msgstr "ã?«ã??ã?´ã?ªã?®ã?¢ã?¤ã?³ã?³(_I)"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:3
-msgid "Category _Name"
-msgstr "ã?«ã??ã?´ã?ªã?®å??å??(_N)"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:4
+#: ../libedataserverui/e-categories-dialog.c:661
 msgid "Currently _used categories:"
 msgstr "æ??è¿?ä½¿ç?¨ã??ã??ã?«ã??ã?´ã?ª(_U):"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:5
+#: ../libedataserverui/e-categories-dialog.c:668
 msgid "_Available Categories:"
 msgstr "å?©ç?¨å?¯è?½ã?ªã?«ã??ã?´ã?ª(_A):"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:6
+#: ../libedataserverui/e-categories-dialog.c:711
 msgid "_Edit"
 msgstr "ç·¨é??(_E)"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:7
-msgid "categories"
+#: ../libedataserverui/e-categories-dialog.c:768
+msgid "Icon"
+msgstr "ã?¢ã?¤ã?³ã?³"
+
+#: ../libedataserverui/e-categories-dialog.c:773
+msgid "Category"
 msgstr "ã?«ã??ã?´ã?ª"
 
-#: ../libedataserverui/e-category-completion.c:292
+#: ../libedataserverui/e-category-completion.c:294
 #, c-format
 msgid "Create category \"%s\""
 msgstr "\"%s\" ã?¨ã??ã??ã?«ã??ã?´ã?ªã?®ç??æ??"
 
-#: ../libedataserverui/e-name-selector-dialog.c:321
-msgid "Select Contacts from Address Book"
-msgstr "ã?¢ã??ã?¬ã?¹å¸³ã??ã??é?£çµ¡å??ã?®é?¸æ??"
+#: ../libedataserverui/e-name-selector-dialog.c:176
+msgid "Show Contacts"
+msgstr "é?£çµ¡å??ã??è¡¨ç¤º"
 
-#: ../libedataserverui/e-name-selector-dialog.c:660
-msgid "_Add"
-msgstr "è¿½å? (_A)"
+#: ../libedataserverui/e-name-selector-dialog.c:198
+msgid "Address B_ook:"
+msgstr "ã?¢ã??ã?¬ã?¹å¸³(_O):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:664
-msgid "_Remove"
-msgstr "å??é?¤(_R)"
+#: ../libedataserverui/e-name-selector-dialog.c:206
+msgid "Cate_gory:"
+msgstr "ã?«ã??ã?´ã?ª(_G):"
+
+#: ../libedataserverui/e-name-selector-dialog.c:224
+msgid "_Search:"
+msgstr "æ¤?ç´¢(_S):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:892
-#: ../libedataserverui/e-name-selector-dialog.ui.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:242
+#: ../libedataserverui/e-name-selector-dialog.c:977
 msgid "Any Category"
 msgstr "ä»»æ??ã?®ã?«ã??ã?´ã?ª"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:1
-msgid "*"
-msgstr "*"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>é?£çµ¡å??(_N)</b>"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>é?£çµ¡å??ã?®è¡¨ç¤º</b>"
+#: ../libedataserverui/e-name-selector-dialog.c:244
+msgid "Co_ntacts"
+msgstr "é?£çµ¡å??(_N)"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:4
-msgid "Address B_ook:"
-msgstr "ã?¢ã??ã?¬ã?¹å¸³(_O):"
+#: ../libedataserverui/e-name-selector-dialog.c:289
+msgid "Search"
+msgstr "æ¤?ç´¢"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:5
+#: ../libedataserverui/e-name-selector-dialog.c:292
 msgid "Address Book"
 msgstr "ã?¢ã??ã?¬ã?¹å¸³"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:7
-msgid "Cate_gory:"
-msgstr "ã?«ã??ã?´ã?ª(_G):"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:8
+#: ../libedataserverui/e-name-selector-dialog.c:295
 msgid "Contacts"
 msgstr "é?£çµ¡å??"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:9
-msgid "Search"
-msgstr "æ¤?ç´¢"
+#: ../libedataserverui/e-name-selector-dialog.c:412
+msgid "Select Contacts from Address Book"
+msgstr "ã?¢ã??ã?¬ã?¹å¸³ã??ã??é?£çµ¡å??ã?®é?¸æ??"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:10
-msgid "_Search:"
-msgstr "æ¤?ç´¢(_S):"
+#: ../libedataserverui/e-name-selector-dialog.c:747
+msgid "_Add"
+msgstr "è¿½å? (_A)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:751
+msgid "_Remove"
+msgstr "å??é?¤(_R)"
+
+#: ../libedataserverui/e-name-selector-dialog.c:891
+#, c-format
+msgid "Error loading address book: %s"
+msgstr "ã?¢ã??ã?¬ã?¹æ?µã?®èªã?¿è¾¼ã?¿ä¸ã?«ã?¨ã?©ã?¼: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2639
+#: ../libedataserverui/e-name-selector-entry.c:2661
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s ã??ã?¤ã?³ã?©ã?¤ã?³ã?§å±?é??ã??ã??(_X)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2654
+#: ../libedataserverui/e-name-selector-entry.c:2676
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s ã?®ã?³ã??ã?¼(_Y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2664
+#: ../libedataserverui/e-name-selector-entry.c:2686
 #, c-format
 msgid "C_ut %s"
 msgstr "%s ã?®å??ã??å??ã??(_U)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2681
+#: ../libedataserverui/e-name-selector-entry.c:2703
 #, c-format
 msgid "_Edit %s"
 msgstr "%s ã?®ç·¨é??(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:516
+#: ../libedataserverui/e-name-selector-list.c:509
 #, c-format
 msgid "_Delete %s"
 msgstr "%s ã?®å??é?¤(_D)"
 
-#: ../libedataserverui/e-passwords.c:257
+#: ../libedataserverui/e-passwords.c:127
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr "ã?ã?¼ã?ªã?³ã?°ã?®ã?ã?¼ã??ä½¿ç?¨ã?§ã??ã?¾ã??ã??: ã?¦ã?¼ã?¶ã?¾ã??ã?¯ã??ã?¹ã??å??ã??å?å?¨ã??ã?¾ã??ã??"
 
-#: ../libedataserverui/e-passwords.c:1120
+#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
-msgstr "\"[Caps Lock] ã?ã?¼ã?? ON ç?¶æ??ã?§ã??"
+msgstr "\"[Caps Lock] ã?ã?¼ã?? ON ç?¶æ??ã?§ã??ã??"
 
-#: ../libedataserverui/e-passwords.c:1243
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "ã??ã?®ã??ã?¹ã??ã?¬ã?¼ã?ºã??è¨?æ?¶ã??ã??(_R)"
 
-#: ../libedataserverui/e-passwords.c:1244
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:736
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "ã??ã?®ã??ã?¹ã??ã?¬ã?¼ã?ºã??ã??ã?®ã?»ã??ã?·ã?§ã?³ç?¨ã?«ä¿?å?ã??ã??(_R)"
 
-#: ../libedataserverui/e-passwords.c:1249
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??è¨?æ?¶ã??ã??(_R)"
 
-#: ../libedataserverui/e-passwords.c:1250
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr "ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ã??ã?®ã?»ã??ã?·ã?§ã?³ç?¨ã?«ä¿?å?ã??ã??(_R)"
 
@@ -4980,7 +5119,7 @@ msgstr "ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ã??ã?®ã?»ã??ã?·ã?§ã?³ç?¨ã?«ä¿?å?ã??ã??(_R)"
 msgid "Select destination"
 msgstr "è»¢é??å??ã?®é?¸æ??"
 
-#: ../libedataserverui/e-source-selector-dialog.c:174
+#: ../libedataserverui/e-source-selector-dialog.c:170
 msgid "_Destination"
 msgstr "è»¢é??å??(_D)"
 
@@ -5000,6 +5139,27 @@ msgstr "ã?µã?¼ã??ã??ã??å¿?ç?ã??ã??ã??ã?¾ã??ã??"
 msgid "Bad parameter"
 msgstr "ã??ã?©ã?¡ã?¼ã?¿ã??ç?¡å?¹ã?§ã??"
 
+#~ msgid "Verifying message"
+#~ msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®æ¤?è¨¼ä¸"
+
+#~ msgid "_Apply filters to new messages in INBOX on this server"
+#~ msgstr "ã??ã?®ã?µã?¼ã??ã?®å??ä¿¡ç®±ã?«ã??ã??æ?°ç??ã?¡ã?¼ã?«ã?«ã??ã?£ã?«ã?¿ã??é?©ç?¨ã??ã??(_A)"
+
+#~ msgid "Cannot create spool file: %s"
+#~ msgstr "ã?¹ã??ã?¼ã?«ã??ã?¡ã?¤ã?«ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s"
+
+#~ msgid "categories"
+#~ msgstr "ã?«ã??ã?´ã?ª"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "<b>Co_ntacts</b>"
+#~ msgstr "<b>é?£çµ¡å??(_N)</b>"
+
+#~ msgid "<b>Show Contacts</b>"
+#~ msgstr "<b>é?£çµ¡å??ã?®è¡¨ç¤º</b>"
+
 #~ msgid "\"%s\" on book before \"%s\""
 #~ msgstr "\"%2$s\" ã?®å??ã?«ã??ã??ã??ã??ã?¯ã?® \"%1$s\""
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]