[evolution-data-server] Updated Japanese translation

From: Takayuki Kusano <kusano src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [evolution-data-server] Updated Japanese translation
Date: Wed, 16 Sep 2009 14:00:57 +0000 (UTC)
commit 55ea9d8f91d9d72c3d39aef50961b256e3a6d120
Author: Takayuki KUSANO <AE5T-KSN asahi-net or jp>
Date:   Wed Sep 16 22:55:47 2009 +0900

    Updated Japanese translation

 po/ja.po | 1970 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 991 insertions(+), 979 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index b8ff53d..a695318 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,76 +5,78 @@
 # 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server trunk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 08:09+0900\n"
-"PO-Revision-Date: 2009-02-17 08:08+0900\n"
-"Last-Translator: Takeshi AIHANA <takeshi aihana gmail com>\n"
+"Project-Id-Version: evolution-data-server master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution-data-server&component=general\n"
+"POT-Creation-Date: 2009-09-16 22:53+0900\n"
+"PO-Revision-Date: 2009-09-16 22:54+0900\n"
+"Last-Translator: Takayuki KUSANO <AE5T-KSN asahi-net or jp>\n"
 "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"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2329
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "èªã?¿è¾¼ã?¿ä¸..."
 
 #: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2344
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2260
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2282
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2327
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "æ¤?ç´¢ä¸..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2695
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "é?£çµ¡å?? (%då??) ã?®ã??ã?¦ã?³ã?ã?¼ã??ä¸..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2844
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3072
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "é?£çµ¡å??ã?®ã?ã?£ã??ã?·ã?¥æ??å ± (%då??) ã?®æ?´æ?°ä¸..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:788
 msgid "Using Distinguished Name (DN)"
 msgstr "è?å?¥å?? (DN) ã??ä½¿ç?¨ã??ã??"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
 msgid "Using Email Address"
 msgstr "E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã??ä½¿ç?¨ã??ã??"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP ã?µã?¼ã??ã?¸å??æ?¥ç¶?ä¸..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP ã?µã?¼ã??ã?¸é?£çµ¡å??ã?®è¿½å? ä¸..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
 msgid "Removing contact from LDAP server..."
 msgstr "LDP ã?µã?¼ã??ã??ã??é?£çµ¡å??ã?®å??é?¤ä¸..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP ã?µã?¼ã??ã?«ã??ã??é?£çµ¡å??ã?®ä¿®æ£ä¸..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
 msgid "Receiving LDAP search results..."
 msgstr "LDAP ã?µã?¼ã??æ¤?ç´¢çµ?æ??ã?®å??å¾?ä¸..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
 msgid "Error performing search"
 msgstr "æ¤?ç´¢ä¸ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
 
@@ -82,92 +84,93 @@ msgstr "æ¤?ç´¢ä¸ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
 #. * function names, e.g.
 #. * "e_book_add_contact" on book before
 #. * "e_book_open
-#: ../addressbook/libebook/e-book.c:260 ../addressbook/libebook/e-book.c:264
-#: ../addressbook/libebook/e-book.c:469 ../addressbook/libebook/e-book.c:473
-#: ../addressbook/libebook/e-book.c:612 ../addressbook/libebook/e-book.c:616
-#: ../addressbook/libebook/e-book.c:703 ../addressbook/libebook/e-book.c:707
-#: ../addressbook/libebook/e-book.c:1003 ../addressbook/libebook/e-book.c:1008
-#: ../addressbook/libebook/e-book.c:1187 ../addressbook/libebook/e-book.c:1191
-#: ../addressbook/libebook/e-book.c:1346 ../addressbook/libebook/e-book.c:1350
-#: ../addressbook/libebook/e-book.c:1552 ../addressbook/libebook/e-book.c:1556
-#: ../addressbook/libebook/e-book.c:1795 ../addressbook/libebook/e-book.c:1799
-#: ../addressbook/libebook/e-book.c:2033 ../addressbook/libebook/e-book.c:2037
-#: ../addressbook/libebook/e-book.c:2242 ../addressbook/libebook/e-book.c:2246
-#: ../addressbook/libebook/e-book.c:3405
+#: ../addressbook/libebook/e-book.c:287 ../addressbook/libebook/e-book.c:291
+#: ../addressbook/libebook/e-book.c:495 ../addressbook/libebook/e-book.c:499
+#: ../addressbook/libebook/e-book.c:637 ../addressbook/libebook/e-book.c:641
+#: ../addressbook/libebook/e-book.c:727 ../addressbook/libebook/e-book.c:731
+#: ../addressbook/libebook/e-book.c:1024 ../addressbook/libebook/e-book.c:1029
+#: ../addressbook/libebook/e-book.c:1206 ../addressbook/libebook/e-book.c:1210
+#: ../addressbook/libebook/e-book.c:1365 ../addressbook/libebook/e-book.c:1369
+#: ../addressbook/libebook/e-book.c:1570 ../addressbook/libebook/e-book.c:1574
+#: ../addressbook/libebook/e-book.c:1813 ../addressbook/libebook/e-book.c:1817
+#: ../addressbook/libebook/e-book.c:2050 ../addressbook/libebook/e-book.c:2054
+#: ../addressbook/libebook/e-book.c:2257 ../addressbook/libebook/e-book.c:2261
+#: ../addressbook/libebook/e-book.c:3445
 #, c-format
 msgid "\"%s\" on book before \"%s\""
 msgstr "\"%2$s\" ã?®å??ã?«ã??ã??ã??ã??ã?¯ã?® \"%1$s\""
 
-#: ../addressbook/libebook/e-book.c:273 ../addressbook/libebook/e-book.c:482
-#: ../addressbook/libebook/e-book.c:625 ../addressbook/libebook/e-book.c:716
-#: ../addressbook/libebook/e-book.c:1018 ../addressbook/libebook/e-book.c:1201
-#: ../addressbook/libebook/e-book.c:1360 ../addressbook/libebook/e-book.c:1565
-#: ../addressbook/libebook/e-book.c:1808 ../addressbook/libebook/e-book.c:2047
-#: ../addressbook/libebook/e-book.c:2255 ../addressbook/libebook/e-book.c:2634
-#: ../addressbook/libebook/e-book.c:2833
+#: ../addressbook/libebook/e-book.c:300 ../addressbook/libebook/e-book.c:508
+#: ../addressbook/libebook/e-book.c:650 ../addressbook/libebook/e-book.c:740
+#: ../addressbook/libebook/e-book.c:1039 ../addressbook/libebook/e-book.c:1220
+#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1583
+#: ../addressbook/libebook/e-book.c:1826 ../addressbook/libebook/e-book.c:2064
+#: ../addressbook/libebook/e-book.c:2270 ../addressbook/libebook/e-book.c:2679
+#: ../addressbook/libebook/e-book.c:2877
 #, c-format
 msgid "book busy"
 msgstr "ã??ã??ã?¯ã?¯å?¦ç??ä¸ã?§ã??"
 
-#: ../addressbook/libebook/e-book.c:304 ../addressbook/libebook/e-book.c:308
-#: ../addressbook/libebook/e-book.c:513 ../addressbook/libebook/e-book.c:517
-#: ../addressbook/libebook/e-book.c:652 ../addressbook/libebook/e-book.c:656
-#: ../addressbook/libebook/e-book.c:743 ../addressbook/libebook/e-book.c:747
-#: ../addressbook/libebook/e-book.c:1045 ../addressbook/libebook/e-book.c:1048
-#: ../addressbook/libebook/e-book.c:1231 ../addressbook/libebook/e-book.c:1234
-#: ../addressbook/libebook/e-book.c:1387 ../addressbook/libebook/e-book.c:1391
-#: ../addressbook/libebook/e-book.c:1601 ../addressbook/libebook/e-book.c:1605
-#: ../addressbook/libebook/e-book.c:1855 ../addressbook/libebook/e-book.c:1859
-#: ../addressbook/libebook/e-book.c:2077 ../addressbook/libebook/e-book.c:2081
-#: ../addressbook/libebook/e-book.c:2281 ../addressbook/libebook/e-book.c:2285
-#: ../addressbook/libebook/e-book.c:2518 ../addressbook/libebook/e-book.c:2660
-#: ../addressbook/libebook/e-book.c:2664 ../addressbook/libebook/e-book.c:2859
-#: ../addressbook/libebook/e-book.c:2863 ../addressbook/libebook/e-book.c:3414
+#: ../addressbook/libebook/e-book.c:331 ../addressbook/libebook/e-book.c:335
+#: ../addressbook/libebook/e-book.c:539 ../addressbook/libebook/e-book.c:543
+#: ../addressbook/libebook/e-book.c:677 ../addressbook/libebook/e-book.c:681
+#: ../addressbook/libebook/e-book.c:767 ../addressbook/libebook/e-book.c:771
+#: ../addressbook/libebook/e-book.c:1066 ../addressbook/libebook/e-book.c:1069
+#: ../addressbook/libebook/e-book.c:1250 ../addressbook/libebook/e-book.c:1253
+#: ../addressbook/libebook/e-book.c:1406 ../addressbook/libebook/e-book.c:1410
+#: ../addressbook/libebook/e-book.c:1619 ../addressbook/libebook/e-book.c:1623
+#: ../addressbook/libebook/e-book.c:1873 ../addressbook/libebook/e-book.c:1877
+#: ../addressbook/libebook/e-book.c:2094 ../addressbook/libebook/e-book.c:2098
+#: ../addressbook/libebook/e-book.c:2296 ../addressbook/libebook/e-book.c:2300
+#: ../addressbook/libebook/e-book.c:2531 ../addressbook/libebook/e-book.c:2705
+#: ../addressbook/libebook/e-book.c:2709 ../addressbook/libebook/e-book.c:2903
+#: ../addressbook/libebook/e-book.c:2907 ../addressbook/libebook/e-book.c:3454
 #, c-format
 msgid "CORBA exception making \"%s\" call"
 msgstr "\"%s\" å?¼ã?³å?ºã??ã??è¡?ã??é??ã?« CORBA ä¾?å¤?ã??ç?ºç??ã??ã?¾ã??ã??"
 
-#: ../addressbook/libebook/e-book.c:2507
+#: ../addressbook/libebook/e-book.c:2520
 #, c-format
 msgid "%s: there is no current operation"
 msgstr "%s: ç?¾å?¨å®?è¡?ä¸ã?®æ??ä½?ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../addressbook/libebook/e-book.c:2532
+#: ../addressbook/libebook/e-book.c:2549 ../addressbook/libebook/e-book.c:2594
+#: ../addressbook/libebook/e-book.c:2633
 #, c-format
 msgid "%s: could not cancel"
 msgstr "%s: ã?ã?£ã?³ã?»ã?«ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../addressbook/libebook/e-book.c:2620 ../addressbook/libebook/e-book.c:2624
+#: ../addressbook/libebook/e-book.c:2665 ../addressbook/libebook/e-book.c:2669
 #, c-format
 msgid "\"%s\" on book after \"%s\""
 msgstr "\"%2$s\" ã?®æ¬¡ã?«ã??ã??ã??ã??ã?¯ã?® \"%1$s\""
 
-#: ../addressbook/libebook/e-book.c:2688
+#: ../addressbook/libebook/e-book.c:2733
 #, c-format
 msgid "%s: canceled"
 msgstr "%s: ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
 
-#: ../addressbook/libebook/e-book.c:3269
+#: ../addressbook/libebook/e-book.c:3310
 #, c-format
 msgid "%s: Invalid source."
 msgstr "%s: ã?½ã?¼ã?¹ã??æ£ã??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../addressbook/libebook/e-book.c:3277 ../addressbook/libebook/e-book.c:3343
+#: ../addressbook/libebook/e-book.c:3318 ../addressbook/libebook/e-book.c:3383
 #, c-format
 msgid "%s: no factories available for URI `%s'"
 msgstr "%s: URI '%s' ã?«å¯¾ã??ã??ã??ã?¡ã?¯ã??ã?ªã??å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../addressbook/libebook/e-book.c:3289
+#: ../addressbook/libebook/e-book.c:3329
 #, c-format
 msgid "%s: Could not create EBookListener"
 msgstr "%s: EBookListener ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../addressbook/libebook/e-book.c:3556
+#: ../addressbook/libebook/e-book.c:3595
 #, c-format
 msgid "%s: there was no self contact UID stored in gconf"
 msgstr "%s: GConf ã?«ã?»ã?«ã??é?£çµ¡å?? UID ã??ã??ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../addressbook/libebook/e-book.c:3689
+#: ../addressbook/libebook/e-book.c:3727
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%s: GConf ã?« UID '%s' ã?®ã?½ã?¼ã?¹ã??ã??ã??ã?¾ã??ã??ã??"
@@ -358,7 +361,7 @@ msgstr "ã??ã?ã?°ã?® URL"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:517
+#: ../libedataserverui/e-categories-dialog.c:609
 msgid "Categories"
 msgstr "ã?«ã??ã?´ã?ª"
 
@@ -624,7 +627,7 @@ msgstr "èª?ç??æ?¥"
 
 #: ../addressbook/libebook/e-contact.c:260
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:43
+#: ../libedataserver/e-categories.c:45
 msgid "Anniversary"
 msgstr "è¨?å¿µæ?¥"
 
@@ -708,7 +711,7 @@ msgid "Unnamed List"
 msgstr "å??å??ã?ªã??ã?®ä¸?è¦§"
 
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:44
+#: ../libedataserver/e-categories.c:46
 msgid "Birthday"
 msgstr "èª?ç??æ?¥"
 
@@ -722,274 +725,274 @@ msgstr "èª?ç??æ?¥: %s"
 msgid "Anniversary: %s"
 msgstr "è¨?å¿µæ?¥: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:212
+#: ../calendar/backends/file/e-cal-backend-file.c:234
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "ã?«ã?¬ã?³ã??ã?®ã??ã?¼ã?¿ã??ä¿?å?ã?§ã??ã?¾ã??ã??: URI ã??é??é??ã?£ã?¦ã??ã?¾ã??ã??"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
+#: ../calendar/backends/file/e-cal-backend-file.c:241
+#: ../calendar/backends/file/e-cal-backend-file.c:247
 msgid "Cannot save calendar data"
 msgstr "ã?«ã?¬ã?³ã??ã?®ã??ã?¼ã?¿ã??ä¿?å?ã?§ã??ã?¾ã??ã??"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
 msgid "Could not create thread for getting deltas"
 msgstr "å·®å??ã??å??å¾?ã??ã??ã??ã??ã?®ã?¹ã?¬ã??ã??ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:369
-#: ../calendar/backends/google/e-cal-backend-google.c:1192
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
-#: ../calendar/backends/http/e-cal-backend-http.c:561
-#: ../calendar/backends/weather/e-cal-backend-weather.c:484
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:376
+#: ../calendar/backends/google/e-cal-backend-google.c:1189
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1080
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1381
+#: ../calendar/backends/http/e-cal-backend-http.c:659
+#: ../calendar/backends/weather/e-cal-backend-weather.c:486
 msgid "Could not create cache file"
 msgstr "ã?ã?£ã??ã?·ã?¥ã?»ã??ã?¡ã?¤ã?«ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1093
 msgid "Could not create thread for populating cache"
 msgstr "ã?ã?£ã??ã?·ã?¥ã??ç??æ??ã??ã??ã??ã??ã?®ã?¹ã?¬ã??ã??ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1899
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
 msgid "Reply Requested: by "
 msgstr "è¿?ä¿¡è¦?æ±?: by "
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1904
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
 msgid "Reply Requested: When convenient"
 msgstr "è¿?ä¿¡è¦?æ±?: When convenient"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
 #, c-format
 msgid "Loading %s items"
 msgstr "\"%s\" ã?¢ã?¤ã??ã? ã?®èªã?¿è¾¼ã?¿"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
 msgid "Calendar"
 msgstr "ã?«ã?¬ã?³ã??"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
 msgid "Invalid server URI"
 msgstr "ç?¡å?¹ã?ªã?µã?¼ã?? URI ã?§ã??"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
-#: ../calendar/libecal/e-cal.c:5098
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:995
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1098
+#: ../calendar/libecal/e-cal.c:5117
 #: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1131
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1163
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1201
-#: ../camel/providers/groupwise/camel-groupwise-store.c:588
-#: ../camel/providers/groupwise/camel-groupwise-store.c:753
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:184
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1291
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1327
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
+#: ../camel/providers/groupwise/camel-groupwise-store.c:598
+#: ../camel/providers/groupwise/camel-groupwise-store.c:773
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
 msgid "Authentication failed"
 msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:268
+#: ../calendar/backends/http/e-cal-backend-http.c:316
 msgid "Redirected to Invalid URI"
 msgstr "URI ã?¸ã?®ã?ªã??ã?¤ã?¬ã?¯ã??ã??ç?¡å?¹ã?§ã??"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:289
+#: ../calendar/backends/http/e-cal-backend-http.c:339
 msgid "Bad file format."
 msgstr "ã??ã?¡ã?¤ã?«ã?®ã??ã?©â??ã??ã??ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??ã??"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:295
+#: ../calendar/backends/http/e-cal-backend-http.c:346
 msgid "Not a calendar."
 msgstr "ã?«ã?¬ã?³ã??ã?§ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
+#: ../calendar/backends/weather/e-cal-backend-weather.c:150
 msgid "Could not retrieve weather data"
 msgstr "å¤©æ°?ã?®ã??ã?¼ã?¿ã??å??å¾?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:247
 msgid "Weather: Fog"
 msgstr "å¤©æ°?: é?§"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+#: ../calendar/backends/weather/e-cal-backend-weather.c:248
 msgid "Weather: Cloudy"
 msgstr "å¤©æ°?: æ??ã??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
+#: ../calendar/backends/weather/e-cal-backend-weather.c:249
 msgid "Weather: Cloudy Night"
 msgstr "å¤©æ°?: æ??ã?®ã??ã??å¤?ç©º"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:250
 msgid "Weather: Overcast"
 msgstr "å¤©æ°?: æ?¬æ??ã??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
 msgid "Weather: Showers"
 msgstr "å¤©æ°?: é?¨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
 msgid "Weather: Snow"
 msgstr "å¤©æ°?: é?ª"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
 msgid "Weather: Sunny"
 msgstr "å¤©æ°?: æ??ã??ã??å¿«æ?´"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Clear Night"
 msgstr "å¤©æ°?: æ¾?ã??ã? å¤?ç©º"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Thunderstorms"
 msgstr "å¤©æ°?: é?·é?¨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:399
+#: ../calendar/backends/weather/e-cal-backend-weather.c:400
 msgid "Forecast"
 msgstr "å¤©æ°?äº?å ±"
 
-#: ../calendar/libecal/e-cal-component.c:1322
+#: ../calendar/libecal/e-cal-component.c:1320
 msgid "Untitled appointment"
 msgstr "ã?¿ã?¤ã??ã?«ã?ªã??ã?®äº?å®?"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:3945
 msgid "1st"
 msgstr "1æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:3946
 msgid "2nd"
 msgstr "2æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:3947
 msgid "3rd"
 msgstr "3æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:3948
 msgid "4th"
 msgstr "4æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:3949
 msgid "5th"
 msgstr "5æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:3950
 msgid "6th"
 msgstr "6æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:3951
 msgid "7th"
 msgstr "7æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3952
 msgid "8th"
 msgstr "8æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3953
 msgid "9th"
 msgstr "9æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3954
 msgid "10th"
 msgstr "10æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3955
 msgid "11th"
 msgstr "11æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3956
 msgid "12th"
 msgstr "12æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3957
 msgid "13th"
 msgstr "13æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:3958
 msgid "14th"
 msgstr "14æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:3959
 msgid "15th"
 msgstr "15æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:3960
 msgid "16th"
 msgstr "16æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:3961
 msgid "17th"
 msgstr "17æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:3962
 msgid "18th"
 msgstr "18æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:3963
 msgid "19th"
 msgstr "19æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:3964
 msgid "20th"
 msgstr "20æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:3965
 msgid "21st"
 msgstr "21æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:3966
 msgid "22nd"
 msgstr "22æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:3967
 msgid "23rd"
 msgstr "23æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:3968
 msgid "24th"
 msgstr "24æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:3969
 msgid "25th"
 msgstr "25æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:3970
 msgid "26th"
 msgstr "26æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:3971
 msgid "27th"
 msgstr "27æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:3972
 msgid "28th"
 msgstr "28æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:3973
 msgid "29th"
 msgstr "29æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:3974
 msgid "30th"
 msgstr "30æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:3975
 msgid "31st"
 msgstr "31æ?¥"
 
-#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:712
 msgid "High"
 msgstr "é«?ã??"
 
-#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:714
 msgid "Normal"
 msgstr "æ?®é??"
 
-#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:689 ../calendar/libecal/e-cal-util.c:716
 msgid "Low"
 msgstr "ä½?ã??"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:710
 msgid "Undefined"
 msgstr "æ?ªå®?ç¾©"
 
-#: ../calendar/libecal/e-cal.c:1677 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1693 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (ã?¦ã?¼ã?¶ %s) ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ä¸?ã??ã??"
@@ -998,112 +1001,112 @@ 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:1691
+#: ../calendar/libecal/e-cal.c:1707
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "%s ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã?¦ã?¼ã?¶ %s ã?®ã??ã?ã?ã?·ã??æ??å?¹ã?«ã??ã?¦ä¸?ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5070
+#: ../calendar/libecal/e-cal.c:5089
 msgid "Invalid argument"
 msgstr "ç?¡å?¹ã?ªå¼?æ?°"
 
-#: ../calendar/libecal/e-cal.c:5072
+#: ../calendar/libecal/e-cal.c:5091
 msgid "Backend is busy"
 msgstr "ã??ã??ã?¯ã?¨ã?³ã??ã??å?¦ç??ä¸ã?§ã??"
 
-#: ../calendar/libecal/e-cal.c:5074
+#: ../calendar/libecal/e-cal.c:5093
 #: ../calendar/libedata-cal/e-cal-backend-util.c:105
 msgid "Repository is offline"
 msgstr "ã?ªã??ã?¸ã??ã?ªã?¯ã?ªã??ã?©ã?¤ã?³ã?§ã??"
 
-#: ../calendar/libecal/e-cal.c:5076
+#: ../calendar/libecal/e-cal.c:5095
 #: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "No such calendar"
 msgstr "ã??ã?®ã??ã??ã?ªã?«ã?¬ã?³ã??ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5078
+#: ../calendar/libecal/e-cal.c:5097
 #: ../calendar/libedata-cal/e-cal-backend-util.c:111
 #: ../servers/groupwise/e-gw-connection.c:233
 msgid "Object not found"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5080
+#: ../calendar/libecal/e-cal.c:5099
 #: ../calendar/libedata-cal/e-cal-backend-util.c:113
 #: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid object"
 msgstr "ç?¡å?¹ã?ªã?ªã??ã?¸ã?§ã?¯ã??ã?§ã??"
 
-#: ../calendar/libecal/e-cal.c:5082
+#: ../calendar/libecal/e-cal.c:5101
 msgid "URI not loaded"
 msgstr "URI ã??èªã?¿è¾¼ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5084
+#: ../calendar/libecal/e-cal.c:5103
 msgid "URI already loaded"
 msgstr "URL ã?¯æ?¢ã?«èªã?¿è¾¼ã?¿æ¸?ã?¿ã?§ã??"
 
-#: ../calendar/libecal/e-cal.c:5086
+#: ../calendar/libecal/e-cal.c:5105
 #: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:571
+#: ../servers/exchange/storage/e-storage.c:573
 msgid "Permission denied"
 msgstr "æ¨©é??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5088
+#: ../calendar/libecal/e-cal.c:5107
 #: ../calendar/libedata-cal/e-cal-backend-util.c:131
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Unknown User"
 msgstr "ã?¦ã?¼ã?¶ã??ç?¹å®?ã?§ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5090
+#: ../calendar/libecal/e-cal.c:5109
 #: ../calendar/libedata-cal/e-cal-backend-util.c:115
 msgid "Object ID already exists"
 msgstr "æ?¢ã?«ã?ªã??ã?¸ã?§ã?¯ã?? ID ã??å?å?¨ã??ã?¦ã??ã?¾ã??"
 
-#: ../calendar/libecal/e-cal.c:5092
+#: ../calendar/libecal/e-cal.c:5111
 msgid "Protocol not supported"
 msgstr "ã??ã?ã??ã?³ã?«ã?¯ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5094
+#: ../calendar/libecal/e-cal.c:5113
 msgid "Operation has been canceled"
 msgstr "æ??ä½?ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5096
+#: ../calendar/libecal/e-cal.c:5115
 #: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Could not cancel operation"
 msgstr "æ??ä½?ã??ã?ã?£ã?³ã?»ã?«ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5100
+#: ../calendar/libecal/e-cal.c:5119
 #: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
+#: ../camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication required"
 msgstr "èª?è¨¼ã??å¿?è¦?ã?¨ã??ã?¦ã??ã?¾ã??"
 
-#: ../calendar/libecal/e-cal.c:5102
+#: ../calendar/libecal/e-cal.c:5121
 msgid "A CORBA exception has occurred"
 msgstr "CORBA ä¾?å¤?ã??ç?ºç??ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5104
+#: ../calendar/libecal/e-cal.c:5123
 #: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:434
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
+#: ../camel/providers/imap/camel-imap-command.c:432
 #: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1570
-#: ../camel/providers/imap4/camel-imap4-engine.c:1609
-#: ../camel/providers/imap4/camel-imap4-engine.c:1654
-#: ../camel/providers/imap4/camel-imap4-engine.c:1710
-#: ../camel/providers/imap4/camel-imap4-store.c:315
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-#: ../camel/providers/pop3/camel-pop3-store.c:554
-#: ../camel/providers/pop3/camel-pop3-store.c:561
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../servers/exchange/storage/e-storage.c:585
+#: ../camel/providers/imap4/camel-imap4-engine.c:1547
+#: ../camel/providers/imap4/camel-imap4-engine.c:1585
+#: ../camel/providers/imap4/camel-imap4-engine.c:1629
+#: ../camel/providers/imap4/camel-imap4-engine.c:1684
+#: ../camel/providers/imap4/camel-imap4-store.c:311
+#: ../camel/providers/imap4/camel-imap4-store.c:818
+#: ../camel/providers/imap4/camel-imap4-store.c:1574
+#: ../camel/providers/pop3/camel-pop3-store.c:552
+#: ../camel/providers/pop3/camel-pop3-store.c:559
+#: ../camel/providers/pop3/camel-pop3-store.c:565
+#: ../servers/exchange/storage/e-storage.c:587
 #: ../servers/groupwise/e-gw-connection.c:241
 msgid "Unknown error"
 msgstr "ã?¨ã?©ã?¼ã??ç?¹å®?ã?§ã??ã?¾ã??ã??"
 
-#: ../calendar/libecal/e-cal.c:5106
+#: ../calendar/libecal/e-cal.c:5125
 #: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:553
+#: ../servers/exchange/storage/e-storage.c:555
 msgid "No error"
 msgstr "ã?¨ã?©ã?¼ã?¯ã??ã??ã?¾ã??ã??"
 
@@ -1290,16 +1293,16 @@ msgstr "ã??ã?®æ??å?·ã?§é?µã??ã?¨ã?ã?¹ã??ã?¼ã??ã?§ã??ã?¾ã??ã??"
 msgid "Unable to create cache path"
 msgstr "ã?ã?£ã??ã?·ã?¥ã??ã?¡ã?¤ã?«ã??ç??æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-data-cache.c:403
+#: ../camel/camel-data-cache.c:402
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ã?ã?£ã??ã?·ã?¥ã?»ã?¨ã?³ã??ã?ªã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s: %s"
 
-#: ../camel/camel-db.c:469
+#: ../camel/camel-db.c:412
 msgid "Insufficient memory"
 msgstr "ã?¡ã?¢ã?ªã??è¶³ã??ã?¾ã??ã??"
 
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:197
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1310,8 +1313,8 @@ msgstr ""
 "ã??ã??ã??ã?¯ã?¼ã?¯ã?«å??æ?¥ç¶?ã??ã?¦ã??ã??ã??ã?®ã?µã?¼ã??ã?«å¯¾ã??ã??\n"
 "ã??ã??ä»¥é??ã?®æ??ä½?ã?¯å??ç?¾ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:318
+#: ../camel/camel-disco-diary.c:260
+#: ../camel/providers/imap/camel-imap-journal.c:320
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1322,114 +1325,114 @@ msgstr ""
 "%s\n"
 "ã??ã?®ã??ã?©ã?«ã??ã?«å¯¾ã??ã??å¤?æ?´ã??å??ã?³å??æ??ã??ã??ã??ã??ã?¨ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:296
 msgid "Resynchronizing with server"
 msgstr "ã?µã?¼ã??ã?®å??å??æ??ä¸"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:52
+#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
 msgid "Copy folder content locally for offline operation"
 msgstr "ã??ã?©ã?«ã??ã?®å??å®¹ã??ã?ã?¼ã?«ã?«ã?¸ã?³ã??ã?¼ã??ã?? (ã?ªã??ã?©ã?¤ã?³ç?¨)"
 
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:111
+#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
 msgid "Downloading new messages for offline mode"
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?®æ?°ç??ã?¡ã?¼ã?«ã?®ã??ã?¦ã?³ã?ã?¼ã??ä¸"
 
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?«å??ã??æ?¿ã??ã??æº?å??ä¸: %s"
 
-#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/groupwise/camel-groupwise-store.c:226
+#: ../camel/camel-disco-store.c:400
+#: ../camel/providers/groupwise/camel-groupwise-store.c:223
 #: ../camel/providers/imap/camel-imap-store.c:1003
 #: ../camel/providers/imap/camel-imap-store.c:1813
 #: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:2997
+#: ../camel/providers/imap/camel-imap-store.c:3014
 msgid "You must be working online to complete this operation"
 msgstr "ã??ã?®å??ä½?ã??å®?äº?ã??ã??ã??ã??ã?«ã?ªã?³ã?©ã?¤ã?³ã?§ä½?æ¥ã??ã?¦ä¸?ã??ã??"
 
-#: ../camel/camel-exception.c:262
+#: ../camel/camel-exception.c:260
 msgid "No description available"
 msgstr "èª¬æ??ã?ªã??"
 
-#: ../camel/camel-filter-driver.c:795 ../camel/camel-filter-search.c:581
+#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "å?ã??ã?ã?»ã?¹ '%s' ã?®ç??æ??ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:836
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s ã??ã??å??ä¿¡ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?»ã?¹ã??ã?ªã?¼ã? ã??æ£ã??ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-filter-driver.c:1026 ../camel/camel-filter-driver.c:1035
+#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
 msgid "Syncing folders"
 msgstr "ã??ã?©ã?«ã??ã?®å??æ??ä¸"
 
-#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1530
+#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ã??ã?£ã?«ã?¿ã?®æ§?æ??è§£æ??ä¸ã?«ã?¨ã?©ã?¼: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1133 ../camel/camel-filter-driver.c:1539
+#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ã??ã?£ã?«ã?¿å®?è¡?ä¸ã?«ã?¨ã?©ã?¼: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1221
+#: ../camel/camel-filter-driver.c:1216
 msgid "Unable to open spool folder"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã??é??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1225
 msgid "Unable to process spool folder"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã??å?¦ç??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1241
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ %d ã?®å??å¾?ä¸ (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1250
+#: ../camel/camel-filter-driver.c:1245
 msgid "Cannot open message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
 #, c-format
 msgid "Failed on message %d"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ %d ã?§å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-filter-driver.c:1283 ../camel/camel-filter-driver.c:1374
+#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
 msgid "Syncing folder"
 msgstr "ã??ã?©ã?«ã??ã?®å??æ??ä¸"
 
-#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
 msgid "Complete"
 msgstr "å®?äº?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1338
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ %d / %d ã?®å??å¾?ä¸"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1353
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ %d / %d ã?§å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:137
 msgid "Failed to retrieve message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®å??å¾?ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:399
 msgid "Invalid arguments to (system-flag)"
 msgstr "(system-flag) ã?«å¯¾ã??ã??ç?¡å?¹ã?ªå¼?æ?°"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:414
 msgid "Invalid arguments to (user-tag)"
 msgstr "(user-tag) ã?«å¯¾ã??ã??ç?¡å?¹ã?ªå¼?æ?°"
 
 #. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:737 ../camel/camel-filter-search.c:745
+#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ã??ã?£ã?«ã?¿æ¤?ç´¢å®?è¡?ä¸ã?«ã?¨ã?©ã?¼: %s: %s"
@@ -1454,72 +1457,72 @@ msgstr ""
 "æ£è¦?è¡¨ç?¾ã?§ã?®æ¤?ç´¢ã??å®?è¡?ä¸ã?«ã?¨ã?©ã?¼: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:853
+#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ã?«ã?¯è«?ç??çµ?æ??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-folder-search.c:906
+#: ../camel/camel-folder-search.c:905
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ã?¯ %s ã?®ä¸ã?«å?«ã??ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-folder-search.c:912 ../camel/camel-folder-search.c:919
+#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ã?«ã?¯æ¤?ç´¢ã?®ç¨®é¡?ã??è¡¨ã??æ??å?å??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-folder-search.c:946
+#: ../camel/camel-folder-search.c:945
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ã?¯é??å??ã?®çµ?æ??ã??æ??å¾?ã??ã?¾ã??"
 
-#: ../camel/camel-folder-search.c:955
+#: ../camel/camel-folder-search.c:954
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ã?«ã?¯ã??ã?©ã?«ã??ã?®çµ?ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-folder.c:696
+#: ../camel/camel-folder.c:683
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??æ??ä½?: %s ã?«å¯¾ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®è¿½å? "
 
-#: ../camel/camel-folder.c:1398
+#: ../camel/camel-folder.c:1388
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??æ??ä½?: %s ã?«å¯¾ã??ã?¦å¼?ã??ä½¿ã?£ã??æ¤?ç´¢"
 
-#: ../camel/camel-folder.c:1440
+#: ../camel/camel-folder.c:1429
 #, c-format
 msgid "Unsupported operation: count by expression: for %s"
 msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??æ??ä½?: %s ã?«å¯¾ã??ã?¦å¼?ã??ä½¿ã?£ã??ã?«ã?¦ã?³ã??"
 
-#: ../camel/camel-folder.c:1480
+#: ../camel/camel-folder.c:1468
 #, c-format
 msgid "Unsupported operation: search by UIDs: for %s"
 msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??æ??ä½?: %s ã?«å¯¾ã??ã?¦ UID ã??ä½¿ã?£ã??æ¤?ç´¢"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:1581
 msgid "Moving messages"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®ç§»å??ä¸"
 
-#: ../camel/camel-folder.c:1596
+#: ../camel/camel-folder.c:1581
 msgid "Copying messages"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®ã?³ã??ã?¼ä¸"
 
-#: ../camel/camel-folder.c:1942
+#: ../camel/camel-folder.c:1922
 msgid "Learning junk"
 msgstr "ã?¸ã?£ã?³ã?¯ã?»ã?¡ã?¼ã?«ã?®å¦ç¿?ä¸"
 
-#: ../camel/camel-folder.c:1959
+#: ../camel/camel-folder.c:1939
 msgid "Learning non-junk"
 msgstr "ã?¸ã?£ã?³ã?¯ã?§ã?¯ã?ªã??ã?¡ã?¼ã?«ã?®å¦ç¿?ä¸"
 
-#: ../camel/camel-folder.c:1978
+#: ../camel/camel-folder.c:1958
 msgid "Filtering new message(s)"
 msgstr "æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®ã??ã?£ã?«ã?¿ã?ªã?³ã?°ä¸"
 
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:751
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1530,15 +1533,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:766
 msgid "Failed to parse gpg userid hint."
 msgstr "GnuPG ã?®ã?¦ã?¼ã?¶ ID ã??ã?³ã??ã?®è§£æ??ã?«å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:804
 msgid "Failed to parse gpg passphrase request."
 msgstr "GnuPG ã?®ã??ã?¹ã?¯ã?¼ã??è¦?æ±?ã?®è§£æ??ã?«å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:824
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1547,7 +1550,7 @@ msgstr ""
 "ã??ä½¿ã??ã?®ã?¹ã??ã?¼ã??ã?«ã?¼ã??ã?®ã?ã?¼ã??è§£é?¤ã??ã??ã?«ã?¯\n"
 "PIN ã??å¿?è¦?ã?§ã??: \"%s\""
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:828
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1556,45 +1559,46 @@ msgstr ""
 "æ¬¡ã?®ã?¦ã?¼ã?¶ã?®ã?ã?¼ã??è§£é?¤ã??ã??ã?«ã?¯ã??ã?¹ã?¯ã?¼ã??ã??å¿?è¦?ã?§ã??:\n"
 " \"%s\""
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:833
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "'%s' ã?«å¯¾ã??ã?¦ GnuPG ã??ã??æ?³å®?å¤?ã?®è¦?æ±?ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1071
-#: ../camel/providers/nntp/camel-nntp-store.c:1287
+#: ../camel/camel-gpg-context.c:858 ../camel/camel-gpg-context.c:1067
+#: ../camel/providers/nntp/camel-nntp-store.c:1313
 msgid "Canceled."
 msgstr "ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
 
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:872
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "ç§?å¯?é?µã?®è§£é?¤ã?«å¤±æ??ã??ã?¾ã??ã??: æ??å®?ã??ã??ä¸?ã?¤ã?®ã??ã?¹ã?¯ã?¼ã??ã??ã??ã??ã??ã??ã?§ã??ã??"
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:880
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-gpg-context.c:947
+#: ../camel/camel-gpg-context.c:943
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "æ??å?·å??ã?«å¤±æ??ã??ã?¾ã??ã??: æ£ã??ã??å®?å??ã??æ??å®?ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
 #. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1209 ../camel/camel-gpg-context.c:1337
-#: ../camel/camel-gpg-context.c:1832 ../camel/camel-gpg-context.c:1877
+#: ../camel/camel-gpg-context.c:1212 ../camel/camel-gpg-context.c:1337
+#: ../camel/camel-gpg-context.c:1859 ../camel/camel-gpg-context.c:1904
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "GPG ã?®å®?è¡?ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-gpg-context.c:1305 ../camel/camel-smime-context.c:392
+#: ../camel/camel-gpg-context.c:1305 ../camel/camel-smime-context.c:602
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "ç½²å??ã??ã?¼ã?¿ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/camel-gpg-context.c:1352 ../camel/camel-gpg-context.c:1537
-#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1637
-#: ../camel/camel-gpg-context.c:1753 ../camel/camel-gpg-context.c:1768
-#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1893
+#: ../camel/camel-gpg-context.c:1352 ../camel/camel-gpg-context.c:1553
+#: ../camel/camel-gpg-context.c:1569 ../camel/camel-gpg-context.c:1649
+#: ../camel/camel-gpg-context.c:1664 ../camel/camel-gpg-context.c:1780
+#: ../camel/camel-gpg-context.c:1795 ../camel/camel-gpg-context.c:1875
+#: ../camel/camel-gpg-context.c:1920
 msgid "Failed to execute gpg."
 msgstr "GPG ã?®å®?è¡?ã?«å¤±æ??ã??ã?¾ã??ã??"
 
@@ -1602,53 +1606,53 @@ msgstr "GPG ã?®å®?è¡?ã?«å¤±æ??ã??ã?¾ã??ã??"
 msgid "This is a digitally signed message part"
 msgstr "ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ã?«ã?¯ã??ã?¸ã?¿ã?«ç½²å??ã??ã??ã??é?¨å??ã??ã??ã??ã?¾ã??"
 
-#: ../camel/camel-gpg-context.c:1456 ../camel/camel-gpg-context.c:1462
-#: ../camel/camel-gpg-context.c:1468 ../camel/camel-gpg-context.c:1483
-#: ../camel/camel-smime-context.c:695 ../camel/camel-smime-context.c:706
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-gpg-context.c:1457 ../camel/camel-gpg-context.c:1463
+#: ../camel/camel-gpg-context.c:1469 ../camel/camel-gpg-context.c:1484
+#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
+#: ../camel/camel-smime-context.c:928
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ç½²å??ã?®æ?´å??æ?§ã??ç¢ºèª?ã?§ã??ã?¾ã??ã??: ã?¡ã??ã?»ã?¼ã?¸ã?®æ?¸å¼?ã??æ£ã??ã??ã??ã??ã?¾ã??"
 "ã??"
 
-#: ../camel/camel-gpg-context.c:1522
+#: ../camel/camel-gpg-context.c:1523
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ã?®æ?´å??æ?§ã??ç¢ºèª?ã?§ã??ã?¾ã??ã??: ä½?æ¥ç?¨ã??ã?¡ã?¤ã?«ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??"
 "ã??: %s"
 
-#: ../camel/camel-gpg-context.c:1605
+#: ../camel/camel-gpg-context.c:1632
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "æ??å?·å??ã??ã??ã??ã?¼ã?¿ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-gpg-context.c:1682
 msgid "This is a digitally encrypted message part"
 msgstr "ã??ã??ã?¯ã??ã?¸ã?¿ã?«ç½²å??ã??ã??ã??é?¨å??ã?§ã??"
 
-#: ../camel/camel-gpg-context.c:1708 ../camel/camel-gpg-context.c:1716
-#: ../camel/camel-gpg-context.c:1735
+#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1743
+#: ../camel/camel-gpg-context.c:1762
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??è§£èªã?§ã??ã?¾ã??ã??: ã?¡ã??ã?»ã?¼ã?¸ã?®æ?¸å¼?ã??æ£ã??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-gpg-context.c:1725
+#: ../camel/camel-gpg-context.c:1752
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME å??ã?®æ??å?·è§£èªã?«å¤±æ??ã??ã?¾ã??ã??: ã??ã?ã??ã?³ã?«ã?»ã?¨ã?©ã?¼"
 
-#: ../camel/camel-gpg-context.c:1790 ../camel/camel-smime-context.c:969
+#: ../camel/camel-gpg-context.c:1817 ../camel/camel-smime-context.c:1186
 msgid "Encrypted content"
 msgstr "æ??å?·å??ã??ã??å??å®¹"
 
-#: ../camel/camel-gpg-context.c:1809
+#: ../camel/camel-gpg-context.c:1836
 msgid "Unable to parse message content"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®å??å®¹ã??è§£æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-gpg-context.c:1833 ../camel/camel-gpg-context.c:1878
-#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-utils.c:624
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-#: ../camel/providers/smtp/camel-smtp-transport.c:221
+#: ../camel/camel-gpg-context.c:1860 ../camel/camel-gpg-context.c:1905
+#: ../camel/camel-tcp-stream-openssl.c:627
+#: ../camel/providers/imap4/camel-imap4-utils.c:614
+#: ../camel/providers/smtp/camel-smtp-transport.c:165
+#: ../camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
@@ -1662,12 +1666,12 @@ msgstr "ã?ã??ã?ã?³ã?°ã?»ã??ã?«ã??ã?¼ã?»ã??ã?¤ã??ã??æ§?ç¯?ã?§ã??ã?¾ã??ã??: %s"
 msgid "Cannot fork locking helper: %s"
 msgstr "ã?ã??ã?ã?³ã?°ã?»ã??ã?«ã??ã?¼ã?®ã??ã?ã?»ã?¹ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-lock-client.c:204 ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "'%s' ã??ã?ã??ã?¯ã?§ã??ã?¾ã??ã??ã?§ã??ã??: lock-helper ã?®ã??ã?ã??ã?³ã?«ã?»ã?¨ã?©ã?¼ã?§ã??"
 
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:216
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "'%s' ã??ã?ã??ã?¯ã?§ã??ã?¾ã??ã??"
@@ -1747,54 +1751,54 @@ msgstr "ã?¡ã?¼ã?«ä½?æ¥ã??ã?¡ã?¤ã?«ã?®æ?¸ã??è¾¼ã?¿ä¸ã?«ã?¨ã?©ã?¼: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "ã?¡ã?¼ã?«ä½?æ¥ã??ã?¡ã?¤ã?«ã?®ã?³ã??ã?¼ä¸ã?«ã?¨ã?©ã?¼: %s"
 
-#: ../camel/camel-multipart-signed.c:593
+#: ../camel/camel-multipart-signed.c:592
 msgid "parse error"
 msgstr "è§£æ??ã?¨ã?©ã?¼"
 
-#: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667
-#: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:448
-#: ../camel/providers/pop3/camel-pop3-store.c:548
+#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
+#: ../camel/camel-net-utils.c:806
+#: ../camel/providers/pop3/camel-pop3-store.c:446
+#: ../camel/providers/pop3/camel-pop3-store.c:546
 msgid "Canceled"
 msgstr "ã?ã?£ã?³ã?»ã?«æ¸?ã?¿"
 
-#: ../camel/camel-net-utils.c:524
+#: ../camel/camel-net-utils.c:522
 msgid "cannot create thread"
 msgstr "ã?¹ã?¬ã??ã??ã??ç??æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-net-utils.c:678
 #, c-format
 msgid "Resolving: %s"
 msgstr "è§£æ±ºä¸: %s"
 
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:700
 msgid "Host lookup failed"
 msgstr "ã??ã?¹ã??ã?®æ¤?ç´¢ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:702
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "ã??ã?¹ã??ã?®æ¤?ç´¢ã?«å¤±æ??ã??ã?¾ã??ã??: %s: %s"
 
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:810
 msgid "Resolving address"
 msgstr "ã?¢ã??ã?¬ã?¹ã?®è§£æ±ºä¸"
 
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:830
 msgid "Name lookup failed"
 msgstr "å??å??ã?®æ¤?ç´¢ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:833
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "å??å??ã?®æ¤?ç´¢ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/camel-offline-folder.c:253
+#: ../camel/camel-offline-folder.c:249
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "ã??ã?©ã?«ã?? '%s' ã?«ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??å??æ??ã??ã?¦ä¿?å?ä¸"
 
-#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "ã??ã?©ã?«ã?? '%s' ã?®ã?ªã??ã?©ã?¤ã?³ã?»ã?¸ã?£ã?¼ã??ã?«ã?«æ?¸ã??è¾¼ã??ã?¾ã??ã??: %s"
@@ -1824,24 +1828,24 @@ msgstr "%s ã??èªã?¿è¾¼ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ã??èªã?¿è¾¼ã??ã?¾ã??ã??ã?§ã??ã??: ã?¢ã?¸ã?¥ã?¼ã?«ã?®ã?³ã?¼ã??ã??å??æ??å??ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-provider.c:373 ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:379 ../camel/camel-session.c:182
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "'%s' ã?¨ã??ã??ã??ã?ã??ã?³ã?«ã??å?©ç?¨ã?§ã??ã??ã??ã?ã??ã?¤ã??ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:36
 msgid "Anonymous"
 msgstr "å?¿å??"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:38
 msgid "This option will connect to the server using an anonymous login."
 msgstr "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯å?¿å??ã?ã?°ã?¤ã?³ã??ä½¿ã?£ã?¦ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-anonymous.c:124 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
 msgid "Authentication failed."
 msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:130
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1850,7 +1854,7 @@ msgstr ""
 "ç?¡å?¹ã?ª E-ã?¡ã?¼ã?«ã?»ã?¢ã??ã?¬ã?¹ã?®ã??ã?¬ã?¼ã?¹æ??å ±:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:142
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1859,7 +1863,7 @@ msgstr ""
 "ç?¡å?¹ã?§ä¸?å?¯è§£ã?ªã??ã?¬ã?¼ã?¹æ??å ±:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:154
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1892,41 +1896,41 @@ msgstr ""
 "ã?µã?¼ã??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã??å ´å??ã??ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã?? DIGEST-"
 "MD5 ã??ä½¿ã?£ã?¦ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-digest-md5.c:845
+#: ../camel/camel-sasl-digest-md5.c:844
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ã?µã?¼ã??è¦?æ±?ã??é?·ã??ã??ã?¾ã?? (2048 octet ä»¥ä¸?ã?§ã??)"
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:853
 msgid "Server challenge invalid\n"
 msgstr "ç?¡å?¹ã?§ã??\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:859
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr ""
 "ã?µã?¼ã??è¦?æ±?ã?«ã??ã??ã??ã?ª \"ä¿?è·å??è³ª (QOP: Quality of Protection)\" ã?®ã??ã?¼ã?¯ã?³ã??å?«"
 "ã?¾ã??ã?¦ã??ã?¾ã??"
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:889
 msgid "Server response did not contain authorization data"
 msgstr "ã?µã?¼ã??ã?®å¿?ç?ã?«èª?è¨¼ã??ã?¼ã?¿ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:907
 msgid "Server response contained incomplete authorization data"
 msgstr "ã?µã?¼ã??ã?®å¿?ç?ã?«ä¸?å®?å?¨ã?ªèª?è¨¼ã??ã?¼ã?¿ã??ã??ã??ã?¾ã??"
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:917
 msgid "Server response does not match"
 msgstr "ã?µã?¼ã??ã?®å¿?ç?ã??ä¸?è?´ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:63
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:65
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ Kerberos 5 èª?è¨¼ã??ä½¿ã?£ã?¦ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:159
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -1934,11 +1938,11 @@ msgstr ""
 "æ??å®?ã??ã??ã?¡ã?«ã??ã?ºã? ã??æ??ä¾?ã??ã??ã??è¨¼æ??æ?¸ã?§ã?¯ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã?ªã??ã??ã??ã??ã?®å®?è£?ã?§èª?"
 "è?ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The provided target_name parameter was ill-formed."
 msgstr "æ??å®?ã??ã??å¼?æ?° target_name ã?®å½¢å¼?ã??é??é??ã?£ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:172
+#: ../camel/camel-sasl-gssapi.c:167
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -1946,7 +1950,7 @@ msgstr ""
 "æ??å®?ã??ã??å¼?æ?°ã?® target_name ã?«ç?¡å?¹ã?ªã??ã??ã??ã??ã?¯ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??ç¨®é¡?ã?®å??å??ã??ã??"
 "ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:171
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -1954,14 +1958,14 @@ msgstr ""
 "input_token ã?«å¼?æ?° input_chan_bindigs ã??ä»?ã??ã?¦æ??å®?ã??ã??ã??å?¥ã?®ã??ã?£ã?³ã??ã?«ã?®ã??ã?³"
 "ã??ã?£ã?³ã?°ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:181
+#: ../camel/camel-sasl-gssapi.c:176
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr ""
 "input_token ã?®ä¸ã?«ç?¡å?¹ã?ªç½²å??ã??ã??ã??ã??ã??ã?¾ã??ã?¯ã??ã?®ç½²å??ã??æ£ã??ã??ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:180
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -1969,31 +1973,31 @@ msgstr ""
 "æ??å®?ã??ã??è¨¼æ??æ?¸ã?§ã?³ã?³ã??ã?ã?¹ã??ã?®å??æ??å??ã?¯ã?§ã??ã?ªã??ã??ã??ã?¾ã??ã?¯è¨¼æ??æ?¸ã?®ã??ã?³ã??ã?«ã??ä»»"
 "æ??ã?®è¨¼æ??æ?¸ã??å??ç?§ã??ã?¦ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:190
+#: ../camel/camel-sasl-gssapi.c:185
 msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 "æ??å®?ã??ã??ã?³ã?³ã??ã?ã?¹ã??ã?®ã??ã?³ã??ã?«ã??æ£ã??ã??ã?³ã?³ã??ã?ã?¹ã??ã??å??ç?§ã??ã?¦ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../camel/camel-sasl-gssapi.c:188
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token ã?§å®?æ?½ã??ã??æ?´å??æ?§ã?®ã??ã?§ã??ã?¯ã??å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:191
 msgid "The consistency checks performed on the credential failed."
 msgstr "è¨¼æ??æ?¸ã?§å®?æ?½ã??ã??æ?´å??æ?§ã?®ã??ã?§ã??ã?¯ã??å¤±æ??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:194
 msgid "The referenced credentials have expired."
 msgstr "å??ç?§ã??ã?¦ã??ã??è¨¼æ??æ?¸ã?®æ??é??ã??é??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253
-#: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304
-#: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1273
+#: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
+#: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
+#: ../camel/camel-sasl-kerberos4.c:230
+#: ../camel/providers/imap/camel-imap-store.c:1274
 msgid "Bad authentication response from server."
 msgstr "ã?µã?¼ã??ã??ã??é??é??ã?£ã??èª?è¨¼å¿?ç?ã??ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:309
 msgid "Unsupported security layer."
 msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??ã?»ã?ã?¥ã?ªã??ã?£ã?»ã?¬ã?¤ã?¤ã?§ã??ã??"
 
@@ -2005,7 +2009,7 @@ msgstr "Kerberos 4"
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ Kerberos 4 èª?è¨¼ã??ä½¿ã?£ã?¦ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã?¾ã??"
 
-#: ../camel/camel-sasl-kerberos4.c:174
+#: ../camel/camel-sasl-kerberos4.c:173
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -2022,7 +2026,7 @@ msgstr "ã?ã?°ã?¤ã?³"
 msgid "This option will connect to the server using a simple password."
 msgstr "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ç°¡å??ã?ªã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã?¾ã??"
 
-#: ../camel/camel-sasl-login.c:135
+#: ../camel/camel-sasl-login.c:134
 msgid "Unknown authentication state."
 msgstr "ç?¹å®?ã?§ã??ã?ªã??èª?è¨¼ç?¶æ??ã?§ã??"
 
@@ -2067,22 +2071,22 @@ msgstr "POP ã?§ã?ªã??ã?½ã?¼ã?¹ã??å?©ç?¨ã??ã?¦ SMTP èª?è¨¼ã?®å??ã?« POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "æ£è¦?è¡¨ç?¾ã?®ç·¨é??ã?«å¤±æ??: %s: %s"
 
-#: ../camel/camel-service.c:270
+#: ../camel/camel-service.c:265
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' ã?¯ã?¦ã?¼ã?¶å??ã?³ã?³ã??ã?¼ã??ã?³ã??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:269
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' ã?¯ã??ã?¹ã??ã?»ã?³ã?³ã??ã?¼ã??ã?³ã??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:273
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' ã?¯ã??ã?¹ã?»ã?³ã?³ã??ã?¼ã??ã?³ã??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/camel-session.c:308
+#: ../camel/camel-session.c:307
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2091,220 +2095,214 @@ msgstr ""
 "ã??ã?©ã?«ã?? %s ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??:\n"
 "%s"
 
-#: ../camel/camel-session.c:483
+#: ../camel/camel-session.c:479
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "%s%s %s ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../camel/camel-session.c:822
+#: ../camel/camel-session.c:817
 msgid "Camel session doesn't support forwarding of a message."
 msgstr "Camel ã?®ã?»ã??ã?·ã?§ã?³ã?§ã?¯ã?¡ã??ã?»ã?¼ã?¸ã?®è»¢é??ã?¯ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:234 ../camel/camel-smime-context.c:778
+#: ../camel/camel-smime-context.c:444 ../camel/camel-smime-context.c:993
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' ã?®è¨¼æ??æ?¸ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:240
+#: ../camel/camel-smime-context.c:450
 msgid "Cannot create CMS message"
 msgstr "CMS ã?¡ã??ã?»ã?¼ã?¸ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:245
+#: ../camel/camel-smime-context.c:455
 msgid "Cannot create CMS signed data"
 msgstr "CMS ç½²å??ã??ã?¼ã?¿ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:251
+#: ../camel/camel-smime-context.c:461
 msgid "Cannot attach CMS signed data"
 msgstr "CMS ç½²å??ã??ã?¼ã?¿ã??æ·»ä»?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:258
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot attach CMS data"
 msgstr "CMS ã??ã?¼ã?¿ã??æ·»ä»?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:264
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot create CMS Signer information"
 msgstr "CMS ç½²å??è??ã?®æ??å ±ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:270
+#: ../camel/camel-smime-context.c:480
 msgid "Cannot find certificate chain"
 msgstr "èª?è¨¼ã??ã?§ã?¤ã?³ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:276
+#: ../camel/camel-smime-context.c:486
 msgid "Cannot add CMS Signing time"
 msgstr "CMS ç½²å??æ??å?»ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:298 ../camel/camel-smime-context.c:310
+#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ã?®æ??å?·å??è¨¼æ??æ?¸ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:317
+#: ../camel/camel-smime-context.c:527
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "å±?æ?§ SMIMEEncKeyPrefs ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:322
+#: ../camel/camel-smime-context.c:532
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "å±?æ?§ MS SMIMEEncKeyPrefs ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:327
+#: ../camel/camel-smime-context.c:537
 msgid "Cannot add encryption certificate"
 msgstr "æ??å?·å??è¨¼æ??æ?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:333
+#: ../camel/camel-smime-context.c:543
 msgid "Cannot add CMS Signer information"
 msgstr "CMS ç½²å??è??æ??å ±ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:403 ../camel/camel-smime-context.c:851
+#: ../camel/camel-smime-context.c:613 ../camel/camel-smime-context.c:1065
 msgid "Cannot create encoder context"
 msgstr "ã?¨ã?³ã?³ã?¼ã??ã?®ã?³ã?³ã??ã?ã?¹ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:409
+#: ../camel/camel-smime-context.c:619
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS ã?¨ã?³ã?³ã?¼ã??ã?¸ã?®ã??ã?¼ã?¿ã?®è¿½å? ã??å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:414 ../camel/camel-smime-context.c:868
+#: ../camel/camel-smime-context.c:624 ../camel/camel-smime-context.c:1082
 msgid "Failed to encode data"
 msgstr "ã??ã?¼ã?¿ã?®ã?¨ã?³ã?³ã?¼ã??ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:487
+#: ../camel/camel-smime-context.c:697
 msgid "Unverified"
 msgstr "æ?ªæ¤?è¨¼"
 
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:699
 msgid "Good signature"
 msgstr "è?¯ã??ç½²å??"
 
-#: ../camel/camel-smime-context.c:491
+#: ../camel/camel-smime-context.c:701
 msgid "Bad signature"
 msgstr "æ?ªã??ç½²å??"
 
-#: ../camel/camel-smime-context.c:493
+#: ../camel/camel-smime-context.c:703
 msgid "Content tampered with or altered in transit"
 msgstr "ã??ã?¼ã?¿ã?®è»¢é??ä¸ã?«ä¸?å½?ã?«æ?¹ç«?ã??ã??ã??å??å®¹ã?§ã??"
 
-#: ../camel/camel-smime-context.c:495
+#: ../camel/camel-smime-context.c:705
 msgid "Signing certificate not found"
 msgstr "ç½²å??ä»?ã??è¨¼æ??æ?¸ã??ã?¿ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:497
+#: ../camel/camel-smime-context.c:707
 msgid "Signing certificate not trusted"
 msgstr "ç½²å??ä»?ã??è¨¼æ??æ?¸ã?¯ä¿¡é ¼ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:499
+#: ../camel/camel-smime-context.c:709
 msgid "Signature algorithm unknown"
 msgstr "ç½²å??ã?¢ã?«ã?´ã?ªã?ºã? ã??ä¸?æ??ã?§ã??"
 
-#: ../camel/camel-smime-context.c:501
+#: ../camel/camel-smime-context.c:711
 msgid "Signature algorithm unsupported"
 msgstr "ç½²å??ã?¢ã?«ã?´ã?ªã?ºã? ã?¯æ?ªã?µã??ã?¼ã??ã?§ã??"
 
-#: ../camel/camel-smime-context.c:503
+#: ../camel/camel-smime-context.c:713
 msgid "Malformed signature"
 msgstr "ã??ã??ã??ã?ªç½²å??ã?§ã??"
 
-#: ../camel/camel-smime-context.c:505
+#: ../camel/camel-smime-context.c:715
 msgid "Processing error"
 msgstr "å?¦ç??ã?¨ã?©ã?¼ã?§ã??"
 
-#: ../camel/camel-smime-context.c:542
+#: ../camel/camel-smime-context.c:753
 msgid "No signed data in signature"
 msgstr "ç½²å??ã?®ä¸ã?«ç½²å??ã??ã??ã??ã?¼ã?¿ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:549
+#: ../camel/camel-smime-context.c:758
 msgid "Digests missing from enveloped data"
 msgstr "EnvelopedData ã??ã??ã?®ã??ã?¤ã?¸ã?§ã?¹ã??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:562 ../camel/camel-smime-context.c:572
+#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
 msgid "Cannot calculate digests"
 msgstr "ã??ã?¤ã?¸ã?§ã?¹ã??ã??è¨?ç®?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:577
+#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
 msgid "Cannot set message digests"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?»ã??ã?¤ã?¸ã?§ã?¹ã??ã??ã?»ã??ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:592
+#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
 msgid "Certificate import failed"
 msgstr "è¨¼æ??æ?¸ã?®ã?¤ã?³ã??ã?¼ã??ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:817
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®ã?¿èª?è¨¼ã??ã?¾ã??ã??ã??å¦¥å½?æ?§ã??æ¤?è¨¼ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:605
+#: ../camel/camel-smime-context.c:820
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?¨ã?¤ã?³ã??ã?¼ã??æ¸?ã?§æ¤?è¨¼æ¸?ã?¿ã?®è¨¼æ??æ?¸ã?®ã?¿èª?è¨¼ã??ã?¾ã??"
 
-#: ../camel/camel-smime-context.c:609
+#: ../camel/camel-smime-context.c:824
 msgid "Cannot find signature digests"
 msgstr "è¨¼æ??æ?¸ã?®ã??ã?¤ã?¸ã?§ã?¹ã??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:625
+#: ../camel/camel-smime-context.c:840
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ç½²å??è??: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:726
+#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
 msgid "Decoder failed"
 msgstr "ã??ã?³ã?¼ã??ã?®ã?¨ã?©ã?¼ã?§ã??"
 
-#: ../camel/camel-smime-context.c:785
+#: ../camel/camel-smime-context.c:1000
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "å?±é??ã?ªã??ã?«ã?¯æ??å?·å??ã?¢ã?«ã?´ã?ªã?ºã? ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
-#. PORT_GetError(); ??
-#: ../camel/camel-smime-context.c:794
+#: ../camel/camel-smime-context.c:1008
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "æ??å?·å??ã??ã?«ã?¯é?µã?®ã?¹ã?ã??ã??ã??ç¢ºä¿?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:805
+#: ../camel/camel-smime-context.c:1019
 msgid "Cannot create CMS Message"
 msgstr "CMS ã?¡ã??ã?»ã?¼ã?¸ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:1025
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS Enveloped ã??ã?¼ã?¿ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:1031
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS Enveloped ã??ã?¼ã?¿ã??æ·»ä»?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:823
+#: ../camel/camel-smime-context.c:1037
 msgid "Cannot attach CMS data object"
 msgstr "CMS ã??ã?¼ã?¿ã?»ã?ªã??ã?¸ã?§ã?¯ã??ã??æ·»ä»?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:832
+#: ../camel/camel-smime-context.c:1046
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS å??é ?æ??å ±ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:837
+#: ../camel/camel-smime-context.c:1051
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS å??é ?æ??å ±ã??è¿½å? ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:862
+#: ../camel/camel-smime-context.c:1076
 msgid "Failed to add data to encoder"
 msgstr "ã??ã?¼ã?¿ã?®ã?¨ã?³ã?³ã?¼ã??ã?¸ã?®è¿½å? ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:949
-#, c-format
-msgid "Decoder failed, error %d"
-msgstr "ã??ã?³ã?¼ã??ã?®ã?¨ã?©ã?¼ (%d)"
-
-#: ../camel/camel-smime-context.c:956
+#: ../camel/camel-smime-context.c:1172
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME å¾©å?·å??: æ??å?·å??ã??ã??ã??å??å®¹ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:983
+#: ../camel/camel-smime-context.c:1200
 msgid "import keys: unimplemented"
 msgstr "é?µã?®ã?¤ã?³ã??ã?¼ã??: æ?ªã? å®?è£?ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/camel-smime-context.c:991
+#: ../camel/camel-smime-context.c:1208
 msgid "export keys: unimplemented"
 msgstr "é?µã?®ã?¨ã?ã?¹ã??ã?¼ã??: æ?ªã? å®?è£?ã??ã??ã?¦ã??ã?¾ã??ã??"
 
 #: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: ã??ã??ã?§ã?¯ç?¡å?¹ã?ªæ??ä½?ã?§ã??"
 
@@ -2322,146 +2320,145 @@ msgstr "ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: ã??ã??ã?§ã?¯ç?¡å?¹ã?ªæ??ä½?ã?§ã??"
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s: ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??"
 
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:384
+#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
 #: ../camel/providers/local/camel-maildir-store.c:219
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: %s: ç?¡å?¹ã?ªæ??ä½?ã?§ã??"
 
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:421
+#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
 #: ../camel/providers/local/camel-maildir-store.c:291
 #, 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:899 ../camel/camel-vtrash-folder.c:54
-#: ../camel/providers/imap/camel-imap-store.c:1061
+#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
 msgid "Trash"
 msgstr "ã?´ã??ç®±"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:902 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
 msgid "Junk"
 msgstr "ã?¸ã?£ã?³ã?¯"
 
-#: ../camel/camel-tcp-stream-openssl.c:572
+#: ../camel/camel-tcp-stream-openssl.c:564
 msgid "Unable to get issuer's certificate"
 msgstr "ç?ºè¡?è??ã?®è¨¼æ??æ?¸ã??å??å¾?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:574
+#: ../camel/camel-tcp-stream-openssl.c:566
 msgid "Unable to get Certificate Revocation List"
 msgstr "èª?è¨¼å??ã??æ¶?ã??ä¸?è¦§ã??å??å¾?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:576
+#: ../camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to decrypt certificate signature"
 msgstr "è¨¼æ??æ?¸ã?®ç½²å??ã??è§£èªã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:578
+#: ../camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr "èª?è¨¼å??ã??æ¶?ã??ä¸?è¦§ã?®ç½²å??ã?®è§£èªã??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:580
+#: ../camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decode issuer's public key"
 msgstr "ç?ºè¡?è??ã?®ã??ã??ã?ªã??ã?¯ã?»ã?ã?¼ã??è§£èªã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:582
+#: ../camel/camel-tcp-stream-openssl.c:574
 msgid "Certificate signature failure"
 msgstr "è¨¼æ??æ?¸ã?®ç½²å??ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:584
+#: ../camel/camel-tcp-stream-openssl.c:576
 msgid "Certificate Revocation List signature failure"
 msgstr "èª?è¨¼å??ã??æ¶?ã??ä¸?è¦§ã?®ç½²å??ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:586
+#: ../camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate not yet valid"
 msgstr "èª?è¨¼ã??ã?¾ã? æ£ã??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:588
+#: ../camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate has expired"
 msgstr "è¨¼æ??æ?¸ã?®æ??å?¹æ??é??ã??å»¶ã?³ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "CRL ã?¯ã?¾ã? æ£ã??ã??ã??ã??ã?¾ã??ã??"
+#: ../camel/camel-tcp-stream-openssl.c:582
+msgid "Certificate Revocation List (CRL) not yet valid"
+msgstr "è¨¼æ??æ?¸å¤±å?¹ã?ªã?¹ã?? (CRL) ã?¯ã?¾ã? ç?¡å?¹ã?§ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "CRL ã??æ??é??å??ã??ã?§ã??"
+#: ../camel/camel-tcp-stream-openssl.c:584
+msgid "Certificate Revocation List (CRL) has expired"
+msgstr "è¨¼æ??æ?¸å¤±å?¹ã?ªã?¹ã?? (CRL) ã??æ??é??å??ã??ã?§ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "CRL ã?®ä¸ã?§ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
+#: ../camel/camel-tcp-stream-openssl.c:589
+msgid "Error in Certificate Revocation List (CRL)"
+msgstr "è¨¼æ??æ?¸å¤±å?¹ã?ªã?¹ã?? (CRL) ã?«ã?¨ã?©ã?¼"
 
-#: ../camel/camel-tcp-stream-openssl.c:599
+#: ../camel/camel-tcp-stream-openssl.c:591
 msgid "Out of memory"
 msgstr "ã?¡ã?¢ã?ªã??è¶³ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:601
+#: ../camel/camel-tcp-stream-openssl.c:593
 msgid "Zero-depth self-signed certificate"
 msgstr "Zero-depth self-signed èª?è¨¼"
 
-#: ../camel/camel-tcp-stream-openssl.c:603
+#: ../camel/camel-tcp-stream-openssl.c:595
 msgid "Self-signed certificate in chain"
 msgstr "ã??ã?§ã?¼ã?³ã?®ä¸ã?«ã??ã?? Self-signed èª?è¨¼"
 
-#: ../camel/camel-tcp-stream-openssl.c:605
+#: ../camel/camel-tcp-stream-openssl.c:597
 msgid "Unable to get issuer's certificate locally"
 msgstr "ç?ºè¡?è??ã?®èª?è¨¼ã??ã?ã?¼ã?«ã?«ã?§å??å¾?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:607
+#: ../camel/camel-tcp-stream-openssl.c:599
 msgid "Unable to verify leaf signature"
 msgstr "Leaf ç½²å??ã??æ¤?è¨¼ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:609
+#: ../camel/camel-tcp-stream-openssl.c:601
 msgid "Certificate chain too long"
 msgstr "èª?è¨¼ã??ã?§ã?¼ã?³ã??é?·ã??ã??ã?¾ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:611
+#: ../camel/camel-tcp-stream-openssl.c:603
 msgid "Certificate Revoked"
 msgstr "ç?¡å?¹ã?«ã?ªã?£ã??è¨¼æ??æ?¸ã?§ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:613
+#: ../camel/camel-tcp-stream-openssl.c:605
 msgid "Invalid Certificate Authority (CA)"
 msgstr "èª?è¨¼å±? (CA) ã??ç?¡å?¹ã?§ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:615
+#: ../camel/camel-tcp-stream-openssl.c:607
 msgid "Path length exceeded"
 msgstr "ã??ã?¹ã?¯ã?¼ã??ã??é?·ã??ã??ã?¾ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:617
+#: ../camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid purpose"
 msgstr "ç?®ç??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:619
+#: ../camel/camel-tcp-stream-openssl.c:611
 msgid "Certificate untrusted"
 msgstr "ä¿¡é ¼ã??ã??ã?¦ã??ã?ªã??è¨¼æ??æ?¸ã?§ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:621
+#: ../camel/camel-tcp-stream-openssl.c:613
 msgid "Certificate rejected"
 msgstr "æ??å?¦ã??ã??ã??è¨¼æ??æ?¸ã?§ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:624
+#: ../camel/camel-tcp-stream-openssl.c:616
 msgid "Subject/Issuer mismatch"
 msgstr "ã?¿ã?¤ã??ã?«/ç?ºè¡?è??ã??ä¸?è?´ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:626
+#: ../camel/camel-tcp-stream-openssl.c:618
 msgid "AKID/SKID mismatch"
 msgstr "AKID/SKID ã??ä¸?è?´ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:628
+#: ../camel/camel-tcp-stream-openssl.c:620
 msgid "AKID/Issuer serial mismatch"
 msgstr "AKID/ç?ºè¡?è??ã?®ã?·ã?ªã?¢ã?«ç?ªå?·ã??ä¸?è?´ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:630
+#: ../camel/camel-tcp-stream-openssl.c:622
 msgid "Key usage does not support certificate signing"
 msgstr "ã?ã?¼ã?®å?©ç?¨æ?¹æ³?ã??èª?è¨¼ç½²å??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:633
+#: ../camel/camel-tcp-stream-openssl.c:625
 msgid "Error in application verification"
 msgstr "ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?®æ¤?è¨¼ã?§ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:873
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2474,15 +2471,15 @@ msgstr ""
 "æ??ç´?:              %s\n"
 "ç½²å??:              %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
 msgid "BAD"
 msgstr "BAD"
 
-#: ../camel/camel-tcp-stream-openssl.c:708
+#: ../camel/camel-tcp-stream-openssl.c:700
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -2502,7 +2499,7 @@ msgstr ""
 "å??è«¾ã??ã?¦ã?¿ã?¾ã??ã??ï¼?"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:890
+#: ../camel/camel-tcp-stream-ssl.c:883
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2517,7 +2514,7 @@ msgstr ""
 "\n"
 "å??è«¾ã??ã?¦ã?¿ã?¾ã??ã??ï¼?"
 
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:927
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2526,7 +2523,7 @@ msgstr ""
 "èª?è¨¼å??é¡?: %s\n"
 "ç?ºè¡?è??: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:979
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2535,7 +2532,7 @@ msgstr ""
 "ã??ã??ã??ã?ªèª?è¨¼ã??ã?¡ã?¤ã?³: %s\n"
 "ç?ºè¡?è??: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:997
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2544,7 +2541,7 @@ msgstr ""
 "è¨¼æ??æ?¸ã?®æ??å?¹æ??é??å??ã??: %s\n"
 "ç?ºè¡?è??: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:1014
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2558,31 +2555,31 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "'%s' ã?¨ã??ã?? URL ã??è§£æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/camel-vee-folder.c:582
+#: ../camel/camel-vee-folder.c:580
 #, c-format
 msgid "Error storing '%s': %s"
 msgstr "'%s' ã?®æ ¼ç´?ä¸ã?«ã?¨ã?©ã?¼: %s"
 
-#: ../camel/camel-vee-folder.c:660
+#: ../camel/camel-vee-folder.c:657
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%2$s ã?«ã?¯ %1$s ã?¨ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-vee-folder.c:820 ../camel/camel-vee-folder.c:826
+#: ../camel/camel-vee-folder.c:816 ../camel/camel-vee-folder.c:822
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®ä»®æ?³ã??ã?©ã?«ã??ã?¸ã?®ã?³ã??ã?¼ã?¾ã??ã?¯ç§»å??ã??ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/camel-vee-store.c:114 ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
+#: ../camel/camel-vee-store.c:353
 msgid "Unmatched"
 msgstr "è©²å½?ã??ã?ªã??ã??ã?®"
 
-#: ../camel/camel-vee-store.c:407
+#: ../camel/camel-vee-store.c:400
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: %s: ã??ã?®ã??ã??ã?ªã??ã?©ã?«ã??ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:422
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "ã??ã?©ã?«ã??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: %s: ã??ã?®ã??ã??ã?ªã??ã?©ã?«ã??ã?¯ã??ã??ã?¾ã??ã??"
@@ -2595,7 +2592,7 @@ msgstr "ã?´ã??ç®±ã??ã?©ã?«ã??ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ã?¸ã?£ã?³ã?¯ã?»ã??ã?©ã?«ã??ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:129
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2604,20 +2601,20 @@ msgstr ""
 "ã?¡ã??ã?»ã?¼ã?¸ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s\n"
 "  %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:129
-#: ../camel/providers/local/camel-maildir-folder.c:248
-#: ../camel/providers/local/camel-maildir-folder.c:275
-#: ../camel/providers/local/camel-mbox-folder.c:347
-#: ../camel/providers/local/camel-mbox-folder.c:399
-#: ../camel/providers/local/camel-mh-folder.c:214
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/local/camel-maildir-folder.c:278
+#: ../camel/providers/local/camel-maildir-folder.c:310
+#: ../camel/providers/local/camel-mbox-folder.c:363
+#: ../camel/providers/local/camel-mbox-folder.c:414
+#: ../camel/providers/local/camel-mh-folder.c:245
 msgid "No such message"
 msgstr "ã??ã?®ã??ã??ã?ªã?¡ã??ã?»ã?¼ã?¸ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:141
-#: ../camel/providers/imap4/camel-imap4-folder.c:821
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
+#: ../camel/providers/imap4/camel-imap4-folder.c:814
 #: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:411
+#: ../camel/providers/nntp/camel-nntp-folder.c:250
+#: ../camel/providers/nntp/camel-nntp-folder.c:410
 #: ../camel/providers/pop3/camel-pop3-folder.c:268
 #: ../camel/providers/pop3/camel-pop3-folder.c:578
 #: ../camel/providers/pop3/camel-pop3-folder.c:639
@@ -2625,12 +2622,12 @@ msgstr "ã??ã?®ã??ã??ã?ªã?¡ã??ã?»ã?¼ã?¸ã?¯ã??ã??ã?¾ã??ã??"
 msgid "User canceled"
 msgstr "ã?¦ã?¼ã?¶ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:826
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
+#: ../camel/providers/imap4/camel-imap4-folder.c:819
 #: ../camel/providers/nntp/camel-nntp-folder.c:166
 #: ../camel/providers/nntp/camel-nntp-folder.c:168
 #: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:253
+#: ../camel/providers/nntp/camel-nntp-folder.c:252
 #: ../camel/providers/pop3/camel-pop3-folder.c:388
 #: ../camel/providers/pop3/camel-pop3-folder.c:581
 #: ../camel/providers/pop3/camel-pop3-folder.c:642
@@ -2640,197 +2637,202 @@ msgstr "ã?¦ã?¼ã?¶ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
 msgid "Cannot get message %s: %s"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ %s ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:165
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2277
-#: ../camel/providers/imap4/camel-imap4-folder.c:844
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2463
+#: ../camel/providers/imap4/camel-imap4-folder.c:837
 msgid "This message is not available in offline mode."
 msgstr "ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ã?¯ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:185
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:192
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1800
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1851
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:194
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:201
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1966
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2017
 msgid "Could not get message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??å¾?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:867
-#: ../camel/providers/imap/camel-imap-folder.c:265
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
+#: ../camel/providers/imap/camel-imap-folder.c:296
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s ã?®ã?µã??ã?ªã??ã?ã?¼ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1127
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012
+#, c-format
+msgid "Checking for deleted messages %s"
+msgstr "å??é?¤ã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ %s ã?®ã??ã?§ã??ã?¯ä¸"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
 msgid "Trash Folder Full. Please Empty."
 msgstr "ã?´ã??ç®±ã??ã?©ã?«ã??ã??æº?æ?¯ã?§ã??ã??ç©ºã?«ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1335
-#: ../camel/providers/groupwise/camel-groupwise-store.c:617
-#: ../camel/providers/groupwise/camel-groupwise-store.c:743
-#: ../camel/providers/imap/camel-imap-folder.c:3362
-#: ../camel/providers/imap/camel-imap-folder.c:3438
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
+#: ../camel/providers/groupwise/camel-groupwise-store.c:633
+#: ../camel/providers/groupwise/camel-groupwise-store.c:763
+#: ../camel/providers/imap/camel-imap-folder.c:3421
+#: ../camel/providers/imap/camel-imap-folder.c:3497
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "%s ã?«ã??ã??æ?°ç??ã?¡ã??ã?»ã?¼ã?¸ã?®ã?µã??ã?ªæ??å ±ã?®å??æ??ä¸"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2135
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2177
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2317
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2165
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??ä½?æ??ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "ã??ã?©ã?«ã??ã?®ã?³ã?³ã??ã?? %s ã??å??å¾?ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
+#: ../camel/providers/imap4/camel-imap4-journal.c:311
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr ""
 "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: ã?ã?£ã??ã?·ã?¥ã??å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
+#: ../camel/providers/imap4/camel-imap4-journal.c:327
 #, c-format
 msgid "Cannot append message in offline mode: %s"
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
+#: ../camel/providers/imap4/camel-imap4-provider.c:38
 msgid "Checking for new mail"
 msgstr "æ?°ç??ã?¡ã?¼ã?«ã?®ã??ã?§ã??ã?¯"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
+#: ../camel/providers/hula/camel-hula-provider.c:50
 #: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
+#: ../camel/providers/imap4/camel-imap4-provider.c:40
 msgid "C_heck for new messages in all folders"
 msgstr "å?¨ã?¦ã?®ã??ã?©ã?«ã??ã?®æ?°ç??ã?¡ã?¼ã?«ã??ã??ã?§ã??ã?¯ã??ã??(_H)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
 #: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
+#: ../camel/providers/imap4/camel-imap4-provider.c:51
 #: ../camel/providers/local/camel-local-provider.c:46
 #: ../camel/providers/local/camel-local-provider.c:86
 #: ../camel/providers/local/camel-local-provider.c:106
 msgid "Options"
 msgstr "ã?ªã??ã?·ã?§ã?³"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "ã??ã?®ã?µã?¼ã??ã?® Inbox ã?«ã??ã??æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?¸ã??ã?£ã?«ã?¿ã??é?©ç?¨ã??ã??(_A)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
 msgid "Check new messages for J_unk contents"
 msgstr "æ?°ç??ã?¡ã?¼ã?«ã??ã?¹ã??ã? ã??ã?©ã??ã??ã??ã?§ã??ã?¯ã??ã??(_U)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
 #: ../camel/providers/imap/camel-imap-provider.c:74
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "å??ä¿¡ç®±ã?«ã??ã??ã?¡ã?¼ã?«ã? ã??ã?¹ã??ã? ã??ã?©ã??ã??ã??ã?§ã??ã?¯ã??ã??(_B)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
 msgid "Automatically synchroni_ze account locally"
 msgstr "ã?ã?¼ã?«ã?«ã?®ã?¢ã?«ã?¦ã?³ã??ã??è?ªå??ç??ã?«å??æ??ã??ã??(_A)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
 msgid "SOAP Settings"
 msgstr "SOAP ã?®è¨å®?"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
 msgid "Post Office Agent SOAP _Port:"
 msgstr "ã??ã?¹ã??ã?»ã?ªã??ã?£ã?¹ã?»ã?¨ã?¼ã?¸ã?§ã?³ã??ã?® SOAP ã??ã?¼ã??(_P):"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
 msgid "For accessing Novell GroupWise servers"
 msgstr "Novell GroupWise ã?µã?¼ã??ã?¸ã?®ã?¢ã?¯ã?»ã?¹ç?¨ã?§ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
+#: ../camel/providers/hula/camel-hula-provider.c:93
 #: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:84
+#: ../camel/providers/imap4/camel-imap4-provider.c:83
 #: ../camel/providers/imapp/camel-imapp-provider.c:67
 #: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:74
 msgid "Password"
 msgstr "ã??ã?¹ã?¯ã?¼ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
 msgid ""
 "This option will connect to the GroupWise server using a plaintext password."
 msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã?¬ã?¤ã?³ã?»ã??ã?ã?¹ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ IMAP ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã?¾"
 "ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:104
+#: ../camel/providers/groupwise/camel-groupwise-store.c:102
 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:1357
+#: ../camel/providers/groupwise/camel-groupwise-store.c:204
+#: ../camel/providers/imap/camel-imap-store.c:1358
 msgid "You did not enter a password."
 msgstr "ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:303
+#: ../camel/providers/groupwise/camel-groupwise-store.c:319
 msgid "Some features may not work correctly with your current server version"
 msgstr ""
 "ã??ä½¿ã??ã?®ã?µã?¼ã??ã?®ã??ã?¼ã?¸ã?§ã?³ã?§ã?¯ã??ã??ã??ã?¤ã??ã?®æ©?è?½ã??æ£ã??ã??å??ä½?ã??ã?ªã??ã??ã??ã??ã??ã?¾ã??"
 "ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:524
+#: ../camel/providers/groupwise/camel-groupwise-store.c:540
 #: ../camel/providers/imap/camel-imap-store.c:1849
 #: ../camel/providers/imap/camel-imap-store.c:2047
 #, c-format
 msgid "No such folder %s"
 msgstr "ã??ã?®ã??ã??ã?ªã??ã?©ã?«ã?? %s ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ GroupWise ã??ã?©ã?«ã??ã??ç??æ??ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
 #: ../camel/providers/imap/camel-imap-store.c:1924
 #: ../camel/providers/imap/camel-imap-store.c:2304
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "è¦ªã??ã?©ã?«ã??ã?«ã?¯è¤?æ?°ã?®ã?µã??ã??ã?©ã?«ã??ã??å?«ã??ã??ã??ã?¨ã?¯ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
 #: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "GroupWise ã??ã?©ã?«ã??ã?® '%s' ã?? '%s' ã?¨ã??ã??å??å??ã?«å¤?æ?´ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise ã?®ã?µã?¼ã?? %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "%s ã?® %s ã?«ã??ã?? GroupWise ã?®ã?µã?¼ã??ã?¹"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "%s çµ?ç?±ã?§ GroupWise ã?®ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
 msgid "Sending Message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®é??ä¿¡"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
 msgid ""
 "You have exceeded this account's storage limit. Your messages are queued in "
 "your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
@@ -2840,95 +2842,95 @@ msgstr ""
 "ç®±ã?«ä¿?å?ã??ã??ã?¾ã??ã??ã?¾ã??ã?¯ã?¡ã?¼ã?«ã??å??é?¤ã??ã??ã??ã?¢ã?¼ã?«ã?¤ã??ã?«ã?¾ã?¨ã??ã??ç?ã??ã?¦ã??ã??ã??[é??"
 "å??ä¿¡] ã??ã?¿ã?³ã??æ?¼ã??ã?¦ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã??ã?¦ä¸?ã??ã??ã??\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
 #, c-format
 msgid "Could not send message: %s"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:49
+#: ../camel/providers/hula/camel-hula-provider.c:48
 #: ../camel/providers/imap/camel-imap-provider.c:44
 msgid "Checking for New Mail"
 msgstr "æ?°ç??ã?¡ã?¼ã?«ã?®ã??ã?§ã??ã?¯"
 
-#: ../camel/providers/hula/camel-hula-provider.c:54
+#: ../camel/providers/hula/camel-hula-provider.c:53
 #: ../camel/providers/imap/camel-imap-provider.c:52
 msgid "Connection to Server"
 msgstr "ã?µã?¼ã??ã?¸æ?¥ç¶?"
 
-#: ../camel/providers/hula/camel-hula-provider.c:56
+#: ../camel/providers/hula/camel-hula-provider.c:55
 #: ../camel/providers/imap/camel-imap-provider.c:54
 msgid "_Use custom command to connect to server"
 msgstr "ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã??é??ã?«ã?«ã?¹ã?¿ã? ã?»ã?³ã??ã?³ã??ã??ä½¿ç?¨ã??ã??(_U)"
 
-#: ../camel/providers/hula/camel-hula-provider.c:58
+#: ../camel/providers/hula/camel-hula-provider.c:57
 #: ../camel/providers/imap/camel-imap-provider.c:56
 msgid "Command:"
 msgstr "ã?³ã??ã?³ã??:"
 
-#: ../camel/providers/hula/camel-hula-provider.c:61
+#: ../camel/providers/hula/camel-hula-provider.c:60
 #: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
+#: ../camel/providers/imap4/camel-imap4-provider.c:43
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid "Folders"
 msgstr "ã??ã?©ã?«ã??"
 
-#: ../camel/providers/hula/camel-hula-provider.c:63
+#: ../camel/providers/hula/camel-hula-provider.c:62
 #: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
+#: ../camel/providers/imap4/camel-imap4-provider.c:45
 msgid "_Show only subscribed folders"
 msgstr "è³¼èªã??ã?¦ã??ã??ã??ã?©ã?«ã??ã? ã??è¡¨ç¤ºã??ã??(_S)"
 
-#: ../camel/providers/hula/camel-hula-provider.c:65
+#: ../camel/providers/hula/camel-hula-provider.c:64
 #: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
+#: ../camel/providers/imap4/camel-imap4-provider.c:47
 msgid "O_verride server-supplied folder namespace"
 msgstr "ã?µã?¼ã??ã??æ??ä¾?ã??ã??ã??ã?©ã?«ã??ã?®ã??ã?¼ã? ã?¹ã??ã?¼ã?¹ã??ä¸?æ?¸ã??ã??ã??(_V)"
 
-#: ../camel/providers/hula/camel-hula-provider.c:67
+#: ../camel/providers/hula/camel-hula-provider.c:66
 msgid "Namespace"
 msgstr "ã??ã?¼ã? ã?¹ã??ã?¼ã?¹"
 
-#: ../camel/providers/hula/camel-hula-provider.c:78
+#: ../camel/providers/hula/camel-hula-provider.c:76
 msgid "Hula"
 msgstr "Hula"
 
-#: ../camel/providers/hula/camel-hula-provider.c:80
+#: ../camel/providers/hula/camel-hula-provider.c:78
 msgid "For accessing Hula servers"
 msgstr "Hula ã?µã?¼ã??ã?¸ã?®ã?¢ã?¯ã?»ã?¹ç?¨ã?§ã??"
 
-#: ../camel/providers/hula/camel-hula-provider.c:97
+#: ../camel/providers/hula/camel-hula-provider.c:95
 msgid "This option will connect to the Hula server using a plaintext password."
 msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã?¬ã?¤ã?³ã?»ã??ã?ã?¹ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ Hula ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã?¾"
 "ã??"
 
-#: ../camel/providers/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
+#: ../camel/providers/imap/camel-imap-command.c:181
+#: ../camel/providers/imap/camel-imap-command.c:265
 msgid "No output stream"
 msgstr "å?ºå??ã?¹ã??ã?ªã?¼ã? ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
+#: ../camel/providers/imap/camel-imap-command.c:186
+#: ../camel/providers/imap/camel-imap-command.c:270
 msgid "No input stream"
 msgstr "å?¥å??ã?¹ã??ã?ªã?¼ã? ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-command.c:231
-#: ../camel/providers/imap/camel-imap-command.c:280
-#: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3037
+#: ../camel/providers/imap/camel-imap-command.c:229
+#: ../camel/providers/imap/camel-imap-command.c:278
+#: ../camel/providers/imap/camel-imap-command.c:492
+#: ../camel/providers/imap/camel-imap-store.c:3051
 msgid "Operation cancelled"
 msgstr "å?¦ç??ã??ã?ã?£ã?³ã?»ã?«ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
+#: ../camel/providers/imap/camel-imap-command.c:331
+#: ../camel/providers/imap/camel-imap-store.c:3056
 #, 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:354
+#: ../camel/providers/imap/camel-imap-command.c:352
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2937,107 +2939,107 @@ msgstr ""
 "IMAP ã?µã?¼ã?? %s %s ã??ã??ã?®è¦å??:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:423
+#: ../camel/providers/imap/camel-imap-command.c:421
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP ã?µã?¼ã??ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:433
+#: ../camel/providers/imap/camel-imap-command.c:431
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:508
+#: ../camel/providers/imap/camel-imap-command.c:506
 msgid "Server response ended too soon."
 msgstr "ã?µã?¼ã??ã?¬ã?¹ã??ã?³ã?¹ã?¯ã??ã?£ã??ã?ªã??çµ?ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-command.c:715
+#: ../camel/providers/imap/camel-imap-command.c:712
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ã?µã?¼ã??ã?®å¿?ç?ã?¯ %s æ??å ±ã??å?«ã??ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-command.c:751
+#: ../camel/providers/imap/camel-imap-command.c:748
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ã?µã?¼ã??ã??ã??æ?³å®?å¤?ã?® OK å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:89
+#: ../camel/providers/imap/camel-imap-folder.c:91
 msgid "Always check for new mail in this folder"
 msgstr "å¸¸ã?«ã??ã?®ã??ã?©ã?«ã??ã?«ã??ã??æ?°ç??ã?¡ã?¼ã?«ã??ã??ã?§ã??ã?¯ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:246
+#: ../camel/providers/imap/camel-imap-folder.c:277
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ã??ã?©ã?«ã?? %s ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
 #. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:891
+#: ../camel/providers/imap/camel-imap-folder.c:919
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s ã?«ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®è§£æ??ä¸"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1950
+#: ../camel/providers/imap/camel-imap-folder.c:1987
 #, c-format
 msgid "Unexpected response status '%s' after APPEND command"
 msgstr "APPEND ã?³ã??ã?³ã??ã?®å¾?ã?«æ?³å®?å¤?ã?®å¿?ç?ã?¹ã??ã?¼ã?¿ã?¹ã??ã??ã??ã?¾ã??: '%s'"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1965
+#: ../camel/providers/imap/camel-imap-folder.c:2002
 msgid "No response on continuation after APPEND command"
 msgstr "APPEND ã?³ã??ã?³ã??ã?«ç¶?ã??å¿?ç?ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2010
+#: ../camel/providers/imap/camel-imap-folder.c:2047
 msgid "Unknown error occurred during APPEND command!"
 msgstr "APPEND ã?³ã??ã?³ã??ã?®ç?ºè¡?ä¸ã?«å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ï¼?"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2842
+#: ../camel/providers/imap/camel-imap-folder.c:2878
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:2913
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "%s ã?¨ã??ã?? ID ã?®ã?¡ã??ã?»ã?¼ã?¸ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2878
+#: ../camel/providers/imap/camel-imap-folder.c:2914
 msgid "No such message available."
 msgstr "ã??ã?®ã??ã??ã?ªã?¡ã??ã?»ã?¼ã?¸ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2932
-#: ../camel/providers/imap/camel-imap-folder.c:3753
-#: ../camel/providers/nntp/camel-nntp-folder.c:239
+#: ../camel/providers/imap/camel-imap-folder.c:2975
+#: ../camel/providers/imap/camel-imap-folder.c:3808
+#: ../camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "ã??ã?®ã?¡ã??ã?»ã?¼ã?¸ã?¯ç?¾å?¨å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3567
+#: ../camel/providers/imap/camel-imap-folder.c:3624
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ä¸?å®?å?¨ã?ªã?µã?¼ã??ã?®å¿?ç?: ã?¡ã??ã?»ã?¼ã?¸ %d ã?®æ??å ±ã??æ??ä¾?ã??ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3575
+#: ../camel/providers/imap/camel-imap-folder.c:3632
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "ä¸?å®?å?¨ã?ªã?µã?¼ã??ã?®å¿?ç?: ã?¡ã??ã?»ã?¼ã?¸ %d ã?® UID ã??æ??ä¾?ã??ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3791
+#: ../camel/providers/imap/camel-imap-folder.c:3846
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH å¿?ç?ã?«ã?¡ã??ã?»ã?¼ã?¸æ?¬ä½?ã??ã??ã??ã?¾ã??ã??ã?§ã??ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:182
-#: ../camel/providers/imap/camel-imap-message-cache.c:246
+#: ../camel/providers/imap/camel-imap-message-cache.c:181
+#: ../camel/providers/imap/camel-imap-message-cache.c:244
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "ã?ã?£ã??ã?·ã?¥ã?»ã??ã?©ã?«ã??ã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:333
-#: ../camel/providers/imap/camel-imap-message-cache.c:390
-#: ../camel/providers/imap/camel-imap-message-cache.c:421
-#: ../camel/providers/imap/camel-imap-message-cache.c:453
+#: ../camel/providers/imap/camel-imap-message-cache.c:330
+#: ../camel/providers/imap/camel-imap-message-cache.c:387
+#: ../camel/providers/imap/camel-imap-message-cache.c:418
+#: ../camel/providers/imap/camel-imap-message-cache.c:450
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "%s ã?¨ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã??ã?ã?£ã??ã?·ã?¥ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:533
+#: ../camel/providers/imap/camel-imap-message-cache.c:530
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "%s ã??ã?ã?£ã??ã?·ã?¥ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
@@ -3047,12 +3049,12 @@ msgid "Ch_eck for new messages in subscribed folders"
 msgstr "è³¼èªã??ã?¦ã??ã??ã??ã?©ã?«ã??ã?®æ?°ç??ã?¡ã?¼ã?«ã??ã??ã?§ã??ã?¯ã??ã??(_E)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
+#: ../camel/providers/imap4/camel-imap4-provider.c:49
 msgid "Namespace:"
 msgstr "ã??ã?¼ã? ã?¹ã??ã?¼ã?¹:"
 
 #: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
+#: ../camel/providers/imap4/camel-imap4-provider.c:53
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "ã??ã?®ã?µã?¼ã??ã?®å??ä¿¡ç®±ã?«ã??ã??æ?°ç??ã?¡ã?¼ã?«ã?«ã??ã?£ã?«ã?¿ã??é?©ç?¨ã??ã??(_A)"
 
@@ -3061,7 +3063,7 @@ msgid "Check new messages for Jun_k contents"
 msgstr "æ?°ç??ã?¡ã?¼ã?«ã??ã?¹ã??ã? ã??ã?©ã??ã??ã??ã?§ã??ã?¯ã??ã??(_K)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
+#: ../camel/providers/imap4/camel-imap4-provider.c:59
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "ã?ªã?¢ã?¼ã??ã?¨ã?ã?¼ã?«ã?«ã?®ã?¡ã?¼ã?«ã??è?ªå??ç??ã?«å??æ??ã??ã??(_Z)"
 
@@ -3081,36 +3083,36 @@ msgstr ""
 "ã??"
 
 #: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:214
+#: ../camel/providers/imap4/camel-imap4-store.c:210
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP ã?µã?¼ã?? %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:216
+#: ../camel/providers/imap4/camel-imap4-store.c:212
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s ã?® %s ã?«ã??ã?? IMAP ã?µã?¼ã??ã?¹"
 
 #: ../camel/providers/imap/camel-imap-store.c:568
 #: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:251
-#: ../camel/providers/imap4/camel-imap4-store.c:266
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:172
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-#: ../camel/providers/smtp/camel-smtp-transport.c:275
+#: ../camel/providers/imap4/camel-imap4-store.c:247
+#: ../camel/providers/imap4/camel-imap4-store.c:262
+#: ../camel/providers/nntp/camel-nntp-store.c:182
+#: ../camel/providers/nntp/camel-nntp-store.c:197
+#: ../camel/providers/pop3/camel-pop3-store.c:170
+#: ../camel/providers/pop3/camel-pop3-store.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:274
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "%s ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:173
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
+#: ../camel/providers/imap4/camel-imap4-store.c:248
+#: ../camel/providers/nntp/camel-nntp-store.c:183
+#: ../camel/providers/pop3/camel-pop3-store.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:260
 msgid "SSL unavailable"
 msgstr "SSL ã?¯ç?¡å?¹ã?§ã??"
 
@@ -3123,16 +3125,16 @@ msgstr "æ?¥ç¶?ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
 #: ../camel/providers/imap/camel-imap-store.c:710
 #: ../camel/providers/imap/camel-imap-store.c:716
 #: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
+#: ../camel/providers/imap4/camel-imap4-store.c:310
+#: ../camel/providers/imap4/camel-imap4-store.c:325
+#: ../camel/providers/imap4/camel-imap4-store.c:334
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã??ã?¢ã?¼ã??ã?§ IMAP ã?µã?¼ã?? %s ã?¸ã?®æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../camel/providers/smtp/camel-smtp-transport.c:332
 msgid "STARTTLS not supported"
 msgstr "STARTTLS æ?¡å¼µã?¯ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
@@ -3141,8 +3143,8 @@ msgid "SSL negotiations failed"
 msgstr "SSL æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??"
 
 #: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:339
-#: ../camel/providers/smtp/camel-smtp-transport.c:372
+#: ../camel/providers/imap4/camel-imap4-store.c:335
+#: ../camel/providers/smtp/camel-smtp-transport.c:371
 msgid "SSL is not available in this build"
 msgstr "ã??ã?®ã??ã??ã?±ã?¼ã?¸ã?§ã?¯ SSL ã??å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
@@ -3154,43 +3156,30 @@ msgstr "ã?³ã??ã?³ã?? \"%s\" ã?§æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
 #: ../camel/providers/imap/camel-imap-store.c:1053
 #: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:78
+#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
+#: ../camel/providers/imap4/camel-imap4-store.c:1403
+#: ../camel/providers/local/camel-maildir-folder.c:80
 #: ../camel/providers/local/camel-maildir-store.c:219
 #: ../camel/providers/local/camel-maildir-store.c:291
 #: ../camel/providers/local/camel-maildir-store.c:517
 #: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:464
+#: ../camel/providers/local/camel-spool-store.c:463
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
 msgid "Inbox"
 msgstr "å??ä¿¡ç®±"
 
-#: ../camel/providers/imap/camel-imap-store.c:1055
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "è??æ¡?"
-
-#: ../camel/providers/imap/camel-imap-store.c:1057
-msgid "Sent"
-msgstr "é??ä¿¡æ¸?"
-
-#: ../camel/providers/imap/camel-imap-store.c:1059
-msgid "Templates"
-msgstr "ã??ã?³ã??ã?¬ã?¼ã??"
-
-#: ../camel/providers/imap/camel-imap-store.c:1304
+#: ../camel/providers/imap/camel-imap-store.c:1305
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ã?µã?¼ã??ã?® %s ã?§ã?¯ %s ã?¨ã??ã??èª?è¨¼ã?¿ã?¤ã??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
+#: ../camel/providers/imap/camel-imap-store.c:1315
+#: ../camel/providers/smtp/camel-smtp-transport.c:506
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s ã?¨ã??ã??èª?è¨¼ã?¿ã?¤ã??ã?¯ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap/camel-imap-store.c:1388
+#: ../camel/providers/imap/camel-imap-store.c:1389
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3203,7 +3192,7 @@ msgstr ""
 
 #: ../camel/providers/imap/camel-imap-store.c:1861
 #: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:959
+#: ../camel/providers/imap4/camel-imap4-store.c:954
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -3222,50 +3211,54 @@ msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: æ?¢ã?«å?å?¨ã??ã?¦
 msgid "Unknown parent folder: %s"
 msgstr "è¦ªã??ã?©ã?«ã??ã??ç?¹å®?ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:576
-#: ../camel/providers/imap4/camel-imap4-command.c:583
+#: ../camel/providers/imap/camel-imap-store.c:3053
+msgid "Server unexpectedly disconnected"
+msgstr "çª?ç?¶ã?µã?¼ã??ã??æ?¥ç¶?ã??å??ã??ã?¾ã??ã??"
+
+#: ../camel/providers/imap4/camel-imap4-command.c:572
+#: ../camel/providers/imap4/camel-imap4-command.c:579
 #, c-format
 msgid "Failed sending command to IMAP server %s: %s"
 msgstr "%s ã?¨ã??ã?? IMAP ã?µã?¼ã??ã?¸ã?®ã?³ã??ã?³ã??é??ä¿¡ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:686
+#: ../camel/providers/imap4/camel-imap4-command.c:681
 #, c-format
 msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr "IMAP ã?µã?¼ã??ã?® %s ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:221
+#: ../camel/providers/imap4/camel-imap4-engine.c:215
 #, c-format
 msgid "Unexpected greeting from IMAP server %s."
 msgstr "IMAP ã?µã?¼ã??ã?® %s ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:450
+#: ../camel/providers/imap4/camel-imap4-engine.c:440
 #, c-format
 msgid "Cannot select folder '%s': Invalid mailbox name"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??é?¸æ??ã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:456
+#: ../camel/providers/imap4/camel-imap4-engine.c:446
 #, c-format
 msgid "Cannot select folder '%s': Bad command"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã?? ã??é?¸æ??ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
+#: ../camel/providers/imap4/camel-imap4-engine.c:1414
 #, c-format
 msgid "Failed to send command to IMAP server %s: %s"
 msgstr "%s ã?¨ã??ã?? IMAP ã?µã?¼ã??ã?¸ã?®ã?³ã??ã?³ã??é??ä¿¡ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1435
+#: ../camel/providers/imap4/camel-imap4-engine.c:1416
 msgid "service unavailable"
 msgstr "ã?µã?¼ã??ã?¹ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1569
-#: ../camel/providers/imap4/camel-imap4-engine.c:1608
-#: ../camel/providers/imap4/camel-imap4-engine.c:1653
-#: ../camel/providers/imap4/camel-imap4-engine.c:1709
+#: ../camel/providers/imap4/camel-imap4-engine.c:1546
+#: ../camel/providers/imap4/camel-imap4-engine.c:1584
+#: ../camel/providers/imap4/camel-imap4-engine.c:1628
+#: ../camel/providers/imap4/camel-imap4-engine.c:1683
 #, c-format
 msgid "IMAP4 server %s unexpectedly disconnected: %s"
 msgstr "çª?ç?¶ IMAP4 ã?µã?¼ã??ã?® %s ã??æ?¥ç¶?ã??å??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
+#: ../camel/providers/imap4/camel-imap4-folder.c:87
 msgid ""
 "Enable extended Mailing-List detection required for some filter and vFolder "
 "rules"
@@ -3273,121 +3266,121 @@ msgstr ""
 "ã??ã?£ã?«ã?¿ã?®ã?«ã?¼ã?«ã??ä»®æ?³ã??ã?©ã?«ã??ã?®ã?«ã?¼ã?«ã?«å¿?è¦?ã?ªã?¡ã?¼ã?ªã?³ã?°ã?»ã?ªã?¹ã??ã?®æ¤?å?ºã??æ??å?¹"
 "ã?«ã??ã??"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
+#: ../camel/providers/imap4/camel-imap4-folder.c:88
 msgid "Expire cached messages that haven't been read in X seconds"
 msgstr "ï¼¸ç§?é??èªã?¾ã??ã?ªã??ã?£ã??ã?ã?£ã??ã?·ã?¥æ¸?ã?®ã?¡ã??ã?»ã?¼ã?¸ã??ç?¡å?¹ã?«ã??ã?¾ã??"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:91
+#: ../camel/providers/imap4/camel-imap4-folder.c:89
 msgid "Expire cached messages older than X seconds"
 msgstr "ï¼¸ç§?ã??ã??å?¤ã??ã?ã?£ã??ã?·ã?¥æ¸?ã?®ã?¡ã??ã?»ã?¼ã?¸ã??ç?¡å?¹ã?«ã??ã?¾ã??"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:432
+#: ../camel/providers/imap4/camel-imap4-folder.c:427
 #, c-format
 msgid "Cannot access folder '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?«ã?¢ã?¯ã?»ã?¹ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:491
+#: ../camel/providers/imap4/camel-imap4-folder.c:484
 #, c-format
 msgid "Cannot sync flags to folder '%s': Unknown error"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?¨ã??ã?©ã?°ã??å??æ??ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:497
+#: ../camel/providers/imap4/camel-imap4-folder.c:490
 #, c-format
 msgid "Cannot sync flags to folder '%s': Bad command"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?¨ã??ã?©ã?°ã??å??æ??ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:637
+#: ../camel/providers/imap4/camel-imap4-folder.c:630
 #, c-format
 msgid "Cannot expunge folder '%s': Unknown error"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??æ?¹æ¶?ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:642
+#: ../camel/providers/imap4/camel-imap4-folder.c:635
 #, c-format
 msgid "Cannot expunge folder '%s': Bad command"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??æ?¹æ¶?ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:898
+#: ../camel/providers/imap4/camel-imap4-folder.c:891
 #, c-format
 msgid "Cannot get message %s from folder '%s': No such message"
 msgstr ""
 "%s ã?? '%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: ã??ã?®ã??ã??ã?ªã?¡ã??ã?»ã?¼ã?¸ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:903
+#: ../camel/providers/imap4/camel-imap4-folder.c:896
 #, c-format
 msgid "Cannot get message %s from folder '%s': Bad command"
 msgstr "%s ã?? '%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:947
+#: ../camel/providers/imap4/camel-imap4-folder.c:940
 #, c-format
 msgid "Cannot append message to folder '%s': Folder is read-only"
 msgstr ""
 "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: ã??ã?©ã?«ã??ã?¯èªã?¿è¾¼ã?¿å°?ç?¨ã?§ã??"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1040
+#: ../camel/providers/imap4/camel-imap4-folder.c:1033
 #, c-format
 msgid "Cannot append message to folder '%s': Unknown error"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1070
+#: ../camel/providers/imap4/camel-imap4-folder.c:1063
 #, c-format
 msgid "Cannot append message to folder '%s': Bad command"
 msgstr ""
 "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1190
+#: ../camel/providers/imap4/camel-imap4-folder.c:1182
 #, c-format
 msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
 msgstr "'%s' ã??ã?? '%s' ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ç§»å??ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
+#: ../camel/providers/imap4/camel-imap4-folder.c:1186
 #, c-format
 msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
 msgstr "'%s' ã??ã?? '%s' ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1202
+#: ../camel/providers/imap4/camel-imap4-folder.c:1194
 #, c-format
 msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
 msgstr "'%s' ã??ã?? '%s' ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ç§»å??ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1206
+#: ../camel/providers/imap4/camel-imap4-folder.c:1198
 #, c-format
 msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
 msgstr ""
 "'%s' ã??ã?? '%s' ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:56
+#: ../camel/providers/imap4/camel-imap4-provider.c:55
 msgid "Check new messages for _Junk contents"
 msgstr "æ?°ç??ã?¡ã?¼ã?«ã?«ã?¹ã??ã? ã??å?«ã?¾ã??ã?¦ã??ã??ã??ã??ã?§ã??ã?¯ã??ã??(_J)"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
+#: ../camel/providers/imap4/camel-imap4-provider.c:57
 msgid "Only check for Junk messa_ges in the INBOX folder"
 msgstr "å??ä¿¡ç®±ã?«ã??ã??ã?¡ã?¼ã?«ã? ã??ã?¹ã??ã? ã??ã?©ã??ã??ã??ã?§ã??ã?¯ã??ã??(_G)"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:67
+#: ../camel/providers/imap4/camel-imap4-provider.c:66
 msgid "IMAP4rev1"
 msgstr "IMAP4rev1"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
+#: ../camel/providers/imap4/camel-imap4-provider.c:68
 msgid "For reading and storing mail on IMAPv4rev1 servers."
 msgstr "IMAP ã?µã?¼ã??ã?«ã??ã??ã?¡ã?¼ã?«ã??èªã??ã? ã??ä¿?å?ã??ã?¾ã??"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:86
+#: ../camel/providers/imap4/camel-imap4-provider.c:85
 msgid ""
 "This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã?¬ã?¤ã?³ã?»ã??ã?ã?¹ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ IMAPv4rev1 ã?µã?¼ã??ã?«æ?¥"
 "ç¶?ã??ã?¾ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:263
+#: ../camel/providers/imap4/camel-imap4-store.c:259
 #: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:195
-#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:183
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
+#: ../camel/providers/nntp/camel-nntp-store.c:194
+#: ../camel/providers/nntp/camel-nntp-store.c:213
+#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:271
 msgid "Connection canceled"
 msgstr "æ?¥ç¶?ã??ã?ã?£ã?³ã?»ã?«ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:300
+#: ../camel/providers/imap4/camel-imap4-store.c:296
 #, c-format
 msgid ""
 "Failed to connect to IMAP server %s in secure mode: Server does not support "
@@ -3396,154 +3389,154 @@ msgstr ""
 "ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã??ã?¢ã?¼ã??ã?§ IMAP ã?µã?¼ã?? %s ã?¸ã?®æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??: ã?µã?¼ã??"
 "å?´ã?§ STARTTLS ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??ã?®ã??å??å? ã?§ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:251
+#: ../camel/providers/imap4/camel-imap4-store.c:326
+#: ../camel/providers/pop3/camel-pop3-store.c:249
 msgid "TLS negotiations failed"
 msgstr "TLS æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:415
+#: ../camel/providers/imap4/camel-imap4-store.c:411
 #, c-format
 msgid ""
 "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 msgstr "IMAP ã?µã?¼ã?? %s ã?«å¯¾ã??ã?¦èª?è¨¼æ?¹å¼? %s ã??ä½¿ã?£ã?¦èª?è¨¼ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:538
+#: ../camel/providers/imap4/camel-imap4-store.c:534
 #, c-format
 msgid "Cannot authenticate to IMAP server %s using %s"
 msgstr "IMAP ã?µã?¼ã?? %s ã?§ %s ã??ä½¿ã?£ã??èª?è¨¼ã??è¡?ã??ã?¾ã??ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:701
-#: ../camel/providers/imap4/camel-imap4-store.c:969
+#: ../camel/providers/imap4/camel-imap4-store.c:697
+#: ../camel/providers/imap4/camel-imap4-store.c:964
 msgid "Cannot create IMAP folders in offline mode."
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ IMAP ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:740
+#: ../camel/providers/imap4/camel-imap4-store.c:736
 #, c-format
 msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
 msgstr "'%s' ã?? IMAP ã?µã?¼ã??ã?® %s ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:821
+#: ../camel/providers/imap4/camel-imap4-store.c:816
 #, c-format
 msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
 msgstr "'%s' ã?® LIST æ??å ±ã?? IMAP ã?µã?¼ã??ã?® %s ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
+#: ../camel/providers/imap4/camel-imap4-store.c:818
+#: ../camel/providers/imap4/camel-imap4-store.c:1574
 msgid "Bad command"
 msgstr "ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:902
+#: ../camel/providers/imap4/camel-imap4-store.c:897
 #, c-format
 msgid "Cannot create folder '%s': Invalid mailbox name"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:907
+#: ../camel/providers/imap4/camel-imap4-store.c:902
 #, c-format
 msgid "Cannot create folder '%s': Bad command"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
+#: ../camel/providers/imap4/camel-imap4-store.c:1008
 #, c-format
 msgid "Cannot delete folder '%s': Special folder"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: ç?¹å?¥ã?ªã??ã?©ã?«ã??ã?§ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1020
+#: ../camel/providers/imap4/camel-imap4-store.c:1015
 msgid "Cannot delete IMAP folders in offline mode."
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ IMAP ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
+#: ../camel/providers/imap4/camel-imap4-store.c:1074
 #, c-format
 msgid "Cannot delete folder '%s': Invalid mailbox name"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
+#: ../camel/providers/imap4/camel-imap4-store.c:1079
 #, c-format
 msgid "Cannot delete folder '%s': Bad command"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
+#: ../camel/providers/imap4/camel-imap4-store.c:1099
 #, c-format
 msgid "Cannot rename folder '%s' to '%s': Special folder"
 msgstr "'%s' ã??ã?? '%s' ã?«å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: ç?¹å?¥ã?ªã??ã?©ã?«ã??ã?§ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1111
+#: ../camel/providers/imap4/camel-imap4-store.c:1106
 msgid "Cannot rename IMAP folders in offline mode."
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ IMAP ã?®ã??ã?©ã?«ã??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
+#: ../camel/providers/imap4/camel-imap4-store.c:1137
 #, c-format
 msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
 msgstr "'%s' ã??ã?? '%s' ã?«å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
+#: ../camel/providers/imap4/camel-imap4-store.c:1142
 #, c-format
 msgid "Cannot rename folder '%s' to '%s': Bad command"
 msgstr "'%s' ã??ã?? '%s' ã?«å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
 #. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
 #. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
+#: ../camel/providers/imap4/camel-imap4-store.c:1572
 #, c-format
 msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
 msgstr "%s ã?? '%s' ã?¨ã??ã??ã??ã?¿ã?¼ã?³ã?§ IMAP ã?µã?¼ã??ã?® %s ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1638
+#: ../camel/providers/imap4/camel-imap4-store.c:1633
 msgid "Cannot subscribe to IMAP folders in offline mode."
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ IMAP ã??ã?©ã?«ã??ã??è³¼èªã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
+#: ../camel/providers/imap4/camel-imap4-store.c:1678
 #, c-format
 msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??è³¼èªã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1688
+#: ../camel/providers/imap4/camel-imap4-store.c:1683
 #, c-format
 msgid "Cannot subscribe to folder '%s': Bad command"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??è³¼èªã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1710
+#: ../camel/providers/imap4/camel-imap4-store.c:1705
 msgid "Cannot unsubscribe from IMAP folders in offline mode."
 msgstr "ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯ IMAP ã??ã?©ã?«ã??ã?®è³¼èªã??å??æ¢ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
+#: ../camel/providers/imap4/camel-imap4-store.c:1750
 #, c-format
 msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?®è³¼èªã??å??æ¢ã?§ã??ã?¾ã??ã??: mailbox ã?®å??å??ã??ç?¡å?¹ã?§ã??"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1760
+#: ../camel/providers/imap4/camel-imap4-store.c:1755
 #, c-format
 msgid "Cannot unsubscribe from folder '%s': Bad command"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã?®è³¼èªã??å??æ¢ã?§ã??ã?¾ã??ã??: ã?³ã??ã?³ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1596
+#: ../camel/providers/imap4/camel-imap4-summary.c:1590
 msgid "Scanning for changed messages"
 msgstr "å¤?æ?´ã?¡ã??ã?»ã?¼ã?¸ã?®è§£æ??ä¸"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
+#: ../camel/providers/imap4/camel-imap4-summary.c:1611
 #, c-format
 msgid "IMAP server %s is in an inconsistent state."
 msgstr "IMAP ã?µã?¼ã?? %s ã?®ç?¶æ??ã??ç??ç?¾ã??ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
+#: ../camel/providers/imap4/camel-imap4-summary.c:1638
 msgid "Fetching envelopes of new messages"
 msgstr "æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®ã?¨ã?³ã??ã?ã?¼ã??ã?®å??å¾?ä¸"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
+#: ../camel/providers/imap4/camel-imap4-utils.c:429
 #, c-format
 msgid "Unexpected token in response from IMAP server %s: "
 msgstr "IMAP ã?µã?¼ã?? %s ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:460
+#: ../camel/providers/imap4/camel-imap4-utils.c:452
 msgid "No data"
 msgstr "ã??ã?¼ã?¿ã?ªã??"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
+#: ../camel/providers/imap4/camel-imap4-utils.c:613
 #, c-format
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "çª?ç?¶ IMAP ã?µã?¼ã?? %s ã??æ?¥ç¶?ã??å??ã??ã?¾ã??ã??: %s"
 
 #: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 msgid "Message storage"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®æ ¼ç´?"
 
@@ -3569,30 +3562,30 @@ msgstr ""
 msgid "Could not connect to %s (port %s): %s"
 msgstr "%s (ã??ã?¼ã?? %s) ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:349
+#: ../camel/providers/imapp/camel-imapp-store.c:348
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "%s ã?® POP ã?µã?¼ã??ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/local/camel-local-folder.c:176
+#: ../camel/providers/local/camel-local-folder.c:178
 msgid "Index message body data"
 msgstr "ã?¡ã?¼ã?«æ?¬æ??ã?®ã?¤ã?³ã??ã??ã?¯ã?¹ã??ä½?æ??ã??ã??"
 
 #. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:392
+#: ../camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:396
 #: ../camel/providers/local/camel-local-folder.c:399
+#: ../camel/providers/local/camel-local-folder.c:402
 #, c-format
-msgid "mailbox:%s (%s)"
+msgid "mailbox: %s (%s)"
 msgstr "mailbox: %s (%s)"
 
 #. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:403
+#: ../camel/providers/local/camel-local-folder.c:406
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -3659,7 +3652,7 @@ msgstr "æ¨?æº?ç??ã?ª UNIX ã?® mbox å½¢å¼?ã?®ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??"
 #: ../camel/providers/local/camel-local-store.c:165
 #: ../camel/providers/local/camel-local-store.c:276
 #: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../camel/providers/local/camel-spool-store.c:128
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "ä¿?å?ã??ã??ã?«ã?¼ã?? %s ã?¯çµ¶å¯¾ã??ã?¹ã?§ã?¯ã??ã??ã?¾ã??ã??"
@@ -3707,31 +3700,31 @@ msgstr "'%s' ã?¨ã??ã??ã?¤ã?³ã??ã??ã?¯ã?¹ã?»ã??ã?¡ã?¤ã?«ã??å??é?¤ã?§ã??ã?¾ã??ã??
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã?¡ã?¿ã?»ã??ã?¡ã?¤ã?«ã??å??é?¤ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:508
+#: ../camel/providers/local/camel-local-summary.c:515
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??ã?µã??ã?ªã?¸è¿½å? ã?§ã??ã?¾ã??ã??: å??å? ã?¯ä¸?æ??ã?§ã??"
 
-#: ../camel/providers/local/camel-maildir-folder.c:222
+#: ../camel/providers/local/camel-maildir-folder.c:244
 msgid "Maildir append message canceled"
 msgstr "Maildir å½¢å¼?ã?®ã?¡ã??ã?»ã?¼ã?¸è¿½å? ã??å??ã??æ¶?ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-maildir-folder.c:225
+#: ../camel/providers/local/camel-maildir-folder.c:247
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Maildir å½¢å¼?ã?®ã??ã?©ã?«ã??ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:247
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:288
-#: ../camel/providers/local/camel-maildir-folder.c:297
-#: ../camel/providers/local/camel-mbox-folder.c:346
-#: ../camel/providers/local/camel-mbox-folder.c:398
-#: ../camel/providers/local/camel-mbox-folder.c:419
-#: ../camel/providers/local/camel-mbox-folder.c:450
-#: ../camel/providers/local/camel-mbox-folder.c:458
-#: ../camel/providers/local/camel-mh-folder.c:213
-#: ../camel/providers/local/camel-mh-folder.c:224
-#: ../camel/providers/local/camel-mh-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:277
+#: ../camel/providers/local/camel-maildir-folder.c:309
+#: ../camel/providers/local/camel-maildir-folder.c:323
+#: ../camel/providers/local/camel-maildir-folder.c:331
+#: ../camel/providers/local/camel-mbox-folder.c:362
+#: ../camel/providers/local/camel-mbox-folder.c:413
+#: ../camel/providers/local/camel-mbox-folder.c:434
+#: ../camel/providers/local/camel-mbox-folder.c:465
+#: ../camel/providers/local/camel-mbox-folder.c:473
+#: ../camel/providers/local/camel-mh-folder.c:244
+#: ../camel/providers/local/camel-mh-folder.c:255
+#: ../camel/providers/local/camel-mh-folder.c:263
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3740,7 +3733,7 @@ msgstr ""
 "ã?¡ã??ã?»ã?¼ã?¸ %s ã??ã??ã?©ã?«ã?? %s ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:298
+#: ../camel/providers/local/camel-maildir-folder.c:332
 msgid "Invalid message contents"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®å??å®¹ã?¯ç?¡å?¹ã?§ã??"
 
@@ -3783,60 +3776,60 @@ msgid "not a maildir directory"
 msgstr "maildir å½¢å¼?ã?®ã??ã?©ã?«ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
 #: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
+#: ../camel/providers/local/camel-spool-store.c:330
+#: ../camel/providers/local/camel-spool-store.c:344
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ã?¹ã?ã?£ã?³ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:437
+#: ../camel/providers/local/camel-maildir-summary.c:556
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir ã??ã?©ã?«ã??ã?®ã??ã?¹ã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:549
 msgid "Checking folder consistency"
 msgstr "ã??ã?©ã?«ã??ã?®æ?´å??æ?§ã?®ç¢ºèª?ä¸"
 
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../camel/providers/local/camel-maildir-summary.c:658
 msgid "Checking for new messages"
 msgstr "æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®ã??ã?§ã??ã?¯"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
-#: ../camel/providers/local/camel-mbox-summary.c:529
-#: ../camel/providers/local/camel-mbox-summary.c:711
-#: ../camel/providers/local/camel-mbox-summary.c:831
-#: ../camel/providers/local/camel-spool-summary.c:148
+#: ../camel/providers/local/camel-maildir-summary.c:748
+#: ../camel/providers/local/camel-mbox-summary.c:526
+#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-mbox-summary.c:842
+#: ../camel/providers/local/camel-spool-summary.c:150
 msgid "Storing folder"
 msgstr "ã??ã?©ã?«ã??ã?«æ ¼ç´?ã??ã??"
 
-#: ../camel/providers/local/camel-mbox-folder.c:159
+#: ../camel/providers/local/camel-mbox-folder.c:167
 #: ../camel/providers/local/camel-spool-folder.c:150
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s ã?®ã??ã?©ã?«ã??ã?»ã?ã??ã?¯ã??ç??æ??ã?§ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:220
+#: ../camel/providers/local/camel-mbox-folder.c:231
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "mailbox ã??é??ã??ã?¾ã??ã??: %s: %s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:297
 msgid "Mail append canceled"
 msgstr "ã?¡ã?¼ã?«ã?®è¿½å? ã??ã?ã?£ã?³ã?»ã?«ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-mbox-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:300
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "mbox ã??ã?¡ã?¤ã?«ã?«ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:451
+#: ../camel/providers/local/camel-mbox-folder.c:466
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ã??ã?©ã?«ã??ã?§å??å¾©ã?§ã??ã?ªã??ã?¨ã?©ã?¼ã??ç?ºç??ã??ã??ã??ã??ã?§ã??"
 
-#: ../camel/providers/local/camel-mbox-folder.c:459
-#: ../camel/providers/local/camel-mh-folder.c:234
+#: ../camel/providers/local/camel-mbox-folder.c:474
+#: ../camel/providers/local/camel-mh-folder.c:264
 msgid "Message construction failed."
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®æ§?ç¯?ã?«å¤±æ??ã??ã?¾ã??ã??ã??"
 
@@ -3905,85 +3898,85 @@ msgstr "'%s' ã?®å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??ã?§ã??ã??: '%s': %s"
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s' ã??ã?? %s ã?¸å??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:535
+#: ../camel/providers/local/camel-mbox-summary.c:532
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ã??ã?©ã?«ã??ã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:585
+#: ../camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "%ld ä»?è¿?ã?®ã??ã?©ã?«ã?? %s ã?§è?´å?½ç??ã?ªã?¡ã?¼ã?«æ§?æ??è§£æ??ã?¨ã?©ã?¼ã?§ã??"
 
-#: ../camel/providers/local/camel-mbox-summary.c:648
+#: ../camel/providers/local/camel-mbox-summary.c:659
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ã??ã?©ã?«ã??ã??ã??ã?§ã??ã?¯ã?§ã??ã?¾ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:716
-#: ../camel/providers/local/camel-mbox-summary.c:836
-#: ../camel/providers/local/camel-spool-summary.c:153
+#: ../camel/providers/local/camel-mbox-summary.c:727
+#: ../camel/providers/local/camel-mbox-summary.c:847
+#: ../camel/providers/local/camel-spool-summary.c:155
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ã??ã?¡ã?¤ã?«ã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
-#: ../camel/providers/local/camel-spool-summary.c:166
+#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-spool-summary.c:168
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "ä½?æ¥ç?¨ã?® mailbox ã??é??ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:945
+#: ../camel/providers/local/camel-mbox-summary.c:752
+#: ../camel/providers/local/camel-mbox-summary.c:956
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "å??ã?®ã??ã?©ã?«ã?? %s ã??é??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:750
+#: ../camel/providers/local/camel-mbox-summary.c:761
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "ä½?æ¥ç?¨ã??ã?©ã?«ã??ã??é??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:765
+#: ../camel/providers/local/camel-mbox-summary.c:776
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ã??ã?©ã?«ã??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../camel/providers/local/camel-mbox-summary.c:858
+#: ../camel/providers/local/camel-mbox-summary.c:1083
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ã??ã?©ã?«ã??ã??ä¿?å?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:894
-#: ../camel/providers/local/camel-mbox-summary.c:1105
+#: ../camel/providers/local/camel-mbox-summary.c:897
+#: ../camel/providers/local/camel-mbox-summary.c:905
 #: ../camel/providers/local/camel-mbox-summary.c:1113
+#: ../camel/providers/local/camel-mbox-summary.c:1121
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ã?µã??ã?ªã?¨ã??ã?©ã?«ã??ã??ä¸?è?´ã??ã?¾ã??ã??ã?§ã??ã?? (å??æ??ã??ã?¦ã??)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1038
+#: ../camel/providers/local/camel-mbox-summary.c:1046
 #: ../camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "å??å? ä¸?æ??ã?®ã?¨ã?©ã?¼: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1189
+#: ../camel/providers/local/camel-mbox-summary.c:1215
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "ä½?æ¥ç?¨ã?® mailbox ã?«æ?¸ã??è¾¼ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1206
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "ä½?æ¥ç?¨ã?® mailbox ã?«æ?¸ã??è¾¼ã??ã?¾ã??ã??ã?§ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-mh-folder.c:184
 msgid "MH append message canceled"
 msgstr "MH å½¢å¼?ã?®ã?¡ã??ã?»ã?¼ã?¸è¿½å? ã??ã?ã?£ã?³ã?»ã?«ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-mh-folder.c:187
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "MH å½¢å¼?ã??ã?©ã?«ã??ã?¸ã?¡ã??ã?»ã?¼ã?¸ã??è¿½å? ã?§ã??ã?¾ã??ã??: %s: %s"
@@ -3998,27 +3991,27 @@ msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 msgid "Cannot get folder '%s': not a directory."
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å??å¾?ã?§ã??ã?¾ã??ã??: ã??ã?©ã?«ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../camel/providers/local/camel-mh-summary.c:240
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH ã??ã?©ã?«ã??ã?®ã??ã?¹ã??é??ã??ã?¾ã??ã??: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:134
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "'%s' ã?¨ã??ã??ã?¹ã??ã?¼ã?«ã??é??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:146
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "'%s' ã?¨ã??ã??ã?¹ã??ã?¼ã?«ã?¯é??å¸¸ã?®ã??ã?¡ã?¤ã?«ã?¾ã??ã?¯ã??ã?©ã?«ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:166
+#: ../camel/providers/local/camel-spool-store.c:165
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "'%s/%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:175
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4027,12 +4020,12 @@ msgstr ""
 "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??é??ã??ã?¾ã??ã??ã?§ã??ã??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:179
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:185
+#: ../camel/providers/local/camel-spool-store.c:184
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4041,41 +4034,41 @@ msgstr ""
 "'%s' ã?¨ã??ã??ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:192
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' ã?¯ã?¡ã?¼ã?«ã??ã??ã?¯ã?¹ã?»ã??ã?¡ã?¤ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:209
 msgid "Store does not support an INBOX"
 msgstr "å??ä¿¡ç®±ã?¸ã?®æ ¼ç´?ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:221
 #, c-format
 msgid "Spool mail file %s"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã?¡ã?¼ã?«ã?»ã??ã?¡ã?¤ã?« %s"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:221
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã?»ã??ã?ªã?¼ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:230
+#: ../camel/providers/local/camel-spool-store.c:229
 msgid "Spool folders cannot be renamed"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã?®å??å??ã?¯å¤?æ?´ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-spool-store.c:238
+#: ../camel/providers/local/camel-spool-store.c:237
 msgid "Spool folders cannot be deleted"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã??ã?¯å??é?¤ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/local/camel-spool-summary.c:179
-#: ../camel/providers/local/camel-spool-summary.c:189
-#: ../camel/providers/local/camel-spool-summary.c:199
+#: ../camel/providers/local/camel-spool-summary.c:180
+#: ../camel/providers/local/camel-spool-summary.c:190
+#: ../camel/providers/local/camel-spool-summary.c:200
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "ä½?æ¥ç?¨ã??ã?©ã?«ã?? %s ã??å??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:215
+#: ../camel/providers/local/camel-spool-summary.c:216
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "ã?¹ã??ã?¼ã?«ã?»ã??ã?©ã?«ã?? %s ã??å??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
@@ -4092,25 +4085,25 @@ msgstr ""
 "ã??ã?©ã?«ã??ã??å£?ã??ã?¦ã??ã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??ã??ã??ã?®ã?³ã??ã?¼ã?? '%s' ã?«ä¿?å?ã??ã?¾ã??ã??ã??"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../camel/providers/nntp/camel-nntp-folder.c:194
+#: ../camel/providers/nntp/camel-nntp-folder.c:226
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "å??é?¨ã?¨ã?©ã?¼: UID ã?®æ?¸å¼?ã??ç?¡å?¹ã?§ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:371
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/nntp/camel-nntp-folder.c:415
+#: ../camel/providers/nntp/camel-nntp-folder.c:367
+#: ../camel/providers/nntp/camel-nntp-folder.c:370
+#: ../camel/providers/nntp/camel-nntp-folder.c:412
+#: ../camel/providers/nntp/camel-nntp-folder.c:414
 #, c-format
 msgid "Posting failed: %s"
 msgstr "æ??ç¨¿ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:433
+#: ../camel/providers/nntp/camel-nntp-folder.c:432
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "ã?ªã??ã?©ã?¤ã?³ç?¶æ??ã?®é??ã?¯ NNTP ã?¡ã??ã?»ã?¼ã?¸ã??æ??ç¨¿ã?§ã??ã?¾ã??ã??ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:444
+#: ../camel/providers/nntp/camel-nntp-folder.c:443
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NNTP ã??ã?©ã?«ã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®ã?³ã??ã?¼ã?¯ã?§ã??ã?¾ã??ã??ï¼?"
 
@@ -4139,22 +4132,22 @@ msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã?¬ã?¤ã?³ã?»ã??ã?ã?¹ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ NNTP ã?µã?¼ã??ã?§èª?è¨¼ã??ã?¾"
 "ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:216
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "%s ã??ã??ã?®æ?¨æ?¶ã??èªã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:228
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP ã?µã?¼ã?? %s ã??ã?¨ã?©ã?¼ã?³ã?¼ã?? %d ã??è¿?ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:410
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s çµ?ç?±ã?® USENET ã??ã?¥ã?¼ã?¹"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:798
+#: ../camel/providers/nntp/camel-nntp-store.c:819
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4165,7 +4158,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:892
+#: ../camel/providers/nntp/camel-nntp-store.c:913
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4176,7 +4169,7 @@ msgstr ""
 "ã??ã?®ã??ã??ã?ªã??ã?¥ã?¼ã?¹ã?°ã?«ã?¼ã??ã?¯ã??ã??ã?¾ã??ã??ã??é?¸æ??ã??ã??ã?¢ã?¤ã??ã? ã?¯è¦ªã??ã?©ã?«ã??ã?®ã??ã?®ã??"
 "ã??ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:924
+#: ../camel/providers/nntp/camel-nntp-store.c:945
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4186,64 +4179,64 @@ msgstr ""
 "\n"
 "ã??ã?¥ã?¼ã?¹ã?°ã?«ã?¼ã??ã??ã??ã??ã?¾ã??ã??ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:949
+#: ../camel/providers/nntp/camel-nntp-store.c:970
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "ã??ã?¥ã?¼ã?¹ã?»ã?¹ã??ã?¢ã?«ã??ã?©ã?«ã??ã??ç??æ??ã?§ã??ã?¾ã??ã??: ä»£ã??ã??ã?«è³¼èªã??ç?³è«?ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:957
+#: ../camel/providers/nntp/camel-nntp-store.c:978
 msgid "You cannot rename a folder in a News store."
 msgstr "ã??ã?¥ã?¼ã?¹æ ¼ç´?å ´æ??ã?®ã??ã?©ã?«ã??å??ã??å¤?æ?´ã?§ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:965
+#: ../camel/providers/nntp/camel-nntp-store.c:986
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "ã??ã?¥ã?¼ã?¹æ ¼ç´?å ´æ??ã?®ã??ã?©ã?«ã??ã??å??é?¤ã?§ã??ã?¾ã??ã??: ä»£ã??ã??ã?«è³¼èªã??å??æ¢ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1154
+#: ../camel/providers/nntp/camel-nntp-store.c:1180
 msgid "Authentication requested but no username provided"
 msgstr "èª?è¨¼ã??å¿?è¦?ã?¨ã??ã?¦ã??ã?¾ã??ã??ã??ã?¦ã?¼ã?¶å??ã??æ??å®?ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1166
+#: ../camel/providers/nntp/camel-nntp-store.c:1192
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "ã?µã?¼ã??ã?®èª?è¨¼ã??è¡?ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1289
+#: ../camel/providers/nntp/camel-nntp-store.c:1315
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1343
+#: ../camel/providers/nntp/camel-nntp-store.c:1369
 msgid "Not connected."
 msgstr "æ?¥ç¶?ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1396
+#: ../camel/providers/nntp/camel-nntp-store.c:1422
 #, c-format
 msgid "No such folder: %s"
 msgstr "ã??ã?®ã??ã??ã?ªã??ã?©ã?«ã??ã?¯ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:271
-#: ../camel/providers/nntp/camel-nntp-summary.c:364
+#: ../camel/providers/nntp/camel-nntp-summary.c:272
+#: ../camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: æ?°ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?®è§£æ??ä¸"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:278
+#: ../camel/providers/nntp/camel-nntp-summary.c:279
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:378
+#: ../camel/providers/nntp/camel-nntp-summary.c:384
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "head ã??ã??æ?³å®?å¤?ã?®å¿?ç?ã??ã??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
+#: ../camel/providers/nntp/camel-nntp-summary.c:420
 msgid "Use cancel"
 msgstr "ã?ã?£ã?³ã?»ã?«ã??å?©ç?¨ã??ã??"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:422
 #, c-format
 msgid "Operation failed: %s"
 msgstr "æ??ä½?ã??å¤±æ??ã??ã?¾ã??ã??: %s"
@@ -4282,28 +4275,28 @@ msgstr "ã?¡ã??ã?»ã?¼ã?¸ %d ã?? POP ã?§å??å¾?ä¸"
 msgid "Unknown reason"
 msgstr "å??å? ä¸?æ??"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "_Leave messages on server"
 msgstr "ã?µã?¼ã??ã?«ã?¡ã??ã?»ã?¼ã?¸ã??æ®?ã??(_L)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "%s æ?¥å¾?ã?«å??é?¤ã??ã??(_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:49
 msgid "Disable _support for all POP3 extensions"
 msgstr "å?¨ã?¦ã?® POP3 æ?¡å¼µã?µã??ã?¼ã??ã??ç?¡å?¹ã?«ã??ã??(_S)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:57
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:59
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "POP ã?µã?¼ã??ã?«æ?¥ç¶?ã??ã??ã??ã?¡ã?¼ã?«ã??èªã??ã? ã??ã??ã?¾ã??"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/pop3/camel-pop3-provider.c:76
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4311,7 +4304,7 @@ msgstr ""
 "ã??ã?®ã?ªã??ã?·ã?§ã?³ã?¯ã??ã?¬ã?¤ã?³ã?»ã??ã?ã?¹ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ä½¿ã?£ã?¦ POP ã?µã?¼ã??ã?¸æ?¥ç¶?ã??ã?¾"
 "ã??ã??ã??ã??ã?¯å¤?ã??ã?® POP ã?µã?¼ã??ã?§ã?µã??ã?¼ã??ã??ã??ã??ã?ªã??ã?·ã?§ã?³ã?§ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
+#: ../camel/providers/pop3/camel-pop3-provider.c:86
 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 "
@@ -4321,35 +4314,35 @@ msgstr ""
 "ã??ã?¸æ?¥ç¶?ã??ã?¾ã??ã??ã??ã??ã?¯å?¬å¹³ã?ªã?µã??ã?¼ã??ã??è¦?æ±?ã??ã??ã?µã?¼ã??ã?§ã??å?¨ã?¦ã?®ã?¦ã?¼ã?¶ã??æ£å¸¸ã?«"
 "å??ä½?ã??ã??ã??ã??ã?§ã?¯ã??ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#: ../camel/providers/pop3/camel-pop3-store.c:207
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP ã?µã?¼ã?? %s ã??ã??å¦¥å½?ã?ªæ?¨æ?¶ã?®èªã?¿è¾¼ã?¿ã??å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:226
-#: ../camel/providers/pop3/camel-pop3-store.c:240
-#: ../camel/providers/pop3/camel-pop3-store.c:250
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../camel/providers/pop3/camel-pop3-store.c:224
+#: ../camel/providers/pop3/camel-pop3-store.c:238
+#: ../camel/providers/pop3/camel-pop3-store.c:248
+#: ../camel/providers/pop3/camel-pop3-store.c:254
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "ã?»ã?ã?¥ã?ªã??ã?£ä¿?è·ã??ã??ã??ã?¢ã?¼ã??ã?§ POP ã?µã?¼ã?? %s ã?¸ã?®æ?¥ç¶?ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:227
+#: ../camel/providers/pop3/camel-pop3-store.c:225
 msgid "STLS not supported by server"
 msgstr "ã?µã?¼ã??ã?¯ STLS æ?¡å¼µã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:257
+#: ../camel/providers/pop3/camel-pop3-store.c:255
 msgid "TLS is not available in this build"
 msgstr "ã??ã?®ã??ã??ã?±ã?¼ã?¸ã?§ã?¯ TLS ã??å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:363
+#: ../camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "POP ã?µã?¼ã?? %s ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:404
-#: ../camel/providers/pop3/camel-pop3-store.c:537
+#: ../camel/providers/pop3/camel-pop3-store.c:402
+#: ../camel/providers/pop3/camel-pop3-store.c:535
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4357,22 +4350,22 @@ msgid ""
 msgstr ""
 "POP ã?µã?¼ã?? %s ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??: è¦?æ±?ã??ã??ã??èª?è¨¼æ?¹å¼?ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:420
+#: ../camel/providers/pop3/camel-pop3-store.c:418
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s: %s"
 msgstr "SASL '%s' ã?® POP ã?µã?¼ã?? %s ã?¸ã?®ã?ã?°ã?¤ã?³ã?«å¤±æ??: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:432
+#: ../camel/providers/pop3/camel-pop3-store.c:430
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP ã?µã?¼ã?? %s ã?¸ã?ã?°ã?¤ã?³ã?§ã??ã?¾ã??ã??: SASL ã??ã?ã??ã?³ã?«ã?»ã?¨ã?©ã?¼"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:451
+#: ../camel/providers/pop3/camel-pop3-store.c:449
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "POP ã?µã?¼ã?? %s ã?§èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:510
+#: ../camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4381,8 +4374,8 @@ msgstr ""
 "POP ã?µã?¼ã?? %s ã?¸æ?¥ç¶?ã?§ã??ã?¾ã??ã??:\tç?¡å?¹ã?ª APOP ID ã??å??ã??å??ã??ã?¾ã??ã??; è©?ç§°æ?»æ??ã?®"
 "å?¯è?½æ?§ã??ã??ã??ã?®ã?§ç®¡ç??è??ã?«é?£çµ¡ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:564
+#: ../camel/providers/pop3/camel-pop3-store.c:549
+#: ../camel/providers/pop3/camel-pop3-store.c:562
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4391,7 +4384,7 @@ msgstr ""
 "POP ã?µã?¼ã?? %s ã?«æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã??\n"
 "ã??ã?¹ã?¯ã?¼ã??ã?®é??ä¿¡ä¸ã?«ã?¨ã?©ã?¼: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#: ../camel/providers/pop3/camel-pop3-store.c:556
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4400,7 +4393,7 @@ msgstr ""
 "POP ã?µã?¼ã?? %s ã?«æ?¥ç¶?ã?§ã??ã?¾ã??ã??ã??\n"
 "ã?¦ã?¼ã?¶å??ã?®é??ä¿¡ä¸ã?«ã?¨ã?©ã?¼: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:671
+#: ../camel/providers/pop3/camel-pop3-store.c:669
 #, c-format
 msgid "No such folder '%s'."
 msgstr "ã??ã?®ã??ã??ã?ªã??ã?©ã?«ã??ã?¯å?å?¨ã??ã?¾ã??ã??: %s"
@@ -4416,174 +4409,174 @@ msgid ""
 msgstr ""
 "ã?¡ã?¼ã?«ã??é??é??ã??ã??ã??ã??ã?«ã?ã?¼ã?«ã?«ã?·ã?¹ã??ã? ã?® \"sendmail\" ã??ã?ã?°ã?©ã? ã?¸æ¸¡ã??ã?¾ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "è¿?ä¿¡ã?ªã?¹ã??ã??è§£æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "sendmail ã?¸ã??ã?¤ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail ã?? fork(2) ã?§ã??ã?¾ã??ã??ã?§ã??ã??: %s: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail ã?¯ã?·ã?°ã??ã?« %s ã?§çµ?äº?ã??ã?¾ã??ã??: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s ã??å®?è¡?ã?§ã??ã?¾ã??ã??ã?§ã??ã??: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail ã?¯ã?¹ã??ã?¼ã?¿ã?¹ %d ã?§çµ?äº?ã??ã?¾ã??ã??: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail çµ?ç?±ã?§ã?¡ã?¼ã?«ã??é??ä¿¡"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "SMTP ã??ä½¿ã?£ã?¦ã?ªã?¢ã?¼ã??ã?®ã?¡ã?¼ã?«ã??ã??ã?«æ?¥ç¶?ã??ã??ã??ã?¨ã?§ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error, command unrecognized"
 msgstr "æ§?æ??è§£æ??ã?¨ã?©ã?¼: ã?³ã??ã?³ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error in parameters or arguments"
 msgstr "ã??ã?©ã?¡ã?¼ã?¿ã??ã??ã??ã?¯å¼?æ?°ã?«æ§?æ??è§£æ??ã?¨ã?©ã?¼"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command not implemented"
 msgstr "ã?³ã??ã?³ã??ã?¯å®?è£?ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command parameter not implemented"
 msgstr "ã?³ã??ã?³ã??ã??ã?©ã?¡ã?¼ã?¿ã?¯å®?è£?ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:175
 msgid "System status, or system help reply"
 msgstr "ã?·ã?¹ã??ã? ã?»ã?¹ã??ã?¼ã?¿ã?¹ã?¾ã??ã?¯ã?·ã?¹ã??ã? ã?»ã??ã?«ã??ã?®å¿?ç?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Help message"
 msgstr "ã??ã?«ã??ã?»ã?¡ã??ã?»ã?¼ã?¸"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service ready"
 msgstr "ã?µã?¼ã??ã?¹ã?¯å?©ç?¨ã?§ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service closing transmission channel"
 msgstr "ã?µã?¼ã??ã?¹ã?¯é??ä¿¡ã??ã?£ã?³ã??ã?«ã??é??ã??ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Service not available, closing transmission channel"
 msgstr "ã?µã?¼ã??ã?¹ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??, é??ä¿¡ã??ã?£ã?³ã??ã?«ã??é??ã??ã?¦ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Requested mail action okay, completed"
 msgstr "è¦?æ±?ã??ã??ã??ã?¡ã?¼ã?«ã?®å??ä½?ã?¯OK, å®?äº?ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:187
 msgid "User not local; will forward to <forward-path>"
 msgstr "ã?¦ã?¼ã?¶ã?¯ã?ã?¼ã?«ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??; <forward-path> ã?¸è»¢é??ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "è¦?æ±?ã??ã??ã??ã?¡ã?¼ã?«ã?®å??ä½?ã?¯å®?äº?ã??ã?¾ã??ã??: ã?¡ã?¼ã?«ã??ã??ã?¯ã?¹ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "è¦?æ±?ã??ã??ã??å??ä½?ã?¯å®?äº?ã??ã?¾ã??ã??: ã?¡ã?¼ã?«ã??ã??ã?¯ã?¹ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action aborted: error in processing"
 msgstr "è¦?æ±?ã??ã??ã??å??ä½?ã??ä¸æ?ã??ã?¾ã??ã??: å?¦ç??ä¸ã?«ã?¨ã?©ã?¼"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:195
 msgid "User not local; please try <forward-path>"
 msgstr "ã?¦ã?¼ã?¶ã?¯ã?ã?¼ã?«ã?«ã?§ã?¯ã??ã??ã?¾ã??ã??; <forward-path> ã??è©¦ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: insufficient system storage"
 msgstr "è¦?æ±?ã??ã??ã??å??ä½?ã?¯å®?äº?ã??ã?¾ã??ã??: ã?·ã?¹ã??ã? ã?®ä¿?å?é ?å??ã??è¶³ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "è¦?æ±?ã??ã??ã??ã?¡ã?¼ã?«ã?®å??ä½?ã??ä¸æ?ã??ã?¾ã??ã??: é ?å??å?²ã??å½?ã?¦ã??è¶?ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "è¦?æ±?ã??ã??ã??å??ä½?ã?¯å®?äº?ã??ã?¾ã??ã??: ã?¡ã?¼ã?«ã??ã??ã?¯ã?¹å??ã?¯èª?ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ã?¡ã?¼ã?«ã?®å?¥å??ã??é??å§?ã??ã?¾ã??; <CRLF>.<CRLF> ã?§çµ?äº?ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Transaction failed"
 msgstr "å?¦ç??ã?¯å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:209
 msgid "A password transition is needed"
 msgstr "ã??ã?¹ã?¯ã?¼ã??ã?®å¤?æ?´ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Authentication mechanism is too weak"
 msgstr "èª?è¨¼ã?¡ã?«ã??ã?ºã? ã?¯ä¸?å??å??é??ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Encryption required for requested authentication mechanism"
 msgstr "è¦?æ±?ã??ã??èª?è¨¼ã?¡ã?«ã??ã?ºã? ã?®ã??ã??ã?«æ??å?·å??ã??å¿?è¦?ã?§ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Temporary authentication failure"
 msgstr "ä¸?æ??ç??ã?ªèª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
+#: ../camel/providers/smtp/camel-smtp-transport.c:296
 msgid "Welcome response error"
 msgstr "Welcome å¿?ç?ã?¨ã?©ã?¼"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:331
+#: ../camel/providers/smtp/camel-smtp-transport.c:364
+#: ../camel/providers/smtp/camel-smtp-transport.c:370
 #, 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:341
+#: ../camel/providers/smtp/camel-smtp-transport.c:340
 #, c-format
 msgid "STARTTLS command failed: %s"
 msgstr "STARTTLS ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
+#: ../camel/providers/smtp/camel-smtp-transport.c:355
 msgid "STARTTLS command failed"
 msgstr "STARTTLS ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../camel/providers/smtp/camel-smtp-transport.c:496
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP ã?µã?¼ã?? %s ã?¯è¦?æ±?ã??ã??èª?è¨¼æ?¹å¼? %s ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:568
+#: ../camel/providers/smtp/camel-smtp-transport.c:567
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4594,93 +4587,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
+#: ../camel/providers/smtp/camel-smtp-transport.c:700
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ã?µã?¼ã?? %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:702
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s çµ?ç?±ã?§ SMTP ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Cannot send message: service not connected."
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??: ã?µã?¼ã??ã?¹ã??æ?¥ç¶?ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
 msgid "Cannot send message: sender address not valid."
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??: å·®å?ºäººã?®ã?¢ã??ã?¬ã?¹ã??æ£ã??ã??ã??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
 msgid "Sending message"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã?®é??ä¿¡ä¸"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 msgid "Cannot send message: no recipients defined."
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??: å®?å??ã??å®?ç¾©ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ã?¡ã??ã?»ã?¼ã?¸ã??é??ä¿¡ã?§ã??ã?¾ã??ã??: ç?¡å?¹ã?ªå¿?ç?ã??ä¸?ã?¤ä»¥ä¸?ã??ã??ã?¾ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:986
+#: ../camel/providers/smtp/camel-smtp-transport.c:985
 msgid "SMTP Greeting"
 msgstr "SMTP ã?§æ?¥ç¶?ä¸"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1011
+#: ../camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "HELO ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
+#: ../camel/providers/smtp/camel-smtp-transport.c:1027
 msgid "HELO command failed"
 msgstr "HELO ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
+#: ../camel/providers/smtp/camel-smtp-transport.c:1093
 msgid "SMTP Authentication"
 msgstr "SMTP èª?è¨¼"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
+#: ../camel/providers/smtp/camel-smtp-transport.c:1099
 msgid "Error creating SASL authentication object."
 msgstr "SASL èª?è¨¼ã?ªã??ã?¸ã?§ã?¯ã??ã?®ç??æ??ä¸ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
+#: ../camel/providers/smtp/camel-smtp-transport.c:1116
+#: ../camel/providers/smtp/camel-smtp-transport.c:1127
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "AUTH ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1134
+#: ../camel/providers/smtp/camel-smtp-transport.c:1133
 msgid "AUTH command failed"
 msgstr "AUTH ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
+#: ../camel/providers/smtp/camel-smtp-transport.c:1203
 msgid "Bad authentication response from server.\n"
 msgstr "ã?µã?¼ã??ã??ã??é??é??ã?£ã??èª?è¨¼å¿?ç?ã??ã??ã??ã?¾ã??ã??\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#: ../camel/providers/smtp/camel-smtp-transport.c:1230
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1248
+#: ../camel/providers/smtp/camel-smtp-transport.c:1247
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../camel/providers/smtp/camel-smtp-transport.c:1271
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1291
+#: ../camel/providers/smtp/camel-smtp-transport.c:1290
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1331
-#: ../camel/providers/smtp/camel-smtp-transport.c:1400
-#: ../camel/providers/smtp/camel-smtp-transport.c:1419
+#: ../camel/providers/smtp/camel-smtp-transport.c:1330
+#: ../camel/providers/smtp/camel-smtp-transport.c:1399
+#: ../camel/providers/smtp/camel-smtp-transport.c:1418
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??ã??"
@@ -4688,108 +4681,108 @@ msgstr "DATA ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s: ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¾ã??
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1348
-#: ../camel/providers/smtp/camel-smtp-transport.c:1435
+#: ../camel/providers/smtp/camel-smtp-transport.c:1347
+#: ../camel/providers/smtp/camel-smtp-transport.c:1434
 msgid "DATA command failed"
 msgstr "DATA ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1457
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "RSET ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1474
+#: ../camel/providers/smtp/camel-smtp-transport.c:1473
 msgid "RSET command failed"
 msgstr "RSET ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
+#: ../camel/providers/smtp/camel-smtp-transport.c:1496
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "QUIT ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
+#: ../camel/providers/smtp/camel-smtp-transport.c:1510
 msgid "QUIT command failed"
 msgstr "QUIT ã?³ã??ã?³ã??ã??å¤±æ??ã??ã?¾ã??ã??"
 
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:47
 msgid "Business"
 msgstr "ä»?äº?"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:48
 msgid "Competition"
 msgstr "ç«¶å??ä»?ç¤¾"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:49
 msgid "Favorites"
 msgstr "ã??æ°?ã?«å?¥ã??"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
 msgid "Gifts"
 msgstr "è´?ã??ç?©"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
 msgid "Goals/Objectives"
 msgstr "ç?®æ¨?/ã?´ã?¼ã?«"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
 msgid "Holiday"
 msgstr "ä¼?æ?¥"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
 msgid "Holiday Cards"
 msgstr "ã?¯ã?ªã?¹ã??ã?¹ã?»ã?«ã?¼ã??"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
 msgid "Hot Contacts"
 msgstr "æ??æ?°ã?®é?£çµ¡å??"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:56
 msgid "Ideas"
 msgstr "ã?¢ã?¤ã??ã?£ã?¢"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:57
 msgid "International"
 msgstr "å?½é??"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
 msgid "Key Customer"
 msgstr "é??è¦?ã?ªé¡§å®¢"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
 msgid "Miscellaneous"
 msgstr "ã??ã?®ä»?"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
 msgid "Personal"
 msgstr "å??äºº"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
 msgid "Phone Calls"
 msgstr "æ?ºå¸¯é?»è©±"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:63
 msgid "Status"
 msgstr "ç?¶æ??"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:64
 msgid "Strategies"
 msgstr "æ?¦ç?¥"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:65
 msgid "Suppliers"
 msgstr "ã?µã??ã?©ã?¤ã?¤ã?¼"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
 msgid "Time & Expenses"
 msgstr "æ??é??ã?¨çµ?è²»"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
 msgid "VIP"
 msgstr "é??è¦?äººç?©"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
 msgid "Waiting"
 msgstr "çµ¦ä»?"
 
@@ -4797,7 +4790,7 @@ msgstr "çµ¦ä»?"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1911
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1900
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p%l:%M:%S"
 
@@ -4805,7 +4798,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:1649 ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1891
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %k:%M:%S"
 
@@ -4813,7 +4806,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:1654 ../libedataserver/e-time-utils.c:1907
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1896
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d (%a) %p%l:%M"
 
@@ -4821,78 +4814,78 @@ 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:1659 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1887
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%Y/%m/%d (%a) %k:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1664
+#: ../libedataserver/e-time-utils.c:1655
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%Y/%m/%d (%a) %p%læ??"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1669
+#: ../libedataserver/e-time-utils.c:1660
 msgid "%a %m/%d/%Y %H"
 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:1672 ../libedataserver/e-time-utils.c:1773
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1763
+#: ../libedataserver/e-time-utils.c:1882
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1680
+#: ../libedataserver/e-time-utils.c:1670
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d %p%l:%M:%S"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1684
+#: ../libedataserver/e-time-utils.c:1674
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d %k:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1679
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d %p%l:%M"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1684
 msgid "%m/%d/%Y %H:%M"
 msgstr "%Y/%m/%d %k:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1699
+#: ../libedataserver/e-time-utils.c:1689
 msgid "%m/%d/%Y %I %p"
 msgstr "%Y/%m/%d %p%læ??"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1704
+#: ../libedataserver/e-time-utils.c:1694
 msgid "%m/%d/%Y %H"
 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:1707 ../libedataserver/e-time-utils.c:1776
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1766
 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:1834 ../libedataserver/e-time-utils.c:1956
+#: ../libedataserver/e-time-utils.c:1824 ../libedataserver/e-time-utils.c:1944
 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:1838 ../libedataserver/e-time-utils.c:1948
+#: ../libedataserver/e-time-utils.c:1828 ../libedataserver/e-time-utils.c:1936
 msgid "%H:%M:%S"
 msgstr "%k:%M:%S"
 
@@ -4900,24 +4893,24 @@ msgstr "%k:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1843 ../libedataserver/e-time-utils.c:1953
+#: ../libedataserver/e-time-utils.c:1833 ../libedataserver/e-time-utils.c:1941
 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:1847 ../libedataserver/e-time-utils.c:1945
+#: ../libedataserver/e-time-utils.c:1837 ../libedataserver/e-time-utils.c:1933
 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:1850
+#: ../libedataserver/e-time-utils.c:1840
 msgid "%H%M"
 msgstr "%k%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1854
+#: ../libedataserver/e-time-utils.c:1844
 msgid "%I %p"
 msgstr "%p%læ??"
 
@@ -4929,18 +4922,18 @@ msgstr "å?¿å??ã?§ LDAP ã?µã?¼ã??ã?¸ã?¢ã?¯ã?»ã?¹ä¸"
 msgid "Failed to authenticate.\n"
 msgstr "èª?è¨¼ã?«å¤±æ??ã??ã?¾ã??ã??ã??\n"
 
-#: ../libedataserverui/e-categories-dialog.c:362
+#: ../libedataserverui/e-categories-dialog.c:327
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "è¨å®?ã?®ä¸ã?«ã?«ã??ã?´ã?ª '%s' ã??å?å?¨ã??ã?¾ã??ã??å?¥ã?®å??å??ã??æ??å®?ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../libedataserverui/e-categories-dialog.c:526
+#: ../libedataserverui/e-categories-dialog.c:618
 msgid "Icon"
 msgstr "ã?¢ã?¤ã?³ã?³"
 
-#: ../libedataserverui/e-categories-dialog.c:531
+#: ../libedataserverui/e-categories-dialog.c:623
 msgid "Category"
 msgstr "ã?«ã??ã?´ã?ª"
 
@@ -4989,19 +4982,19 @@ msgstr "è?²ã?®æ??å ±"
 msgid "The color to render"
 msgstr "æ??ç?»ã??ã??è?²ã?®æ??å ±ã?§ã??"
 
-#: ../libedataserverui/e-name-selector-dialog.c:278
+#: ../libedataserverui/e-name-selector-dialog.c:276
 msgid "Select Contacts from Address Book"
 msgstr "ã?¢ã??ã?¬ã?¹å¸³ã??ã??é?£çµ¡å??ã?®é?¸æ??"
 
-#: ../libedataserverui/e-name-selector-dialog.c:565
+#: ../libedataserverui/e-name-selector-dialog.c:563
 msgid "_Add"
 msgstr "è¿½å? (_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:590
+#: ../libedataserverui/e-name-selector-dialog.c:588
 msgid "_Remove"
 msgstr "å??é?¤(_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:767
+#: ../libedataserverui/e-name-selector-dialog.c:765
 #: ../libedataserverui/e-name-selector-dialog.glade.h:6
 msgid "Any Category"
 msgstr "ä»»æ??ã?®ã?«ã??ã?´ã?ª"
@@ -5044,30 +5037,30 @@ msgid "_Search:"
 msgstr "æ¤?ç´¢(_S):"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2456
+#: ../libedataserverui/e-name-selector-entry.c:2494
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s ã??ã?¤ã?³ã?©ã?¤ã?³ã?§å±?é??ã??ã??(_X)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2471
+#: ../libedataserverui/e-name-selector-entry.c:2509
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s ã?®ã?³ã??ã?¼(_Y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2481
+#: ../libedataserverui/e-name-selector-entry.c:2519
 #, c-format
 msgid "C_ut %s"
 msgstr "%s ã?®å??ã??å??ã??(_U)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2498
+#: ../libedataserverui/e-name-selector-entry.c:2536
 #, c-format
 msgid "_Edit %s"
 msgstr "%s ã?®ç·¨é??(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:472
+#: ../libedataserverui/e-name-selector-list.c:469
 #, c-format
 msgid "_Delete %s"
 msgstr "%s ã?®å??é?¤(_D)"
@@ -5077,23 +5070,23 @@ msgstr "%s ã?®å??é?¤(_D)"
 msgid "Keyring key is unusable: no user or host name"
 msgstr "ã?ã?¼ã?ªã?³ã?°ã?®ã?ã?¼ã??ä½¿ç?¨ã?§ã??ã?¾ã??ã??: ã?¦ã?¼ã?¶ã?¾ã??ã?¯ã??ã?¹ã??å??ã??å?å?¨ã??ã?¾ã??ã??"
 
-#: ../libedataserverui/e-passwords.c:1094
+#: ../libedataserverui/e-passwords.c:1093
 msgid "You have the Caps Lock key on."
 msgstr "\"[Caps Lock] ã?ã?¼ã?? ON ç?¶æ??ã?§ã??"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1215
 msgid "_Remember this passphrase"
 msgstr "ã??ã?®ã??ã?¹ã??ã?¬ã?¼ã?ºã??è¨?æ?¶ã??ã??(_R)"
 
-#: ../libedataserverui/e-passwords.c:1217
+#: ../libedataserverui/e-passwords.c:1216
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "ã??ã?®ã??ã?¹ã??ã?¬ã?¼ã?ºã??ã??ã?®ã?»ã??ã?·ã?§ã?³ç?¨ã?«ä¿?å?ã??ã??(_R)"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1221
 msgid "_Remember this password"
 msgstr "ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??è¨?æ?¶ã??ã??(_R)"
 
-#: ../libedataserverui/e-passwords.c:1223
+#: ../libedataserverui/e-passwords.c:1222
 msgid "_Remember this password for the remainder of this session"
 msgstr "ã??ã?®ã??ã?¹ã?¯ã?¼ã??ã??ã??ã?®ã?»ã??ã?·ã?§ã?³ç?¨ã?«ä¿?å?ã??ã??(_R)"
 
@@ -5106,137 +5099,137 @@ msgstr "è»¢é??å??ã?®é?¸æ??"
 msgid "_Destination"
 msgstr "è»¢é??å??(_D)"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1698
-#: ../servers/exchange/storage/exchange-account.c:959
+#: ../servers/exchange/lib/e2k-autoconfig.c:1694
+#: ../servers/exchange/storage/exchange-account.c:955
 #, c-format
 msgid "Enter password for %s"
 msgstr "%s ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ä¸?ã??ã??"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1699
-#: ../servers/exchange/storage/exchange-account.c:964
+#: ../servers/exchange/lib/e2k-autoconfig.c:1695
+#: ../servers/exchange/storage/exchange-account.c:960
 msgid "Enter password"
 msgstr "ã??ã?¹ã?¯ã?¼ã??ã?®å?¥å??"
 
 #. i18n: These are Outlook's words for the default roles in
 #. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:847
+#: ../servers/exchange/lib/e2k-security-descriptor.c:844
 msgid "Owner"
 msgstr "æ??æ??è??"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
+#: ../servers/exchange/lib/e2k-security-descriptor.c:854
 msgid "Publishing Editor"
 msgstr "Publishing Editor"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
+#: ../servers/exchange/lib/e2k-security-descriptor.c:862
 msgid "Editor"
 msgstr "ç·¨é??è??"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
+#: ../servers/exchange/lib/e2k-security-descriptor.c:869
 msgid "Publishing Author"
 msgstr "Publishing Author"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
+#: ../servers/exchange/lib/e2k-security-descriptor.c:875
 msgid "Author"
 msgstr "ä½?è??"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
+#: ../servers/exchange/lib/e2k-security-descriptor.c:880
 msgid "Non-editing Author"
 msgstr "Non-editing Author"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
+#: ../servers/exchange/lib/e2k-security-descriptor.c:884
 msgid "Reviewer"
 msgstr "ã?¬ã??ã?¥ã?¼ã?¢"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
+#: ../servers/exchange/lib/e2k-security-descriptor.c:886
 msgid "Contributor"
 msgstr "è²¢ç?®è??"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
+#: ../servers/exchange/lib/e2k-security-descriptor.c:888
 msgid "None"
 msgstr "ã?ªã??"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
+#: ../servers/exchange/lib/e2k-security-descriptor.c:903
 msgid "Custom"
 msgstr "ã?«ã?¹ã?¿ã? "
 
-#: ../servers/exchange/storage/e-storage.c:555
+#: ../servers/exchange/storage/e-storage.c:557
 msgid "Generic error"
 msgstr "ä¸?è?¬ç??ã?ªã?¨ã?©ã?¼"
 
-#: ../servers/exchange/storage/e-storage.c:557
+#: ../servers/exchange/storage/e-storage.c:559
 msgid "A folder with the same name already exists"
 msgstr "æ?¢ã?«å??å??ã?®ã??ã?©ã?«ã??ã??å?å?¨ã??ã?¾ã??"
 
-#: ../servers/exchange/storage/e-storage.c:559
+#: ../servers/exchange/storage/e-storage.c:561
 msgid "The specified folder type is not valid"
 msgstr "æ??å®?ã??ã??ã??ã?©ã?«ã??ã?®ç¨®é¡?ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../servers/exchange/storage/e-storage.c:561
+#: ../servers/exchange/storage/e-storage.c:563
 msgid "I/O error"
 msgstr "I/O ã?¨ã?©ã?¼"
 
-#: ../servers/exchange/storage/e-storage.c:563
+#: ../servers/exchange/storage/e-storage.c:565
 msgid "Not enough space to create the folder"
 msgstr "ã??ã?©ã?«ã??ã??ç??æ??ã??ã??ã??ã??ã?®å®¹é??ã??è¶³ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/storage/e-storage.c:565
+#: ../servers/exchange/storage/e-storage.c:567
 msgid "The folder is not empty"
 msgstr "ã??ã?®ã??ã?©ã?«ã??ã?¯ç©ºã?§ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/storage/e-storage.c:567
+#: ../servers/exchange/storage/e-storage.c:569
 msgid "The specified folder was not found"
 msgstr "æ??å®?ã??ã??ã??ã?©ã?«ã??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã??"
 
-#: ../servers/exchange/storage/e-storage.c:569
+#: ../servers/exchange/storage/e-storage.c:571
 msgid "Function not implemented in this storage"
 msgstr "ã??ã?®ã?¹ã??ã?¬ã?¼ã?¸ã?§ã?¯å®?è£?ã??ã??ã?¦ã??ã?ªã??æ©?è?½ã?§ã??"
 
-#: ../servers/exchange/storage/e-storage.c:573
+#: ../servers/exchange/storage/e-storage.c:575
 msgid "Operation not supported"
 msgstr "ã?µã??ã?¼ã??ã??ã?¦ã??ã?ªã??æ??ä½?ã?§ã??"
 
-#: ../servers/exchange/storage/e-storage.c:575
+#: ../servers/exchange/storage/e-storage.c:577
 msgid "The specified type is not supported in this storage"
 msgstr "ã??ã?®ã?¹ã??ã?¬ã?¼ã?¸ã?§ã?¯æ??å®?ã??ã??ç¨®é¡?ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/storage/e-storage.c:577
+#: ../servers/exchange/storage/e-storage.c:579
 msgid "The specified folder cannot be modified or removed"
 msgstr "æ??å®?ã??ã??ã??ã?©ã?«ã??ã??å¤?æ?´/å??é?¤ã?§ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/storage/e-storage.c:579
+#: ../servers/exchange/storage/e-storage.c:581
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "ã??ã?®ã??ã?©ã?«ã??ã?®å?ã??ç??æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/storage/e-storage.c:581
+#: ../servers/exchange/storage/e-storage.c:583
 msgid "Cannot create a folder with that name"
 msgstr "ã??ã?®ã??ã??ã?ªå??å??ã?§ã??ã?©ã?«ã??ã??ä½?æ??ã?§ã??ã?¾ã??ã??"
 
-#: ../servers/exchange/storage/e-storage.c:583
+#: ../servers/exchange/storage/e-storage.c:585
 msgid "This operation cannot be performed in off-line mode"
 msgstr "ã??ã?®æ??ä½?ã?¯ã?ªã??ã?©ã?¤ã?³ã?»ã?¢ã?¼ã??ã?§ã?¯å?©ç?¨ã?§ã??ã?¾ã??ã??ã??"
 
 #. i18n: This is the title of an "other user's folders"
 #. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:642
+#: ../servers/exchange/storage/exchange-account.c:640
 #, c-format
 msgid "%s's Folders"
 msgstr "%s ã?®ã??ã?©ã?«ã??"
 
-#: ../servers/exchange/storage/exchange-account.c:1265
+#: ../servers/exchange/storage/exchange-account.c:1260
 msgid "Personal Folders"
 msgstr "å??äººã??ã?©ã?«ã??"
 
-#: ../servers/exchange/storage/exchange-account.c:1280
+#: ../servers/exchange/storage/exchange-account.c:1275
 msgid "Favorite Public Folders"
 msgstr "ã??æ°?ã?«å?¥ã??ã?®ã??ã??ã?ªã??ã?¯ã?ªã??ã?©ã?«ã??"
 
 #. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
+#: ../servers/exchange/storage/exchange-account.c:1292
 msgid "All Public Folders"
 msgstr "å?¨ã?¦ã?®ã??ã??ã?ªã??ã?¯ã?ªã??ã?©ã?«ã??"
 
 #. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1311
+#: ../servers/exchange/storage/exchange-account.c:1306
 msgid "Global Address List"
 msgstr "ã?°ã?ã?¼ã??ã?«ã?ªä½?æ??ã?®ä¸?è¦§"
 
@@ -5244,6 +5237,10 @@ msgstr "ã?°ã?ã?¼ã??ã?«ã?ªä½?æ??ã?®ä¸?è¦§"
 msgid "Deleted Items"
 msgstr "ã?¢ã?¤ã??ã? ã??å??é?¤ã??ã?¾ã??ã??"
 
+#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
+msgid "Drafts"
+msgstr "è??æ¡?"
+
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
 msgid "Journal"
 msgstr "ã?¸ã?£ã?¼ã??ã?«"
@@ -5296,13 +5293,28 @@ msgstr "Evolution ã??ã?¼ã?¿ã?»ã?µã?¼ã??ã?®ã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹ç¢ºèª?ã?µã?¼ã??
 msgid "Evolution Data Server logging service"
 msgstr "Evolution ã??ã?¼ã?¿ã?»ã?µã?¼ã??ã?®ã?ã?°è¨?é?²ã?µã?¼ã??ã?¹"
 
-#. dialog display isn't working out
-#: ../src/server.c:109
-#, c-format
-msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-msgstr ""
-"ã?»ã?°ã?¡ã?³ã??ã?¼ã?·ã?§ã?³ã?»ã??ã?©ã?«ã??ã??è¤?æ?°å??ç?ºç??ã??ã?¾ã??ã??: ã?¨ã?©ã?¼ã?»ã??ã?¤ã?¢ã?ã?°ã??è¡¨ç¤ºã?§"
-"ã??ã?¾ã??ã??\n"
+#~ msgid "Decoder failed, error %d"
+#~ msgstr "ã??ã?³ã?¼ã??ã?®ã?¨ã?©ã?¼ (%d)"
+
+#~ msgid "CRL not yet valid"
+#~ msgstr "CRL ã?¯ã?¾ã? æ£ã??ã??ã??ã??ã?¾ã??ã??"
+
+#~ msgid "CRL has expired"
+#~ msgstr "CRL ã??æ??é??å??ã??ã?§ã??"
+
+#~ msgid "Error in CRL"
+#~ msgstr "CRL ã?®ä¸ã?§ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??"
+
+#~ msgid "Sent"
+#~ msgstr "é??ä¿¡æ¸?"
+
+#~ msgid "Templates"
+#~ msgstr "ã??ã?³ã??ã?¬ã?¼ã??"
+
+#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
+#~ msgstr ""
+#~ "ã?»ã?°ã?¡ã?³ã??ã?¼ã?·ã?§ã?³ã?»ã??ã?©ã?«ã??ã??è¤?æ?°å??ç?ºç??ã??ã?¾ã??ã??: ã?¨ã?©ã?¼ã?»ã??ã?¤ã?¢ã?ã?°ã??è¡¨ç¤º"
+#~ "ã?§ã??ã?¾ã??ã??\n"
 
 #~ msgid "Failed to create create child process '%s': %s"
 #~ msgstr "å?ã??ã?ã?»ã?¹ '%s' ã?®ç??æ??ã?«å¤±æ??ã??ã?¾ã??ã??: %s"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]