[evolution-data-server/gnome-2-30] Updated Thai translation.

[Theppitak Karoonboonyanan <tkaroonb src gnome org>]

commit 00e6e450737edc23c92f4fc7bf851ee598c7e113
Author: Theppitak Karoonboonyanan <thep linux thai net>
Date:   Mon Apr 26 16:15:27 2010 +0700

    Updated Thai translation.

 po/th.po | 3306 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1701 insertions(+), 1605 deletions(-)
---
diff --git a/po/th.po b/po/th.po
index 047aa12..d080803 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1,15 +1,16 @@
 # Thai translation of evolution-data-server.
-# Copyright (C) 2005-2009 Free Software Foundation, Inc.
+# Copyright (C) 2005-2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the evolution-data-server package.
 # Supranee Thirawatthanasuk <supranee opentle org>, 2005, 2006.
-# Theppitak Karoonboonyanan <thep linux thai net>, 2006-2009.
+# Theppitak Karoonboonyanan <thep linux thai net>, 2006-2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server 2.25.91\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-18 15:58+0700\n"
-"PO-Revision-Date: 2009-02-18 16:10+0700\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution-data-server&component=general\n"
+"POT-Creation-Date: 2010-03-22 20:40+0000\n"
+"PO-Revision-Date: 2010-04-26 16:14+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep linux thai net>\n"
 "Language-Team: Thai <thai-l10n googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +18,81 @@ msgstr ""
 "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:2330
+#: 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:2261
+#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
+#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
+#: addressbook/backends/ldap/e-book-backend-ldap.c:4553
+#: 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:2696
+#: addressbook/backends/ldap/e-book-backend-ldap.c:4717
 #, c-format
 msgid "Downloading contacts (%d)... "
-msgstr "�ำลั��าว���หล��ี�อยู��ิ���อ (%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:2845
+#: addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
+#: addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
 #, c-format
 msgid "Updating contacts cache (%d)... "
-msgstr "�ำลั��รั���อมูล����ี�อยู��ิ���อ (%d)... "
+msgstr "�ำลั��รั���อมูล�����อมูล�ู��ิ���อ (%d)... "
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:751
+#: addressbook/backends/ldap/e-book-backend-ldap.c:818
 msgid "Using Distinguished Name (DN)"
 msgstr "�ำลั���� Distinguished Name (DN)"
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: addressbook/backends/ldap/e-book-backend-ldap.c:821
 msgid "Using Email Address"
 msgstr "�ำลั�����ี�อยู�อี�มล"
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:1019
+#: addressbook/backends/ldap/e-book-backend-ldap.c:1098
 msgid "Reconnecting to LDAP server..."
 msgstr "�ำลั���ื�อม��อ�หม���ยั���ิร���วอร� LDAP..."
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:1617
+#: addressbook/backends/ldap/e-book-backend-ldap.c:1740
 msgid "Adding contact to LDAP server..."
-msgstr "�ำลั���ิ�ม�ี�อยู��ิ���อ��ยั���ิร���วอร� LDAP..."
+msgstr "�ำลั���ิ�ม�ู��ิ���อ���า����ิร���วอร� LDAP..."
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:1752
+#: addressbook/backends/ldap/e-book-backend-ldap.c:1874
 msgid "Removing contact from LDAP server..."
-msgstr "�ำลั�ล��ี�อยู��ิ���อออ��า���ิร���วอร� LDAP..."
+msgstr "�ำลั�ล��ู��ิ���อออ��า���ิร���วอร� LDAP..."
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:2064
+#: addressbook/backends/ldap/e-book-backend-ldap.c:2311
 msgid "Modifying contact from LDAP server..."
-msgstr "�ำลั���ลี�ย���ล��ี�อยู��ิ���อ�า���ิร���วอร� LDAP..."
+msgstr "�ำลั���ลี�ย���ล���อมูล�ู��ิ���อ�า���ิร���วอร� LDAP..."
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:4148
+#: addressbook/backends/ldap/e-book-backend-ldap.c:4414
 msgid "Receiving LDAP search results..."
 msgstr "�ำลั�รั��ล�าร���หา LDAP..."
 
-#: addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: addressbook/backends/ldap/e-book-backend-ldap.c:4575
 msgid "Error performing search"
 msgstr "��ิ���อ�ิ��ลา���ะ���หา"
 
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: addressbook/libebook/e-book.c: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
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "\"%s\" �ั�สมุ���อ� \"%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
-#, 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
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "��ิ�สิ���ิ��ร��ิ�อ� CORBA ��ะ�รีย� \"%s\""
-
-#: addressbook/libebook/e-book.c:2507
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: �ม�มี��ิ�ั�ิ�าร����ะ�ี�"
-
-#: addressbook/libebook/e-book.c:2532
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%s: �ม�สามาร�ย��ลิ�"
-
-#: addressbook/libebook/e-book.c:2620 addressbook/libebook/e-book.c:2624
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "\"%s\" �ั�สมุ�หลั��า� \"%s\""
-
-#: addressbook/libebook/e-book.c:2688
-#, c-format
-msgid "%s: canceled"
-msgstr "%s: ย��ลิ�"
-
-#: addressbook/libebook/e-book.c:3269
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%s: �หล����อมูล�ม��ู���อ�"
-
-#: addressbook/libebook/e-book.c:3277 addressbook/libebook/e-book.c:3343
-#, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: �ม�มี����อรี�ี�สามาร�����ั� URI `%s'"
-
-#: addressbook/libebook/e-book.c:3289
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: �ม�สามาร�สร�า� EBookListener"
-
-#: addressbook/libebook/e-book.c:3556
-#, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: �ม�มี�ี�อยู��ิ���อ�อ��ัว�ู�����อ��� gconf"
-
-#: addressbook/libebook/e-book.c:3689
+#: addressbook/libebook/e-book.c:2152
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%s: �ม�มี�หล��สำหรั� uid `%s' �� gconf"
 
 #. Dummy row as EContactField starts from 1
-#: addressbook/libebook/e-contact.c:113
+#: addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
 msgstr "ID �ี��ม���ำ"
 
-#: addressbook/libebook/e-contact.c:114
+#: addressbook/libebook/e-contact.c:116
 msgid "File Under"
 msgstr "������วย�ื�อ"
 
 #. URI of the book to which the contact belongs to
-#: addressbook/libebook/e-contact.c:116
+#: addressbook/libebook/e-contact.c:118
 msgid "Book URI"
 msgstr "URI �อ�สมุ��ี�อยู�"
 
@@ -188,806 +100,866 @@ msgstr "URI �อ�สมุ��ี�อยู�"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: addressbook/libebook/e-contact.c:122
+#: addressbook/libebook/e-contact.c:124
 msgid "Full Name"
 msgstr "�ื�อ���ม"
 
-#: addressbook/libebook/e-contact.c:123
+#: addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "�ื�อ"
 
-#: addressbook/libebook/e-contact.c:124
+#: addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "�ามส�ุล"
 
-#: addressbook/libebook/e-contact.c:125
+#: addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "�ื�อ�ล��"
 
 #. Email fields
-#: addressbook/libebook/e-contact.c:128
+#: addressbook/libebook/e-contact.c:130
 msgid "Email 1"
 msgstr "อี�มล 1"
 
-#: addressbook/libebook/e-contact.c:129
+#: addressbook/libebook/e-contact.c:131
 msgid "Email 2"
 msgstr "อี�มล 2"
 
-#: addressbook/libebook/e-contact.c:130
+#: addressbook/libebook/e-contact.c:132
 msgid "Email 3"
 msgstr "อี�มล 3"
 
-#: addressbook/libebook/e-contact.c:131
+#: addressbook/libebook/e-contact.c:133
 msgid "Email 4"
 msgstr "อี�มล 4"
 
-#: addressbook/libebook/e-contact.c:133
+#: addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "��ร��รมส���มล"
 
 #. Address Labels
-#: addressbook/libebook/e-contact.c:136
+#: addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "��าย�ื�อ�ี�อยู���า�"
 
-#: addressbook/libebook/e-contact.c:137
+#: addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "��าย�ื�อ�ี�อยู��ี��ำ�า�"
 
-#: addressbook/libebook/e-contact.c:138
+#: addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "��าย�ื�อ�ี�อยู�อื��"
 
 #. Phone fields
-#: addressbook/libebook/e-contact.c:141
+#: addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "��รศั����ู���วย"
 
-#: addressbook/libebook/e-contact.c:142
+#: addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "��รศั����ี��ำ�า�"
 
-#: addressbook/libebook/e-contact.c:143
+#: addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
 msgstr "��รศั����ี��ำ�า� 2"
 
-#: addressbook/libebook/e-contact.c:144
+#: addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "��รสาร�ี��ำ�า�"
 
-#: addressbook/libebook/e-contact.c:145
+#: addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
 msgstr "��รศั�����ร�ลั�"
 
-#: addressbook/libebook/e-contact.c:146
+#: addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "��รศั���ร�"
 
-#: addressbook/libebook/e-contact.c:147
+#: addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "��รศั����ริษั�"
 
-#: addressbook/libebook/e-contact.c:148
+#: addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "��รศั�����า�"
 
-#: addressbook/libebook/e-contact.c:149
+#: addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
 msgstr "��รศั�����า� 2"
 
-#: addressbook/libebook/e-contact.c:150
+#: addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "��รสาร��า�"
 
-#: addressbook/libebook/e-contact.c:151
+#: addressbook/libebook/e-contact.c:153
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/libebook/e-contact.c:152
+#: addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "��รศั���มือ�ือ"
 
-#: addressbook/libebook/e-contact.c:153
+#: addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "��รศั���อื���"
 
-#: addressbook/libebook/e-contact.c:154
+#: addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "��รสารอื���"
 
-#: addressbook/libebook/e-contact.c:155
+#: addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "�����อร�"
 
-#: addressbook/libebook/e-contact.c:156
+#: addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "��รศั���หลั�"
 
-#: addressbook/libebook/e-contact.c:157
+#: addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "วิ�ยุสื�อสาร"
 
-#: addressbook/libebook/e-contact.c:158
+#: addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "���ล���"
 
 #. To translators: TTY is Teletypewriter
-#: addressbook/libebook/e-contact.c:160
+#: addressbook/libebook/e-contact.c:162
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: addressbook/libebook/e-contact.c:163
+#: addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "อ����ร"
 
-#: addressbook/libebook/e-contact.c:164
+#: addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "ห��วย�า�อ����ร"
 
-#: addressbook/libebook/e-contact.c:165
+#: addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "สำ�ั��า�"
 
-#: addressbook/libebook/e-contact.c:166
+#: addressbook/libebook/e-contact.c:168
 msgid "Title"
 msgstr "�ำ�ห���"
 
-#: addressbook/libebook/e-contact.c:167
+#: addressbook/libebook/e-contact.c:169
 msgid "Role"
 msgstr "���า�"
 
-#: addressbook/libebook/e-contact.c:168
+#: addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "�ู��ั��าร"
 
-#: addressbook/libebook/e-contact.c:169
+#: addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "�ู���วย"
 
 #. Web fields
-#: addressbook/libebook/e-contact.c:172
+#: addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "URL �อ��ฮม���"
 
-#: addressbook/libebook/e-contact.c:173
+#: addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "URL �อ��ว��ล�อ�"
 
 #. Contact categories
-#: addressbook/libebook/e-contact.c:176
-#: libedataserverui/e-categories-dialog.c:517
+#: addressbook/libebook/e-contact.c:178
+#: libedataserverui/e-categories-dialog.c:671
 msgid "Categories"
 msgstr "หมว�หมู�"
 
 #. Collaboration fields
-#: addressbook/libebook/e-contact.c:179
+#: addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "URI ��ิ�ิ�"
 
-#: addressbook/libebook/e-contact.c:180
+#: addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "URL ส�า�ะว�า�/�ม�ว�า�"
 
-#: addressbook/libebook/e-contact.c:181
+#: addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
 msgstr "��ิ�ิ� ICS"
 
-#: addressbook/libebook/e-contact.c:182
+#: addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "URL �อ��าร�ระ�ุมวี�ิ�ัศ��"
 
 #. Misc fields
-#: addressbook/libebook/e-contact.c:185
+#: addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "�ื�อ�ู�สมรส"
 
-#: addressbook/libebook/e-contact.c:186
+#: addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "หมาย�ห�ุ"
 
 #. Instant messaging fields
-#: addressbook/libebook/e-contact.c:189
+#: addressbook/libebook/e-contact.c:191
 msgid "AIM Home Screen Name 1"
 msgstr "�ื�อ�รีย��ี���า� 1 สำหรั� AIM"
 
-#: addressbook/libebook/e-contact.c:190
+#: addressbook/libebook/e-contact.c:192
 msgid "AIM Home Screen Name 2"
 msgstr "�ื�อ�รีย��ี���า� 2 สำหรั� AIM"
 
-#: addressbook/libebook/e-contact.c:191
+#: addressbook/libebook/e-contact.c:193
 msgid "AIM Home Screen Name 3"
 msgstr "�ื�อ�รีย��ี���า� 3 สำหรั� AIM"
 
-#: addressbook/libebook/e-contact.c:192
+#: addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 1"
 msgstr "�ื�อ�รีย��ี��ำ�า� 1 สำหรั� AIM"
 
-#: addressbook/libebook/e-contact.c:193
+#: addressbook/libebook/e-contact.c:195
 msgid "AIM Work Screen Name 2"
 msgstr "�ื�อ�รีย��ี��ำ�า� 2 สำหรั� AIM"
 
-#: addressbook/libebook/e-contact.c:194
+#: addressbook/libebook/e-contact.c:196
 msgid "AIM Work Screen Name 3"
 msgstr "�ื�อ�รีย��ี��ำ�า� 3 สำหรั� AIM"
 
-#: addressbook/libebook/e-contact.c:195
+#: addressbook/libebook/e-contact.c:197
 msgid "GroupWise Home Screen Name 1"
 msgstr "�ื�อ�รีย��ี���า� 1 สำหรั� GroupWise"
 
-#: addressbook/libebook/e-contact.c:196
+#: addressbook/libebook/e-contact.c:198
 msgid "GroupWise Home Screen Name 2"
 msgstr "�ื�อ�รีย��ี���า� 2 สำหรั� GroupWise"
 
-#: addressbook/libebook/e-contact.c:197
+#: addressbook/libebook/e-contact.c:199
 msgid "GroupWise Home Screen Name 3"
 msgstr "�ื�อ�รีย��ี���า� 3 สำหรั� GroupWise"
 
-#: addressbook/libebook/e-contact.c:198
+#: addressbook/libebook/e-contact.c:200
 msgid "GroupWise Work Screen Name 1"
 msgstr "�ื�อ�รีย��ี��ำ�า� 1 สำหรั� GroupWise"
 
-#: addressbook/libebook/e-contact.c:199
+#: addressbook/libebook/e-contact.c:201
 msgid "GroupWise Work Screen Name 2"
 msgstr "�ื�อ�รีย��ี��ำ�า� 2 สำหรั� GroupWise"
 
-#: addressbook/libebook/e-contact.c:200
+#: addressbook/libebook/e-contact.c:202
 msgid "GroupWise Work Screen Name 3"
 msgstr "�ื�อ�รีย��ี��ำ�า� 3 สำหรั� GroupWise"
 
-#: addressbook/libebook/e-contact.c:201
+#: addressbook/libebook/e-contact.c:203
 msgid "Jabber Home Id 1"
 msgstr "Id �ี���า� 1 สำหรั� Jabber"
 
-#: addressbook/libebook/e-contact.c:202
+#: addressbook/libebook/e-contact.c:204
 msgid "Jabber Home Id 2"
 msgstr "Id �ี���า� 2 สำหรั� Jabber"
 
-#: addressbook/libebook/e-contact.c:203
+#: addressbook/libebook/e-contact.c:205
 msgid "Jabber Home Id 3"
 msgstr "Id �ี���า� 3 สำหรั� Jabber"
 
-#: addressbook/libebook/e-contact.c:204
+#: addressbook/libebook/e-contact.c:206
 msgid "Jabber Work Id 1"
 msgstr "Id �ี��ำ�า� 1 สำหรั� Jabber"
 
-#: addressbook/libebook/e-contact.c:205
+#: addressbook/libebook/e-contact.c:207
 msgid "Jabber Work Id 2"
 msgstr "Id �ี��ำ�า� 2 สำหรั� Jabber"
 
-#: addressbook/libebook/e-contact.c:206
+#: addressbook/libebook/e-contact.c:208
 msgid "Jabber Work Id 3"
 msgstr "Id �ี��ำ�า� 3 สำหรั� Jabber"
 
-#: addressbook/libebook/e-contact.c:207
+#: addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 1"
 msgstr "�ื�อ�รีย��ี���า� 1 สำหรั� Yahoo!"
 
-#: addressbook/libebook/e-contact.c:208
+#: addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Home Screen Name 2"
 msgstr "�ื�อ�รีย��ี���า� 2 สำหรั� Yahoo!"
 
-#: addressbook/libebook/e-contact.c:209
+#: addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Home Screen Name 3"
 msgstr "�ื�อ�รีย��ี���า� 3 สำหรั� Yahoo!"
 
-#: addressbook/libebook/e-contact.c:210
+#: addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 1"
 msgstr "�ื�อ�รีย��ี��ำ�า� 1 สำหรั� Yahoo!"
 
-#: addressbook/libebook/e-contact.c:211
+#: addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Work Screen Name 2"
 msgstr "�ื�อ�รีย��ี��ำ�า�  2 สำหรั� Yahoo!"
 
-#: addressbook/libebook/e-contact.c:212
+#: addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Work Screen Name 3"
 msgstr "�ื�อ�รีย��ี��ำ�า� 3 สำหรั� Yahoo!"
 
-#: addressbook/libebook/e-contact.c:213
+#: addressbook/libebook/e-contact.c:215
 msgid "MSN Home Screen Name 1"
 msgstr "�ื�อ�รีย��ี���า� 1 สำหรั� MSN"
 
-#: addressbook/libebook/e-contact.c:214
+#: addressbook/libebook/e-contact.c:216
 msgid "MSN Home Screen Name 2"
 msgstr "�ื�อ�รีย��ี���า� 2 สำหรั� MSN"
 
-#: addressbook/libebook/e-contact.c:215
+#: addressbook/libebook/e-contact.c:217
 msgid "MSN Home Screen Name 3"
 msgstr "�ื�อ�รีย��ี���า� 3 สำหรั� MSN"
 
-#: addressbook/libebook/e-contact.c:216
+#: addressbook/libebook/e-contact.c:218
 msgid "MSN Work Screen Name 1"
 msgstr "�ื�อ�รีย��ี��ำ�า� 1 สำหรั� MSN"
 
-#: addressbook/libebook/e-contact.c:217
+#: addressbook/libebook/e-contact.c:219
 msgid "MSN Work Screen Name 2"
 msgstr "�ื�อ�รีย��ี��ำ�า� 2 สำหรั� MSN"
 
-#: addressbook/libebook/e-contact.c:218
+#: addressbook/libebook/e-contact.c:220
 msgid "MSN Work Screen Name 3"
 msgstr "�ื�อ�รีย��ี��ำ�า� 3 สำหรั� MSN"
 
-#: addressbook/libebook/e-contact.c:219
+#: addressbook/libebook/e-contact.c:221
 msgid "ICQ Home Id 1"
 msgstr "Id �ี���า� 1 สำหรั� ICQ"
 
-#: addressbook/libebook/e-contact.c:220
+#: addressbook/libebook/e-contact.c:222
 msgid "ICQ Home Id 2"
 msgstr "Id �ี���า� 2 สำหรั� ICQ"
 
-#: addressbook/libebook/e-contact.c:221
+#: addressbook/libebook/e-contact.c:223
 msgid "ICQ Home Id 3"
 msgstr "Id �ี���า� 3 สำหรั� ICQ"
 
-#: addressbook/libebook/e-contact.c:222
+#: addressbook/libebook/e-contact.c:224
 msgid "ICQ Work Id 1"
 msgstr "Id �ี��ำ�า� 1 สำหรั� ICQ"
 
-#: addressbook/libebook/e-contact.c:223
+#: addressbook/libebook/e-contact.c:225
 msgid "ICQ Work Id 2"
 msgstr "Id �ี��ำ�า� 2 สำหรั� ICQ"
 
-#: addressbook/libebook/e-contact.c:224
+#: addressbook/libebook/e-contact.c:226
 msgid "ICQ Work Id 3"
 msgstr "Id �ี��ำ�า� 3 สำหรั� ICQ"
 
 #. Last modified time
-#: addressbook/libebook/e-contact.c:227
+#: addressbook/libebook/e-contact.c:229
 msgid "Last Revision"
 msgstr "�����ล�าสุ�"
 
-#: addressbook/libebook/e-contact.c:228
+#: addressbook/libebook/e-contact.c:230
 msgid "Name or Org"
 msgstr "�ื�อหรืออ����ร"
 
 #. Address fields
-#: addressbook/libebook/e-contact.c:231
+#: addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "ราย�าร�ี�อยู�"
 
-#: addressbook/libebook/e-contact.c:232
+#: addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "�ี�อยู���า�"
 
-#: addressbook/libebook/e-contact.c:233
+#: addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "�ี�อยู��ี��ำ�า�"
 
-#: addressbook/libebook/e-contact.c:234
+#: addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "�ี�อยู�อื��"
 
 #. Contact categories
-#: addressbook/libebook/e-contact.c:237
+#: addressbook/libebook/e-contact.c:239
 msgid "Category List"
 msgstr "ราย�ารหมว�หมู�"
 
 #. Photo/Logo
-#: addressbook/libebook/e-contact.c:240
+#: addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr "ภา���าย"
 
-#: addressbook/libebook/e-contact.c:241
+#: addressbook/libebook/e-contact.c:243
 msgid "Logo"
 msgstr "�ล��"
 
-#: addressbook/libebook/e-contact.c:243
+#: addressbook/libebook/e-contact.c:245
 msgid "Name"
 msgstr "�ื�อ"
 
-#: addressbook/libebook/e-contact.c:244
+#: addressbook/libebook/e-contact.c:246
 msgid "Email List"
 msgstr "ราย�ื�ออี�มล"
 
 #. Instant messaging fields
-#: addressbook/libebook/e-contact.c:247
+#: addressbook/libebook/e-contact.c:249
 msgid "AIM Screen Name List"
 msgstr "ราย�าร�ื�อ�รีย�สำหรั� AIM"
 
-#: addressbook/libebook/e-contact.c:248
+#: addressbook/libebook/e-contact.c:250
 msgid "GroupWise Id List"
 msgstr "ราย�าร Id สำหรั� GroupWise"
 
-#: addressbook/libebook/e-contact.c:249
+#: addressbook/libebook/e-contact.c:251
 msgid "Jabber Id List"
 msgstr "ราย�าร Id สำหรั� Jabber"
 
-#: addressbook/libebook/e-contact.c:250
+#: addressbook/libebook/e-contact.c:252
 msgid "Yahoo! Screen Name List"
 msgstr "ราย�าร�ื�อ�รีย�สำหรั� Yahoo"
 
-#: addressbook/libebook/e-contact.c:251
+#: addressbook/libebook/e-contact.c:253
 msgid "MSN Screen Name List"
 msgstr "ราย�าร�ื�อ�รีย�สำหรั� MSN"
 
-#: addressbook/libebook/e-contact.c:252
+#: addressbook/libebook/e-contact.c:254
 msgid "ICQ Id List"
 msgstr "ราย�าร Id �อ� ICQ"
 
-#: addressbook/libebook/e-contact.c:254
+#: addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
 msgstr "��อ��าร�มล HTML"
 
-#: addressbook/libebook/e-contact.c:256
+#: addressbook/libebook/e-contact.c:258
 msgid "List"
 msgstr "ราย�าร"
 
-#: addressbook/libebook/e-contact.c:257
+#: addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
 msgstr "ราย�าร�ส���ี�อยู�"
 
-#: addressbook/libebook/e-contact.c:259
+#: addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "วั���ิ�"
 
-#: addressbook/libebook/e-contact.c:260
-#: calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: libedataserver/e-categories.c:43
+#: addressbook/libebook/e-contact.c:262
+#: calendar/backends/contacts/e-cal-backend-contacts.c:715
+#: libedataserver/e-categories.c:45
 msgid "Anniversary"
 msgstr "วั��ร�รอ��ี"
 
 #. Security fields
-#: addressbook/libebook/e-contact.c:263
+#: addressbook/libebook/e-contact.c:265
 msgid "X.509 Certificate"
 msgstr "��รั�รอ� X.509"
 
-#: addressbook/libebook/e-contact.c:265
+#: addressbook/libebook/e-contact.c:267
 msgid "Gadu-Gadu Home Id 1"
 msgstr "Id �ี���า� 1 สำหรั� Gadu-Gadu"
 
-#: addressbook/libebook/e-contact.c:266
+#: addressbook/libebook/e-contact.c:268
 msgid "Gadu-Gadu Home Id 2"
 msgstr "Id �ี���า� 2 สำหรั� Gadu-Gadu"
 
-#: addressbook/libebook/e-contact.c:267
+#: addressbook/libebook/e-contact.c:269
 msgid "Gadu-Gadu Home Id 3"
 msgstr "Id �ี���า� 3 สำหรั� Gadu-Gadu"
 
-#: addressbook/libebook/e-contact.c:268
+#: addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Work Id 1"
 msgstr "Id �ี��ำ�า� 1 สำหรั� Gadu-Gadu"
 
-#: addressbook/libebook/e-contact.c:269
+#: addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Work Id 2"
 msgstr "Id �ี��ำ�า� 2 สำหรั� Gadu-Gadu"
 
-#: addressbook/libebook/e-contact.c:270
+#: addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Work Id 3"
 msgstr "Id �ี��ำ�า� 3 สำหรั� Gadu-Gadu"
 
-#: addressbook/libebook/e-contact.c:271
+#: addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Id List"
 msgstr "ราย�าร Id สำหรั� Gadu-Gadu"
 
 #. Geo information
-#: addressbook/libebook/e-contact.c:274
+#: addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr "��อมูลภูมิศาส�ร�"
 
-#: addressbook/libebook/e-contact.c:276
+#: addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "��รศั���"
 
-#: addressbook/libebook/e-contact.c:278
+#: addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
 msgstr "�ื�อ�รีย��ี���า� 1 สำหรั� Skype"
 
-#: addressbook/libebook/e-contact.c:279
+#: addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
 msgstr "�ื�อ�รีย��ี���า� 2 สำหรั� Skype"
 
-#: addressbook/libebook/e-contact.c:280
+#: addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
 msgstr "�ื�อ�รีย��ี���า� 3 สำหรั� Skype"
 
-#: addressbook/libebook/e-contact.c:281
+#: addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
 msgstr "�ื�อ�รีย��ี��ำ�า� 1 สำหรั� Skype"
 
-#: addressbook/libebook/e-contact.c:282
+#: addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
 msgstr "�ื�อ�รีย��ี��ำ�า� 2 สำหรั� Skype"
 
-#: addressbook/libebook/e-contact.c:283
+#: addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
 msgstr "�ื�อ�รีย��ี��ำ�า� 3 สำหรั� Skype"
 
-#: addressbook/libebook/e-contact.c:284
+#: addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
 msgstr "ราย�าร�ื�อ�รีย�สำหรั� Skype"
 
-#: addressbook/libebook/e-contact.c:286
+#: addressbook/libebook/e-contact.c:288
 msgid "SIP address"
 msgstr "�ี�อยู� SIP"
 
-#: addressbook/libebook/e-contact.c:1535
-#: addressbook/libebook/e-destination.c:761
+#: addressbook/libebook/e-contact.c:1515
+#: addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "ราย�าร�ี�ยั��ม�มี�ื�อ"
 
-#: calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: libedataserver/e-categories.c:44
+#: addressbook/libedata-book/e-data-book-factory.c:290
+#, c-format
+msgid "Empty URI"
+msgstr "URI ว�า���ล�า"
+
+#: addressbook/libedata-book/e-data-book-factory.c:305
+#: addressbook/libedata-book/e-data-book-factory.c:332
+#: calendar/libedata-cal/e-data-cal-factory.c:323
+#: calendar/libedata-cal/e-data-cal-factory.c:332
+#, c-format
+msgid "Invalid source"
+msgstr "�หล����อมูล�ม��ู���อ�"
+
+#: addressbook/libedata-book/e-data-book.c:301
+msgid "Cannot open book"
+msgstr "�ม�สามาร���ิ�สมุ����"
+
+#: addressbook/libedata-book/e-data-book.c:319
+msgid "Cannot remove book"
+msgstr "�ม�สามาร�ล�สมุ����"
+
+#: addressbook/libedata-book/e-data-book.c:331
+#: addressbook/libedata-book/e-data-book.c:346
+msgid "Cannot get contact"
+msgstr "�ม�สามาร�อ�า���อมูล�ู��ิ���อ"
+
+#: addressbook/libedata-book/e-data-book.c:358
+msgid "Empty query"
+msgstr "�ำ���ว�า���ล�า"
+
+#: addressbook/libedata-book/e-data-book.c:402
+msgid "Cannot authenticate user"
+msgstr "�ม�สามาร�ยื�ยั��ัว�ุ��ล�อ��ู����"
+
+#: addressbook/libedata-book/e-data-book.c:414
+#: addressbook/libedata-book/e-data-book.c:429
+msgid "Cannot add contact"
+msgstr "�ม�สามาร���ิ�ม�ู��ิ���อ"
+
+#: addressbook/libedata-book/e-data-book.c:444
+#: addressbook/libedata-book/e-data-book.c:459
+msgid "Cannot modify contact"
+msgstr "�ม�สามาร���ลี�ย���ล���อมูล�ู��ิ���อ"
+
+#: addressbook/libedata-book/e-data-book.c:494
+msgid "Cannot remove contacts"
+msgstr "�ม�สามาร�ล��ู��ิ���อ���"
+
+#: addressbook/libedata-book/e-data-book.c:569
+#: calendar/libedata-cal/e-cal-backend-util.c:141
+msgid "Invalid query"
+msgstr "�ำ����ม��ู���อ�"
+
+#: addressbook/libedata-book/e-data-book.c:598
+msgid "Cannot get changes"
+msgstr "�ม�สามาร�อ�า�ราย�าร��ลี�ย���ล�"
+
+#: addressbook/libedata-book/e-data-book.c:699
+msgid "Cannot complete operation"
+msgstr "�ม�สามาร��ำ�ำสั�����สร�����"
+
+#: calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: libedataserver/e-categories.c:46
 msgid "Birthday"
 msgstr "วั���ิ�"
 
-#: calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: calendar/backends/contacts/e-cal-backend-contacts.c:746
 #, c-format
 msgid "Birthday: %s"
 msgstr "วั���ิ�: %s"
 
-#: calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: calendar/backends/contacts/e-cal-backend-contacts.c:770
 #, c-format
 msgid "Anniversary: %s"
 msgstr "วั��ร�รอ��ี: %s"
 
-#: calendar/backends/file/e-cal-backend-file.c:212
+#: calendar/backends/file/e-cal-backend-file.c:236
 msgid "Cannot save calendar data: Malformed URI."
-msgstr "�มสามาร��ั��ึ���อมูล��ิ�ิ�: รู���� 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:243
+#: calendar/backends/file/e-cal-backend-file.c:249
 msgid "Cannot save calendar data"
-msgstr "�มสามาร��ั��ึ���อมูล��ิ�ิ�"
+msgstr "�ม�สามาร��ั��ึ���อมูล��ิ�ิ�"
 
-#: calendar/backends/google/e-cal-backend-google-utils.c:337
+#: calendar/backends/google/e-cal-backend-google-utils.c:342
 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:374
+#: calendar/backends/google/e-cal-backend-google.c:1144
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:1105
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:1403
+#: calendar/backends/http/e-cal-backend-http.c:678
+#: calendar/backends/weather/e-cal-backend-weather.c:492
 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:387
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:1118
 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:1917
+#: calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
+#: camel/providers/groupwise/camel-groupwise-folder.c:2121
 msgid "Reply Requested: by "
 msgstr "��อ��าร�าร�อ��ลั�: ภาย�� "
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: camel/providers/groupwise/camel-groupwise-folder.c:1922
+#: calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
+#: camel/providers/groupwise/camel-groupwise-folder.c:2126
 msgid "Reply Requested: When convenient"
 msgstr "��อ��าร�าร�อ��ลั�: �มื�อสะ�ว�"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:277
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:280
 #, c-format
 msgid "Loading %s items"
 msgstr "�ำลั��หล�ราย�าร %s"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:889
-#: servers/exchange/storage/exchange-hierarchy-foreign.c:260
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:944
 msgid "Calendar"
 msgstr "��ิ�ิ�"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:947
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:1002
 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/libedata-cal/e-cal-backend-util.c:117
-#: camel/providers/groupwise/camel-groupwise-folder.c:1147
-#: camel/providers/groupwise/camel-groupwise-folder.c:1179
-#: camel/providers/groupwise/camel-groupwise-folder.c:1217
-#: 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
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:1021
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:1030
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:1123
+#: calendar/libecal/e-cal.c:4024
+#: calendar/libedata-cal/e-cal-backend-util.c:119
+#: camel/providers/groupwise/camel-groupwise-folder.c:1334
+#: camel/providers/groupwise/camel-groupwise-folder.c:1370
+#: camel/providers/groupwise/camel-groupwise-folder.c:1385
+#: camel/providers/groupwise/camel-groupwise-store.c:591
+#: camel/providers/groupwise/camel-groupwise-store.c:766
+#: 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:335
 msgid "Redirected to Invalid URI"
 msgstr "��ลี�ย��ส���า���ยั� URI �ี�����ม����"
 
-#: calendar/backends/http/e-cal-backend-http.c:289
+#: calendar/backends/http/e-cal-backend-http.c:358
 msgid "Bad file format."
 msgstr "รู�������ม�ี�����ม����"
 
-#: calendar/backends/http/e-cal-backend-http.c:295
+#: calendar/backends/http/e-cal-backend-http.c:365
 msgid "Not a calendar."
 msgstr "�ม������ิ�ิ�"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:149
+#: calendar/backends/weather/e-cal-backend-weather.c:152
 msgid "Could not retrieve weather data"
 msgstr "�ม�สามาร�อ�า���อมูลสภา�อา�าศ"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:246
+#: calendar/backends/weather/e-cal-backend-weather.c:251
 msgid "Weather: Fog"
 msgstr "สภา�อา�าศ: หมอ�"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Cloudy"
-msgstr "สภา�อา�าศ: ��อ���ามี�ม�����ส�ว�มา�"
-
-#: calendar/backends/weather/e-cal-backend-weather.c:248
+#: calendar/backends/weather/e-cal-backend-weather.c:252
 msgid "Weather: Cloudy Night"
 msgstr "สภา�อา�าศ: �ื���อ���ามี�ม�����ส�ว�มา�"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:249
+#: calendar/backends/weather/e-cal-backend-weather.c:253
+msgid "Weather: Cloudy"
+msgstr "สภา�อา�าศ: ��อ���ามี�ม�����ส�ว�มา�"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Overcast"
 msgstr "สภา�อา�าศ: �ม����ม��อ���า"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:250
+#: calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Showers"
 msgstr "สภา�อา�าศ: ���ู�"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:251
+#: calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Snow"
 msgstr "สภา�อา�าศ: หิมะ��"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:252
-msgid "Weather: Sunny"
-msgstr "สภา�อา�าศ: ��อ���า���ม�ส"
-
-#: calendar/backends/weather/e-cal-backend-weather.c:253
+#: calendar/backends/weather/e-cal-backend-weather.c:257
 msgid "Weather: Clear Night"
 msgstr "สภา�อา�าศ: �ื���อ���า���ม�ส"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:254
+#: calendar/backends/weather/e-cal-backend-weather.c:258
+msgid "Weather: Sunny"
+msgstr "สภา�อา�าศ: ��อ���า���ม�ส"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:259
 msgid "Weather: Thunderstorms"
 msgstr "สภา�อา�าศ: �ายุ��า�ะ�อ�"
 
-#: calendar/backends/weather/e-cal-backend-weather.c:399
+#: calendar/backends/weather/e-cal-backend-weather.c:405
 msgid "Forecast"
 msgstr "�ยา�ร��อา�าศ"
 
-#: calendar/libecal/e-cal-component.c:1322
+#: calendar/libecal/e-cal-component.c:1286
 msgid "Untitled appointment"
 msgstr "�ั�หมาย�ม�มี�ื�อ"
 
-#: calendar/libecal/e-cal-recur.c:4041
+#: calendar/libecal/e-cal-recur.c:3951
 msgid "1st"
 msgstr "วั��ี� 1"
 
-#: calendar/libecal/e-cal-recur.c:4042
+#: calendar/libecal/e-cal-recur.c:3952
 msgid "2nd"
 msgstr "วั��ี� 2"
 
-#: calendar/libecal/e-cal-recur.c:4043
+#: calendar/libecal/e-cal-recur.c:3953
 msgid "3rd"
 msgstr "วั��ี� 3"
 
-#: calendar/libecal/e-cal-recur.c:4044
+#: calendar/libecal/e-cal-recur.c:3954
 msgid "4th"
 msgstr "วั��ี� 4"
 
-#: calendar/libecal/e-cal-recur.c:4045
+#: calendar/libecal/e-cal-recur.c:3955
 msgid "5th"
 msgstr "วั��ี� 5"
 
-#: calendar/libecal/e-cal-recur.c:4046
+#: calendar/libecal/e-cal-recur.c:3956
 msgid "6th"
 msgstr "วั��ี� 6"
 
-#: calendar/libecal/e-cal-recur.c:4047
+#: calendar/libecal/e-cal-recur.c:3957
 msgid "7th"
 msgstr "วั��ี� 7"
 
-#: calendar/libecal/e-cal-recur.c:4048
+#: calendar/libecal/e-cal-recur.c:3958
 msgid "8th"
 msgstr "วั��ี� 8"
 
-#: calendar/libecal/e-cal-recur.c:4049
+#: calendar/libecal/e-cal-recur.c:3959
 msgid "9th"
 msgstr "วั��ี� 9"
 
-#: calendar/libecal/e-cal-recur.c:4050
+#: calendar/libecal/e-cal-recur.c:3960
 msgid "10th"
 msgstr "วั��ี� 10"
 
-#: calendar/libecal/e-cal-recur.c:4051
+#: calendar/libecal/e-cal-recur.c:3961
 msgid "11th"
 msgstr "วั��ี� 11"
 
-#: calendar/libecal/e-cal-recur.c:4052
+#: calendar/libecal/e-cal-recur.c:3962
 msgid "12th"
 msgstr "วั��ี� 12"
 
-#: calendar/libecal/e-cal-recur.c:4053
+#: calendar/libecal/e-cal-recur.c:3963
 msgid "13th"
 msgstr "วั��ี� 13"
 
-#: calendar/libecal/e-cal-recur.c:4054
+#: calendar/libecal/e-cal-recur.c:3964
 msgid "14th"
 msgstr "วั��ี� 14"
 
-#: calendar/libecal/e-cal-recur.c:4055
+#: calendar/libecal/e-cal-recur.c:3965
 msgid "15th"
 msgstr "วั��ี� 15"
 
-#: calendar/libecal/e-cal-recur.c:4056
+#: calendar/libecal/e-cal-recur.c:3966
 msgid "16th"
 msgstr "วั��ี� 16"
 
-#: calendar/libecal/e-cal-recur.c:4057
+#: calendar/libecal/e-cal-recur.c:3967
 msgid "17th"
 msgstr "วั��ี� 17"
 
-#: calendar/libecal/e-cal-recur.c:4058
+#: calendar/libecal/e-cal-recur.c:3968
 msgid "18th"
 msgstr "วั��ี� 18"
 
-#: calendar/libecal/e-cal-recur.c:4059
+#: calendar/libecal/e-cal-recur.c:3969
 msgid "19th"
 msgstr "วั��ี� 19"
 
-#: calendar/libecal/e-cal-recur.c:4060
+#: calendar/libecal/e-cal-recur.c:3970
 msgid "20th"
 msgstr "วั��ี� 20"
 
-#: calendar/libecal/e-cal-recur.c:4061
+#: calendar/libecal/e-cal-recur.c:3971
 msgid "21st"
 msgstr "วั��ี� 21"
 
-#: calendar/libecal/e-cal-recur.c:4062
+#: calendar/libecal/e-cal-recur.c:3972
 msgid "22nd"
 msgstr "วั��ี� 22"
 
-#: calendar/libecal/e-cal-recur.c:4063
+#: calendar/libecal/e-cal-recur.c:3973
 msgid "23rd"
 msgstr "วั��ี� 23"
 
-#: calendar/libecal/e-cal-recur.c:4064
+#: calendar/libecal/e-cal-recur.c:3974
 msgid "24th"
 msgstr "วั��ี� 24"
 
-#: calendar/libecal/e-cal-recur.c:4065
+#: calendar/libecal/e-cal-recur.c:3975
 msgid "25th"
 msgstr "วั��ี� 25"
 
-#: calendar/libecal/e-cal-recur.c:4066
+#: calendar/libecal/e-cal-recur.c:3976
 msgid "26th"
 msgstr "วั��ี� 26"
 
-#: calendar/libecal/e-cal-recur.c:4067
+#: calendar/libecal/e-cal-recur.c:3977
 msgid "27th"
 msgstr "วั��ี� 27"
 
-#: calendar/libecal/e-cal-recur.c:4068
+#: calendar/libecal/e-cal-recur.c:3978
 msgid "28th"
 msgstr "วั��ี� 28"
 
-#: calendar/libecal/e-cal-recur.c:4069
+#: calendar/libecal/e-cal-recur.c:3979
 msgid "29th"
 msgstr "วั��ี� 29"
 
-#: calendar/libecal/e-cal-recur.c:4070
+#: calendar/libecal/e-cal-recur.c:3980
 msgid "30th"
 msgstr "วั��ี� 30"
 
-#: calendar/libecal/e-cal-recur.c:4071
+#: calendar/libecal/e-cal-recur.c:3981
 msgid "31st"
 msgstr "วั��ี� 31"
 
-#: calendar/libecal/e-cal-util.c:685 calendar/libecal/e-cal-util.c:713
+#: calendar/libecal/e-cal-util.c:688 calendar/libecal/e-cal-util.c:715
 msgid "High"
 msgstr "สู�"
 
-#: calendar/libecal/e-cal-util.c:687 calendar/libecal/e-cal-util.c:715
+#: calendar/libecal/e-cal-util.c:690 calendar/libecal/e-cal-util.c:717
 msgid "Normal"
 msgstr "���ิ"
 
-#: calendar/libecal/e-cal-util.c:689 calendar/libecal/e-cal-util.c:717
+#: calendar/libecal/e-cal-util.c:692 calendar/libecal/e-cal-util.c:719
 msgid "Low"
 msgstr "��ำ"
 
 #. An empty string is the same as 'None'.
-#: calendar/libecal/e-cal-util.c:711
+#: calendar/libecal/e-cal-util.c:713
 msgid "Undefined"
 msgstr "�ม�����ำห��"
 
-#: calendar/libecal/e-cal.c:1677 libedataserverui/e-book-auth-util.c:199
+#: calendar/libecal/e-cal.c:1173 libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "��อ�รหัส��า�สำหรั� %s (�ู���� %s)"
@@ -996,186 +968,181 @@ msgstr "��อ�รหัส��า�สำหรั� %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:1187
 #, 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:3996
 msgid "Invalid argument"
 msgstr "อาร��ิว�ม����ม��ู���อ�"
 
-#: calendar/libecal/e-cal.c:5072
+#: calendar/libecal/e-cal.c:3998
 msgid "Backend is busy"
 msgstr "�����อ�������า�อยู�"
 
-#: calendar/libecal/e-cal.c:5074
-#: calendar/libedata-cal/e-cal-backend-util.c:105
+#: calendar/libecal/e-cal.c:4000
+#: calendar/libedata-cal/e-cal-backend-util.c:107
 msgid "Repository is offline"
 msgstr "�หล��������อมูล�ม������ื�อม��ออยู�"
 
-#: calendar/libecal/e-cal.c:5076
-#: calendar/libedata-cal/e-cal-backend-util.c:129
+#: calendar/libecal/e-cal.c:4002
+#: calendar/libedata-cal/e-cal-backend-util.c:131
 msgid "No such calendar"
 msgstr "�ม�มี��ิ�ิ��ั��ล�าว"
 
-#: calendar/libecal/e-cal.c:5078
-#: calendar/libedata-cal/e-cal-backend-util.c:111
-#: servers/groupwise/e-gw-connection.c:233
+#: calendar/libecal/e-cal.c:4004
+#: calendar/libedata-cal/e-cal-backend-util.c:113
+#: servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "�ม���วั��ุ"
 
-#: calendar/libecal/e-cal.c:5080
-#: calendar/libedata-cal/e-cal-backend-util.c:113
-#: servers/groupwise/e-gw-connection.c:227
+#: calendar/libecal/e-cal.c:4006
+#: calendar/libedata-cal/e-cal-backend-util.c:115
+#: servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "วั��ุ�ม��ู���อ�"
 
-#: calendar/libecal/e-cal.c:5082
+#: calendar/libecal/e-cal.c:4008
 msgid "URI not loaded"
 msgstr "�ม�����หล� URI"
 
-#: calendar/libecal/e-cal.c:5084
+#: calendar/libecal/e-cal.c:4010
 msgid "URI already loaded"
 msgstr "�หล� URI �รีย�ร�อย"
 
-#: calendar/libecal/e-cal.c:5086
-#: calendar/libedata-cal/e-cal-backend-util.c:107
-#: servers/exchange/storage/e-storage.c:571
+#: calendar/libecal/e-cal.c:4012
+#: calendar/libedata-cal/e-cal-backend-util.c:109
 msgid "Permission denied"
 msgstr "�ม����รั�อ�ุ�า�"
 
-#: calendar/libecal/e-cal.c:5088
-#: calendar/libedata-cal/e-cal-backend-util.c:131
-#: servers/groupwise/e-gw-connection.c:235
+#: calendar/libecal/e-cal.c:4014
+#: calendar/libedata-cal/e-cal-backend-util.c:133
+#: servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "�ู�����ี��ม�รู��ั�"
 
-#: calendar/libecal/e-cal.c:5090
-#: calendar/libedata-cal/e-cal-backend-util.c:115
+#: calendar/libecal/e-cal.c:4016
+#: calendar/libedata-cal/e-cal-backend-util.c:117
 msgid "Object ID already exists"
 msgstr "ID �อ�วั��ุมีอยู��ล�ว"
 
-#: calendar/libecal/e-cal.c:5092
+#: calendar/libecal/e-cal.c:4018
 msgid "Protocol not supported"
 msgstr "��ร���อล�ม�รอ�รั�"
 
-#: calendar/libecal/e-cal.c:5094
+#: calendar/libecal/e-cal.c:4020
 msgid "Operation has been canceled"
 msgstr "�าร��ิ�ั�ิ�าร���ย��ลิ����ล�ว"
 
-#: calendar/libecal/e-cal.c:5096
-#: calendar/libedata-cal/e-cal-backend-util.c:143
+#: calendar/libecal/e-cal.c:4022
+#: calendar/libedata-cal/e-cal-backend-util.c:145
 msgid "Could not cancel operation"
 msgstr "�ม�สามาร�ย��ลิ��าร��ิ�ั�ิ�าร"
 
-#: calendar/libecal/e-cal.c:5100
-#: calendar/libedata-cal/e-cal-backend-util.c:119
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/libecal/e-cal.c:4026
+#: calendar/libedata-cal/e-cal-backend-util.c:121
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication required"
 msgstr "��อ��าร�ารยื�ยั��ัว�ุ��ล"
 
-#: calendar/libecal/e-cal.c:5102
+#: calendar/libecal/e-cal.c:4028
 msgid "A CORBA exception has occurred"
 msgstr "��ิ�สิ���ิ��ร��ิ�อ� CORBA"
 
-#: calendar/libecal/e-cal.c:5104
-#: 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/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
-#: servers/groupwise/e-gw-connection.c:241
+#: calendar/libecal/e-cal.c:4030
+#: calendar/libedata-cal/e-cal-backend-util.c:148 camel/camel-net-utils.c:523
+#: camel/providers/groupwise/camel-groupwise-transport.c:214
+#: camel/providers/imap/camel-imap-command.c:432
+#: camel/providers/imap/camel-imap-store.c:741
+#: 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:584
+#: servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "��อ�ิ��ลา��ม��รา�สา�ห�ุ"
 
-#: calendar/libecal/e-cal.c:5106
-#: calendar/libedata-cal/e-cal-backend-util.c:103
-#: servers/exchange/storage/e-storage.c:553
+#: calendar/libecal/e-cal.c:4032
+#: calendar/libedata-cal/e-cal-backend-util.c:105
 msgid "No error"
 msgstr "�ม�มี��อ�ิ��ลา�"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: calendar/libedata-cal/e-cal-backend-sexp.c:1052
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" �ม���อ��ารอาร��ิว�ม���"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: calendar/libedata-cal/e-cal-backend-sexp.c:1090
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" ��อ��ารห�ึ��อาร��ิว�ม���"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: calendar/libedata-cal/e-cal-backend-sexp.c:737
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" ��อ��ารอาร��ิว�ม����ร�����ส�ริ�"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr "\"%s\" ��อ��ารอาร��ิว�ม����ร�����ส�ริ�วั�/�วลา�อ� ISO 8601"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: calendar/libedata-cal/e-cal-backend-sexp.c:864
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" ��อ��ารสอ�อาร��ิว�ม���"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: calendar/libedata-cal/e-cal-backend-sexp.c:1096
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" ��อ��ารอาร��ิว�ม����ร�������ิ� time_t"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\" ��อ��ารอาร��ิว�ม����ี�สอ������ล��ำ�ว����ม"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" ��อ��ารอาร��ิว�ม����ี�สอ�������ิ� time_t"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: calendar/libedata-cal/e-cal-backend-sexp.c:745
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" ��อ��ารอาร��ิว�ม����ี�สอ�����ส�ริ�"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1185,12 +1152,12 @@ msgstr ""
 "\"%s\" ��อ��ารอาร��ิว�ม����ร����� \"any\", \"summary\",  \"description\", "
 "\"location\", \"attendee\", \"organizer\", หรือ \"classification\""
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" ��อ��ารอย�า���อยห�ึ��อาร��ิว�ม���"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1199,50 +1166,176 @@ msgstr ""
 "\"%s\" ��อ��ารอาร��ิว�ม����ี�����ส�ริ��ุ��ัว หรือมิ�ะ�ั�� ������อาร��ิว�ม�����ียว�ี������ูลี���า���� "
 "(#f) ���า�ั��"
 
-#: calendar/libedata-cal/e-cal-backend-util.c:109
+#: calendar/libedata-cal/e-cal-backend-util.c:111
 msgid "Invalid range"
 msgstr "��ว��ม��ู���อ�"
 
-#: calendar/libedata-cal/e-cal-backend-util.c:121
+#: calendar/libedata-cal/e-cal-backend-util.c:123
 msgid "Unsupported field"
 msgstr "�ม�รอ�รั������อมูล�ี�"
 
-#: calendar/libedata-cal/e-cal-backend-util.c:123
+#: calendar/libedata-cal/e-cal-backend-util.c:125
 msgid "Unsupported method"
 msgstr "�ม�รอ�รั�วิ�ี�ี�"
 
-#: calendar/libedata-cal/e-cal-backend-util.c:125
+#: calendar/libedata-cal/e-cal-backend-util.c:127
 msgid "Unsupported authentication method"
 msgstr "�ม�รอ�รั��ารยื�ยั��ัว�ุ��ลวิ�ี�ี�"
 
-#: calendar/libedata-cal/e-cal-backend-util.c:127
+#: calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "TLS not available"
 msgstr "TLS �ม�สามาร�����า����"
 
-#: calendar/libedata-cal/e-cal-backend-util.c:133
+#: calendar/libedata-cal/e-cal-backend-util.c:135
 msgid "Offline mode unavailable"
 msgstr "�ม�สามาร�����หม�ออ��ล�����"
 
-#: calendar/libedata-cal/e-cal-backend-util.c:135
+#: calendar/libedata-cal/e-cal-backend-util.c:137
 msgid "Search size limit exceeded"
 msgstr "��า��อ��าร���หา��ิ��ำห��"
 
-#: calendar/libedata-cal/e-cal-backend-util.c:137
+#: calendar/libedata-cal/e-cal-backend-util.c:139
 msgid "Search time limit exceeded"
 msgstr "�วลา�อ��าร���หา��ิ��ำห��"
 
-#: calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "��อ�ำ�าม�ม��ู���อ�"
-
-#: calendar/libedata-cal/e-cal-backend-util.c:141
+#: calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Query refused"
 msgstr "��อ�ำ�าม�ู���ิ�ส�"
 
-#: calendar/libedata-cal/e-cal-backend-util.c:148
+#: calendar/libedata-cal/e-cal-backend-util.c:150
 msgid "Invalid server version"
 msgstr "รุ���อ���ิร���วอร��ม��ู���อ�"
 
+#: calendar/libedata-cal/e-data-cal.c:501
+#, c-format
+msgid "Cannot retrieve calendar address"
+msgstr "�ม�สามาร��ึ��ี�อยู���ิ�ิ����"
+
+#: calendar/libedata-cal/e-data-cal.c:519
+#, c-format
+msgid "Cannot retrieve calendar alarm e-mail address"
+msgstr "�ม�สามาร��ึ��ี�อยู�อี�มลสำหรั�������ือ��า���ิ�ิ����"
+
+#: calendar/libedata-cal/e-data-cal.c:537
+#, c-format
+msgid "Cannot retrieve calendar's ldap attribute"
+msgstr "�ม�สามาร��ั��ึ��อ��ริ�ิว�� LDAP �อ���ิ�ิ����"
+
+#: calendar/libedata-cal/e-data-cal.c:555
+#, c-format
+msgid "Cannot retrieve calendar scheduling information"
+msgstr "�ม�สามาร��ึ���อมูล�าร�ั��ารา��วลา�อ���ิ�ิ����"
+
+#: calendar/libedata-cal/e-data-cal.c:572
+#, c-format
+msgid "Cannot open calendar"
+msgstr "�ม�สามาร���ิ���ิ�ิ����"
+
+#: calendar/libedata-cal/e-data-cal.c:591
+#, c-format
+msgid "Cannot refresh calendar"
+msgstr "�ม�สามาร��รั��ส����ิ�ิ����"
+
+#: calendar/libedata-cal/e-data-cal.c:608
+#, c-format
+msgid "Cannot remove calendar"
+msgstr "�ม�สามาร�ล���ิ�ิ����"
+
+#: calendar/libedata-cal/e-data-cal.c:627
+#, c-format
+msgid "Cannot create calendar object"
+msgstr "�ม�สามาร�สร�า�อ�อ��������ิ�ิ�"
+
+#: calendar/libedata-cal/e-data-cal.c:649
+#, c-format
+msgid "Cannot modify calendar object"
+msgstr "�ม�สามาร���ลี�ย���ล�อ�อ��������ิ�ิ�"
+
+#: calendar/libedata-cal/e-data-cal.c:673
+#, c-format
+msgid "Cannot remove calendar object"
+msgstr "�ม�สามาร�ล�อ�อ��������ิ�ิ�"
+
+#: calendar/libedata-cal/e-data-cal.c:692
+#, c-format
+msgid "Cannot receive calendar objects"
+msgstr "�ม�สามาร�รั���อมูลอ�อ��������ิ�ิ�"
+
+#: calendar/libedata-cal/e-data-cal.c:709
+#, c-format
+msgid "Cannot discard calendar alarm"
+msgstr "�ม�สามารละ�ิ���าร������ือ��อ���ิ�ิ�"
+
+#: calendar/libedata-cal/e-data-cal.c:728
+#, c-format
+msgid "Cannot send calendar objects"
+msgstr "�ม�สามาร�ส����อมูลอ�อ��������ิ�ิ�"
+
+#: calendar/libedata-cal/e-data-cal.c:763
+#, c-format
+msgid "Cannot retrieve default calendar object path"
+msgstr "�ม�สามาร��ึ���อมูล�า��ริยาย�อ�อ�อ��������ิ�ิ����"
+
+#: calendar/libedata-cal/e-data-cal.c:781
+#, c-format
+msgid "Cannot retrieve calendar object path"
+msgstr "�ม�สามาร��ึ���อมูล�า��อ�อ�อ��������ิ�ิ����"
+
+#: calendar/libedata-cal/e-data-cal.c:799
+#, c-format
+msgid "Cannot retrieve calendar object list"
+msgstr "�ม�สามาร��ึ�ราย�ื�อ�อ�อ�อ��������ิ�ิ�"
+
+#: calendar/libedata-cal/e-data-cal.c:837
+#, c-format
+msgid "Could not retrieve attachment list"
+msgstr "�ม�สามาร��ึ�ราย�ื�อ�อ����ม���"
+
+#: calendar/libedata-cal/e-data-cal.c:859
+#, c-format
+msgid "Could not complete calendar query"
+msgstr "�ม�สามาร��ำ�ำสั�������ิ�ิ����สร�����"
+
+#: calendar/libedata-cal/e-data-cal.c:877
+#, c-format
+msgid "Could not retrieve calendar time zone"
+msgstr "�ม�สามาร��ึ���อมูล����วลา�อ���ิ�ิ�"
+
+#: calendar/libedata-cal/e-data-cal.c:895
+#, c-format
+msgid "Could not add calendar time zone"
+msgstr "�ม�สามาร���ิ�ม����วลา�อ���ิ�ิ�"
+
+#: calendar/libedata-cal/e-data-cal.c:912
+#, c-format
+msgid "Could not set default calendar time zone"
+msgstr "�ม�สามาร��ำห������วลา�ริยาย�อ���ิ�ิ�"
+
+#: calendar/libedata-cal/e-data-cal.c:933
+#, c-format
+msgid "Cannot retrieve calendar changes"
+msgstr "�ม�สามาร��ึ�ราย�าร��ลี�ย���ล��อ���ิ�ิ�"
+
+#: calendar/libedata-cal/e-data-cal.c:983
+#, c-format
+msgid "Cannot retrieve calendar free/busy list"
+msgstr "�ม�สามาร��ึ�ราย�ารส�า�ะอยู�/�ม�อยู��อ���ิ�ิ�"
+
+#: calendar/libedata-cal/e-data-cal-factory.c:339
+#, c-format
+msgid "Invalid URI"
+msgstr "URI �ม��ู���อ�"
+
+#: calendar/libedata-cal/e-data-cal-factory.c:350
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "�ม�มี�ร��า������อ���สำหรั� '%s' �อ� '%s'"
+
+#: calendar/libedata-cal/e-data-cal-factory.c:390
+#, c-format
+msgid "Could not instantiate backend"
+msgstr "�ม�สามาร�สร�า�อ�อ�������อ������อ���"
+
 #: camel/camel-cipher-context.c:102
 msgid "Signing is not supported by this cipher"
 msgstr "�ม�รอ�รั��าร�����ำ�ั�สำหรั��าร���ารหัสลั��ี�"
@@ -1283,7 +1376,7 @@ msgstr "�ุ��ม�สามาร��ำ���า�ุ���ส
 msgid "You may not export keys with this cipher"
 msgstr "�ุ��ม�สามาร�ส��ออ��ุ���สำหรั��าร���ารหัสลั��ี����"
 
-#: camel/camel-data-cache.c:136
+#: camel/camel-data-cache.c:135
 msgid "Unable to create cache path"
 msgstr "�ม�สามาร�สร�า��า����"
 
@@ -1292,11 +1385,11 @@ msgstr "�ม�สามาร�สร�า��า����"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "�ม�สามาร�ล�ราย�าร���: %s: %s"
 
-#: camel/camel-db.c:469
+#: camel/camel-db.c:416
 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"
@@ -1307,7 +1400,7 @@ 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"
@@ -1318,120 +1411,123 @@ 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/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/camel-disco-store.c:400
+#: camel/providers/groupwise/camel-groupwise-store.c:216
+#: camel/providers/imap/camel-imap-store.c:1001
+#: camel/providers/imap/camel-imap-store.c:1843
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap/camel-imap-store.c:3068
+#: camel/providers/imapx/camel-imapx-store.c:167
+#: camel/providers/imapx/camel-imapx-store.c:620
+#: camel/providers/imapx/camel-imapx-store.c:650
 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"
 
-#: camel/camel-folder-search.c:351 camel/camel-folder-search.c:453
-#: camel/camel-folder-search.c:608
+#: camel/camel-folder-search.c:351 camel/camel-folder-search.c:455
+#: camel/camel-folder-search.c:610
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1440,8 +1536,8 @@ msgstr ""
 "�ม�สามาร�����ิ�������หา: %s\n"
 "%s"
 
-#: camel/camel-folder-search.c:361 camel/camel-folder-search.c:463
-#: camel/camel-folder-search.c:618
+#: camel/camel-folder-search.c:361 camel/camel-folder-search.c:465
+#: camel/camel-folder-search.c:620
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1450,52 +1546,52 @@ msgstr ""
 "��ิ���อ�ิ��ลา�ระหว�า������วย�ิ�������หา: %s\n"
 "%s"
 
-#: camel/camel-folder-search.c:810 camel/camel-folder-search.c:853
+#: camel/camel-folder-search.c:812 camel/camel-folder-search.c:854
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ��อ��าร�ลลั�����ิ��ูลี���า��ียว"
 
-#: camel/camel-folder-search.c:906
+#: camel/camel-folder-search.c:907
 #, 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:913 camel/camel-folder-search.c:920
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ��อ��ารราย�าร�������ิ�ส�ริ�"
 
-#: camel/camel-folder-search.c:946
+#: camel/camel-folder-search.c:947
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ��อ��าร�ลลั��������อร��รย�"
 
-#: camel/camel-folder-search.c:955
+#: camel/camel-folder-search.c:956
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ��อ��าร�ุ���ล��อร�"
 
-#: camel/camel-folder.c:696
+#: camel/camel-folder.c:690
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "�ม�รอ�รั���ิ�ั�ิ�าร: ��ิ�ม��าย��อ�วาม: สำหรั� %s"
 
-#: camel/camel-folder.c:1398
+#: camel/camel-folder.c:1401
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "�ม�รอ�รั���ิ�ั�ิ�าร: ���หา��วย�ิ����: สำหรั� %s"
 
-#: camel/camel-folder.c:1440
+#: camel/camel-folder.c:1442
 #, c-format
 msgid "Unsupported operation: count by expression: for %s"
 msgstr "�ม�รอ�รั���ิ�ั�ิ�าร: �ั���วย�ิ����: สำหรั� %s"
 
-#: camel/camel-folder.c:1480
+#: camel/camel-folder.c:1483
 #, c-format
 msgid "Unsupported operation: search by UIDs: for %s"
 msgstr "�ม�รอ�รั���ิ�ั�ิ�าร: ���หา�าม UID: สำหรั� %s"
 
-#: camel/camel-folder.c:1596
+#: camel/camel-folder.c:1596 camel/providers/local/camel-maildir-folder.c:387
 msgid "Moving messages"
 msgstr "�ำลั�ย�าย��อ�วาม"
 
@@ -1503,19 +1599,19 @@ msgstr "�ำลั�ย�าย��อ�วาม"
 msgid "Copying messages"
 msgstr "�ำลั��ั�ลอ���อ�วาม"
 
-#: camel/camel-folder.c:1942
+#: camel/camel-folder.c:1945
 msgid "Learning junk"
 msgstr "�ำลั��รีย�รู�รู�����มล�ยะ"
 
-#: camel/camel-folder.c:1959
+#: camel/camel-folder.c:1963
 msgid "Learning non-junk"
 msgstr "�ำลั��รีย�รู�รู�����มล�ี��ม�����ยะ"
 
-#: camel/camel-folder.c:1978
+#: camel/camel-folder.c:1983
 msgid "Filtering new message(s)"
 msgstr "�ำลั��รอ���อ�วาม�หม�"
 
-#: camel/camel-gpg-context.c:755
+#: camel/camel-gpg-context.c:760
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1526,15 +1622,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:775
 msgid "Failed to parse gpg userid hint."
 msgstr "�ม�สามาร������อมูล userid ��ื�อ�����อ� gpg"
 
-#: camel/camel-gpg-context.c:794 camel/camel-gpg-context.c:808
+#: camel/camel-gpg-context.c:799 camel/camel-gpg-context.c:813
 msgid "Failed to parse gpg passphrase request."
 msgstr "�ม�สามาร�����ำร�อ��อรหัส��า� gpg"
 
-#: camel/camel-gpg-context.c:828
+#: camel/camel-gpg-context.c:833
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1543,7 +1639,7 @@ msgstr ""
 "��อ����รหัส PIN ��ื�อ�ล�ล�อ��ุ���สำหรั�สมาร���าร��\n"
 "�อ��ุ�: \"%s\""
 
-#: camel/camel-gpg-context.c:832
+#: camel/camel-gpg-context.c:837
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1552,95 +1648,91 @@ msgstr ""
 "��อ����รหัส��า���ื�อ�ล�ล�อ��ุ���สำหรั�\n"
 "�ู����: \"%s\""
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:842
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "�ารร�อ��อ�ี��ม��า�หมาย�า� GnuPG สำหรั� '%s'"
 
-#: 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:867 camel/camel-gpg-context.c:1113
+#: camel/providers/nntp/camel-nntp-store.c:1313
 msgid "Canceled."
 msgstr "ย��ลิ�"
 
-#: camel/camel-gpg-context.c:876
+#: camel/camel-gpg-context.c:881
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "�ม�สามาร��ล�ล�อ��ุ���ลั�: รหัส��า��ิ� 3 �รั��"
 
-#: camel/camel-gpg-context.c:884
+#: camel/camel-gpg-context.c:889
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "�าร�อ�ส�อ��ี��ม�����า�หมาย�า� GnuPG: %s"
 
-#: camel/camel-gpg-context.c:947
+#: camel/camel-gpg-context.c:988
 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:1262 camel/camel-gpg-context.c:1387
+#: camel/camel-gpg-context.c:1953 camel/camel-gpg-context.c:1998
 #, 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:1355 camel/camel-smime-context.c:605
 #, 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:1402 camel/camel-gpg-context.c:1630
+#: camel/camel-gpg-context.c:1646 camel/camel-gpg-context.c:1728
+#: camel/camel-gpg-context.c:1743 camel/camel-gpg-context.c:1859
+#: camel/camel-gpg-context.c:1874 camel/camel-gpg-context.c:1969
+#: camel/camel-gpg-context.c:2014
 msgid "Failed to execute gpg."
 msgstr "�ม�สามาร��รีย���� gpg"
 
-#: camel/camel-gpg-context.c:1371
-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:1534 camel/camel-gpg-context.c:1540
+#: camel/camel-gpg-context.c:1546 camel/camel-gpg-context.c:1561
+#: camel/camel-smime-context.c:929 camel/camel-smime-context.c:940
+#: camel/camel-smime-context.c:947
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "�ม�สามาร��รว�สอ�ลาย������อ�วาม: รู������อ�วาม�ี��ม��ู���อ�"
 
-#: camel/camel-gpg-context.c:1522
+#: camel/camel-gpg-context.c:1600
 #, 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:1711
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "�ม�สามาร�สร�า���อมูล�าร���ารหัส: %s"
 
-#: camel/camel-gpg-context.c:1655
+#: camel/camel-gpg-context.c:1761
 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:1814 camel/camel-gpg-context.c:1822
+#: camel/camel-gpg-context.c:1841
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "�ม�สามาร��อ�รหัส��อ�วาม: รู������อ�วาม�ี��ม��ู���อ�"
 
-#: camel/camel-gpg-context.c:1725
+#: camel/camel-gpg-context.c:1831
 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:1909 camel/camel-smime-context.c:1205
 msgid "Encrypted content"
 msgstr "��ื�อหา�ี����ารหัสลั�"
 
-#: camel/camel-gpg-context.c:1809
+#: camel/camel-gpg-context.c:1930
 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:1954 camel/camel-gpg-context.c:1999
+#: 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 "�ม��รา�"
 
@@ -1654,12 +1746,12 @@ msgstr "�ม�สามาร�สร�า�������วยล�
 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': ��ร���อลมี�ั�หา�ั���ร��รม��วยล�อ�"
 
-#: camel/camel-lock-client.c:217
+#: camel/camel-lock-client.c:216
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "�ม�สามาร�ล�อ� '%s'"
@@ -1738,53 +1830,53 @@ msgstr "��ิ���อ�ิ��ลา���ะ��ีย���
 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:678
+#: camel/camel-net-utils.c:817 camel/providers/pop3/camel-pop3-store.c:478
+#: camel/providers/pop3/camel-pop3-store.c:578
 msgid "Canceled"
 msgstr "ย��ลิ�"
 
-#: camel/camel-net-utils.c:524
+#: camel/camel-net-utils.c:523
 msgid "cannot create thread"
 msgstr "�ม�สามาร�สร�า���ร�"
 
-#: camel/camel-net-utils.c:671
+#: camel/camel-net-utils.c:682
 #, c-format
 msgid "Resolving: %s"
 msgstr "�ำลั���ล�: %s"
 
-#: camel/camel-net-utils.c:693
+#: camel/camel-net-utils.c:704
 msgid "Host lookup failed"
 msgstr "��ิ�หา�ี�อยู��ฮส���ม�สำ�ร��"
 
-#: camel/camel-net-utils.c:695
+#: camel/camel-net-utils.c:706
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "��ิ�หา�ี�อยู��ฮส���ม�สำ�ร��: %s: %s"
 
-#: camel/camel-net-utils.c:803
+#: camel/camel-net-utils.c:821
 msgid "Resolving address"
 msgstr "�ำลั���ล��ี�อยู�"
 
-#: camel/camel-net-utils.c:823
+#: camel/camel-net-utils.c:841
 msgid "Name lookup failed"
 msgstr "��ิ�หา�ี�อยู��ม�สำ�ร��"
 
-#: camel/camel-net-utils.c:826
+#: camel/camel-net-utils.c:844
 #, 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"
@@ -1812,24 +1904,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:180
 #, 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"
@@ -1838,7 +1930,7 @@ msgstr ""
 "��อมูลสำหรั���ะรอย��รู��ี�อยู�อี�มล�ิ�รู����:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:145
+#: camel/camel-sasl-anonymous.c:142
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1847,7 +1939,7 @@ msgstr ""
 "��อมูลสำหรั���ะรอย��รู���อ�วามล�ว��ิ�รู����:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:157
+#: camel/camel-sasl-anonymous.c:154
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1878,117 +1970,101 @@ msgid ""
 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 ����)"
 
-#: 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 "�ำ��า�าย�า���ิร���วอร�มี������ \"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:72
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: camel/camel-sasl-gssapi.c:66
+#: camel/camel-sasl-gssapi.c:74
 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:168
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr "�ล���ี�ระ�ุ �ม�สามาร�����ั���อมูลลั��ี����มา หรือ�ัว��ร��รมยั��ม�รู��ั�"
 
-#: camel/camel-sasl-gssapi.c:169
+#: camel/camel-sasl-gssapi.c:173
 msgid "The provided target_name parameter was ill-formed."
 msgstr "�ารามิ��อร� target_name �ิ�รู����"
 
-#: camel/camel-sasl-gssapi.c:172
+#: camel/camel-sasl-gssapi.c:176
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "�ารามิ��อร� target_name ระ�ุ��ิ��อ��ื�อ�ี��ม�รอ�รั�"
 
-#: camel/camel-sasl-gssapi.c:176
+#: camel/camel-sasl-gssapi.c:180
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr ""
 "input_token มี�าร��ื�อม��อ���อมูล��า����า��ี�ระ�ุ��า��ารามิ��อร� input_chan_bindings"
 
-#: camel/camel-sasl-gssapi.c:181
+#: camel/camel-sasl-gssapi.c:185
 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:189
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 msgstr ""
+"��อมูลลั��ี��ห�มา�ม�สามาร�����ั����� context ��� หรือมิ�ะ�ั�� handle "
+"�อ���อมูลลั����ม����อ�า�อิ���ยั���อมูลลั����ลย"
 
-#: camel/camel-sasl-gssapi.c:190
+#: camel/camel-sasl-gssapi.c:194
 msgid "The supplied context handle did not refer to a valid context."
-msgstr ""
+msgstr "handle �อ� context �ี��ห�มา�ม����อ�า���ยั� context �ี�����าร���"
 
-#: camel/camel-sasl-gssapi.c:193
+#: camel/camel-sasl-gssapi.c:197
 msgid "The consistency checks performed on the input_token failed."
 msgstr "�าร�รว�สอ��วามสอ��ล�อ��อ���อมูล�� input_token ล�ม�หลว"
 
-#: camel/camel-sasl-gssapi.c:196
+#: camel/camel-sasl-gssapi.c:200
 msgid "The consistency checks performed on the credential failed."
 msgstr "�าร�รว�สอ��วามสอ��ล�อ��อ���อมูล����อมูลลั�ล�ม�หลว"
 
-#: camel/camel-sasl-gssapi.c:199
+#: camel/camel-sasl-gssapi.c:203
 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:209 camel/camel-sasl-gssapi.c:316
+#: camel/camel-sasl-gssapi.c:358 camel/camel-sasl-gssapi.c:373
+#: camel/providers/imap/camel-imap-store.c:1272
 msgid "Bad authentication response from server."
 msgstr "�ำ�อ��ารยื�ยั��ัว�ุ��ล�า���ิร���วอร��ิ��ลา�"
 
-#: camel/camel-sasl-gssapi.c:314
+#: camel/camel-sasl-gssapi.c:383
 msgid "Unsupported security layer."
 msgstr "�ม�รอ�รั��ั���ารรั�ษา�วาม�ลอ�ภัย�ี�"
 
-#: camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "�ัว�ลือ��ี��ะ��ื�อม��อ��ยั���ิร���วอร���ย�าร����ารยื�ยั��ัว�ุ��ล��� Kerberos 4"
-
-#: camel/camel-sasl-kerberos4.c:174
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"�ม�สามาร��อ�ั�วสำหรั� Kerberos:\n"
-"%s"
-
 #: camel/camel-sasl-login.c:36
 msgid "Login"
 msgstr "���าระ��"
@@ -1997,7 +2073,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 "�ม��รา�ส�า�ะ�ารยื�ยั��ัว�ุ��ล"
 
@@ -2037,27 +2113,27 @@ msgstr "�ยายามยื�ยั�สิ��ิ� POP ��อ�
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "�ยายามยื�ยั�สิ��ิ� POP ��อ� SMTP ��ย����หล���ี��ม���� POP"
 
-#: camel/camel-search-private.c:149
+#: camel/camel-search-private.c:147
 #, c-format
 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:305
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2066,220 +2142,214 @@ msgstr ""
 "�ม�สามาร�สร�า����ร��อรี %s:\n"
 "%s"
 
-#: camel/camel-session.c:483
+#: camel/camel-session.c:484
 #, 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:832
 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:447 camel/camel-smime-context.c:1012
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "�ม�����รั�รอ�สำหรั� '%s'"
 
-#: camel/camel-smime-context.c:240
+#: camel/camel-smime-context.c:453
 msgid "Cannot create CMS message"
 msgstr "�ม�สามาร�สร�า���อ�วาม CMS"
 
-#: camel/camel-smime-context.c:245
+#: camel/camel-smime-context.c:458
 msgid "Cannot create CMS signed data"
 msgstr "�ม�สามาร�สร�า���อมูล CMS �ี�มี�าร�����ำ�ั�"
 
-#: camel/camel-smime-context.c:251
+#: camel/camel-smime-context.c:464
 msgid "Cannot attach CMS signed data"
 msgstr "�ม�สามาร������อมูล CMS �ี�มี�าร�����ำ�ั�"
 
-#: camel/camel-smime-context.c:258
+#: camel/camel-smime-context.c:471
 msgid "Cannot attach CMS data"
 msgstr "�ม�สามาร������อมูล CMS"
 
-#: camel/camel-smime-context.c:264
+#: camel/camel-smime-context.c:477
 msgid "Cannot create CMS Signer information"
 msgstr "�ม�สามาร�สร�า���อมูล�ู����� CMS"
 
-#: camel/camel-smime-context.c:270
+#: camel/camel-smime-context.c:483
 msgid "Cannot find certificate chain"
 msgstr ""
 
-#: camel/camel-smime-context.c:276
+#: camel/camel-smime-context.c:489
 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:511 camel/camel-smime-context.c:523
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "�ม�มี��รั�รอ��าร���ารหัสลั�สำหรั� '%s'"
 
-#: camel/camel-smime-context.c:317
+#: camel/camel-smime-context.c:530
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "�ม�สามาร���ิ�ม�ุ�ลั�ษ�ะ SMIMEEncKeyPrefs"
 
-#: camel/camel-smime-context.c:322
+#: camel/camel-smime-context.c:535
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "�ม�สามาร���ิ�ม�ุ�ลั�ษ�ะ MS SMIMEEncKeyPrefs "
 
-#: camel/camel-smime-context.c:327
+#: camel/camel-smime-context.c:540
 msgid "Cannot add encryption certificate"
 msgstr "�ม�สามาร���ิ�ม��รั�รอ��าร���ารหัสลั�"
 
-#: camel/camel-smime-context.c:333
+#: camel/camel-smime-context.c:546
 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:616 camel/camel-smime-context.c:1084
 msgid "Cannot create encoder context"
 msgstr "�ม�สามาร�สร�า��อ��������ัวล�รหัส"
 
-#: camel/camel-smime-context.c:409
+#: camel/camel-smime-context.c:622
 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:627 camel/camel-smime-context.c:1101
 msgid "Failed to encode data"
 msgstr "ล�รหัส��อมูล�ม�สำ�ร��"
 
-#: camel/camel-smime-context.c:487
+#: camel/camel-smime-context.c:700
 msgid "Unverified"
 msgstr "�ม�����รว�สอ�"
 
-#: camel/camel-smime-context.c:489
+#: camel/camel-smime-context.c:702
 msgid "Good signature"
 msgstr "ลาย�����ู���อ�"
 
-#: camel/camel-smime-context.c:491
+#: camel/camel-smime-context.c:704
 msgid "Bad signature"
 msgstr "ลาย�����ม��ู���อ�"
 
-#: camel/camel-smime-context.c:493
+#: camel/camel-smime-context.c:706
 msgid "Content tampered with or altered in transit"
 msgstr "��ื�อหา�ู��ั���ล������ระหว�า��า�"
 
-#: camel/camel-smime-context.c:495
+#: camel/camel-smime-context.c:708
 msgid "Signing certificate not found"
 msgstr "�ม�����รั�รอ�ลาย����"
 
-#: camel/camel-smime-context.c:497
+#: camel/camel-smime-context.c:710
 msgid "Signing certificate not trusted"
 msgstr "��รั�รอ�ลาย�����ม���า��ื�อ�ือ"
 
-#: camel/camel-smime-context.c:499
+#: camel/camel-smime-context.c:712
 msgid "Signature algorithm unknown"
 msgstr "�ม�รู��ั��รรมวิ�ี�อ�ลาย����"
 
-#: camel/camel-smime-context.c:501
+#: camel/camel-smime-context.c:714
 msgid "Signature algorithm unsupported"
 msgstr "�ม�รอ�รั��รรมวิ�ี�อ�ลาย����"
 
-#: camel/camel-smime-context.c:503
+#: camel/camel-smime-context.c:716
 msgid "Malformed signature"
 msgstr "ลาย�����ิ�รู����"
 
-#: camel/camel-smime-context.c:505
+#: camel/camel-smime-context.c:718
 msgid "Processing error"
 msgstr "��ิ���อ�ิ��ลา�ระหว�า��ำ��ิ��าร"
 
-#: camel/camel-smime-context.c:542
+#: camel/camel-smime-context.c:772
 msgid "No signed data in signature"
 msgstr "�ม�มี�ัว��อมูล�ี������ำ�ั�"
 
-#: camel/camel-smime-context.c:549
+#: camel/camel-smime-context.c:777
 msgid "Digests missing from enveloped data"
 msgstr "�ม�มี��อมูลสรุ�����อมูล��ห�อ"
 
-#: camel/camel-smime-context.c:562 camel/camel-smime-context.c:572
+#: camel/camel-smime-context.c:790 camel/camel-smime-context.c:800
 msgid "Cannot calculate digests"
 msgstr "�ม�สามาร��ำ�ว���อมูลสรุ�"
 
-#: camel/camel-smime-context.c:577
+#: camel/camel-smime-context.c:807 camel/camel-smime-context.c:811
 msgid "Cannot set message digests"
 msgstr "�ม�สามาร��ำห����อมูลสรุ�"
 
-#: camel/camel-smime-context.c:587 camel/camel-smime-context.c:592
+#: camel/camel-smime-context.c:821 camel/camel-smime-context.c:826
 msgid "Certificate import failed"
 msgstr "�ม�สามาร��ำ���า��รั�รอ�"
 
-#: camel/camel-smime-context.c:602
+#: camel/camel-smime-context.c:836
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "����อ�วามมี�����รั�รอ����า�ั�� �ละ�ม�สามาร��รว�สอ���รั�รอ����"
 
-#: camel/camel-smime-context.c:605
+#: camel/camel-smime-context.c:839
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "����อ�วามมี�����รั�รอ����า�ั�� �ละ����รว�สอ��ละ�ำ���า��รั�รอ��ล�ว"
 
-#: camel/camel-smime-context.c:609
+#: camel/camel-smime-context.c:843
 msgid "Cannot find signature digests"
 msgstr "�ม�����อมูลสรุ��อ�ลาย����"
 
-#: camel/camel-smime-context.c:625
+#: camel/camel-smime-context.c:859
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "�ู�����: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:726
+#: camel/camel-smime-context.c:960 camel/camel-smime-context.c:1184
 msgid "Decoder failed"
 msgstr "�าร�อ�รหัส�ิ��ลา�"
 
-#: camel/camel-smime-context.c:785
+#: camel/camel-smime-context.c:1019
 msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
-#. PORT_GetError(); ??
-#: camel/camel-smime-context.c:794
+#: camel/camel-smime-context.c:1027
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:805
+#: camel/camel-smime-context.c:1038
 msgid "Cannot create CMS Message"
 msgstr "�ม�สามาร�สร�า���อ�วาม CMS"
 
-#: camel/camel-smime-context.c:811
+#: camel/camel-smime-context.c:1044
 msgid "Cannot create CMS Enveloped data"
 msgstr "�ม�สามาร�สร�า���อมูลห�อหุ�ม CMS"
 
-#: camel/camel-smime-context.c:817
+#: camel/camel-smime-context.c:1050
 msgid "Cannot attach CMS Enveloped data"
 msgstr "�ม�สามาร������อมูลห�อหุ�ม CMS"
 
-#: camel/camel-smime-context.c:823
+#: camel/camel-smime-context.c:1056
 msgid "Cannot attach CMS data object"
 msgstr "�ม�สามาร����วั��ุ��อมูล CMS"
 
-#: camel/camel-smime-context.c:832
+#: camel/camel-smime-context.c:1065
 msgid "Cannot create CMS Recipient information"
 msgstr "�ม�สามาร�สร�า���อมูล�ู�รั� CMS"
 
-#: camel/camel-smime-context.c:837
+#: camel/camel-smime-context.c:1070
 msgid "Cannot add CMS Recipient information"
 msgstr "�ม�สามาร���ิ�ม��อมูล�ู�รั� CMS"
 
-#: camel/camel-smime-context.c:862
+#: camel/camel-smime-context.c:1095
 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:1191
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "�าร�อ�รหัสลั� S/MIME: �ม�����ื�อหา�ี����ารหัสลั��ว�"
 
-#: camel/camel-smime-context.c:983
+#: camel/camel-smime-context.c:1219
 msgid "import keys: unimplemented"
 msgstr "�าร�ำ���า�ุ���: ยั��ม�รอ�รั�"
 
-#: camel/camel-smime-context.c:991
+#: camel/camel-smime-context.c:1227
 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 "�ม�สามาร�อ�า���ล��อร�: ��ิ�ั�ิ�าร����ม�����ั��หล�������ี�"
 
@@ -2297,146 +2367,29 @@ 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
-msgid "Unable to get issuer's certificate"
-msgstr "�ม�สามาร�อ�า���รั�รอ��อ��ู�ออ���รั�รอ�"
-
-#: camel/camel-tcp-stream-openssl.c:574
-msgid "Unable to get Certificate Revocation List"
-msgstr "�ม�สามาร�อ�า�ราย�าร�าร��ิ��อ���รั�รอ�"
-
-#: camel/camel-tcp-stream-openssl.c:576
-msgid "Unable to decrypt certificate signature"
-msgstr "�ม�สามาร��อ�รหัสลั�ลาย�����ำ�ั���รั�รอ�"
-
-#: camel/camel-tcp-stream-openssl.c:578
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "�ม�สามาร��อ�รหัสลั�ลาย�����ำ�ั�ราย�าร�าร��ิ��อ���รั�รอ�"
-
-#: camel/camel-tcp-stream-openssl.c:580
-msgid "Unable to decode issuer's public key"
-msgstr "�ม�สามาร��อ�รหัส�ุ���สา�าร�ะ�อ��ู�ออ���รั�รอ�"
-
-#: camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate signature failure"
-msgstr "ลาย�����ำ�ั���รั�รอ�ล�ม�หลว"
-
-#: camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List signature failure"
-msgstr "ลาย�����ำ�ั�ราย�าร�าร��ิ��อ���รั�รอ�ล�ม�หลว"
-
-#: camel/camel-tcp-stream-openssl.c:586
-msgid "Certificate not yet valid"
-msgstr "��รั�รอ�ยั��ม��ริ�ม���"
-
-#: camel/camel-tcp-stream-openssl.c:588
-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:592
-msgid "CRL has expired"
-msgstr "CRL หม�อายุ�ล�ว"
-
-#: camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "��ิ���อ�ิ��ลา��� CRL"
-
-#: camel/camel-tcp-stream-openssl.c:599
-msgid "Out of memory"
-msgstr "�ื��ี��วาม�ำ�ม��อ"
-
-#: camel/camel-tcp-stream-openssl.c:601
-msgid "Zero-depth self-signed certificate"
-msgstr ""
-
-#: camel/camel-tcp-stream-openssl.c:603
-msgid "Self-signed certificate in chain"
-msgstr ""
-
-#: camel/camel-tcp-stream-openssl.c:605
-msgid "Unable to get issuer's certificate locally"
-msgstr ""
-
-#: camel/camel-tcp-stream-openssl.c:607
-msgid "Unable to verify leaf signature"
-msgstr ""
-
-#: camel/camel-tcp-stream-openssl.c:609
-msgid "Certificate chain too long"
-msgstr ""
-
-#: camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate Revoked"
-msgstr "��รั�รอ��ู���ิ��อ�"
-
-#: camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid Certificate Authority (CA)"
-msgstr "อ����รรั�รอ���รั�รอ��ม��ู���อ�"
-
-#: camel/camel-tcp-stream-openssl.c:615
-msgid "Path length exceeded"
-msgstr "�วามยาว�อ��า���ิ�"
-
-#: camel/camel-tcp-stream-openssl.c:617
-msgid "Invalid purpose"
-msgstr "�ุ�มุ��หมาย�ม��ู���อ�"
-
-#: camel/camel-tcp-stream-openssl.c:619
-msgid "Certificate untrusted"
-msgstr "��รั�รอ��ม���า��ื�อ�ือ"
-
-#: camel/camel-tcp-stream-openssl.c:621
-msgid "Certificate rejected"
-msgstr "��รั�รอ��ู���ิ�ส�"
-
-#: camel/camel-tcp-stream-openssl.c:624
-msgid "Subject/Issuer mismatch"
-msgstr "หัว��อ/�ู�ออ��ห� �ม��ร��ั�"
-
-#: camel/camel-tcp-stream-openssl.c:626
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID �ม��ร��ั�"
-
-#: camel/camel-tcp-stream-openssl.c:628
-msgid "AKID/Issuer serial mismatch"
-msgstr ""
-
-#: camel/camel-tcp-stream-openssl.c:630
-msgid "Key usage does not support certificate signing"
-msgstr "�าร����า��ุ����ม�รอ�รั��าร�����ำ�ั���รั�รอ�"
-
-#: camel/camel-tcp-stream-openssl.c:633
-msgid "Error in application verification"
-msgstr "��ิ���อ�ิ��ลา����าร�รว�สอ���ร��รม"
-
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:880
+#: camel/camel-tcp-stream-ssl.c:870
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2449,35 +2402,16 @@ msgstr ""
 "ลาย�ิม���ิ�วมือ:        %s\n"
 "ลาย����:            %s"
 
-#: camel/camel-tcp-stream-openssl.c:706 camel/camel-tcp-stream-ssl.c:886
+#: camel/camel-tcp-stream-ssl.c:876
 msgid "GOOD"
 msgstr "������"
 
-#: camel/camel-tcp-stream-openssl.c:706 camel/camel-tcp-stream-ssl.c:886
+#: camel/camel-tcp-stream-ssl.c:876
 msgid "BAD"
 msgstr "����ม����"
 
-#: camel/camel-tcp-stream-openssl.c:708
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"��รั�รอ�����าร�ม�����า� %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"�ุ�ยั���อ��ารยอมรั�อยู�หรือ�ม�?"
-
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:890
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2492,7 +2426,7 @@ msgstr ""
 "\n"
 "�ุ���อ��ารยอมรั�หรือ�ม�?"
 
-#: camel/camel-tcp-stream-ssl.c:934
+#: camel/camel-tcp-stream-ssl.c:924
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2501,7 +2435,7 @@ msgstr ""
 "�ั�หา�อ���รั�รอ�: %s\n"
 "�ู�ออ��ห�: %s"
 
-#: camel/camel-tcp-stream-ssl.c:986
+#: camel/camel-tcp-stream-ssl.c:976
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2510,7 +2444,7 @@ msgstr ""
 "���ม���รั�รอ��ม��ู���อ�: %s\n"
 "�ู�ออ��ห�: %s"
 
-#: camel/camel-tcp-stream-ssl.c:1004
+#: camel/camel-tcp-stream-ssl.c:994
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2519,7 +2453,7 @@ msgstr ""
 "��รั�รอ�หม�อายุ�ล�ว: %s\n"
 "�ู�ออ��ห�: %s"
 
-#: camel/camel-tcp-stream-ssl.c:1021
+#: camel/camel-tcp-stream-ssl.c:1011
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2533,44 +2467,44 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "�ม�สามาร���� URL '%s'"
 
-#: camel/camel-vee-folder.c:582
+#: camel/camel-vee-folder.c:577
 #, c-format
 msgid "Error storing '%s': %s"
 msgstr "��ิ���อ�ิ��ลา�ระหว�า��ั��ึ� '%s': %s"
 
-#: camel/camel-vee-folder.c:660
+#: camel/camel-vee-folder.c:654
 #, c-format
 msgid "No such message %s in %s"
 msgstr "�ม�มี��อ�วาม %s �ั��ล�าว �� %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:813 camel/camel-vee-folder.c:819
 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: �ม�มี��ล��อร��ั��ล�าว"
 
 #: camel/camel-vtrash-folder.c:55
 msgid "Cannot copy messages to the Trash folder"
-msgstr "�มสามาร��ั�ลอ���อ�วาม��ยั���ล��อร��ยะ"
+msgstr "�ม�สามาร��ั�ลอ���อ�วาม��ยั���ล��อร��ยะ"
 
 #: camel/camel-vtrash-folder.c:57
 msgid "Cannot copy messages to the Junk folder"
 msgstr "�ม�สามาร��ั�ลอ���อ�วาม��ยั���ล��อร��มล�ยะ "
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:136
+#: camel/providers/groupwise/camel-groupwise-folder.c:137
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2579,20 +2513,21 @@ msgstr ""
 "�ม�สามาร��ู��อ�วาม: %s\n"
 "  %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:136
-#: 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:137
+#: camel/providers/local/camel-maildir-folder.c:264
+#: camel/providers/local/camel-maildir-folder.c:293
+#: camel/providers/local/camel-maildir-folder.c:401
+#: camel/providers/local/camel-mbox-folder.c:363
+#: camel/providers/local/camel-mbox-folder.c:414
+#: camel/providers/local/camel-mh-folder.c:226
 msgid "No such message"
 msgstr "�ม�มี��อ�วาม�ั��ล�าว"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:148
-#: camel/providers/imap4/camel-imap4-folder.c:821
-#: 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/groupwise/camel-groupwise-folder.c:149
+#: camel/providers/imap4/camel-imap4-folder.c:814
+#: camel/providers/nntp/camel-nntp-folder.c:173
+#: camel/providers/nntp/camel-nntp-folder.c:248
+#: camel/providers/nntp/camel-nntp-folder.c:408
 #: camel/providers/pop3/camel-pop3-folder.c:268
 #: camel/providers/pop3/camel-pop3-folder.c:578
 #: camel/providers/pop3/camel-pop3-folder.c:639
@@ -2600,12 +2535,12 @@ msgstr "�ม�มี��อ�วาม�ั��ล�าว"
 msgid "User canceled"
 msgstr "�ู���ย��ลิ�"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:155
-#: camel/providers/imap4/camel-imap4-folder.c:826
+#: camel/providers/groupwise/camel-groupwise-folder.c:156
+#: camel/providers/imap4/camel-imap4-folder.c:819
+#: camel/providers/nntp/camel-nntp-folder.c:164
 #: 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:175
+#: camel/providers/nntp/camel-nntp-folder.c:250
 #: camel/providers/pop3/camel-pop3-folder.c:388
 #: camel/providers/pop3/camel-pop3-folder.c:581
 #: camel/providers/pop3/camel-pop3-folder.c:642
@@ -2615,192 +2550,205 @@ msgstr "�ู���ย��ลิ�"
 msgid "Cannot get message %s: %s"
 msgstr "�ม�สามาร��ู��อ�วาม %s: %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:172
-#: camel/providers/groupwise/camel-groupwise-folder.c:180
-#: camel/providers/groupwise/camel-groupwise-folder.c:2303
-#: camel/providers/imap4/camel-imap4-folder.c:844
+#: camel/providers/groupwise/camel-groupwise-folder.c:173
+#: camel/providers/groupwise/camel-groupwise-folder.c:181
+#: camel/providers/groupwise/camel-groupwise-folder.c:2506
+#: 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:192
-#: camel/providers/groupwise/camel-groupwise-folder.c:199
-#: camel/providers/groupwise/camel-groupwise-folder.c:1818
-#: camel/providers/groupwise/camel-groupwise-folder.c:1869
+#: camel/providers/groupwise/camel-groupwise-folder.c:195
+#: camel/providers/groupwise/camel-groupwise-folder.c:202
+#: camel/providers/groupwise/camel-groupwise-folder.c:2009
+#: camel/providers/groupwise/camel-groupwise-folder.c:2060
 msgid "Could not get message"
 msgstr "�ม�สามาร��ู��อ�วาม"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:883
-#: camel/providers/imap/camel-imap-folder.c:265
+#: camel/providers/groupwise/camel-groupwise-folder.c:982
+#: camel/providers/imap/camel-imap-folder.c:295
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "�ม�สามาร��หล���อมูลสรุ�สำหรั� %s ���"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:1143
+#: camel/providers/groupwise/camel-groupwise-folder.c:1055
+#, c-format
+msgid "Checking for deleted messages %s"
+msgstr "�ำลั��รว�สอ���อ�วาม %s �ี��ู�ล�"
+
+#: camel/providers/groupwise/camel-groupwise-folder.c:1330
 msgid "Trash Folder Full. Please Empty."
 msgstr "��ล��อร��ั��ยะ���ม�ล�ว �รุ�า���ยะ"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:1352
-#: 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:1564
+#: camel/providers/groupwise/camel-groupwise-store.c:626
+#: camel/providers/groupwise/camel-groupwise-store.c:756
+#: camel/providers/imap/camel-imap-folder.c:3429
+#: camel/providers/imap/camel-imap-folder.c:3505
+#: camel/providers/imapx/camel-imapx-server.c:2968
+#: camel/providers/imapx/camel-imapx-server.c:3054
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "�ำลั��ึ���อมูลสรุ�สำหรั���อ�วาม�หม��� %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:2157
-#: camel/providers/groupwise/camel-groupwise-folder.c:2200
+#: camel/providers/groupwise/camel-groupwise-folder.c:2360
+#: camel/providers/groupwise/camel-groupwise-folder.c:2403
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "�ม�สามาร������อ�วาม��ยั���ล��อร� '%s': %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:2188
+#: camel/providers/groupwise/camel-groupwise-folder.c:2391
 #, 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
+#: camel/providers/imapx/camel-imapx-provider.c:48
 msgid "C_heck for new messages in all folders"
 msgstr "_�รว�สอ���อ�วาม�หม����ุ���ล��อร�"
 
-#: 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/imapx/camel-imapx-provider.c:74
 #: 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 "�_���ัว�รอ��ั���อ�วาม�หม����ล�อ���หมาย���า�ี���ิร���วอร��ี�"
 
-#: 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 "�รว�สอ�_�ยะ����อ�วาม�หม�"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: camel/providers/groupwise/camel-groupwise-provider.c:65
 #: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "�รว�สอ���อ�วาม�ยะ����ล��อร�_�ล�อ���หมาย���า���า�ั��"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:68
+#: camel/providers/groupwise/camel-groupwise-provider.c:67
 msgid "Automatically synchroni_ze account locally"
 msgstr "_�รั��ั��ี�ู�����ห��ร��ั�ภาย����รื�อ���ยอั���มั�ิ"
 
-#: 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 ""
 
-#: 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/imapp/camel-imapp-provider.c:67
+#: camel/providers/imap4/camel-imap4-provider.c:83
+#: camel/providers/imapx/camel-imapx-provider.c:106
 #: 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 "��ว�ลือ��ี��ะ��ื�อม��อ��ยั���ิร���วอร� GroupWise ��ย�าร���รหัส��า������อ�วาม�รรม�า"
 
-#: 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 "�ฮส��หรือ�ู�����ม�สามาร�����า������ url"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:207
-#: camel/providers/imap/camel-imap-store.c:1357
+#: camel/providers/groupwise/camel-groupwise-store.c:197
+#: camel/providers/imap/camel-imap-store.c:1356
+#: camel/providers/imapx/camel-imapx-server.c:2302
 msgid "You did not enter a password."
 msgstr "�ุ��ม������อ�รหัส��า�"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:303
+#: camel/providers/groupwise/camel-groupwise-store.c:312
 msgid "Some features may not work correctly with your current server version"
 msgstr "รุ���อ���ิร���วอร��ั��ุ�ั�อา��ะ�ำ�ห��ุ�ลั�ษ�ะ�า�อย�า��ำ�า�อย�า��ม��ู���อ�"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:524
-#: camel/providers/imap/camel-imap-store.c:1849
-#: camel/providers/imap/camel-imap-store.c:2047
+#: camel/providers/groupwise/camel-groupwise-store.c:533
+#: camel/providers/imap/camel-imap-store.c:1879
+#: camel/providers/imap/camel-imap-store.c:2077
+#: camel/providers/imapx/camel-imapx-store.c:331
 #, c-format
 msgid "No such folder %s"
 msgstr "�ม�มี��ล��อร� %s �ี�อ�า�"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:1241
+#: camel/providers/groupwise/camel-groupwise-store.c:1201
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "�ม�สามาร�สร�า���ล��อร� GroupWise ��ะออ��ล��"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:1255
-#: camel/providers/imap/camel-imap-store.c:1924
-#: camel/providers/imap/camel-imap-store.c:2304
+#: camel/providers/groupwise/camel-groupwise-store.c:1215
+#: camel/providers/imap/camel-imap-store.c:1954
+#: camel/providers/imap/camel-imap-store.c:2334
+#: camel/providers/imapx/camel-imapx-store.c:687
 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:1294
+#: camel/providers/groupwise/camel-groupwise-store.c:1317
 #, 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:1349
+#: 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:1351
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "�ริ�าร GroupWise สำหรั� %s �� %s"
 
-#: 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 "�ารส���มล GroupWise ��า� %s"
 
-#: 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 "
@@ -2809,93 +2757,100 @@ 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
+#: camel/providers/imapx/camel-imapx-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
+#: camel/providers/imapx/camel-imapx-provider.c:54
 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
+#: camel/providers/imapx/camel-imapx-provider.c:56
 msgid "_Use custom command to connect to server"
 msgstr "�_���ำสั���ำห���อ���ื�อ��ื�อม��อ��ยั���ิร���วอร�"
 
-#: camel/providers/hula/camel-hula-provider.c:58
+#: camel/providers/hula/camel-hula-provider.c:57
 #: camel/providers/imap/camel-imap-provider.c:56
+#: camel/providers/imapx/camel-imapx-provider.c:58
 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/imapx/camel-imapx-provider.c:64
 #: 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
+#: camel/providers/imapx/camel-imapx-provider.c:66
 msgid "_Show only subscribed folders"
 msgstr "�_ส�����าะ��ล��อร��ี��อ�รั����า�ั��"
 
-#: 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
+#: camel/providers/imapx/camel-imapx-provider.c:69
 msgid "O_verride server-supplied folder namespace"
 msgstr "_�ำห�� namespace �อ���ล��อร������า�ี���ิร���วอร��ห�มา"
 
-#: camel/providers/hula/camel-hula-provider.c:67
+#: camel/providers/hula/camel-hula-provider.c:66
 msgid "Namespace"
 msgstr "Namespace"
 
-#: 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:3105
 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:3110
 #, 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"
@@ -2904,131 +2859,139 @@ 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 "�าร�อ�ส�อ� OK �ี��ม�����า�หมาย�า���ิร���วอร� IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:89
+#: camel/providers/imap/camel-imap-folder.c:90
 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:276
 #, 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:918
+#: camel/providers/imapx/camel-imapx-server.c:2997
 #, 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:1986
 #, c-format
 msgid "Unexpected response status '%s' after APPEND command"
 msgstr "���รั�ส�า�ะ�อ�ส�อ��ี��ม��า�หมาย '%s' หลั��ำสั�� APPEND"
 
-#: camel/providers/imap/camel-imap-folder.c:1965
+#: camel/providers/imap/camel-imap-folder.c:2001
 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:2046
 msgid "Unknown error occurred during APPEND command!"
 msgstr "��ิ���อ�ิ��ลา��ม��รา�สา�ห�ุระหว�า��ำ�ำสั�� APPEND"
 
-#: camel/providers/imap/camel-imap-folder.c:2842
+#: camel/providers/imap/camel-imap-folder.c:2877
 #, 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:2912
+#: camel/providers/imapx/camel-imapx-server.c:3943
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "�ม�สามาร��ึ���อ�วามหมาย�ล� %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2878
+#: camel/providers/imap/camel-imap-folder.c:2913
+#: camel/providers/imapx/camel-imapx-server.c:3944
 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:2974
+#: camel/providers/imap/camel-imap-folder.c:3819
+#: camel/providers/nntp/camel-nntp-folder.c:236
 msgid "This message is not currently available"
 msgstr "��อ�วาม�ม�สามาร�����า��������ะ�ี�"
 
-#: camel/providers/imap/camel-imap-folder.c:3567
+#: camel/providers/imap/camel-imap-folder.c:3632
 #, 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:3640
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "�าร�อ�ส�อ��ี��ม�สม�ูร���อ���ิร���วอร�: �ม�มี UID สำหรั���อ�วาม %d"
 
-#: camel/providers/imap/camel-imap-folder.c:3791
+#: camel/providers/imap/camel-imap-folder.c:3857
 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"
 
 #: camel/providers/imap/camel-imap-provider.c:48
+#: camel/providers/imapx/camel-imapx-provider.c:50
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "_�รว�สอ���อ�วาม�หม�����ล��อร��ี��อ�รั��ว�"
 
 #: camel/providers/imap/camel-imap-provider.c:66
-#: camel/providers/imap4/camel-imap4-provider.c:50
+#: camel/providers/imap4/camel-imap4-provider.c:49
+#: camel/providers/imapx/camel-imapx-provider.c:71
 msgid "Namespace:"
 msgstr "Namespace:"
 
 #: camel/providers/imap/camel-imap-provider.c:70
-#: camel/providers/imap4/camel-imap4-provider.c:54
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#: camel/providers/imapx/camel-imapx-provider.c:76
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "�_���ัว�รอ��ั���อ�วาม�หม����ล�อ���หมาย���า�ี���ิร���วอร��ี�"
 
 #: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imapx/camel-imapx-provider.c:78
 msgid "Check new messages for Jun_k contents"
 msgstr "�รว�สอ��_ยะ����อ�วาม�หม�"
 
 #: camel/providers/imap/camel-imap-provider.c:76
-#: camel/providers/imap4/camel-imap4-provider.c:60
+#: camel/providers/imap4/camel-imap4-provider.c:59
+#: camel/providers/imapx/camel-imapx-provider.c:82
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "�ยายาม_�รั���อมูล�มล�ห��ร��ั���ิร���วอร���ยอั���มั�ิ��ะออ��ล��"
 
@@ -3037,124 +3000,121 @@ msgid "IMAP"
 msgstr "IMAP"
 
 #: camel/providers/imap/camel-imap-provider.c:85
+#: camel/providers/imapx/camel-imapx-provider.c:92
 msgid "For reading and storing mail on IMAP servers."
 msgstr "สำหรั��ารอ�า��ละ�าร�รีย�ลำ�ั��มล����ิร���วอร� IMAP"
 
 #: camel/providers/imap/camel-imap-provider.c:102
-#: camel/providers/imapp/camel-imapp-provider.c:69
+#: camel/providers/imapx/camel-imapx-provider.c:108
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "��ว�ลือ��ี��ะ��ื�อม��อ��ยั���ิร���วอร� IMAP ��ย�าร���รหัส��า������อ�วาม�รรม�า"
 
-#: camel/providers/imap/camel-imap-store.c:437
-#: camel/providers/imap4/camel-imap4-store.c:214
+#: camel/providers/imap/camel-imap-store.c:435
+#: camel/providers/imap4/camel-imap4-store.c:210
+#: camel/providers/imapx/camel-imapx-store.c:201
 #, 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/imap/camel-imap-store.c:437
+#: camel/providers/imap4/camel-imap4-store.c:212
+#: camel/providers/imapx/camel-imapx-store.c:203
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "�ริ�าร IMAP สำหรั� %s �� %s"
 
-#: 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/imap/camel-imap-store.c:566
+#: camel/providers/imap/camel-imap-store.c:581
+#: 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:192
+#: camel/providers/pop3/camel-pop3-store.c:206
+#: 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/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:248
+#: camel/providers/nntp/camel-nntp-store.c:183
+#: camel/providers/pop3/camel-pop3-store.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:260
 msgid "SSL unavailable"
 msgstr "SSL �ม�สามาร�����า����"
 
-#: camel/providers/imap/camel-imap-store.c:580
-#: camel/providers/imap/camel-imap-store.c:862
+#: camel/providers/imap/camel-imap-store.c:578
+#: camel/providers/imap/camel-imap-store.c:860
+#: camel/providers/imapx/camel-imapx-server.c:2164
 msgid "Connection cancelled"
 msgstr "ย��ลิ��าร��ื�อม��อ"
 
-#: camel/providers/imap/camel-imap-store.c:691
-#: camel/providers/imap/camel-imap-store.c:710
-#: camel/providers/imap/camel-imap-store.c:716
-#: camel/providers/imap/camel-imap-store.c:742
-#: camel/providers/imap4/camel-imap4-store.c:314
-#: camel/providers/imap4/camel-imap4-store.c:329
-#: camel/providers/imap4/camel-imap4-store.c:338
+#: camel/providers/imap/camel-imap-store.c:689
+#: camel/providers/imap/camel-imap-store.c:708
+#: camel/providers/imap/camel-imap-store.c:714
+#: camel/providers/imap/camel-imap-store.c:740
+#: camel/providers/imap4/camel-imap4-store.c:310
+#: camel/providers/imap4/camel-imap4-store.c:325
+#: camel/providers/imap4/camel-imap4-store.c:334
+#: camel/providers/imapx/camel-imapx-server.c:2209
+#: camel/providers/imapx/camel-imapx-server.c:2231
 #, 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/imap/camel-imap-store.c:690
+#: camel/providers/imapx/camel-imapx-server.c:2210
+#: camel/providers/smtp/camel-smtp-transport.c:332
 msgid "STARTTLS not supported"
 msgstr "�ม�รอ�รั� STARTTLS"
 
-#: camel/providers/imap/camel-imap-store.c:711
+#: camel/providers/imap/camel-imap-store.c:709
+#: camel/providers/imapx/camel-imapx-server.c:2232
 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/imap/camel-imap-store.c:715
+#: 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 ���าร�อม��ล��ุ��ี�"
 
-#: camel/providers/imap/camel-imap-store.c:865
+#: camel/providers/imap/camel-imap-store.c:863
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "�ม�สามาร���ื�อม��อ��วย�ำสั�� \"%s\": %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: camel/providers/imap/camel-imap-store.c:1053
-#: camel/providers/imap/camel-imap-store.c:2400
-#: camel/providers/imap4/camel-imap4-store-summary.c:368
-#: camel/providers/imap4/camel-imap4-store.c:1408
-#: camel/providers/local/camel-maildir-folder.c:78
+#: camel/providers/imap/camel-imap-store.c:1051
+#: camel/providers/imap/camel-imap-store.c:2430
+#: camel/providers/imap4/camel-imap4-store-summary.c:356
+#: camel/providers/imap4/camel-imap4-store.c:1403
+#: camel/providers/imapx/camel-imapx-store.c:383
+#: camel/providers/imapx/camel-imapx-store.c:856
+#: camel/providers/local/camel-maildir-folder.c:81
 #: 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
-#: servers/exchange/storage/exchange-hierarchy-foreign.c:264
+#: camel/providers/local/camel-spool-store.c:461
 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:1303
 #, 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:1313
+#: 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:1387
+#: camel/providers/imapx/camel-imapx-server.c:2328
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3165,71 +3125,77 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1861
-#: camel/providers/imap/camel-imap-store.c:2242
-#: camel/providers/imap4/camel-imap4-store.c:959
+#: camel/providers/imap/camel-imap-store.c:1891
+#: camel/providers/imap/camel-imap-store.c:2272
+#: camel/providers/imap4/camel-imap4-store.c:954
+#: camel/providers/imapx/camel-imapx-store.c:672
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "�ื�อ��ล��อร� \"%s\" �ม��ู���อ� ��ราะมีอั��ระ \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1978
+#: camel/providers/imap/camel-imap-store.c:2008
 #: camel/providers/local/camel-maildir-store.c:192
-#: camel/providers/local/camel-mbox-store.c:204
+#: camel/providers/local/camel-mbox-store.c:202
 #: camel/providers/local/camel-mh-store.c:249
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "�ม�สามาร�สร�า���ล��อร� '%s': ��ล��อร�มีอยู��ล�ว"
 
-#: camel/providers/imap/camel-imap-store.c:2253
+#: camel/providers/imap/camel-imap-store.c:2283
+#: camel/providers/imapx/camel-imapx-store.c:680
 #, c-format
 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:3107
+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 "�ารส���ำสั����ยั���ิร���วอร� IMAP %s ล�ม�หลว: %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 "�าร�อ�ส�อ��ี��ม��า�หมาย�า���ิร���วอร� IMAP4 %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': �ื�อ�ล�อ���หมาย�ม��ู���อ�"
 
-#: 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 "ส���ำสั����ยั���ิร���วอร� IMAP %s �ม�สำ�ร��: %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"
@@ -3237,318 +3203,313 @@ msgstr ""
 "��ิ�����าร�รว��ั� Mailing-List ����ิ�ศษ "
 "�ึ���ำ������อ���������อ��ัว�รอ��ละ��ล��อร��สมือ��า���ิ�"
 
-#: 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 "�ล�ระวา���อ�วาม������ี��ม�มี�ารอ�า������วลา X วิ�า�ี"
 
-#: 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 "�ล�ระวา���อ�วาม������ี�มีอายุ��ิ� X วิ�า�ี"
 
-#: 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 "_�รว�สอ��ยะ����อ�วาม�หม�"
 
-#: 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 "�รว�สอ���อ�วาม_�ยะ����ล��อร��ล�อ���หมาย���า���า�ั��"
 
-#: 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 "สำหรั��ารอ�า��ละ�����มล����ิร���วอร� IMAPv4rev1"
 
-#: 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/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/imap4/camel-imap4-store.c:259
+#: camel/providers/nntp/camel-nntp-store.c:194
+#: camel/providers/nntp/camel-nntp-store.c:213
+#: camel/providers/pop3/camel-pop3-store.c:203
+#: 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 "
 "STARTTLS"
 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:276
 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 "�ม�สามาร��ึ���อมูล LIST สำหรั� '%s' ����ิร���วอร� 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': �ื�อ�ล�อ���หมาย�ม��ู���อ�"
 
-#: 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': �ื�อ�ล�อ���หมาย�ม��ู���อ�"
 
-#: 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': �ื�อ�ล�อ���หมาย�ม��ู���อ�"
 
-#: 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': �ื�อ�ล�อ���หมาย�ิ�รู����"
 
-#: 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': �ื�อ�ล�อ���หมาย�ิ�รู����"
 
-#: 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
-msgid "Message storage"
-msgstr "�หล��������อ�วาม"
+#: camel/providers/imapx/camel-imapx-folder.c:86
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "�ม�สามาร�สร�า���อมูลสรุ�สำหรั���ล��อร� %s"
+
+#: camel/providers/imapx/camel-imapx-folder.c:94
+#, c-format
+msgid "Could not create cache for %s"
+msgstr "�ม�สามาร�สร�า����สำหรั� %s"
 
-#: camel/providers/imapp/camel-imapp-provider.c:49
+#: camel/providers/imapx/camel-imapx-provider.c:46
+msgid "Use I_dle if the server supports it"
+msgstr "����วลา�ี���รื�อ�_ว�า��า���า��ิร���วอร�รอ�รั�"
+
+#: camel/providers/imapx/camel-imapx-provider.c:60
+msgid "Numbe_r of cached connections to use"
+msgstr "�ำ�ว��าร�_�ื�อม��อ������ี��ะ���"
+
+#: camel/providers/imapx/camel-imapx-provider.c:90
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: camel/providers/imapp/camel-imapp-provider.c:51
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-"ลู���าย IMAP 4(.1) ��ั���สอ�\n"
-"�����ี��ม������า��าร��สอ��ละ�ม�มี�ารส�ั�ส�ุ� �ุ�อา���อ��าร��� imap �รรม�า���\n"
-"\n"
-" !!! อย�า����ั�อี�มลสำ�ั� !!!\n"
-
-#: camel/providers/imapp/camel-imapp-store.c:252
+#: camel/providers/imapx/camel-imapx-server.c:2167
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr "�ม�สามาร���ื�อม��อ��ยั� %s (�อร�� %s): %s"
 
-#: camel/providers/imapp/camel-imapp-store.c:349
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "�ม�สามาร���ื�อม��อ��ยั���ิร���วอร� POP �� %s"
-
-#: 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)"
-msgstr "�ล�อ���หมาย:%s (%s)"
+msgid "mailbox: %s (%s)"
+msgstr "�ล�อ���หมาย: %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)"
@@ -3611,111 +3572,116 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "���ร��อรี�ี������ั� 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-local-store.c:163
+#: camel/providers/local/camel-local-store.c:274
+#: camel/providers/local/camel-mbox-store.c:357
+#: camel/providers/local/camel-spool-store.c:126
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "รา��หล������ %s �ม�����า����ม"
 
-#: camel/providers/local/camel-local-store.c:172
+#: camel/providers/local/camel-local-store.c:170
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "รา��หล������ %s �ม�������ร��อรี���ิ"
 
-#: camel/providers/local/camel-local-store.c:181
-#: camel/providers/local/camel-local-store.c:189
-#: camel/providers/local/camel-local-store.c:287
+#: camel/providers/local/camel-local-store.c:179
+#: camel/providers/local/camel-local-store.c:187
+#: camel/providers/local/camel-local-store.c:285
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "�ม�สามาร��ู��ล��อร�: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:201
+#: camel/providers/local/camel-local-store.c:199
 msgid "Local stores do not have an inbox"
 msgstr "�หล����������รื�อ��ม�มี�ล�อ���หมาย���า"
 
-#: camel/providers/local/camel-local-store.c:247
+#: camel/providers/local/camel-local-store.c:245
 #, c-format
 msgid "Local mail file %s"
 msgstr "���ม�มล %s ����รื�อ�"
 
-#: camel/providers/local/camel-local-store.c:342
+#: camel/providers/local/camel-local-store.c:340
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�ม�สามาร���ลี�ย��ื�อ��ล��อร� %s ������ %s: %s"
 
-#: camel/providers/local/camel-local-store.c:410
+#: camel/providers/local/camel-local-store.c:408
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "�ม�สามาร���ลี�ย��ื�อ '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:435
-#: camel/providers/local/camel-mbox-store.c:300
+#: camel/providers/local/camel-local-store.c:433
+#: camel/providers/local/camel-mbox-store.c:298
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "�ม�สามาร�ล����ม�ั��ี��ล��อร� '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:458
-#: camel/providers/local/camel-mbox-store.c:324
+#: camel/providers/local/camel-local-store.c:456
+#: camel/providers/local/camel-mbox-store.c:322
 #, c-format
 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:230
 msgid "Maildir append message canceled"
 msgstr "�าร��ิ�ม��อ�วาม��อ��าย maildir �ู�ย��ลิ�"
 
-#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:233
 #, 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:263
+#: camel/providers/local/camel-maildir-folder.c:292
+#: camel/providers/local/camel-maildir-folder.c:306
+#: camel/providers/local/camel-maildir-folder.c:314
+#: camel/providers/local/camel-maildir-folder.c:400
+#: 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:225
+#: camel/providers/local/camel-mh-folder.c:236
+#: camel/providers/local/camel-mh-folder.c:244
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
-"�มสามาร��ู��อ�วาม: %s �า���ล��อร� %s\n"
+"�ม�สามาร��ู��อ�วาม: %s �า���ล��อร� %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:298
+#: camel/providers/local/camel-maildir-folder.c:315
 msgid "Invalid message contents"
 msgstr "��ื�อหา��อ�วาม�ม��ู���อ�"
 
+#: camel/providers/local/camel-maildir-folder.c:418
+msgid "Cannot transfer message to destination folder"
+msgstr "�ม�สามาร���าย�อ���อ�วาม��ยั���ล��อร��ลาย�า� "
+
 #: camel/providers/local/camel-maildir-store.c:148
 #: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:188
+#: camel/providers/local/camel-mbox-store.c:174
+#: camel/providers/local/camel-mbox-store.c:186
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "�ม�สามาร�สร�า���ล��อร� '%s': %s"
 
 #: camel/providers/local/camel-maildir-store.c:161
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:145
 #: camel/providers/local/camel-mh-store.c:217
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "�ม�สามาร�อ�า���ล��อร� '%s': %s"
 
 #: camel/providers/local/camel-maildir-store.c:165
-#: camel/providers/local/camel-mbox-store.c:155
+#: camel/providers/local/camel-mbox-store.c:153
 #: camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
@@ -3738,76 +3704,76 @@ 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:328
+#: camel/providers/local/camel-spool-store.c:342
 #, 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:432
+#: camel/providers/local/camel-maildir-summary.c:551
 #, 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:544
 msgid "Checking folder consistency"
 msgstr "�ำลั��รว�สอ��วาม�รีย�ร�อย�อ���ล��อร�"
 
-#: camel/providers/local/camel-maildir-summary.c:656
+#: camel/providers/local/camel-maildir-summary.c:637
 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:724
+#: 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 "�ม�สามาร���ิ��ล�อ���หมาย: %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:245
 msgid "Message construction failed."
 msgstr "สร�า���อ�วาม�ม�สำ�ร��"
 
-#: camel/providers/local/camel-mbox-store.c:166
-#: camel/providers/local/camel-mbox-store.c:365
+#: camel/providers/local/camel-mbox-store.c:164
+#: camel/providers/local/camel-mbox-store.c:363
 msgid "Cannot create a folder by this name."
 msgstr "�ม�สามาร�สร�า���ล��อร���วย�ื�อ�ี����"
 
-#: camel/providers/local/camel-mbox-store.c:198
+#: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "�ม�สามาร�อ�า���ล��อร� '%s': �ม�������ม���ิ"
 
-#: camel/providers/local/camel-mbox-store.c:228
-#: camel/providers/local/camel-mbox-store.c:239
-#: camel/providers/local/camel-mbox-store.c:262
+#: camel/providers/local/camel-mbox-store.c:226
+#: camel/providers/local/camel-mbox-store.c:237
+#: camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3816,129 +3782,129 @@ msgstr ""
 "�ม�สามาร�ล���ล��อร� '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:245
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' �ม�������ม���ิ"
 
-#: camel/providers/local/camel-mbox-store.c:254
+#: camel/providers/local/camel-mbox-store.c:252
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "��ล��อร� '%s' ยั�มี��อมูลอยู� �ึ��ม�ล���ล��อร�"
 
-#: camel/providers/local/camel-mbox-store.c:276
-#: camel/providers/local/camel-mbox-store.c:288
+#: camel/providers/local/camel-mbox-store.c:274
+#: camel/providers/local/camel-mbox-store.c:286
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "�ม�สามาร�ล����มสรุ���ล��อร� '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:378
+#: camel/providers/local/camel-mbox-store.c:376
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "�ม�สามาร�สร�า����ร��อรี '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:392
+#: camel/providers/local/camel-mbox-store.c:390
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "�ม�สามาร�สร�า���ล��อร�: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:394
+#: camel/providers/local/camel-mbox-store.c:392
 msgid "Folder already exists"
 msgstr "มี��ล��อร�อยู��ล�ว"
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:483
 msgid "The new folder name is illegal."
 msgstr "�ื�อ��ล��อร��หม��ิ�รู����"
 
-#: camel/providers/local/camel-mbox-store.c:498
+#: camel/providers/local/camel-mbox-store.c:496
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "�ม�สามาร���ลี�ย��ื�อ '%s': '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:579
+#: camel/providers/local/camel-mbox-store.c:577
 #, c-format
 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 "�ม�สามาร���ิ��ล�อ���หมาย�ั�ว�ราว: %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:957
 #, 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:1084
 #, 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:1113
+#: camel/providers/local/camel-mbox-summary.c:897
+#: camel/providers/local/camel-mbox-summary.c:905
+#: camel/providers/local/camel-mbox-summary.c:1114
+#: camel/providers/local/camel-mbox-summary.c:1122
 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:1047
 #: 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:1190
+#: camel/providers/local/camel-mbox-summary.c:1216
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "��ีย�ล��ล�อ���หมาย�ั�ว�ราว�ม�สำ�ร��: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:1198
+#: camel/providers/local/camel-mbox-summary.c:1207
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "��ีย�ล��ล�อ���หมาย�ั�ว�ราว�ม�สำ�ร��: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:178
+#: camel/providers/local/camel-mh-folder.c:180
 msgid "MH append message canceled"
 msgstr "�าร��ิ�ม��อ�วาม��อ��าย�อ� MH �ู�ย��ลิ�"
 
-#: camel/providers/local/camel-mh-folder.c:181
+#: camel/providers/local/camel-mh-folder.c:183
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "�ม�สามาร���ิ�ม��อ�วาม��อ��าย��ล��อร� mh: %s: %s"
@@ -3953,27 +3919,27 @@ msgstr "�ม�สามาร�สร�า���ล��อร� '%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:132
 #, 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:144
 #, 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:163
 #, 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:173
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3982,12 +3948,12 @@ msgstr ""
 "�ม�สามาร���ิ���ล��อร� '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-spool-store.c:180
+#: camel/providers/local/camel-spool-store.c:177
 #, 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:182
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3996,41 +3962,41 @@ msgstr ""
 "�ม�สามาร�สร�า���ล��อร� '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-spool-store.c:193
+#: camel/providers/local/camel-spool-store.c:190
 #, 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:207
 msgid "Store does not support an INBOX"
 msgstr "�หล�������ม�รอ�รั� INBOX"
 
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:219
 #, c-format
 msgid "Spool mail file %s"
 msgstr "���ม�มล %s ���ี������ั�"
 
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:219
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "ลำ�ั��ั����ล��อร� %s ���ี������ั�"
 
-#: camel/providers/local/camel-spool-store.c:230
+#: camel/providers/local/camel-spool-store.c:227
 msgid "Spool folders cannot be renamed"
 msgstr "��ล��อร��ี������ั��ม�สามาร���ลี�ย��ื�อ���"
 
-#: camel/providers/local/camel-spool-store.c:238
+#: camel/providers/local/camel-spool-store.c:235
 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"
@@ -4046,26 +4012,26 @@ msgstr ""
 "�ม�สามาร��รั���ล��อร��ี������ั� %s �ห��ร��ั�: %s\n"
 "��ล��อร�อา��สียหาย ����������สำ��า�ว��ี� '%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:135
+#: camel/providers/nntp/camel-nntp-folder.c:192
+#: camel/providers/nntp/camel-nntp-folder.c:224
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "��อ�ิ��ลา�ภาย��: UID อยู���รู�����ี��ม��ู���อ�: %s"
 
+#: camel/providers/nntp/camel-nntp-folder.c:365
 #: 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:410
+#: camel/providers/nntp/camel-nntp-folder.c:412
 #, c-format
 msgid "Posting failed: %s"
 msgstr "�าร��ะ�ระ�าศล�ม�หลว: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:433
+#: camel/providers/nntp/camel-nntp-folder.c:430
 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:441
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "�ุ��ม�สามาร��ั�ลอ���อ�วาม�า���ล��อร� NNTP"
 
@@ -4092,22 +4058,22 @@ msgid ""
 "password."
 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 "��าว USENET ��า� %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:798
+#: camel/providers/nntp/camel-nntp-store.c:819
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4118,7 +4084,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"
@@ -4128,7 +4094,7 @@ msgstr ""
 "\n"
 "�ม�มี�ลุ�ม��าว�ี�ว�า ���������ว�าราย�าร�ี��ุ��ลือ��ะ������ล��อร�ระ�ั���"
 
-#: 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"
@@ -4138,62 +4104,62 @@ 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"
@@ -4233,27 +4199,31 @@ msgid "Unknown reason"
 msgstr "�ม��รา�สา�ห�ุ"
 
 #: camel/providers/pop3/camel-pop3-provider.c:43
+msgid "Message storage"
+msgstr "�หล��������อ�วาม"
+
+#: camel/providers/pop3/camel-pop3-provider.c:45
 msgid "_Leave messages on server"
 msgstr "_�ิ����อ�วาม����ิร���วอร�"
 
-#: 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 วั�"
 
-#: 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 �ั��หม�"
 
-#: 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."
@@ -4261,7 +4231,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 "
@@ -4270,56 +4240,62 @@ msgstr ""
 "��ว�ลือ��ี��ะ��ื�อม��อ��ยั���ิร���วอร� POP ��ยยื�ยั��ัว�ุ��ล��วยรหัส��า��ี����ารหัส ��า���ร���อล "
 "APOP  �ัว�ลือ��ี�อา�����ม�����ั��ู�����ุ��� �ม��ั���ิร���วอร��ี�อ�า�ว�ารอ�รั����าม"
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:229
 #, 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:246
+#: camel/providers/pop3/camel-pop3-store.c:275
+#: camel/providers/pop3/camel-pop3-store.c:281
 #, 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:247
 msgid "STLS not supported by server"
 msgstr "��ิร���วอร��ม�รอ�รั� STLS"
 
-#: camel/providers/pop3/camel-pop3-store.c:257
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: camel/providers/pop3/camel-pop3-store.c:263
+#, 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:282
 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:388
 #, 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:429
+#: camel/providers/pop3/camel-pop3-store.c:567
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "�ม�สามาร���ื�อม��อ��ยั���ิร���วอร� POP %s: �ม�รอ�รั��ล���ารยื�ยั��ัว�ุ��ล�ี��อ��"
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "�าร���าระ�� SASL '%s' ล�ม�หลวสำหรั���ิร���วอร� POP %s: %s"
+msgid "SASL '%s' Login failed for POP server %s%s"
+msgstr "�าร���าระ�� SASL '%s' ล�ม�หลวสำหรั���ิร���วอร� POP %s%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:462
 #, 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:481
 #, 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:540
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4328,8 +4304,7 @@ 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:581
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4338,16 +4313,27 @@ msgstr ""
 "�ม�สามาร���ื�อม��อ��ยั���ิร���วอร� POP %s.\n"
 "��ิ���อ�ิ��ลา���ะส��รหัส��า�: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:558
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: camel/providers/pop3/camel-pop3-store.c:591
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username%s"
+msgstr ""
+"�ม�สามาร���ื�อม��อ��ยั���ิร���วอร� POP %s\n"
+"��ิ���อ�ิ��ลา���ะส���ื�อ�ู����%s"
+
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: camel/providers/pop3/camel-pop3-store.c:601
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending password%s"
 msgstr ""
 "�ม�สามาร���ื�อม��อ��ยั���ิร���วอร� POP %s\n"
-"��ิ���อ�ิ��ลา���ะส���ื�อ�ู����: %s"
+"��ิ���อ�ิ��ลา���ะส��รหัส��า�%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:671
+#: camel/providers/pop3/camel-pop3-store.c:707
 #, c-format
 msgid "No such folder '%s'."
 msgstr "�ม�มี��ล��อร� '%s' �ั��ล�าว"
@@ -4362,173 +4348,173 @@ msgid ""
 "system."
 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 "�ม�สามาร�สร�า�������ื�อส���มล: %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: %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 "��ิ�ั�ิ�าร�มล�ี��อ�รีย�ร�อย�ี �ำ�า��สร��สม�ูร��"
 
-#: 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 "��ิ���อ�ิ��ลา����าร�อ�รั��าร��ื�อม��อ"
 
-#: 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"
@@ -4539,93 +4525,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 "�ารส���มล��วย SMTP ��า� %s"
 
-#: 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: �มล�ม����มี�ารส��"
@@ -4633,108 +4619,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 "�ี�อยู��ิ���อสำ�ั�"
+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 "VIP"
 
-#: libedataserver/e-categories.c:66
+#: libedataserver/e-categories.c:68
 msgid "Waiting"
 msgstr "�ำลั�รอ"
 
@@ -4742,7 +4728,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:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Ey %I:%M:%S %p"
 
@@ -4750,7 +4736,7 @@ msgstr "%a %d/%m/%Ey %I:%M:%S %p"
 #. 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:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Ey %H:%M:%S"
 
@@ -4758,7 +4744,7 @@ msgstr "%a %d/%m/%Ey %H:%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:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Ey %I:%M %p"
 
@@ -4766,78 +4752,78 @@ msgstr "%a %d/%m/%Ey %I:%M %p"
 #. 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:1889
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Ey %H:%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 "%a %d/%m/%Ey %I %p"
 
 #. 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 "%a %d/%m/%Ey %H"
 
 #. 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:1765
+#: libedataserver/e-time-utils.c:1884
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Ey"
 
 #. 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 "%d/%m/%Ey %I:%M:%S %p"
 
 #. 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 "%d/%m/%Ey %H:%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 "%d/%m/%Ey %I:%M %p"
 
 #. 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 "%d/%m/%Ey %H:%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 "%d/%m/%Ey %I %p"
 
 #. 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 "%d/%m/%Ey %H"
 
 #. 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:1768
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Ey"
 
 #. 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:1826 libedataserver/e-time-utils.c:1946
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. 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:1830 libedataserver/e-time-utils.c:1938
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4845,24 +4831,24 @@ msgstr "%H:%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:1835 libedataserver/e-time-utils.c:1943
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. 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:1839 libedataserver/e-time-utils.c:1935
 msgid "%H:%M"
 msgstr "%H:%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:1842
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: libedataserver/e-time-utils.c:1854
+#: libedataserver/e-time-utils.c:1846
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -4874,54 +4860,58 @@ msgstr "�ำลั����า�����ิร���วอร� LD
 msgid "Failed to authenticate.\n"
 msgstr "�ารยื�ยั��ัว�ุ��ลล�ม�หลว\n"
 
-#: libedataserverui/e-categories-dialog.c:362
+#: libedataserverui/e-categories-dialog.c:145
+msgid "Category Icon"
+msgstr "�อ�อ�หมว�หมู�"
+
+#: libedataserverui/e-categories-dialog.c:151
+msgid "_No Image"
+msgstr "�_ม����รู�ภา�"
+
+#: libedataserverui/e-categories-dialog.c:372
 #, 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:680
 msgid "Icon"
 msgstr "�อ�อ�"
 
-#: libedataserverui/e-categories-dialog.c:531
+#: libedataserverui/e-categories-dialog.c:685
 msgid "Category"
 msgstr "หมว�หมู�"
 
-#: libedataserverui/e-categories-dialog.glade.h:1
-msgid "Category Icon"
-msgstr "�อ�อ�หมว�หมู�"
-
-#: libedataserverui/e-categories-dialog.glade.h:2
+#: libedataserverui/e-categories-dialog.ui.h:1
 msgid "Category Properties"
 msgstr "�ุ�สม�ั�ิหมว�หมู�"
 
-#: libedataserverui/e-categories-dialog.glade.h:3
+#: libedataserverui/e-categories-dialog.ui.h:2
 msgid "Category _Icon"
 msgstr "�อ_�อ�หมว�หมู�"
 
-#: libedataserverui/e-categories-dialog.glade.h:4
+#: libedataserverui/e-categories-dialog.ui.h:3
 msgid "Category _Name"
 msgstr "_�ื�อหมว�หมู�"
 
-#: libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
+#: libedataserverui/e-categories-dialog.ui.h:4
+msgid "Item(s) _belong to these categories:"
 msgstr "สิ���ี��ั�อยู���_หมว��ี�:"
 
-#: libedataserverui/e-categories-dialog.glade.h:6
+#: libedataserverui/e-categories-dialog.ui.h:5
 msgid "_Available Categories:"
 msgstr "_หมว��ี�มี:"
 
-#: libedataserverui/e-categories-dialog.glade.h:7
+#: libedataserverui/e-categories-dialog.ui.h:6
 msgid "_Edit"
 msgstr "�_����"
 
-#: libedataserverui/e-categories-dialog.glade.h:8
+#: libedataserverui/e-categories-dialog.ui.h:7
 msgid "categories"
 msgstr "หมว�"
 
-#: libedataserverui/e-category-completion.c:290
+#: libedataserverui/e-category-completion.c:292
 #, c-format
 msgid "Create category \"%s\""
 msgstr "สร�า�หมว� \"%s\""
@@ -4934,111 +4924,110 @@ msgstr "��อมูลสี"
 msgid "The color to render"
 msgstr "สี�ี��ะ���วา�"
 
-#: libedataserverui/e-name-selector-dialog.c:278
+#: libedataserverui/e-name-selector-dialog.c:292
 msgid "Select Contacts from Address Book"
-msgstr "�ลือ��ี�อยู��ิ���อ�า�สมุ��ี�อยู�"
+msgstr "�ลือ��ู��ิ���อ�า�สมุ��ี�อยู�"
 
-#: libedataserverui/e-name-selector-dialog.c:565
+#: libedataserverui/e-name-selector-dialog.c:587
 msgid "_Add"
 msgstr "�_�ิ�ม"
 
-#: libedataserverui/e-name-selector-dialog.c:590
+#: libedataserverui/e-name-selector-dialog.c:612
 msgid "_Remove"
 msgstr "_ล�"
 
-#: libedataserverui/e-name-selector-dialog.c:767
-#: libedataserverui/e-name-selector-dialog.glade.h:6
+#: libedataserverui/e-name-selector-dialog.c:789
+#: libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "หมว��������"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:1
+#: libedataserverui/e-name-selector-dialog.ui.h:1
 msgid "*"
 msgstr "*"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:2
+#: libedataserverui/e-name-selector-dialog.ui.h:2
 msgid "<b>Co_ntacts</b>"
-msgstr "<b>_�ี�อยู��ิ���อ</b>"
+msgstr "<b>�ู�_�ิ���อ</b>"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:3
+#: libedataserverui/e-name-selector-dialog.ui.h:3
 msgid "<b>Show Contacts</b>"
-msgstr "<b>�ส���ี�อยู��ิ���อ</b>"
+msgstr "<b>�ส���ู��ิ���อ</b>"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:4
+#: libedataserverui/e-name-selector-dialog.ui.h:4
 msgid "Address B_ook:"
 msgstr "_สมุ��ี�อยู�:"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:5
+#: libedataserverui/e-name-selector-dialog.ui.h:5
 msgid "Address Book"
 msgstr "สมุ��ี�อยู�"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:7
+#: libedataserverui/e-name-selector-dialog.ui.h:7
 msgid "Cate_gory:"
 msgstr "_หมว�:"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:8
-#: servers/exchange/storage/exchange-hierarchy-foreign.c:261
+#: libedataserverui/e-name-selector-dialog.ui.h:8
 msgid "Contacts"
-msgstr "�ี�อยู��ิ���อ"
+msgstr "�ู��ิ���อ"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:9
+#: libedataserverui/e-name-selector-dialog.ui.h:9
 msgid "Search"
 msgstr "���หา"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:10
+#: libedataserverui/e-name-selector-dialog.ui.h:10
 msgid "_Search:"
 msgstr "_���หา:"
 
 #. 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:2511
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "�ระ_�าย %s ���รร�ั�"
 
 #. Copy Contact Item
-#: libedataserverui/e-name-selector-entry.c:2471
+#: libedataserverui/e-name-selector-entry.c:2526
 #, c-format
 msgid "Cop_y %s"
 msgstr "�ั�_ลอ� %s"
 
 #. Cut Contact Item
-#: libedataserverui/e-name-selector-entry.c:2481
+#: libedataserverui/e-name-selector-entry.c:2536
 #, c-format
 msgid "C_ut %s"
 msgstr "_�ั� %s"
 
 #. Edit Contact item
-#: libedataserverui/e-name-selector-entry.c:2498
+#: libedataserverui/e-name-selector-entry.c:2553
 #, c-format
 msgid "_Edit %s"
 msgstr "�_���� %s"
 
-#: libedataserverui/e-name-selector-list.c:472
+#: libedataserverui/e-name-selector-list.c:479
 #, c-format
 msgid "_Delete %s"
 msgstr "_ล� %s"
 
-#: libedataserverui/e-passwords.c:234
+#: libedataserverui/e-passwords.c:240
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr "�ุ���สำหรั��ว��ุ�������าร�ม����: �ม�มี�ื�อ�ู����หรือ�ื�อ�ฮส��"
 
-#: libedataserverui/e-passwords.c:1094
+#: libedataserverui/e-passwords.c:1099
 msgid "You have the Caps Lock key on."
 msgstr "�ุ�ม Caps Lock �ิ�อยู�"
 
-#: libedataserverui/e-passwords.c:1216
+#: libedataserverui/e-passwords.c:1221
 msgid "_Remember this passphrase"
 msgstr "_�ำวลีรหัส��า��ี�"
 
-#: libedataserverui/e-passwords.c:1217
+#: libedataserverui/e-passwords.c:1222
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_�ำวลีรหัส��า��ี����ลอ�วาระ�ี��หลือ�ี�"
 
-#: libedataserverui/e-passwords.c:1222
+#: libedataserverui/e-passwords.c:1227
 msgid "_Remember this password"
 msgstr "_�ำรหัส��า��ี�"
 
-#: libedataserverui/e-passwords.c:1223
+#: libedataserverui/e-passwords.c:1228
 msgid "_Remember this password for the remainder of this session"
 msgstr "_�ำรหัส��า��ี����ลอ�วาระ�ี��หลือ�ี�"
 
@@ -5047,206 +5036,313 @@ msgstr "_�ำรหัส��า��ี����ลอ�วาระ
 msgid "Select destination"
 msgstr "�ลือ��ลาย�า�"
 
-#: libedataserverui/e-source-selector-dialog.c:156
+#: libedataserverui/e-source-selector-dialog.c:172
 msgid "_Destination"
 msgstr "_�ลาย�า�"
 
-#: servers/exchange/lib/e2k-autoconfig.c:1698
-#: servers/exchange/storage/exchange-account.c:959
-#, c-format
-msgid "Enter password for %s"
-msgstr "��อ�รหัส��า�สำหรั� %s"
+#: servers/groupwise/e-gw-connection.c:227
+msgid "Invalid connection"
+msgstr "�าร��ื�อม��อ����ม����"
 
-#: servers/exchange/lib/e2k-autoconfig.c:1699
-#: servers/exchange/storage/exchange-account.c:964
-msgid "Enter password"
-msgstr "��อ�รหัส��า�"
+#: servers/groupwise/e-gw-connection.c:231
+msgid "Invalid response from server"
+msgstr "���รั��ำ�อ��ี�����ม�����า���ิร���วอร�"
 
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: servers/exchange/lib/e2k-security-descriptor.c:847
-msgid "Owner"
-msgstr "���า�อ�"
+#: servers/groupwise/e-gw-connection.c:233
+msgid "No response from the server"
+msgstr "�ม�มี�าร�อ�รั��า���ิร���วอร�"
 
-#: servers/exchange/lib/e2k-security-descriptor.c:857
-msgid "Publishing Editor"
-msgstr "�รร�า�ิ�าร�ั��ิม��"
+#: servers/groupwise/e-gw-connection.c:239
+msgid "Bad parameter"
+msgstr "�ารามิ��อร��ม��ู���อ�"
 
-#: servers/exchange/lib/e2k-security-descriptor.c:865
-msgid "Editor"
-msgstr "�รร�า�ิ�าร"
+#~ msgid "\"%s\" on book before \"%s\""
+#~ msgstr "\"%s\" �ั�สมุ���อ� \"%s\""
 
-#: servers/exchange/lib/e2k-security-descriptor.c:872
-msgid "Publishing Author"
-msgstr "�ู���ีย��ละ�ั��ิม��"
+#~ msgid "book busy"
+#~ msgstr "สมุ�����า�อยู�"
 
-#: servers/exchange/lib/e2k-security-descriptor.c:878
-msgid "Author"
-msgstr "�ู���ีย�"
+#~ msgid "CORBA exception making \"%s\" call"
+#~ msgstr "��ิ�สิ���ิ��ร��ิ�อ� CORBA ��ะ�รีย� \"%s\""
 
-#: servers/exchange/lib/e2k-security-descriptor.c:883
-msgid "Non-editing Author"
-msgstr "�ู���ีย���ย�ม������"
+#~ msgid "%s: there is no current operation"
+#~ msgstr "%s: �ม�มี��ิ�ั�ิ�าร����ะ�ี�"
 
-#: servers/exchange/lib/e2k-security-descriptor.c:887
-msgid "Reviewer"
-msgstr "�ู��รว��า�"
+#~ msgid "%s: could not cancel"
+#~ msgstr "%s: �ม�สามาร�ย��ลิ�"
 
-#: servers/exchange/lib/e2k-security-descriptor.c:889
-msgid "Contributor"
-msgstr "�ู�ร�วมสม��"
+#~ msgid "\"%s\" on book after \"%s\""
+#~ msgstr "\"%s\" �ั�สมุ�หลั��า� \"%s\""
 
-#: servers/exchange/lib/e2k-security-descriptor.c:891
-msgid "None"
-msgstr "�ม�มี"
+#~ msgid "%s: canceled"
+#~ msgstr "%s: ย��ลิ�"
 
-#: servers/exchange/lib/e2k-security-descriptor.c:906
-msgid "Custom"
-msgstr "�ำห���อ�"
+#~ msgid "%s: no factories available for URI `%s'"
+#~ msgstr "%s: �ม�มี����อรี�ี�สามาร�����ั� URI `%s'"
 
-#: servers/exchange/storage/e-storage.c:555
-msgid "Generic error"
-msgstr "��อ�ิ��ลา��ั�ว��"
+#~ msgid "%s: Could not create EBookListener"
+#~ msgstr "%s: �ม�สามาร�สร�า� EBookListener"
 
-#: servers/exchange/storage/e-storage.c:557
-msgid "A folder with the same name already exists"
-msgstr "มี��ล��อร��ื�อ��ียว�ั�อยู��ล�ว"
+#~ msgid "%s: there was no self contact UID stored in gconf"
+#~ msgstr "%s: �ม�มี�ี�อยู��ิ���อ�อ��ัว�ู�����อ��� gconf"
 
-#: servers/exchange/storage/e-storage.c:559
-msgid "The specified folder type is not valid"
-msgstr "�ระ�ภ���ล��อร��ี�ระ�ุ�ม��ู���อ�"
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "�ี��ือส�ว���อ�วาม�ี�มีลาย�����ิ�ิ�ัล�ำ�ั�"
 
-#: servers/exchange/storage/e-storage.c:561
-msgid "I/O error"
-msgstr "��อ�ิ��ลา����ารอ�า�-��ีย���อมูล"
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
 
-#: servers/exchange/storage/e-storage.c:563
-msgid "Not enough space to create the folder"
-msgstr "�ื���ี�ว�า��ม��อสำหรั��ารสร�า���ล��อร�"
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 4 authentication."
+#~ msgstr "�ัว�ลือ��ี��ะ��ื�อม��อ��ยั���ิร���วอร���ย�าร����ารยื�ยั��ัว�ุ��ล��� Kerberos 4"
 
-#: servers/exchange/storage/e-storage.c:565
-msgid "The folder is not empty"
-msgstr "��ล��อร��ม�ว�า�"
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "�ม�สามาร��อ�ั�วสำหรั� Kerberos:\n"
+#~ "%s"
 
-#: servers/exchange/storage/e-storage.c:567
-msgid "The specified folder was not found"
-msgstr "�ม�����ล���อร��ี�ระ�ุ"
+#~ msgid "Decoder failed, error %d"
+#~ msgstr "�าร�อ�รหัส�ิ��ลา� ��อ�ิ��ลา�หมาย�ล� %d"
 
-#: servers/exchange/storage/e-storage.c:569
-msgid "Function not implemented in this storage"
-msgstr "ห��า�ี��าร�ำ�า�สำหรั��ื���ี��ั������ี�ยั��ม��ำ�า�"
+#~ msgid "Unable to get issuer's certificate"
+#~ msgstr "�ม�สามาร�อ�า���รั�รอ��อ��ู�ออ���รั�รอ�"
 
-#: servers/exchange/storage/e-storage.c:573
-msgid "Operation not supported"
-msgstr "�ม�รอ�รั���ิ�ั�ิ�าร�ี�"
+#~ msgid "Unable to get Certificate Revocation List"
+#~ msgstr "�ม�สามาร�อ�า�ราย�าร�าร��ิ��อ���รั�รอ�"
 
-#: servers/exchange/storage/e-storage.c:575
-msgid "The specified type is not supported in this storage"
-msgstr "�ื���ี��ั������ี��ม�รอ�รั��ระ�ภ��ี��ำห��"
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "�ม�สามาร��อ�รหัสลั�ลาย�����ำ�ั���รั�รอ�"
 
-#: servers/exchange/storage/e-storage.c:577
-msgid "The specified folder cannot be modified or removed"
-msgstr "��ล��อร��ี�ระ�ุ�ม�สามาร���ลี�ย���ล�หรือล�ออ����"
+#~ msgid "Unable to decrypt Certificate Revocation List signature"
+#~ msgstr "�ม�สามาร��อ�รหัสลั�ลาย�����ำ�ั�ราย�าร�าร��ิ��อ���รั�รอ�"
 
-#: servers/exchange/storage/e-storage.c:579
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "�ม�สามาร��ห���ล��อร�อยู������ล��อร��ี�อยู���า����ล���อี����"
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "�ม�สามาร��อ�รหัส�ุ���สา�าร�ะ�อ��ู�ออ���รั�รอ�"
 
-#: servers/exchange/storage/e-storage.c:581
-msgid "Cannot create a folder with that name"
-msgstr "�ม�สามาร�สร�า���ล��อร���วย�ื�อ�ั�����"
+#~ msgid "Certificate signature failure"
+#~ msgstr "ลาย�����ำ�ั���รั�รอ�ล�ม�หลว"
 
-#: servers/exchange/storage/e-storage.c:583
-msgid "This operation cannot be performed in off-line mode"
-msgstr "��ิ�ั�ิ�าร�ี��ม�สามาร��ระ�ำ��ะออ��ล�����"
+#~ msgid "Certificate Revocation List signature failure"
+#~ 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
-#, c-format
-msgid "%s's Folders"
-msgstr "��ล��อร��อ� %s"
+#~ msgid "Certificate not yet valid"
+#~ msgstr "��รั�รอ�ยั��ม��ริ�ม���"
 
-#: servers/exchange/storage/exchange-account.c:1265
-msgid "Personal Folders"
-msgstr "��ล��อร�ส�ว��ุ��ล"
+#~ msgid "Certificate has expired"
+#~ msgstr "��รั�รอ�หม�อายุ�ล�ว"
 
-#: servers/exchange/storage/exchange-account.c:1280
-msgid "Favorite Public Folders"
-msgstr "��ล��อร�สา�าร�ะราย�าร��ร�"
+#~ msgid "CRL not yet valid"
+#~ msgstr "CRL ยั��ม��ริ�ม���"
 
-#. i18n: Outlookism
-#: servers/exchange/storage/exchange-account.c:1297
-msgid "All Public Folders"
-msgstr "��ล��อร�สา�าร�ะ�ั��หม�"
+#~ msgid "CRL has expired"
+#~ msgstr "CRL หม�อายุ�ล�ว"
 
-#. i18n: Outlookism
-#: servers/exchange/storage/exchange-account.c:1311
-msgid "Global Address List"
-msgstr "Global Address List"
+#~ msgid "Error in CRL"
+#~ msgstr "��ิ���อ�ิ��ลา��� CRL"
 
-#: servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "ราย�าร�ี�ล�"
+#~ msgid "Out of memory"
+#~ msgstr "�ื��ี��วาม�ำ�ม��อ"
 
-#: servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "�ั��ึ�"
+#~ msgid "Certificate Revoked"
+#~ msgstr "��รั�รอ��ู���ิ��อ�"
 
-#: servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "�ั��ึ���อ�วาม"
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "อ����รรั�รอ���รั�รอ��ม��ู���อ�"
 
-#: servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "��หมายออ�"
+#~ msgid "Path length exceeded"
+#~ msgstr "�วามยาว�อ��า���ิ�"
 
-#: servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "ส���ล�ว"
+#~ msgid "Invalid purpose"
+#~ msgstr "�ุ�มุ��หมาย�ม��ู���อ�"
 
-#: servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "ภาร�ิ�"
+#~ msgid "Certificate untrusted"
+#~ msgstr "��รั�รอ��ม���า��ื�อ�ือ"
 
-#: servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "�าร��ื�อม��อ����ม����"
+#~ msgid "Certificate rejected"
+#~ msgstr "��รั�รอ��ู���ิ�ส�"
 
-#: servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "���รั��ำ�อ��ี�����ม�����า���ิร���วอร�"
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "หัว��อ/�ู�ออ��ห� �ม��ร��ั�"
 
-#: servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "�ม�มี�าร�อ�รั��า���ิร���วอร�"
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "AKID/SKID �ม��ร��ั�"
 
-#: servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "�ารามิ��อร��ม��ู���อ�"
+#~ msgid "Key usage does not support certificate signing"
+#~ msgstr "�าร����า��ุ����ม�รอ�รั��าร�����ำ�ั���รั�รอ�"
 
-#: src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "�����อ����อ����มสมุ��ี�อยู� Evolution"
+#~ msgid "Error in application verification"
+#~ msgstr "��ิ���อ�ิ��ลา����าร�รว�สอ���ร��รม"
 
-#: src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "�����อ������ม�ละ webcal �อ���ิ�ิ� Evolution"
+#~ msgid ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
+#~ msgstr ""
+#~ "��รั�รอ�����าร�ม�����า� %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "�ุ�ยั���อ��ารยอมรั�อยู�หรือ�ม�?"
+
+#~ msgid "Drafts"
+#~ msgstr "��หมายร�า�"
+
+#~ msgid "Sent"
+#~ msgstr "��หมายออ�"
+
+#~ msgid "Templates"
+#~ msgstr "������"
 
-#: src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "�ริ�าร�รว�สอ�ส�ว��ิ���อ�อ���ิร���วอร���อมูล Evolution"
+#~ msgid ""
+#~ "Experimental IMAP 4(.1) client\n"
+#~ "This is untested and unsupported code, you want to use plain imap "
+#~ "instead.\n"
+#~ "\n"
+#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+#~ msgstr ""
+#~ "ลู���าย IMAP 4(.1) ��ั���สอ�\n"
+#~ "�����ี��ม������า��าร��สอ��ละ�ม�มี�ารส�ั�ส�ุ� �ุ�อา���อ��าร��� imap �รรม�า���\n"
+#~ "\n"
+#~ " !!! อย�า����ั�อี�มลสำ�ั� !!!\n"
 
-#: src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "�ริ�าร�ั��ึ��ูม�อ���ิร���วอร���อมูล Evolution"
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "�ม�สามาร���ื�อม��อ��ยั���ิร���วอร� POP �� %s"
 
-#. 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 "Enter password for %s"
+#~ msgstr "��อ�รหัส��า�สำหรั� %s"
+
+#~ msgid "Enter password"
+#~ msgstr "��อ�รหัส��า�"
+
+#~ msgid "Owner"
+#~ msgstr "���า�อ�"
+
+#~ msgid "Publishing Editor"
+#~ msgstr "�รร�า�ิ�าร�ั��ิม��"
+
+#~ msgid "Editor"
+#~ msgstr "�รร�า�ิ�าร"
+
+#~ msgid "Publishing Author"
+#~ msgstr "�ู���ีย��ละ�ั��ิม��"
+
+#~ msgid "Author"
+#~ msgstr "�ู���ีย�"
+
+#~ msgid "Non-editing Author"
+#~ msgstr "�ู���ีย���ย�ม������"
+
+#~ msgid "Reviewer"
+#~ msgstr "�ู��รว��า�"
+
+#~ msgid "Contributor"
+#~ msgstr "�ู�ร�วมสม��"
+
+#~ msgid "None"
+#~ msgstr "�ม�มี"
+
+#~ msgid "Custom"
+#~ msgstr "�ำห���อ�"
+
+#~ msgid "Generic error"
+#~ msgstr "��อ�ิ��ลา��ั�ว��"
+
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "มี��ล��อร��ื�อ��ียว�ั�อยู��ล�ว"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "�ระ�ภ���ล��อร��ี�ระ�ุ�ม��ู���อ�"
+
+#~ msgid "I/O error"
+#~ msgstr "��อ�ิ��ลา����ารอ�า�-��ีย���อมูล"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "�ื���ี�ว�า��ม��อสำหรั��ารสร�า���ล��อร�"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "��ล��อร��ม�ว�า�"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "�ม�����ล���อร��ี�ระ�ุ"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "ห��า�ี��าร�ำ�า�สำหรั��ื���ี��ั������ี�ยั��ม��ำ�า�"
+
+#~ msgid "Operation not supported"
+#~ msgstr "�ม�รอ�รั���ิ�ั�ิ�าร�ี�"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "�ื���ี��ั������ี��ม�รอ�รั��ระ�ภ��ี��ำห��"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "��ล��อร��ี�ระ�ุ�ม�สามาร���ลี�ย���ล�หรือล�ออ����"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "�ม�สามาร��ห���ล��อร�อยู������ล��อร��ี�อยู���า����ล���อี����"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "�ม�สามาร�สร�า���ล��อร���วย�ื�อ�ั�����"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "��ิ�ั�ิ�าร�ี��ม�สามาร��ระ�ำ��ะออ��ล�����"
+
+#~ msgid "%s's Folders"
+#~ msgstr "��ล��อร��อ� %s"
+
+#~ msgid "Personal Folders"
+#~ msgstr "��ล��อร�ส�ว��ุ��ล"
+
+#~ msgid "Favorite Public Folders"
+#~ msgstr "��ล��อร�สา�าร�ะราย�าร��ร�"
+
+#~ msgid "All Public Folders"
+#~ msgstr "��ล��อร�สา�าร�ะ�ั��หม�"
+
+#~ msgid "Global Address List"
+#~ msgstr "Global Address List"
+
+#~ msgid "Deleted Items"
+#~ msgstr "ราย�าร�ี�ล�"
+
+#~ msgid "Journal"
+#~ msgstr "�ั��ึ�"
+
+#~ msgid "Notes"
+#~ msgstr "�ั��ึ���อ�วาม"
+
+#~ msgid "Outbox"
+#~ msgstr "��หมายออ�"
+
+#~ msgid "Sent Items"
+#~ msgstr "ส���ล�ว"
+
+#~ msgid "Tasks"
+#~ msgstr "ภาร�ิ�"
+
+#~ msgid "Evolution Addressbook file backend"
+#~ msgstr "�����อ����อ����มสมุ��ี�อยู� Evolution"
+
+#~ msgid "Evolution Calendar file and webcal backend"
+#~ msgstr "�����อ������ม�ละ webcal �อ���ิ�ิ� Evolution"
+
+#~ msgid "Evolution Data Server interface check service"
+#~ msgstr "�ริ�าร�รว�สอ�ส�ว��ิ���อ�อ���ิร���วอร���อมูล Evolution"
+
+#~ msgid "Evolution Data Server logging service"
+#~ msgstr "�ริ�าร�ั��ึ��ูม�อ���ิร���วอร���อมูล Evolution"
+
+#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
+#~ msgstr ""
+#~ "��ิ���อ�ิ��ลา����ารอ�า�ห��วย�วาม�ำหลายราย�าร; "
+#~ "�ม�สามาร��ส���ล�อ�����อ��ส����อ�ิ��ลา�\n"
 
 #~ msgid "Fair"
 #~ msgstr "��อ���า��ร��"